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/mansion1.asm | |
| parent | Label elite four scripts more completely. (diff) | |
| parent | Fix game time labels (diff) | |
| download | pokeyellow-115fba107d6e319e2a047a17f5c0dfca723a8d05.tar.gz pokeyellow-115fba107d6e319e2a047a17f5c0dfca723a8d05.tar.xz pokeyellow-115fba107d6e319e2a047a17f5c0dfca723a8d05.zip | |
Merge pull request #120 from PikalaxALT/master
Fix game time labels, wCurrentMapScriptFlags
Diffstat (limited to 'scripts/mansion1.asm')
| -rwxr-xr-x | scripts/mansion1.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 2b14176d..d342c295 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -9,7 +9,7 @@ Mansion1Script: ; 442af (11:42af) ret Mansion1Subscript1: ; 442c5 (11:42c5) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -106,7 +106,7 @@ Mansion1Text4: ; 4435a (11:435a) jr nz, .asm_4438c ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld hl, MansionSwitchPressedText call PrintText |