Skip to content

Commit

Permalink
fixed cutscene input
Browse files Browse the repository at this point in the history
  • Loading branch information
nstbayless committed Jul 24, 2024
1 parent 30c9d0e commit 2f8aefe
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 4 deletions.
Binary file modified out.ips
Binary file not shown.
18 changes: 15 additions & 3 deletions patch.asm
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,24 @@ FROM $9756
; x=0 before this
lda #VSP_CONTROL_ZERO_VSPEED
STA vsp_control,X
LDA #$00
STA simon_fall_objphase,X
STX simon_fall_objphase
lda #$16
sta imgsin
zero_hspfra:
lda #$00
sta hspfra
__standard_rts:
rts
rts_if_cutscene:
lda cutscene_timer
beq __standard_rts
lda cutscene_input
beq __standard_rts
; double-rts -- rts caller
pla
pla
rts
;DB $FF,$FF,$FF,$FF,$FF,$60,$FF,$FF,$FF,$FF,$FF,$FF
LIMIT $9777

FROM $9777
standard_jump:
Expand Down Expand Up @@ -112,6 +121,7 @@ custom_jump_then_standard_jump:
LDA #$76
PHA
custom_jump_jsr:
jsr rts_if_cutscene
JSR zero_hspfra
LDA joypad_down
AND #$03 ; 1=right, 2=left
Expand Down Expand Up @@ -244,6 +254,8 @@ crouch_direction:
; (detour trampoline continue)
JMP $840C
LIMIT $C000
; --------------------------------------------------------------------
BANK $F
BASE $C000
Expand Down
15 changes: 14 additions & 1 deletion ram.asm
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,16 @@ BASE $05EB:
BASE $004A:
hitpoints:

BASE $0081:
hearts:

BASE $0028:
joypad_pressed:

BASE $002A:
joypad_down:


BASE $0506:
dagger_hspint:

Expand Down Expand Up @@ -134,4 +138,13 @@ BASE $003A
partner_us:

BASE $0048
partner_jp:
partner_jp:
BASE $780
cutscene_timer:
BASE $783
cutscene_input:
BASE $007B:
time_lo:

0 comments on commit 2f8aefe

Please sign in to comment.