ref: a9334f7468b81e5d9e1077e1430f439776f0c7c4
parent: 50f6007cc2714d4f47758305481ab33d865505e6
author: Rangi <[email protected]>
date: Wed Jan 31 05:55:35 EST 2018
Correct engine flag constants
--- 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
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -161,9 +161,9 @@
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
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -35,7 +35,7 @@
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 @@
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
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -150,7 +150,7 @@
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