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/overworld.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/overworld.asm')
| -rwxr-xr-x | engine/events/overworld.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 370162fa9..8c238cb9c 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -358,7 +358,7 @@ SurfFunction: ; c909 ld de, ENGINE_FOGBADGE call CheckBadge jr c, .asm_c956 - ld hl, BikeFlags + ld hl, wBikeFlags bit 1, [hl] ; always on bike jr nz, .cannotsurf ld a, [PlayerState] @@ -520,7 +520,7 @@ TrySurfOW:: ; c9e7 call CheckPartyMove jr c, .quit - ld hl, BikeFlags + ld hl, wBikeFlags bit 1, [hl] ; always on bike (can't surf) jr nz, .quit @@ -1008,7 +1008,7 @@ StrengthFunction: ; cce5 ret SetStrengthFlag: ; cd12 - ld hl, BikeFlags + ld hl, wBikeFlags set 0, [hl] ld a, [CurPartyMon] ld e, a @@ -1086,7 +1086,7 @@ TryStrengthOW: ; cd78 call CheckEngineFlag jr c, .nope - ld hl, BikeFlags + ld hl, wBikeFlags bit 0, [hl] jr z, .already_using @@ -1683,7 +1683,7 @@ BikeFunction: ; d0b3 ret .GetOffBike: - ld hl, BikeFlags + ld hl, wBikeFlags bit 1, [hl] jr nz, .CantGetOffBike ld hl, Script_GetOffBike |