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/celadongamecorner.asm | |
| parent | 1a5a108bdf6904423bfa80cc7bcb5582331740cb (diff) | |
| parent | 28dc5686b05477e13a9cc078975315140bee9800 (diff) | |
Merge pull request #120 from PikalaxALT/master
Fix game time labels, wCurrentMapScriptFlags
Diffstat (limited to 'scripts/celadongamecorner.asm')
| -rwxr-xr-x | scripts/celadongamecorner.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index dd534dba..9a6dcd6d 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -7,7 +7,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd) jp CallFunctionInTable CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z @@ -24,7 +24,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) ret CeladonGameCornerScript_48bec: ; 48bec (12:4bec) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -109,7 +109,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) ld a, HS_GAME_CORNER_ROCKET ld [wMissableObjectIndex], a predef HideObject - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] ld a, $0 |