Renaming Player_Spindash to SonicKnux_Spindash

Tails has his own version of the subroutine (Tails_Spindash). Also correcting explanation for some register usage.
sonicretro · Nov 6, 2015 · ef7b552 · ef7b552
1 parent e400291
commit ef7b552
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/sonic3k.asm b/sonic3k.asm
@@ -22152,7 +22152,9 @@ loc_10A8E:
 ; ---------------------------------------------------------------------------
 
 Obj_Sonic:
-		; Load some addresses into registers to save cycles later on
+		; Load some addresses into registers
+		; This is done to allow some subroutines to be
+		; shared with Tails/Knuckles.
 		lea	(Sonic_Knux_top_speed).w,a4
 		lea	(Distance_from_screen_top).w,a5
 		lea	(Dust).w,a6
@@ -22582,7 +22584,7 @@ loc_10F22:
 ; ---------------------------------------------------------------------------
 ; Sonic_Stand_Path:
 Sonic_MdNormal:
-		bsr.w	Player_Spindash
+		bsr.w	SonicKnux_Spindash
 		bsr.w	Sonic_Jump
 		bsr.w	Player_SlopeResist
 		bsr.w	Sonic_Move
@@ -23917,9 +23919,8 @@ SonicKnux_SuperHyper:
 
 ; =============== S U B R O U T I N E =======================================
 
-
-Player_Spindash:
-
+; Player_Spindash:
+SonicKnux_Spindash:
 		tst.b	$3D(a0)
 		bne.s	loc_11C5E
 		cmpi.b	#8,$20(a0)
@@ -23961,7 +23962,7 @@ loc_11C58:
 		movem.l	(sp)+,a4-a6
 
 locret_11C5C:
-					; Player_Spindash+16j ...
+					; SonicKnux_Spindash+16j ...
 		rts
 ; ---------------------------------------------------------------------------
 
@@ -24042,7 +24043,7 @@ loc_11D16:
 		move.w	#0,$3E(a0)
 
 loc_11D2E:
-					; Player_Spindash+148j
+					; SonicKnux_Spindash+148j
 		move.b	(Ctrl_1_pressed_logical).w,d0
 		andi.b	#$70,d0
 		beq.w	loc_11D5E
@@ -24055,7 +24056,7 @@ loc_11D2E:
 		move.w	#$800,$3E(a0)
 
 loc_11D5E:
-					; Player_Spindash+158j	...
+					; SonicKnux_Spindash+158j	...
 		addq.l	#4,sp
 		cmpi.w	#$60,(a5)
 		beq.s	loc_11D6C
@@ -24090,7 +24091,7 @@ loc_11DA0:
 
 locret_11DA4:
 		rts
-; End of function Player_Spindash
+; End of function SonicKnux_Spindash
 
 
 ; ---------------------------------------------------------------------------
@@ -31040,7 +31041,7 @@ loc_167EA:
 ; ---------------------------------------------------------------------------
 
 Knux_Stand_Path:
-		bsr.w	Player_Spindash
+		bsr.w	SonicKnux_Spindash
 		bsr.w	Knux_Jump
 		bsr.w	Player_SlopeResist
 		bsr.w	Knux_InputAcceleration_Path