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/cinnabargym.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/cinnabargym.asm')
| -rwxr-xr-x | scripts/cinnabargym.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 6b347652..c4905d59 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -6,7 +6,7 @@ CinnabarGymScript: ; 7574a (1d:574a) jp CallFunctionInTable CinnabarGymScript_75759: ; 75759 (1d:5759) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] push hl @@ -165,7 +165,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) ; deactivate gym trainers SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] jp CinnabarGymScript_75792 |