Skip to content

Commit

Permalink
Eggfix.
Browse files Browse the repository at this point in the history
  • Loading branch information
DrMelon committed Nov 17, 2020
1 parent a6aaffa commit 894ec7e
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions sonic3k.asm
Original file line number Diff line number Diff line change
Expand Up @@ -26710,9 +26710,9 @@ loc_13DA6:
move.w (Pos_table_index).w,d0
sub.b d1,d0
move.w (a2,d0.w),d2
btst #3,$2A(a1)
btst #3,$2A(a1)
bne.s loc_13DD0
cmpi.w #$400,$1C(a1)
cmpi.w #$400,$1C(a1) ; check speed against ply 1
bge.s loc_13DD0
subi.w #$20,d2

Expand Down Expand Up @@ -68887,7 +68887,7 @@ loc_3294C:
beq.s loc_32974
cmpi.w #-$400,d0
ble.s loc_32966
move.w #-$400,$1C(a1)
move.w #-$400,$1C(a1) ; fly off left
rts
; ---------------------------------------------------------------------------

Expand All @@ -68903,7 +68903,7 @@ locret_32972:
loc_32974:
cmpi.w #$400,d0
bge.s loc_32982
move.w #$400,$1C(a1)
move.w #$400,$1C(a1) ; fly off right
rts
; ---------------------------------------------------------------------------

Expand Down Expand Up @@ -114235,10 +114235,10 @@ loc_556C4:
cmp.w $10(a1),d0
bls.s loc_556E8
move.w d0,$10(a1)
move.w #$400,$1C(a1)
move.w #$400,$1C(a1) ;forces speed to 400...
cmpi.w #3,(Player_mode).w
bne.s locret_556F6
move.w #$500,$1C(a1)
move.w #$500,$1C(a1) ; forces speed to 500?
bra.s locret_556F6
; ---------------------------------------------------------------------------

Expand Down Expand Up @@ -172638,7 +172638,7 @@ loc_7FDD0:
move.w a0,$46(a1)

loc_7FDE2:
lea (Player_1).w,a1
lea (Player_1).w,a1 ; fetch player
move.w #$30,$10(a1)
move.w #$CD,$14(a1)
bsr.w sub_7FE06
Expand All @@ -172653,7 +172653,7 @@ sub_7FE06:
move.b #-$7F,$2E(a1)
move.b #0,$20(a1)
move.w #$600,$18(a1)
move.w #$600,$1C(a1)
move.w #$600,$1C(a1) ; set speed to 600..?
cmpi.b #1,$38(a1)
bne.s locret_7FE2A
addq.w #4,$14(a1)
Expand All @@ -172675,7 +172675,8 @@ loc_7FE2C:
jsr (Create_New_Sprite).l
bne.s locret_7FE5A
move.l #Obj_Song_Fade_Transition,(a1)
move.b #mus_FinalBoss,$2C(a1)
move.b #mus_FinalBoss,$2C(a1) ; start final boss music. if we're here, we may as well set the always-snolf on?
move.w #1,(Golf_force_allow).w

locret_7FE5A:
rts
Expand Down

0 comments on commit 894ec7e

Please sign in to comment.