diff --git a/out.ips b/out.ips index 394ba5f..96212ec 100644 Binary files a/out.ips and b/out.ips differ diff --git a/patch.asm b/patch.asm index eccb0c8..4fcac3a 100644 --- a/patch.asm +++ b/patch.asm @@ -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: @@ -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 @@ -244,6 +254,8 @@ crouch_direction: ; (detour trampoline continue) JMP $840C +LIMIT $C000 + ; -------------------------------------------------------------------- BANK $F BASE $C000 diff --git a/ram.asm b/ram.asm index edabe67..829e75e 100644 --- a/ram.asm +++ b/ram.asm @@ -82,12 +82,16 @@ BASE $05EB: BASE $004A: hitpoints: +BASE $0081: + hearts: + BASE $0028: joypad_pressed: BASE $002A: joypad_down: + BASE $0506: dagger_hspint: @@ -134,4 +138,13 @@ BASE $003A partner_us: BASE $0048 - partner_jp: \ No newline at end of file + partner_jp: + +BASE $780 + cutscene_timer: + +BASE $783 + cutscene_input: + +BASE $007B: + time_lo: \ No newline at end of file