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/events_2.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/events_2.asm')
| -rw-r--r-- | engine/events_2.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/events_2.asm b/engine/events_2.asm index cab6b8bd0..cac736bab 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -2,7 +2,7 @@ WarpToSpawnPoint:: ; 97c28 - ld hl, StatusFlags2 + ld hl, wStatusFlags2 res 1, [hl] ; safari zone? res 2, [hl] ; bug contest ret @@ -108,7 +108,7 @@ RandomEncounter:: ; 97cc0 jr c, .nope call CanUseSweetScent jr nc, .nope - ld hl, StatusFlags2 + ld hl, wStatusFlags2 bit 2, [hl] ; bug contest jr nz, .bug_contest farcall TryWildEncounter @@ -149,7 +149,7 @@ WildBattleScript: ; 97cf9 ; 97cfd CanUseSweetScent:: ; 97cfd - ld hl, StatusFlags + ld hl, wStatusFlags bit 5, [hl] jr nz, .no ld a, [wEnvironment] @@ -263,7 +263,7 @@ DoBikeStep:: ; 97db3 ; If the bike shop owner doesn't have our number, or ; if we've already gotten the call, we don't have to ; be here. - ld hl, StatusFlags2 + ld hl, wStatusFlags2 bit 4, [hl] ; bike shop call jr z, .NoCall @@ -314,7 +314,7 @@ DoBikeStep:: ; 97db3 ld [wSpecialPhoneCallID], a xor a ld [wSpecialPhoneCallID + 1], a - ld hl, StatusFlags2 + ld hl, wStatusFlags2 res 4, [hl] ; bike shop call scf ret |