diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 2 | ||||
| -rw-r--r-- | home/flag.asm | 12 | ||||
| -rw-r--r-- | home/map.asm | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/home/audio.asm b/home/audio.asm index 44786ee29..7508d569c 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -462,7 +462,7 @@ SpecialMapMusic:: ; 3d62 jr z, .surf ld a, [wStatusFlags2] - bit 2, a + bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, a jr nz, .contest .no diff --git a/home/flag.asm b/home/flag.asm index 5f1d783af..040333a5f 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -15,15 +15,15 @@ ResetBikeFlags:: ; 2e56 ResetFlashIfOutOfCave:: ; 2e5d ld a, [wEnvironment] - cp $2 - jr z, .asm_2e69 - cp $1 - jr z, .asm_2e69 + cp ROUTE + jr z, .outdoors + cp TOWN + jr z, .outdoors ret -.asm_2e69 +.outdoors ld hl, wStatusFlags - res 2, [hl] + res STATUSFLAGS_FLASH_F, [hl] ret ; 2e6f diff --git a/home/map.asm b/home/map.asm index a66391896..1ed0e5ca8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2306,7 +2306,7 @@ GetMapMusic:: ; 2cbd .radiotower ld a, [wStatusFlags2] - bit 0, a + bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a jr z, .clearedradiotower ld de, MUSIC_ROCKET_OVERTURE jr .done @@ -2321,7 +2321,7 @@ GetMapMusic:: ; 2cbd .mahoganymart ld a, [wStatusFlags2] - bit 7, a + bit STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F, a jr z, .clearedmahogany ld de, MUSIC_ROCKET_HIDEOUT jr .done |