diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-01-03 14:21:56 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-01-03 14:21:56 -0500 |
| commit | 115fba107d6e319e2a047a17f5c0dfca723a8d05 (patch) | |
| tree | f242eec26b51c08505ecb5b8d39bfe5eaac14cd5 /scripts/rockethideout4.asm | |
| parent | 1a5a108bdf6904423bfa80cc7bcb5582331740cb (diff) | |
| parent | 28dc5686b05477e13a9cc078975315140bee9800 (diff) | |
Merge pull request #120 from PikalaxALT/master
Fix game time labels, wCurrentMapScriptFlags
Diffstat (limited to 'scripts/rockethideout4.asm')
| -rwxr-xr-x | scripts/rockethideout4.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 23b8c791..44ae7814 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -9,7 +9,7 @@ RocketHideout4Script: ; 4545d (11:545d) ret RocketHideout4Script_45473: ; 45473 (11:5473) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -65,7 +65,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6) call GBFadeInFromBlack xor a ld [wJoyIgnore], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, $0 ld [wRocketHideout4CurScript], a |