From bb03dfffdcfeb872e20c316dbdfe3ad53ed8fe49 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 9 Jun 2024 16:14:22 -0400 Subject: [PATCH] all_sprites cleanup --- Sprites/all_sprites.asm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm index 686b704..3672e0e 100644 --- a/Sprites/all_sprites.asm +++ b/Sprites/all_sprites.asm @@ -1,17 +1,16 @@ InCutScene = $7EF303 -org $0083F8 -LDA InCutScene : BEQ .notInCutscene +; Player2JoypadReturn +org $0083F8 + LDA InCutScene : BEQ .notInCutscene STZ $F0 STZ $F2 STZ $F4 STZ $F6 STZ $F8 STZ $FA ; kill all input - -.notInCutscene - -RTS + .notInCutscene + RTS warnpc $00841E @@ -123,8 +122,6 @@ print "End of poltergeist.asm ", pc incsrc "Sprites/Enemies/pols_voice.asm" print "End of pols_voice.asm ", pc - - incsrc "Sprites/NPCs/zora_princess.asm" print "End of zora_princess.asm ", pc