Correcting Player_Roll to SonicKnux_Roll and Tails_Spin to Tails_Roll

sonicretro · Nov 18, 2015 · e9392ce · e9392ce
1 parent ef7b552
commit e9392ce
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/sonic3k.asm b/sonic3k.asm
@@ -22588,7 +22588,7 @@ Sonic_MdNormal:
 		bsr.w	Sonic_Jump
 		bsr.w	Player_SlopeResist
 		bsr.w	Sonic_Move
-		bsr.w	Player_Roll
+		bsr.w	SonicKnux_Roll
 		bsr.w	Player_LevelBound
 		jsr	(MoveSprite_TestGravity2).l
 		bsr.w	Call_Player_AnglePos
@@ -23502,8 +23502,8 @@ Player_Boundary_Sides:
 
 ; =============== S U B R O U T I N E =======================================
 
-; Player_Spin:
-Player_Roll:
+; Player_Spin: Player_Roll:
+SonicKnux_Roll:
 		tst.b	status_secondary(a0)
 		bmi.s	locret_1177E
 		move.b	(Ctrl_1_logical).w,d0
@@ -23523,7 +23523,7 @@ loc_1176A:
 		move.b	#8,anim(a0)	; enter ducking animation
 
 locret_1177E:
-					; Player_Roll+Ej ...
+					; SonicKnux_Roll+Ej ...
 		rts
 ; ---------------------------------------------------------------------------
 ; loc_11780:
@@ -23559,7 +23559,7 @@ loc_117C2:
 
 locret_117D8:
 		rts
-; End of function Player_Roll
+; End of function SonicKnux_Roll
 
 
 ; ---------------------------------------------------------------------------
@@ -27904,7 +27904,7 @@ loc_14760:
 		bsr.w	Tails_Jump
 		bsr.w	Player_SlopeResist
 		bsr.w	Tails_InputAcceleration_Path
-		bsr.w	Tails_Spin
+		bsr.w	Tails_Roll
 		bsr.w	Tails_Check_Screen_Boundaries
 		jsr	(MoveSprite_TestGravity2).l
 		bsr.w	Call_Player_AnglePos
@@ -28845,8 +28845,8 @@ loc_14F5C:
 
 ; =============== S U B R O U T I N E =======================================
 
-
-Tails_Spin:
+; Tails_Spin:
+Tails_Roll:
 		tst.b	$2B(a0)
 		bmi.s	locret_14FA8
 		move.b	(Ctrl_2_logical).w,d0
@@ -28901,7 +28901,7 @@ loc_14FEA:
 
 locret_15000:
 		rts
-; End of function Tails_Spin
+; End of function Tails_Roll
 
 
 ; =============== S U B R O U T I N E =======================================
@@ -31045,7 +31045,7 @@ Knux_Stand_Path:
 		bsr.w	Knux_Jump
 		bsr.w	Player_SlopeResist
 		bsr.w	Knux_InputAcceleration_Path
-		bsr.w	Player_Roll
+		bsr.w	SonicKnux_Roll
 		bsr.w	Player_LevelBound
 		jsr	(MoveSprite_TestGravity2).l
 		bsr.w	Call_Player_AnglePos