summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/scripts.inc2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc13
-rw-r--r--data/maps/Route101/map.json2
-rw-r--r--data/maps/Route101/scripts.inc2
-rw-r--r--data/maps/Route103/map.json2
-rw-r--r--data/maps/Route103/scripts.inc2
-rw-r--r--data/scripts/field_move_scripts.inc12
-rw-r--r--data/scripts/pc.inc42
-rw-r--r--data/scripts/prof_birch.inc61
-rw-r--r--src/birch_pc.c8
-rw-r--r--src/main_menu.c4
-rw-r--r--src/menu.c4
-rw-r--r--src/pokedex.c12
-rw-r--r--src/start_menu.c2
-rw-r--r--src/tv.c4
15 files changed, 83 insertions, 89 deletions
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 99a1a6eb3..8e4e93770 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -108,7 +108,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
- call EverGrandeCity_ChampionsRoom_EventScript_272184
+ call ProfBirch_EventScript_RatePokedex
msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT
applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index b0275642c..b2307a344 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -6,7 +6,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
call Common_EventScript_SetupRivalGfxId
- call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
+ call ProfBirch_EventScript_UpdateLocation
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
@@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
- goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
+ goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
end
@@ -497,19 +497,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
- goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141
+ goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
- goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
+ goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
- goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141
+ goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister
compare VAR_BIRCH_LAB_STATE, 5
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
release
end
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2
-Route101_EventScript_1FA2D2:: @ 81FA2D2
+EventScript_RegisterProfBirch:: @ 81FA2D2
msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT
closemessage
delay 30
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index 44d8b2137..7e8cfb959 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route101_EventScript_272141",
+ "script": "ProfBirch_EventScript_RatePokedexOrRegister",
"flag": "FLAG_HIDE_ROUTE_101_BIRCH"
},
{
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 73bfe570c..aab1d44b3 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -4,7 +4,7 @@ Route101_MapScripts:: @ 81EBCBA
.byte 0
Route101_OnTransition: @ 81EBCC5
- call Route101_EventScript_2720AD
+ call ProfBirch_EventScript_UpdateLocation
end
Route101_MapScript2_1EBCCB: @ 81EBCCB
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index bf207ec2f..8f5b9f2b3 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -165,7 +165,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route103_EventScript_272141",
+ "script": "ProfBirch_EventScript_RatePokedexOrRegister",
"flag": "FLAG_HIDE_ROUTE_103_BIRCH"
},
{
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 84e7ad98b..cdb76d763 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -5,7 +5,7 @@ Route103_MapScripts:: @ 81EC38E
Route103_OnTransition: @ 81EC399
call Common_EventScript_SetupRivalGfxId
- call Route103_EventScript_2720AD
+ call ProfBirch_EventScript_UpdateLocation
end
Route103_MapScript1_1EC3A4: @ 81EC3A4
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 71d4b725c..bd98a3676 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -3,7 +3,7 @@ EventScript_CutTree:: @ 82906BB
lockall
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
checkpartymove MOVE_CUT
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CheckTreeCantCut
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
@@ -62,7 +62,7 @@ EventScript_RockSmash:: @ 82907A6
lockall
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
checkpartymove MOVE_ROCK_SMASH
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSmashRock
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
@@ -129,7 +129,7 @@ EventScript_StrengthBoulder:: @ 82908BA
goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
checkpartymove MOVE_STRENGTH
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantStrength
setfieldeffectargument 0, VAR_RESULT
msgbox Text_WantToStrength, MSGBOX_YESNO
@@ -190,7 +190,7 @@ Text_StrengthActivated: @ 8290A16
EventScript_UseWaterfall:: @ 8290A49
lockall
checkpartymove MOVE_WATERFALL
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantWaterfall
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
@@ -225,7 +225,7 @@ Text_MonUsedWaterfall: @ 8290AFC
EventScript_UseDive:: @ 8290B0F
lockall
checkpartymove MOVE_DIVE
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantDive
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
@@ -250,7 +250,7 @@ EventScript_EndDive:: @ 8290B58
EventScript_UseDiveUnderwater:: @ 8290B5A
lockall
checkpartymove MOVE_DIVE
- compare VAR_RESULT, 6
+ compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSurface
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index d5e51e412..b3602ee6f 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -4,63 +4,63 @@ EventScript_PC:: @ 8271D92
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox Text_BootUpPC, MSGBOX_DEFAULT
- goto EventScript_271DAC
+ goto EventScript_PCMainMenu
end
-EventScript_271DAC:: @ 8271DAC
+EventScript_PCMainMenu:: @ 8271DAC
message gText_WhichPCShouldBeAccessed
waitmessage
special ScriptMenu_CreatePCMultichoice
waitstate
- goto EventScript_271DBC
+ goto EventScript_AccessPC
end
-EventScript_271DBC:: @ 8271DBC
+EventScript_AccessPC:: @ 8271DBC
switch VAR_RESULT
- case 0, EventScript_271E0E
- case 1, EventScript_271DF9
- case 2, EventScript_271E54
- case 3, EventScript_271E47
- case MULTI_B_PRESSED, EventScript_271E47
+ case 0, EventScript_AccessPokemonStorage
+ case 1, EventScript_AccessPlayersPC
+ case 2, EventScript_AccessHallOfFame
+ case 3, EventScript_TurnOffPC
+ case MULTI_B_PRESSED, EventScript_TurnOffPC
end
-EventScript_271DF9:: @ 8271DF9
+EventScript_AccessPlayersPC:: @ 8271DF9
playse SE_PC_LOGIN
msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
special PlayerPC
waitstate
- goto EventScript_271DAC
+ goto EventScript_PCMainMenu
end
-EventScript_271E0E:: @ 8271E0E
+EventScript_AccessPokemonStorage:: @ 8271E0E
playse SE_PC_LOGIN
- call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35
- call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E
+ call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
+ call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
special ShowPokemonStorageSystemPC
waitstate
- goto EventScript_271DAC
+ goto EventScript_PCMainMenu
end
-EventScript_271E35:: @ 8271E35
+EventScript_AccessSomeonesPC:: @ 8271E35
msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
return
-EventScript_271E3E:: @ 8271E3E
+EventScript_AccessLanettesPC:: @ 8271E3E
msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
return
-EventScript_271E47:: @ 8271E47
+EventScript_TurnOffPC:: @ 8271E47
setvar VAR_0x8004, 0
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall
end
-EventScript_271E54:: @ 8271E54
- goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47
+EventScript_AccessHallOfFame:: @ 8271E54
+ goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
playse SE_PC_LOGIN
special AccessHallOfFamePC
waitstate
- goto EventScript_271DBC
+ goto EventScript_AccessPC
end
diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc
index 249f45376..50284d590 100644
--- a/data/scripts/prof_birch.inc
+++ b/data/scripts/prof_birch.inc
@@ -1,94 +1,89 @@
-LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD
-Route101_EventScript_2720AD:: @ 82720AD
-Route103_EventScript_2720AD:: @ 82720AD
+ProfBirch_EventScript_UpdateLocation:: @ 82720AD
compare VAR_PETALBURG_GYM_STATE, 0
goto_if_eq Common_EventScript_NopReturn
- goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
+ goto_if_set FLAG_SYS_GAME_CLEAR, ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 0
- call_if_eq Route101_EventScript_27211A
+ call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 1
- call_if_eq Route101_EventScript_27211A
+ call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 2
- call_if_eq Route101_EventScript_272127
+ call_if_eq ProfBirch_EventScript_MoveToRoute101
compare VAR_BIRCH_STATE, 3
- call_if_eq Route101_EventScript_272127
+ call_if_eq ProfBirch_EventScript_MoveToRoute101
compare VAR_BIRCH_STATE, 4
- call_if_eq Route101_EventScript_272134
+ call_if_eq ProfBirch_EventScript_MoveToRoute103
compare VAR_BIRCH_STATE, 5
- call_if_eq Route101_EventScript_272134
+ call_if_eq ProfBirch_EventScript_MoveToRoute103
compare VAR_BIRCH_STATE, 6
- call_if_eq Route101_EventScript_27211A
+ call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 7
- call_if_eq Route101_EventScript_27211A
+ call_if_eq ProfBirch_EventScript_MoveToLab
return
-Route101_EventScript_27211A:: @ 827211A
+ProfBirch_EventScript_MoveToLab:: @ 827211A
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_ROUTE_103_BIRCH
return
-Route101_EventScript_272127:: @ 8272127
+ProfBirch_EventScript_MoveToRoute101:: @ 8272127
clearflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_HIDE_ROUTE_103_BIRCH
return
-Route101_EventScript_272134:: @ 8272134
+ProfBirch_EventScript_MoveToRoute103:: @ 8272134
clearflag FLAG_HIDE_ROUTE_103_BIRCH
setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
return
-LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141
-Route101_EventScript_272141:: @ 8272141
-Route103_EventScript_272141:: @ 8272141
+ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
lock
faceplayer
- goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155
- goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2
+ goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex
+ goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
-Route101_EventScript_272155:: @ 8272155
+ProfBirch_EventScript_AskRatePokedex:: @ 8272155
msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq Route101_EventScript_27216F
- call Route101_EventScript_272184
+ goto_if_eq ProfBirch_EventScript_DeclineRating
+ call ProfBirch_EventScript_RatePokedex
release
end
-Route101_EventScript_27216F:: @ 827216F
+ProfBirch_EventScript_DeclineRating:: @ 827216F
msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT
release
end
-Route101_EventScript_272179:: @ 8272179
+ProfBirch_EventScript_ShowRatingMessage:: @ 8272179
copyvar VAR_0x8004, VAR_0x8009
special ShowPokedexRatingMessage
waitmessage
waitbuttonpress
return
-EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184
-Route101_EventScript_272184:: @ 8272184
+ProfBirch_EventScript_RatePokedex:: @ 8272184
setvar VAR_0x8004, 0
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
- buffernumberstring 0, VAR_0x8008
- buffernumberstring 1, VAR_0x8009
+ buffernumberstring 0, VAR_0x8008 @ Num Hoenn seen
+ buffernumberstring 1, VAR_0x8009 @ Num Hoenn caught
msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT
- call Route101_EventScript_272179
+ call ProfBirch_EventScript_ShowRatingMessage
compare VAR_0x800A, 0
- goto_if_eq Common_EventScript_NopReturn
+ goto_if_eq Common_EventScript_NopReturn @ National dex not enabled
setvar VAR_0x8004, 1
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
- buffernumberstring 0, VAR_0x8008
- buffernumberstring 1, VAR_0x8009
+ buffernumberstring 0, VAR_0x8008 @ Num National seen
+ buffernumberstring 1, VAR_0x8009 @ Num National caught
msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
return
diff --git a/src/birch_pc.c b/src/birch_pc.c
index 5179b1920..5b574b05d 100644
--- a/src/birch_pc.c
+++ b/src/birch_pc.c
@@ -9,13 +9,13 @@ bool16 ScriptGetPokedexInfo(void)
{
if (gSpecialVar_0x8004 == 0) // is national dex not present?
{
- gSpecialVar_0x8005 = GetHoennPokedexCount(0);
- gSpecialVar_0x8006 = GetHoennPokedexCount(1);
+ gSpecialVar_0x8005 = GetHoennPokedexCount(FLAG_GET_SEEN);
+ gSpecialVar_0x8006 = GetHoennPokedexCount(FLAG_GET_CAUGHT);
}
else
{
- gSpecialVar_0x8005 = GetNationalPokedexCount(0);
- gSpecialVar_0x8006 = GetNationalPokedexCount(1);
+ gSpecialVar_0x8005 = GetNationalPokedexCount(FLAG_GET_SEEN);
+ gSpecialVar_0x8006 = GetNationalPokedexCount(FLAG_GET_CAUGHT);
}
return IsNationalPokedexEnabled();
diff --git a/src/main_menu.c b/src/main_menu.c
index 0cb91ae09..95c64b3bd 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -2172,9 +2172,9 @@ static void MainMenu_FormatSavegamePokedex(void)
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
{
if (IsNationalPokedexEnabled())
- dexCount = GetNationalPokedexCount(1);
+ dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
else
- dexCount = GetHoennPokedexCount(1);
+ dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex);
AddTextPrinterParameterized3(2, 1, 0, 33, sTextColor_PlayerGenderColor, -1, gStringVar4);
ConvertIntToDecimalStringN(str, dexCount, STR_CONV_MODE_LEFT_ALIGN, 3);
diff --git a/src/menu.c b/src/menu.c
index 7495d7ebc..e349ff43a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2148,9 +2148,9 @@ void sub_819A344(u8 a0, u8 *dest, u8 color)
break;
case 1:
if (IsNationalPokedexEnabled())
- string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(1), STR_CONV_MODE_LEFT_ALIGN, 3);
+ string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(FLAG_GET_CAUGHT), STR_CONV_MODE_LEFT_ALIGN, 3);
else
- string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(1), STR_CONV_MODE_LEFT_ALIGN, 3);
+ string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(FLAG_GET_CAUGHT), STR_CONV_MODE_LEFT_ALIGN, 3);
*string = EOS;
break;
case 2:
diff --git a/src/pokedex.c b/src/pokedex.c
index 98ac962db..0b04ae3b9 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1347,13 +1347,13 @@ void CB2_Pokedex(void)
sPokedexView->selectedScreen = 0;
if (!IsNationalPokedexEnabled())
{
- sPokedexView->seenCount = GetHoennPokedexCount(0);
- sPokedexView->ownCount = GetHoennPokedexCount(1);
+ sPokedexView->seenCount = GetHoennPokedexCount(FLAG_GET_SEEN);
+ sPokedexView->ownCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
}
else
{
- sPokedexView->seenCount = GetNationalPokedexCount(0);
- sPokedexView->ownCount = GetNationalPokedexCount(1);
+ sPokedexView->seenCount = GetNationalPokedexCount(FLAG_GET_SEEN);
+ sPokedexView->ownCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
}
sPokedexView->initialVOffset = 8;
gMain.state++;
@@ -2583,7 +2583,7 @@ static void CreateInterfaceSprites(u8 a)
spriteId = CreateSprite(&gUnknown_0855D20C, 17, 91, 1);
StartSpriteAnim(&gSprites[spriteId], 1);
- r6 = GetHoennPokedexCount(0);
+ r6 = GetHoennPokedexCount(FLAG_GET_SEEN);
_a = 0;
spriteId = CreateSprite(&gUnknown_0855D23C, 40, 45, 1);
@@ -2626,7 +2626,7 @@ static void CreateInterfaceSprites(u8 a)
r5 = (sPokedexView->seenCount % 100) % 10;
StartSpriteAnim(&gSprites[spriteId], r5);
- r6 = GetHoennPokedexCount(1);
+ r6 = GetHoennPokedexCount(FLAG_GET_CAUGHT);
_a = 0;
spriteId = CreateSprite(&gUnknown_0855D23C, 40, 81, 1);
diff --git a/src/start_menu.c b/src/start_menu.c
index fcde176ac..c24497d74 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -570,7 +570,7 @@ static bool8 HandleStartMenuInput(void)
PlaySE(SE_SELECT);
if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void == StartMenuPokedexCallback)
{
- if (GetNationalPokedexCount(0) == 0)
+ if (GetNationalPokedexCount(FLAG_GET_SEEN) == 0)
return FALSE;
}
diff --git a/src/tv.c b/src/tv.c
index 4696a25e3..b9478a3ea 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1955,11 +1955,11 @@ void sub_80EDB44(void)
show->rivalTrainer.badgeCount = nBadges;
if (IsNationalPokedexEnabled())
{
- show->rivalTrainer.dexCount = GetNationalPokedexCount(0x01);
+ show->rivalTrainer.dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
}
else
{
- show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01);
+ show->rivalTrainer.dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
}
show->rivalTrainer.location = gMapHeader.regionMapSectionId;
show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-13 09:47:39 +0000