Skip to content

Commit

Permalink
Renaming Player_DoLevelCollision to SonicKnux_DoLevelCollision and su…
Browse files Browse the repository at this point in the history 
…b_153C2 to Tails_DoLevelCollision

Curiously, Tails uses SonicKnux_DoLevelCollision on occasion.
  • Loading branch information
@Clownacy
Clownacy committed Nov 18, 2015
1 parent 404cdd7 commit 70dd897
Showing 1 changed file with 24 additions and 25 deletions.
49 changes: 24 additions & 25 deletions sonic3k.asm
View file
Expand Up @@ -21944,7 +21944,7 @@ loc_10868:
loc_10884:
bsr.w Player_JumpAngle
movem.l a4-a6,-(sp)
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
movem.l (sp)+,a4-a6
rts
; ---------------------------------------------------------------------------
Expand Down Expand Up @@ -21974,7 +21974,7 @@ loc_108B8:
loc_108D4:
bsr.w Player_JumpAngle
movem.l a4-a6,-(sp)
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
movem.l (sp)+,a4-a6
rts

Expand Down Expand Up @@ -22648,7 +22648,7 @@ Sonic_MdAir:
subi.w #$28,y_vel(a0) ; reduce gravity by $28 ($38-$28=$10)
loc_10FD6:
bsr.w Player_JumpAngle
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
rts
; ---------------------------------------------------------------------------
; Start of subroutine Sonic_MdRoll
Expand Down Expand Up @@ -22701,7 +22701,7 @@ Sonic_MdJump:
subi.w #$28,y_vel(a0) ; reduce gravity by $28 ($38-$28=$10)
loc_11056:
bsr.w Player_JumpAngle
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
rts

; ---------------------------------------------------------------------------
Expand Down Expand Up @@ -24314,8 +24314,8 @@ locret_11EEA:

; =============== S U B R O U T I N E =======================================

; sub_11EEC:
Player_DoLevelCollision:
; sub_11EEC: Player_DoLevelCollision:
SonicKnux_DoLevelCollision:
move.l (Primary_collision_addr).w,(Collision_addr).w
cmpi.b #$C,top_solid_bit(a0)
beq.s loc_11F00
Expand Down Expand Up @@ -24403,7 +24403,7 @@ loc_11FC2:
locret_11FD4:

rts
; End of function Player_DoLevelCollision
; End of function SonicKnux_DoLevelCollision


; =============== S U B R O U T I N E =======================================
Expand Down Expand Up @@ -24784,7 +24784,7 @@ loc_12336:
loc_12344:

movem.l a4-a6,-(sp)
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
movem.l (sp)+,a4-a6
btst #1,$2A(a0)
bne.s locret_12388
Expand Down Expand Up @@ -26089,7 +26089,7 @@ loc_1335A:
loc_1337C:
bsr.w Player_JumpAngle
movem.l a4-a6,-(sp)
bsr.w sub_153C2
bsr.w Tails_DoLevelCollision
movem.l (sp)+,a4-a6
rts
; ---------------------------------------------------------------------------
Expand All @@ -26100,7 +26100,7 @@ loc_1338E:
jsr (MoveSprite2).l
bsr.w Player_JumpAngle
movem.l a4-a6,-(sp)
bsr.w sub_153C2
bsr.w Tails_DoLevelCollision
movem.l (sp)+,a4-a6
rts

Expand Down Expand Up @@ -26215,7 +26215,7 @@ loc_1348C:
loc_134A8:
bsr.w Player_JumpAngle
movem.l a4-a6,-(sp)
bsr.w sub_153C2
bsr.w Tails_DoLevelCollision
movem.l (sp)+,a4-a6
rts

Expand Down Expand Up @@ -27692,7 +27692,7 @@ loc_144F8:
move.w $1A(a0),($FFFFF74C).w
movem.l d0-a6,-(sp)
lea (Player_1).w,a0
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
movem.l (sp)+,d0-a6
rts
; ---------------------------------------------------------------------------
Expand Down Expand Up @@ -27947,7 +27947,7 @@ Tails_Stand_Freespace:

loc_147DE:
bsr.w Player_JumpAngle
bsr.w sub_153C2
bsr.w Tails_DoLevelCollision
rts
; ---------------------------------------------------------------------------

Expand All @@ -27958,7 +27958,7 @@ Tails_FlyingSwimming:
jsr (MoveSprite_TestGravity2).l
bsr.w Player_JumpAngle
movem.l a4-a6,-(sp)
bsr.w sub_153C2
bsr.w Tails_DoLevelCollision
movem.l (sp)+,a4-a6
tst.w (Player_mode).w
bne.s locret_14820
Expand Down Expand Up @@ -28171,7 +28171,7 @@ loc_149BA:

loc_149DA:
bsr.w Player_JumpAngle
bsr.w sub_153C2
bsr.w Tails_DoLevelCollision
rts

; =============== S U B R O U T I N E =======================================
Expand Down Expand Up @@ -29265,9 +29265,8 @@ locret_153C0:

; =============== S U B R O U T I N E =======================================


sub_153C2:

; sub_153C2:
Tails_DoLevelCollision:
move.l (Primary_collision_addr).w,(Collision_addr).w
cmpi.b #$C,$46(a0)
beq.s loc_153D6
Expand Down Expand Up @@ -29518,7 +29517,7 @@ loc_155F2:
locret_1560A:

rts
; End of function sub_153C2
; End of function Tails_DoLevelCollision


; =============== S U B R O U T I N E =======================================
Expand Down Expand Up @@ -29643,7 +29642,7 @@ loc_15734:
loc_15742:

movem.l a4-a6,-(sp)
bsr.w sub_153C2
bsr.w Tails_DoLevelCollision
movem.l (sp)+,a4-a6
btst #1,$2A(a0)
bne.s locret_15786
Expand Down Expand Up @@ -31088,7 +31087,7 @@ Knux_Stand_Freespace:

loc_16872:
bsr.w Player_JumpAngle
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
rts
; ---------------------------------------------------------------------------

Expand Down Expand Up @@ -31930,7 +31929,7 @@ Knux_Spin_Freespace:

loc_17138:
bsr.w Player_JumpAngle
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
rts

; =============== S U B R O U T I N E =======================================
Expand Down Expand Up @@ -33098,7 +33097,7 @@ loc_17C2E:
loc_17C3C:

movem.l a4-a6,-(sp)
bsr.w Player_DoLevelCollision
bsr.w SonicKnux_DoLevelCollision
movem.l (sp)+,a4-a6
btst #1,$2A(a0)
bne.s locret_17C80
Expand Down Expand Up @@ -86645,7 +86644,7 @@ loc_3F678:
movea.l a1,a0

loc_3F69C:
jsr (Player_DoLevelCollision).l
jsr (SonicKnux_DoLevelCollision).l
movem.l (sp)+,d0-a6

loc_3F6A6:
Expand Down Expand Up @@ -99048,7 +99047,7 @@ loc_49730:
movea.l a1,a0
jsr (MoveSprite2).l
jsr (Player_JumpAngle).l
jsr (Player_DoLevelCollision).l
jsr (SonicKnux_DoLevelCollision).l
movem.l (sp)+,d0-a6
bset #1,$2A(a1)
move.b (Level_frame_counter+1).w,d0
Expand Down

0 comments on commit 70dd897

Please sign in to comment.