diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/events/engine_flags.asm | 113 | ||||
| -rwxr-xr-x | engine/events/happiness_egg.asm | 8 | ||||
| -rwxr-xr-x | engine/events/shuckle.asm | 3 | ||||
| -rwxr-xr-x | engine/events/specials.asm | 9 | ||||
| -rw-r--r-- | engine/menus/intro_menu.asm | 6 |
5 files changed, 18 insertions, 121 deletions
diff --git a/engine/events/engine_flags.asm b/engine/events/engine_flags.asm index 9fa5f8c0..d1329f1d 100755 --- a/engine/events/engine_flags.asm +++ b/engine/events/engine_flags.asm @@ -81,115 +81,4 @@ EngineFlagAction:: ; c01b ld [de], a ret -; 404d -EngineFlags: -; All locations are in WRAM bank 1. - - ; location, bit - engine_flag ENGINE_RADIO_CARD - engine_flag ENGINE_MAP_CARD - engine_flag ENGINE_PHONE_CARD - engine_flag ENGINE_EXPN_CARD - engine_flag ENGINE_POKEGEAR - - engine_flag ENGINE_DAY_CARE_MAN_HAS_EGG - engine_flag ENGINE_DAY_CARE_MAN_HAS_MON - - engine_flag ENGINE_DAY_CARE_LADY_HAS_MON - - engine_flag ENGINE_MOM_SAVING_MONEY - engine_flag ENGINE_DST - - engine_flag ENGINE_0A - - engine_flag ENGINE_POKEDEX - engine_flag ENGINE_UNOWN_DEX - engine_flag ENGINE_POKERUS - engine_flag ENGINE_ROCKET_SIGNAL_ON_CH20 - engine_flag ENGINE_CREDITS_SKIP - engine_flag ENGINE_BUG_CONTEST_TIMER - engine_flag ENGINE_SAFARI_ZONE - engine_flag ENGINE_ROCKETS_IN_RADIO_TOWER - engine_flag ENGINE_BIKE_SHOP_CALL_ENABLED - engine_flag ENGINE_GIVE_POKERUS - engine_flag ENGINE_REACHED_GOLDENROD - engine_flag ENGINE_ROCKETS_IN_MAHOGANY - - engine_flag ENGINE_STRENGTH_ACTIVE - engine_flag ENGINE_ALWAYS_ON_BIKE - engine_flag ENGINE_DOWNHILL - - engine_flag ENGINE_ZEPHYRBADGE - engine_flag ENGINE_HIVEBADGE - engine_flag ENGINE_PLAINBADGE - engine_flag ENGINE_FOGBADGE - engine_flag ENGINE_MINERALBADGE - engine_flag ENGINE_STORMBADGE - engine_flag ENGINE_GLACIERBADGE - engine_flag ENGINE_RISINGBADGE - - engine_flag ENGINE_BOULDERBADGE - engine_flag ENGINE_CASCADEBADGE - engine_flag ENGINE_THUNDERBADGE - engine_flag ENGINE_RAINBOWBADGE - engine_flag ENGINE_SOULBADGE - engine_flag ENGINE_MARSHBADGE - engine_flag ENGINE_VOLCANOBADGE - engine_flag ENGINE_EARTHBADGE - - engine_flag ENGINE_UNLOCKED_UNOWNS_A_TO_K - engine_flag ENGINE_UNLOCKED_UNOWNS_L_TO_R - engine_flag ENGINE_UNLOCKED_UNOWNS_S_TO_W - engine_flag ENGINE_UNLOCKED_UNOWNS_X_TO_Z - engine_flag ENGINE_UNLOCKED_UNOWNS_UNUSED_4 - engine_flag ENGINE_UNLOCKED_UNOWNS_UNUSED_5 - engine_flag ENGINE_UNLOCKED_UNOWNS_UNUSED_6 - engine_flag ENGINE_UNLOCKED_UNOWNS_UNUSED_7 - - engine_flag ENGINE_FLYPOINT_PLAYERS_HOUSE - engine_flag ENGINE_FLYPOINT_VIRIDIAN_POKECENTER - engine_flag ENGINE_FLYPOINT_PALLET - engine_flag ENGINE_FLYPOINT_VIRIDIAN - engine_flag ENGINE_FLYPOINT_PEWTER - engine_flag ENGINE_FLYPOINT_CERULEAN - engine_flag ENGINE_FLYPOINT_ROCK_TUNNEL - engine_flag ENGINE_FLYPOINT_VERMILION - engine_flag ENGINE_FLYPOINT_LAVENDER - engine_flag ENGINE_FLYPOINT_SAFFRON - engine_flag ENGINE_FLYPOINT_CELADON - engine_flag ENGINE_FLYPOINT_FUCHSIA - engine_flag ENGINE_FLYPOINT_CINNABAR - engine_flag ENGINE_FLYPOINT_INDIGO_PLATEAU - engine_flag ENGINE_FLYPOINT_NEW_BARK - engine_flag ENGINE_FLYPOINT_CHERRYGROVE - engine_flag ENGINE_FLYPOINT_VIOLET - - engine_flag ENGINE_FLYPOINT_AZALEA - engine_flag ENGINE_FLYPOINT_CIANWOOD - engine_flag ENGINE_FLYPOINT_GOLDENROD - engine_flag ENGINE_FLYPOINT_OLIVINE - engine_flag ENGINE_FLYPOINT_ECRUTEAK - engine_flag ENGINE_FLYPOINT_MAHOGANY - engine_flag ENGINE_FLYPOINT_LAKE_OF_RAGE - engine_flag ENGINE_FLYPOINT_BLACKTHORN - engine_flag ENGINE_FLYPOINT_SILVER_CAVE - - engine_flag ENGINE_FLYPOINT_UNUSED - engine_flag ENGINE_LUCKY_NUMBER_SHOW - engine_flag ENGINE_4E - - engine_flag ENGINE_KURT_MAKING_BALLS - engine_flag ENGINE_DAILY_BUG_CONTEST - engine_flag ENGINE_SPECIAL_WILDDATA - engine_flag ENGINE_TIME_CAPSULE - engine_flag ENGINE_ALL_FRUIT_TREES - engine_flag ENGINE_GOT_SHUCKIE_TODAY - engine_flag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED - engine_flag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY - - engine_flag ENGINE_MT_MOON_SQUARE_CLEFAIRY - engine_flag ENGINE_UNION_CAVE_LAPRAS - engine_flag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - engine_flag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN - engine_flag ENGINE_DAISYS_GROOMING - engine_flag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT +INCLUDE "data/engine_flags.asm" diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index 9e6bffb4..85b6f710 100755 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -140,7 +140,8 @@ StepHappiness:: ret DayCareStep:: - CheckFlag ENGINE_DAY_CARE_MAN_HAS_MON + ld a, [wDayCareMan] + bit DAYCAREMAN_HAS_MON_F, a jr z, .day_care_lady ld a, [wBreedMon1Level] @@ -161,7 +162,8 @@ DayCareStep:: ld [hl], a .day_care_lady - CheckFlag ENGINE_DAY_CARE_LADY_HAS_MON + ld a, [wDayCareLady] + bit DAYCARELADY_HAS_MON_F, a jr z, .check_egg ld a, [wBreedMon2Level] ; level @@ -212,5 +214,5 @@ DayCareStep:: ret nc ld hl, wDayCareMan res DAYCAREMAN_MONS_COMPATIBLE_F, [hl] - SetFlagForceReuseHL ENGINE_DAY_CARE_MAN_HAS_EGG + set DAYCAREMAN_HAS_EGG_F, [hl] ret diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index e83357b2..db6db8f9 100755 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -50,7 +50,8 @@ GiveShuckle: call CopyName2 ; Engine flag for this event. - SetFlag ENGINE_GOT_SHUCKIE_TODAY + ld hl, wDailyFlags1 + set DAILYFLAGS1_GOT_SHUCKIE_TODAY_F, [hl] ld a, 1 ld [wScriptVar], a ret diff --git a/engine/events/specials.asm b/engine/events/specials.asm index c3d2f9ad..1086861a 100755 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -421,11 +421,13 @@ StoreSwarmMapIndices:: ld [wDunsparceMapNumber], a ; fallthrough SetSwarmFlag: - SetFlag ENGINE_SPECIAL_WILDDATA + ld hl, wDailyFlags1 + set DAILYFLAGS1_FISH_SWARM_F, [hl] ret CheckSwarmFlag:: - CheckFlagHL ENGINE_SPECIAL_WILDDATA + ld hl, wDailyFlags1 + bit DAILYFLAGS1_FISH_SWARM_F, [hl] jr z, .asm_c578 xor a ld [wScriptVar], a @@ -446,7 +448,8 @@ CheckPokerus: ; c588 (3:4588) ResetLuckyNumberShowFlag: ; c591 (3:4591) farcall RestartLuckyNumberCountdown - ClearFlag ENGINE_LUCKY_NUMBER_SHOW + ld hl, wLuckyNumberShowFlag + res LUCKYNUMBERSHOW_GAME_OVER_F, [hl] farcall LoadOrRegenerateLuckyIDNumber ret diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 1b19d41e..74eb21f4 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -615,7 +615,8 @@ Continue_LoadMenuHeader: ; 5ed7 (1:5ed7) xor a ldh [hBGMapMode], a ld hl, .MenuDataHeader_Dex - CheckFlag ENGINE_POKEDEX + ld a, [wStatusFlags] + bit STATUSFLAGS_POKEDEX_F, a jr nz, .asm_5ee7 ld hl, .MenuDataHeader_NoDex .asm_5ee7 @@ -695,7 +696,8 @@ Continue_DisplayBadgeCount: ; 5f64 (1:5f64) jp PrintNum Continue_DisplayPokedexNumCaught: ; 5f77 (1:5f77) - CheckFlag ENGINE_POKEDEX + ld a, [wStatusFlags] + bit STATUSFLAGS_POKEDEX_F, a ret z push hl ld hl, wPokedexCaught |