diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-08-01 13:27:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 13:27:38 -0700 |
| commit | f02fb72cfb104d3836196676d9d97076b77c1c4f (patch) | |
| tree | 490e4d3f9a8ca174dd25d2f28c00221bcf5ae22d /data/scripts | |
| parent | 76634df376948b03825fbdcf770ce8351dbe3bd0 (diff) | |
| parent | 3a151b343d4473c96b7128a3565a180298cc070d (diff) | |
Merge pull request #545 from hatal175/various2
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov2.inc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov2.inc b/data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov2.inc index c7a0e571..6c512012 100644 --- a/data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov2.inc +++ b/data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov2.inc @@ -22,32 +22,23 @@ script_080145F8: Wait 0x0018 EnablePlayerControl Jump script_080145F8 +.endif script_08014632: CheckRoomFlag 0x0000 JumpIfNot script_08014632 SetPlayerIdle Call DisablePauseMenuAndPutAwayItems script_08014642: +.ifdef EU CheckRoomFlag 0x0009 - JumpIf script_08014642 - SetSyncFlag 0x00000004 - WaitForSyncFlagAndClear 0x00000008 - Call EnablePauseMenu - EnablePlayerControl - Jump script_080145F8 .else - CheckRoomFlag 0x0000 - JumpIfNot script_080145F8 - SetPlayerIdle - Call DisablePauseMenuAndPutAwayItems -script_08014608: CheckRoomFlag 0x0004 - JumpIf script_08014608 +.endif + JumpIf script_08014642 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 Call EnablePauseMenu EnablePlayerControl Jump script_080145F8 -.endif .align 2, 0 |