diff options
| -rw-r--r-- | constants/engine_flags.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 4 | ||||
| -rw-r--r-- | data/engine_flags.asm | 4 | ||||
| -rw-r--r-- | engine/events_2.asm | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index af8bebe95..7941f3b10 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -28,7 +28,7 @@ const ENGINE_SAFARI_ZONE const ENGINE_ROCKETS_IN_RADIO_TOWER const ENGINE_BIKE_SHOP_CALL_ENABLED - const ENGINE_CAN_USE_SWEET_SCENT + const ENGINE_15 const ENGINE_REACHED_GOLDENROD const ENGINE_ROCKETS_IN_MAHOGANY ; wBikeFlags diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 15846d896..fa8edf232 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -161,9 +161,9 @@ NUM_OBJECTS EQU $10 const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0 const STATUSFLAGS2_SAFARI_GAME_F ; 1 const STATUSFLAGS2_BUG_CONTEST_TIMER_F ; 2 - const STATUSFLAGS2_UNUSED_F ; 3 + const STATUSFLAGS2_UNUSED_3_F ; 3 const STATUSFLAGS2_BIKE_SHOP_CALL_F ; 4 - const STATUSFLAGS2_CAN_USE_SWEET_SCENT_F ; 5 + const STATUSFLAGS2_UNUSED_5_F ; 5 const STATUSFLAGS2_REACHED_GOLDENROD_F ; 6 const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F ; 7 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 261d38d7f..80834bdac 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -35,7 +35,7 @@ EngineFlags: ; 80462 engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F engine_flag wStatusFlags2, STATUSFLAGS2_BIKE_SHOP_CALL_F - engine_flag wStatusFlags2, STATUSFLAGS2_CAN_USE_SWEET_SCENT_F + engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_5_F engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F @@ -102,7 +102,7 @@ EngineFlags: ; 80462 engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F - engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_F + engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F engine_flag wDailyFlags, DAILYFLAGS_KURT_MAKING_BALLS_F ; $50 engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F diff --git a/engine/events_2.asm b/engine/events_2.asm index c27b4737f..de4c47823 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -150,7 +150,7 @@ WildBattleScript: ; 97cf9 CanUseSweetScent:: ; 97cfd ld hl, wStatusFlags - bit STATUSFLAGS2_CAN_USE_SWEET_SCENT_F, [hl] + bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl] jr nz, .no ld a, [wEnvironment] cp CAVE |