diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/scripting.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 826267f6b..7512bdc06 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2609,14 +2609,14 @@ _EngineFlagAction: Script_wildoff: ; script command 0x38 - ld hl, StatusFlags + ld hl, wStatusFlags set 5, [hl] ret Script_wildon: ; script command 0x37 - ld hl, StatusFlags + ld hl, wStatusFlags res 5, [hl] ret @@ -2991,12 +2991,12 @@ Script_end_all: Script_halloffame: ; script command 0xa1 - ld hl, GameTimerPause + ld hl, wGameTimerPause res 0, [hl] farcall TrainerRankings_HallOfFame farcall TrainerRankings_HallOfFame2 farcall HallOfFame - ld hl, GameTimerPause + ld hl, wGameTimerPause set 0, [hl] jr ReturnFromCredits |