summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/events.asm2
-rwxr-xr-xengine/events/field_moves.asm2
-rwxr-xr-xengine/events/halloffame.asm2
-rw-r--r--engine/events/pokerus/pokerus.asm15
-rw-r--r--engine/events/std_scripts.asm4
-rwxr-xr-xengine/events/sweet_scent.asm2
-rw-r--r--engine/events_2.asm12
-rwxr-xr-xengine/intro_menu.asm4
-rwxr-xr-xengine/main_menu.asm6
-rwxr-xr-xengine/mart.asm2
-rw-r--r--engine/pokedex/pokedex.asm2
-rwxr-xr-xengine/pokegear.asm8
-rw-r--r--engine/radio.asm4
-rw-r--r--engine/scripting.asm4
-rwxr-xr-xengine/start_menu.asm14
-rw-r--r--engine/timeofdaypals.asm2
-rwxr-xr-xengine/trainer_card.asm2
-rwxr-xr-xengine/wildmons.asm4
18 files changed, 47 insertions, 44 deletions
diff --git a/engine/events.asm b/engine/events.asm
index 96108730a..fd355744a 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -493,7 +493,7 @@ CheckTimeEvents: ; 9693a
jr nz, .nothing
ld hl, wStatusFlags2
- bit 2, [hl] ; bug contest
+ bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
jr z, .do_daily
farcall CheckBugContestTimer
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 3fb1fe9e6..e6c0629de 100755
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -9,7 +9,7 @@ PlayWhirlpoolSound: ; 8c7d4
BlindingFlash: ; 8c7e1
farcall Special_FadeOutPalettes
ld hl, wStatusFlags
- set 2, [hl] ; Flash
+ set STATUSFLAGS_FLASH_F, [hl]
farcall ReplaceTimeOfDayPals
farcall UpdateTimeOfDayPal
ld b, SCGB_MAPPALS
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm
index dbd3a2d5a..3de91fa5c 100755
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -12,7 +12,7 @@ HallOfFame:: ; 0x8640e
; Enable the Pokégear map to cycle through all of Kanto
ld hl, wStatusFlags
- set 6, [hl] ; hall of fame
+ set STATUSFLAGS_HALL_OF_FAME_F, [hl]
farcall HallOfFame_InitSaveIfNeeded
diff --git a/engine/events/pokerus/pokerus.asm b/engine/events/pokerus/pokerus.asm
index d47bcb6c1..ab717407a 100644
--- a/engine/events/pokerus/pokerus.asm
+++ b/engine/events/pokerus/pokerus.asm
@@ -19,7 +19,7 @@ GivePokerusAndConvertBerries: ; 2ed44
; If we haven't been to Goldenrod City at least once,
; prevent the contraction of Pokerus.
ld hl, wStatusFlags2
- bit 6, [hl]
+ bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl]
ret z
call Random
ld a, [hRandomAdd]
@@ -61,7 +61,7 @@ GivePokerusAndConvertBerries: ; 2ed44
.TrySpreadPokerus:
call Random
- cp 1 + 33 percent
+ cp 33 percent + 1
ret nc ; 1/3 chance
ld a, [PartyCount]
@@ -74,7 +74,7 @@ GivePokerusAndConvertBerries: ; 2ed44
jr c, .checkPreviousMonsLoop ; no more mons after this one, go backwards
call Random
- cp 1 + 50 percent
+ cp 50 percent + 1
jr c, .checkPreviousMonsLoop ; 1/2 chance, go backwards
.checkFollowingMonsLoop
add hl, de
@@ -121,14 +121,15 @@ GivePokerusAndConvertBerries: ; 2ed44
ld [hl], a
ret
-; any berry held by a Shuckle may be converted to berry juice
ConvertBerriesToBerryJuice: ; 2ede6
+; If we haven't been to Goldenrod City at least once,
+; prevent Shuckle from turning held Berry into Berry Juice.
ld hl, wStatusFlags2
- bit 6, [hl]
+ bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl]
ret z
call Random
- cp $10
- ret nc ; 1/16 chance
+ cp 6 percent + 1 ; 1/16 chance
+ ret nc
ld hl, PartyMons
ld a, [PartyCount]
.partyMonLoop
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 216ce0058..e4dd586b0 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -122,7 +122,7 @@ PokecenterNurseScript:
checkphonecall ; elm already called about pokerus
iftrue .no
- checkflag ENGINE_POKERUS ; nurse already talked about pokerus
+ checkflag ENGINE_CAUGHT_POKERUS
iftrue .no
special Special_CheckPokerus
iftrue .pokerus
@@ -158,7 +158,7 @@ PokecenterNurseScript:
closetext
.pokerus_done
- setflag ENGINE_POKERUS
+ setflag ENGINE_CAUGHT_POKERUS
specialphonecall SPECIALCALL_POKERUS
end
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm
index 9b75eb9b8..e936369c8 100755
--- a/engine/events/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
@@ -37,7 +37,7 @@ SweetScentEncounter: ; 506ef
farcall CanUseSweetScent
jr nc, .no_battle
ld hl, wStatusFlags2
- bit 2, [hl]
+ bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
jr nz, .not_in_bug_contest
farcall GetMapEncounterRate
ld a, b
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 1149c2431..93044a23b 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -3,8 +3,8 @@
Special_WarpToSpawnPoint:: ; 97c28
ld hl, wStatusFlags2
- res 1, [hl] ; safari zone?
- res 2, [hl] ; bug contest
+ res STATUSFLAGS2_SAFARI_GAME_F, [hl]
+ res STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
ret
; 97c30
@@ -109,7 +109,7 @@ RandomEncounter:: ; 97cc0
call CanUseSweetScent
jr nc, .nope
ld hl, wStatusFlags2
- bit 2, [hl] ; bug contest
+ bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
jr nz, .bug_contest
farcall TryWildEncounter
jr nz, .nope
@@ -150,7 +150,7 @@ WildBattleScript: ; 97cf9
CanUseSweetScent:: ; 97cfd
ld hl, wStatusFlags
- bit 5, [hl]
+ bit STATUSFLAGS2_CAN_USE_SWEET_SCENT_F, [hl]
jr nz, .no
ld a, [wEnvironment]
cp CAVE
@@ -264,7 +264,7 @@ DoBikeStep:: ; 97db3
; if we've already gotten the call, we don't have to
; be here.
ld hl, wStatusFlags2
- bit 4, [hl] ; bike shop call
+ bit STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl]
jr z, .NoCall
; If we're not on the bike, we don't have to be here.
@@ -315,7 +315,7 @@ DoBikeStep:: ; 97db3
xor a
ld [wSpecialPhoneCallID + 1], a
ld hl, wStatusFlags2
- res 4, [hl] ; bike shop call
+ res STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl]
scf
ret
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index c825a6216..a99303cf0 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -541,7 +541,7 @@ Continue_LoadMenuHeader: ; 5ebf
ld [hBGMapMode], a
ld hl, .MenuDataHeader_Dex
ld a, [wStatusFlags]
- bit 0, a ; pokedex
+ bit STATUSFLAGS_POKEDEX_F, a
jr nz, .show_menu
ld hl, .MenuDataHeader_NoDex
@@ -640,7 +640,7 @@ Continue_DisplayBadgeCount: ; 5f58
Continue_DisplayPokedexNumCaught: ; 5f6b
ld a, [wStatusFlags]
- bit 0, a ; Pokedex
+ bit STATUSFLAGS_POKEDEX_F, a
ret z
push hl
ld hl, PokedexCaught
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index f82c6072a..3bb3a6293 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -166,8 +166,9 @@ MainMenu_GetWhichMenu: ; 49da4
cp -1
call CloseSRAM
jr nz, .mystery_gift
+ ; This check makes no difference.
ld a, [wStatusFlags]
- bit 7, a
+ bit STATUSFLAGS_BUG_CONTEST_ON_F, a
ld a, $1 ; Continue
jr z, .ok
jr .ok
@@ -180,8 +181,9 @@ MainMenu_GetWhichMenu: ; 49da4
ret
.mystery_gift
+ ; This check makes no difference.
ld a, [wStatusFlags]
- bit 7, a
+ bit STATUSFLAGS_BUG_CONTEST_ON_F, a
jr z, .ok3
jr .ok3
diff --git a/engine/mart.asm b/engine/mart.asm
index b427037c1..ed93cbb81 100755
--- a/engine/mart.asm
+++ b/engine/mart.asm
@@ -82,7 +82,7 @@ RooftopSale: ; 15ac4
ld b, BANK(RooftopSaleData1)
ld de, RooftopSaleData1
ld hl, wStatusFlags
- bit 6, [hl] ; hall of fame
+ bit STATUSFLAGS_HALL_OF_FAME_F, [hl]
jr z, .ok
ld b, BANK(RooftopSaleData2)
ld de, RooftopSaleData2
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
index e96d0a7d7..00321d07a 100644
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -108,7 +108,7 @@ InitPokedex: ; 40063
Pokedex_CheckUnlockedUnownMode: ; 400a2
ld a, [wStatusFlags]
- bit 1, a
+ bit STATUSFLAGS_UNOWN_DEX_F, a
jr nz, .unlocked
xor a
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 86c538253..2bb819bf5 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -764,7 +764,7 @@ PokegearMap_UpdateCursorPosition: ; 910d4
TownMap_GetKantoLandmarkLimits: ; 910e8
ld a, [wStatusFlags]
- bit 6, a ; ENGINE_CREDITS_SKIP
+ bit STATUSFLAGS_HALL_OF_FAME_F, a
jr z, .not_hof
ld d, ROUTE_28
ld e, PALLET_TOWN
@@ -1613,7 +1613,7 @@ RadioChannels:
.EvolutionRadio:
; This station airs in the Lake of Rage area when Rocket are still in Mahogany.
ld a, [wStatusFlags]
- bit 4, a ; ENGINE_ROCKET_SIGNAL_ON_CH20
+ bit STATUSFLAGS_ROCKET_SIGNAL_F, a
jr z, .NoSignal
ld a, [wPokegearMapPlayerIconLandmark]
cp MAHOGANY_TOWN
@@ -1699,7 +1699,7 @@ LoadStation_BuenasPassword: ; 917a5 (24:57a5)
call Radio_BackUpFarCallParams
ld de, NotBuenasPasswordName
ld a, [wStatusFlags2]
- bit 0, a ; ENGINE_ROCKETS_IN_RADIO_TOWER
+ bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a
ret z
ld de, BuenasPasswordName
ret
@@ -2561,7 +2561,7 @@ Pokedex_GetArea: ; 91d11
.right
ld a, [wStatusFlags]
- bit 6, a ; ENGINE_CREDITS_SKIP
+ bit STATUSFLAGS_HALL_OF_FAME_F, a
ret z
ld a, [hWY]
and a
diff --git a/engine/radio.asm b/engine/radio.asm
index 67485dc03..9e9646505 100644
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -5,7 +5,7 @@ PlayRadioShow:
jr nc, .ok
; If Team Rocket is not occupying the radio tower, we don't need to be here.
ld a, [wStatusFlags2]
- bit 0, a ; checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
+ bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a
jr z, .ok
; If we're in Kanto, we don't need to be here.
call IsInJohto
@@ -1171,7 +1171,7 @@ PeoplePlaces4: ; People
push af
ld hl, PnP_HiddenPeople
ld a, [wStatusFlags]
- bit 6, a ; ENGINE_CREDITS_SKIP
+ bit STATUSFLAGS_HALL_OF_FAME_F, a
jr z, .ok
ld hl, PnP_HiddenPeople_BeatE4
ld a, [wKantoBadges]
diff --git a/engine/scripting.asm b/engine/scripting.asm
index eebebb752..1ecdc016c 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2449,14 +2449,14 @@ Script_wildoff:
; script command 0x38
ld hl, wStatusFlags
- set 5, [hl]
+ set STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
ret
Script_wildon:
; script command 0x37
ld hl, wStatusFlags
- res 5, [hl]
+ res STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
ret
Script_xycompare:
diff --git a/engine/start_menu.asm b/engine/start_menu.asm
index 20ab75ff4..a60a8b3ce 100755
--- a/engine/start_menu.asm
+++ b/engine/start_menu.asm
@@ -21,7 +21,7 @@ StartMenu:: ; 125cd
farcall ReanchorBGMap_NoOAMUpdate
ld hl, wStatusFlags2
- bit 2, [hl] ; bug catching contest
+ bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
ld hl, .MenuDataHeader
jr z, .GotMenuData
ld hl, .ContestMenuDataHeader
@@ -306,7 +306,7 @@ endr
call .FillMenuList
ld hl, wStatusFlags
- bit 0, [hl]
+ bit STATUSFLAGS_POKEDEX_F, [hl]
jr z, .no_pokedex
ld a, STARTMENUITEM_POKEDEX
call .AppendMenuList
@@ -323,7 +323,7 @@ endr
and a
jr nz, .no_pack
ld hl, wStatusFlags2
- bit 2, [hl] ; bug catching contest
+ bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
jr nz, .no_pack
ld a, STARTMENUITEM_PACK
call .AppendMenuList
@@ -336,14 +336,14 @@ endr
call .AppendMenuList
.no_pokegear
- ld a, 3 ; status
+ ld a, STARTMENUITEM_STATUS
call .AppendMenuList
ld a, [wLinkMode]
and a
jr nz, .no_save
ld hl, wStatusFlags2
- bit 2, [hl] ; bug catching contest
+ bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
ld a, STARTMENUITEM_QUIT
jr nz, .write
ld a, STARTMENUITEM_SAVE
@@ -412,7 +412,7 @@ endr
.DrawBugContestStatusBox: ; 128d1
ld hl, wStatusFlags2
- bit 2, [hl] ; bug catching contest
+ bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
ret z
farcall StartMenu_DrawBugContestStatusBox
ret
@@ -420,7 +420,7 @@ endr
.DrawBugContestStatus: ; 128de
ld hl, wStatusFlags2
- bit 2, [hl] ; bug catching contest
+ bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
jr nz, .contest
ret
.contest
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm
index 6dfa5657a..2e4d4eec0 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -216,7 +216,7 @@ ReplaceTimeOfDayPals: ; 8c0e5
.DarkCave:
ld a, [wStatusFlags]
- bit 2, a ; Flash
+ bit STATUSFLAGS_FLASH_F, a
jr nz, .UsedFlash
ld a, %11111111 ; 3, 3, 3, 3
ld [wTimeOfDayPalset], a
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
index 6d59660f7..29c4b202f 100755
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -290,7 +290,7 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
ld de, .StatusTilemap
call TrainerCardSetup_PlaceTilemapString
ld a, [wStatusFlags]
- bit 0, a ; ENGINE_POKEDEX
+ bit STATUSFLAGS_POKEDEX_F, a
ret nz
hlcoord 1, 9
lb bc, 2, 17
diff --git a/engine/wildmons.asm b/engine/wildmons.asm
index 50d4ea250..d2da42611 100755
--- a/engine/wildmons.asm
+++ b/engine/wildmons.asm
@@ -429,7 +429,7 @@ _SwarmWildmonCheck
call CopyCurrMapDE
push hl
ld hl, wSwarmFlags
- bit 2, [hl]
+ bit SWARMFLAGS_DUNSPARCE_SWARM_F, [hl]
pop hl
jr z, .CheckYanma
ld a, [wDunsparceMapGroup]
@@ -446,7 +446,7 @@ _SwarmWildmonCheck
.CheckYanma:
push hl
ld hl, wSwarmFlags
- bit 3, [hl]
+ bit SWARMFLAGS_YANMA_SWARM_F, [hl]
pop hl
jr z, _NoSwarmWildmon
ld a, [wYanmaMapGroup]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 13:55:11 +0000