Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct engine flag constants

Browse Source
This commit is contained in:
Rangi
2018-01-31 10:55:35 -05:00
parent 50f6007cc2
commit a9334f7468
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants/engine_flags.asm
View File

@@ -28,7 +28,7 @@
const ENGINE_SAFARI_ZONE const ENGINE_SAFARI_ZONE
const ENGINE_ROCKETS_IN_RADIO_TOWER const ENGINE_ROCKETS_IN_RADIO_TOWER
const ENGINE_BIKE_SHOP_CALL_ENABLED const ENGINE_BIKE_SHOP_CALL_ENABLED
const ENGINE_CAN_USE_SWEET_SCENT const ENGINE_15
const ENGINE_REACHED_GOLDENROD const ENGINE_REACHED_GOLDENROD
const ENGINE_ROCKETS_IN_MAHOGANY const ENGINE_ROCKETS_IN_MAHOGANY
; wBikeFlags ; wBikeFlags

4
constants/wram_constants.asm
View File

@@ -161,9 +161,9 @@ NUM_OBJECTS EQU $10
const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0 const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0
const STATUSFLAGS2_SAFARI_GAME_F ; 1 const STATUSFLAGS2_SAFARI_GAME_F ; 1
const STATUSFLAGS2_BUG_CONTEST_TIMER_F ; 2 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_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_REACHED_GOLDENROD_F ; 6
const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F ; 7 const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F ; 7

4
data/engine_flags.asm
View File

@@ -35,7 +35,7 @@ EngineFlags: ; 80462
engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F
engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F
engine_flag wStatusFlags2, STATUSFLAGS2_BIKE_SHOP_CALL_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_REACHED_GOLDENROD_F
engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F
@@ -102,7 +102,7 @@ EngineFlags: ; 80462
engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F 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_KURT_MAKING_BALLS_F ; $50
engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F

2
engine/events_2.asm
View File

@@ -150,7 +150,7 @@ WildBattleScript: ; 97cf9
CanUseSweetScent:: ; 97cfd CanUseSweetScent:: ; 97cfd
ld hl, wStatusFlags ld hl, wStatusFlags
bit STATUSFLAGS2_CAN_USE_SWEET_SCENT_F, [hl] bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
jr nz, .no jr nz, .no
ld a, [wEnvironment] ld a, [wEnvironment]
cp CAVE cp CAVE