dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document pc.inc and prof_birch.inc

Browse Source
This commit is contained in:
GriffinR
2019-10-07 01:13:34 -04:00
parent c0b0602516
commit 81ee8f07ef
15 changed files with 83 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -108,7 +108,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
call EverGrandeCity_ChampionsRoom_EventScript_272184 call ProfBirch_EventScript_RatePokedex
msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0 waitmovement 0
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+6 -7
View File
@@ -6,7 +6,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
call Common_EventScript_SetupRivalGfxId call Common_EventScript_SetupRivalGfxId
call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD call ProfBirch_EventScript_UpdateLocation
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4 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 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E 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 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
end end
@@ -497,19 +497,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E 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 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 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 compare VAR_BIRCH_LAB_STATE, 5
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT
release release
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2 EventScript_RegisterProfBirch:: @ 81FA2D2
Route101_EventScript_1FA2D2:: @ 81FA2D2
msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
data/maps/Route101/map.json
+1 -1
View File
@@ -87,7 +87,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route101_EventScript_272141", "script": "ProfBirch_EventScript_RatePokedexOrRegister",
"flag": "FLAG_HIDE_ROUTE_101_BIRCH" "flag": "FLAG_HIDE_ROUTE_101_BIRCH"
}, },
{ {
data/maps/Route101/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ Route101_MapScripts:: @ 81EBCBA
.byte 0 .byte 0
Route101_OnTransition: @ 81EBCC5 Route101_OnTransition: @ 81EBCC5
call Route101_EventScript_2720AD call ProfBirch_EventScript_UpdateLocation
end end
Route101_MapScript2_1EBCCB: @ 81EBCCB Route101_MapScript2_1EBCCB: @ 81EBCCB
data/maps/Route103/map.json
+1 -1
View File
@@ -165,7 +165,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_272141", "script": "ProfBirch_EventScript_RatePokedexOrRegister",
"flag": "FLAG_HIDE_ROUTE_103_BIRCH" "flag": "FLAG_HIDE_ROUTE_103_BIRCH"
}, },
{ {
data/maps/Route103/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ Route103_MapScripts:: @ 81EC38E
Route103_OnTransition: @ 81EC399 Route103_OnTransition: @ 81EC399
call Common_EventScript_SetupRivalGfxId call Common_EventScript_SetupRivalGfxId
call Route103_EventScript_2720AD call ProfBirch_EventScript_UpdateLocation
end end
Route103_MapScript1_1EC3A4: @ 81EC3A4 Route103_MapScript1_1EC3A4: @ 81EC3A4
data/scripts/field_move_scripts.inc
+6 -6
View File
@@ -3,7 +3,7 @@ EventScript_CutTree:: @ 82906BB
lockall lockall
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
checkpartymove MOVE_CUT checkpartymove MOVE_CUT
compare VAR_RESULT, 6 compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CheckTreeCantCut goto_if_eq EventScript_CheckTreeCantCut
setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT
@@ -62,7 +62,7 @@ EventScript_RockSmash:: @ 82907A6
lockall lockall
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
checkpartymove MOVE_ROCK_SMASH checkpartymove MOVE_ROCK_SMASH
compare VAR_RESULT, 6 compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSmashRock goto_if_eq EventScript_CantSmashRock
setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT
@@ -129,7 +129,7 @@ EventScript_StrengthBoulder:: @ 82908BA
goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
checkpartymove MOVE_STRENGTH checkpartymove MOVE_STRENGTH
compare VAR_RESULT, 6 compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantStrength goto_if_eq EventScript_CantStrength
setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT
msgbox Text_WantToStrength, MSGBOX_YESNO msgbox Text_WantToStrength, MSGBOX_YESNO
@@ -190,7 +190,7 @@ Text_StrengthActivated: @ 8290A16
EventScript_UseWaterfall:: @ 8290A49 EventScript_UseWaterfall:: @ 8290A49
lockall lockall
checkpartymove MOVE_WATERFALL checkpartymove MOVE_WATERFALL
compare VAR_RESULT, 6 compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantWaterfall goto_if_eq EventScript_CantWaterfall
bufferpartymonnick 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT
@@ -225,7 +225,7 @@ Text_MonUsedWaterfall: @ 8290AFC
EventScript_UseDive:: @ 8290B0F EventScript_UseDive:: @ 8290B0F
lockall lockall
checkpartymove MOVE_DIVE checkpartymove MOVE_DIVE
compare VAR_RESULT, 6 compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantDive goto_if_eq EventScript_CantDive
bufferpartymonnick 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT
@@ -250,7 +250,7 @@ EventScript_EndDive:: @ 8290B58
EventScript_UseDiveUnderwater:: @ 8290B5A EventScript_UseDiveUnderwater:: @ 8290B5A
lockall lockall
checkpartymove MOVE_DIVE checkpartymove MOVE_DIVE
compare VAR_RESULT, 6 compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSurface goto_if_eq EventScript_CantSurface
bufferpartymonnick 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT
data/scripts/pc.inc
+21 -21
View File
@@ -4,63 +4,63 @@ EventScript_PC:: @ 8271D92
special DoPCTurnOnEffect special DoPCTurnOnEffect
playse SE_PC_ON playse SE_PC_ON
msgbox Text_BootUpPC, MSGBOX_DEFAULT msgbox Text_BootUpPC, MSGBOX_DEFAULT
goto EventScript_271DAC goto EventScript_PCMainMenu
end end
EventScript_271DAC:: @ 8271DAC EventScript_PCMainMenu:: @ 8271DAC
message gText_WhichPCShouldBeAccessed message gText_WhichPCShouldBeAccessed
waitmessage waitmessage
special ScriptMenu_CreatePCMultichoice special ScriptMenu_CreatePCMultichoice
waitstate waitstate
goto EventScript_271DBC goto EventScript_AccessPC
end end
EventScript_271DBC:: @ 8271DBC EventScript_AccessPC:: @ 8271DBC
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_271E0E case 0, EventScript_AccessPokemonStorage
case 1, EventScript_271DF9 case 1, EventScript_AccessPlayersPC
case 2, EventScript_271E54 case 2, EventScript_AccessHallOfFame
case 3, EventScript_271E47 case 3, EventScript_TurnOffPC
case MULTI_B_PRESSED, EventScript_271E47 case MULTI_B_PRESSED, EventScript_TurnOffPC
end end
EventScript_271DF9:: @ 8271DF9 EventScript_AccessPlayersPC:: @ 8271DF9
playse SE_PC_LOGIN playse SE_PC_LOGIN
msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
special PlayerPC special PlayerPC
waitstate waitstate
goto EventScript_271DAC goto EventScript_PCMainMenu
end end
EventScript_271E0E:: @ 8271E0E EventScript_AccessPokemonStorage:: @ 8271E0E
playse SE_PC_LOGIN playse SE_PC_LOGIN
call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35 call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
special ShowPokemonStorageSystemPC special ShowPokemonStorageSystemPC
waitstate waitstate
goto EventScript_271DAC goto EventScript_PCMainMenu
end end
EventScript_271E35:: @ 8271E35 EventScript_AccessSomeonesPC:: @ 8271E35
msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
return return
EventScript_271E3E:: @ 8271E3E EventScript_AccessLanettesPC:: @ 8271E3E
msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
return return
EventScript_271E47:: @ 8271E47 EventScript_TurnOffPC:: @ 8271E47
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
playse SE_PC_OFF playse SE_PC_OFF
special DoPCTurnOffEffect special DoPCTurnOffEffect
releaseall releaseall
end end
EventScript_271E54:: @ 8271E54 EventScript_AccessHallOfFame:: @ 8271E54
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47 goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
playse SE_PC_LOGIN playse SE_PC_LOGIN
special AccessHallOfFamePC special AccessHallOfFamePC
waitstate waitstate
goto EventScript_271DBC goto EventScript_AccessPC
end end
data/scripts/prof_birch.inc
+28 -33
View File
@@ -1,94 +1,89 @@
LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD ProfBirch_EventScript_UpdateLocation:: @ 82720AD
Route101_EventScript_2720AD:: @ 82720AD
Route103_EventScript_2720AD:: @ 82720AD
compare VAR_PETALBURG_GYM_STATE, 0 compare VAR_PETALBURG_GYM_STATE, 0
goto_if_eq Common_EventScript_NopReturn 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 compare VAR_BIRCH_STATE, 0
call_if_eq Route101_EventScript_27211A call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 1 compare VAR_BIRCH_STATE, 1
call_if_eq Route101_EventScript_27211A call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 2 compare VAR_BIRCH_STATE, 2
call_if_eq Route101_EventScript_272127 call_if_eq ProfBirch_EventScript_MoveToRoute101
compare VAR_BIRCH_STATE, 3 compare VAR_BIRCH_STATE, 3
call_if_eq Route101_EventScript_272127 call_if_eq ProfBirch_EventScript_MoveToRoute101
compare VAR_BIRCH_STATE, 4 compare VAR_BIRCH_STATE, 4
call_if_eq Route101_EventScript_272134 call_if_eq ProfBirch_EventScript_MoveToRoute103
compare VAR_BIRCH_STATE, 5 compare VAR_BIRCH_STATE, 5
call_if_eq Route101_EventScript_272134 call_if_eq ProfBirch_EventScript_MoveToRoute103
compare VAR_BIRCH_STATE, 6 compare VAR_BIRCH_STATE, 6
call_if_eq Route101_EventScript_27211A call_if_eq ProfBirch_EventScript_MoveToLab
compare VAR_BIRCH_STATE, 7 compare VAR_BIRCH_STATE, 7
call_if_eq Route101_EventScript_27211A call_if_eq ProfBirch_EventScript_MoveToLab
return return
Route101_EventScript_27211A:: @ 827211A ProfBirch_EventScript_MoveToLab:: @ 827211A
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_ROUTE_103_BIRCH
return return
Route101_EventScript_272127:: @ 8272127 ProfBirch_EventScript_MoveToRoute101:: @ 8272127
clearflag FLAG_HIDE_ROUTE_101_BIRCH clearflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
setflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_ROUTE_103_BIRCH
return return
Route101_EventScript_272134:: @ 8272134 ProfBirch_EventScript_MoveToRoute103:: @ 8272134
clearflag FLAG_HIDE_ROUTE_103_BIRCH clearflag FLAG_HIDE_ROUTE_103_BIRCH
setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_ROUTE_101_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
return return
LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
Route101_EventScript_272141:: @ 8272141
Route103_EventScript_272141:: @ 8272141
lock lock
faceplayer faceplayer
goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex
goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2 goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
Route101_EventScript_272155:: @ 8272155 ProfBirch_EventScript_AskRatePokedex:: @ 8272155
msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route101_EventScript_27216F goto_if_eq ProfBirch_EventScript_DeclineRating
call Route101_EventScript_272184 call ProfBirch_EventScript_RatePokedex
release release
end end
Route101_EventScript_27216F:: @ 827216F ProfBirch_EventScript_DeclineRating:: @ 827216F
msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT
release release
end end
Route101_EventScript_272179:: @ 8272179 ProfBirch_EventScript_ShowRatingMessage:: @ 8272179
copyvar VAR_0x8004, VAR_0x8009 copyvar VAR_0x8004, VAR_0x8009
special ShowPokedexRatingMessage special ShowPokedexRatingMessage
waitmessage waitmessage
waitbuttonpress waitbuttonpress
return return
EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184 ProfBirch_EventScript_RatePokedex:: @ 8272184
Route101_EventScript_272184:: @ 8272184
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
specialvar VAR_RESULT, ScriptGetPokedexInfo specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT copyvar VAR_0x800A, VAR_RESULT
buffernumberstring 0, VAR_0x8008 buffernumberstring 0, VAR_0x8008 @ Num Hoenn seen
buffernumberstring 1, VAR_0x8009 buffernumberstring 1, VAR_0x8009 @ Num Hoenn caught
msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT
call Route101_EventScript_272179 call ProfBirch_EventScript_ShowRatingMessage
compare VAR_0x800A, 0 compare VAR_0x800A, 0
goto_if_eq Common_EventScript_NopReturn goto_if_eq Common_EventScript_NopReturn @ National dex not enabled
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
specialvar VAR_RESULT, ScriptGetPokedexInfo specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x8009, VAR_0x8006
buffernumberstring 0, VAR_0x8008 buffernumberstring 0, VAR_0x8008 @ Num National seen
buffernumberstring 1, VAR_0x8009 buffernumberstring 1, VAR_0x8009 @ Num National caught
msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
return return
src/birch_pc.c
+4 -4
View File
@@ -9,13 +9,13 @@ bool16 ScriptGetPokedexInfo(void)
{ {
if (gSpecialVar_0x8004 == 0) // is national dex not present? if (gSpecialVar_0x8004 == 0) // is national dex not present?
{ {
gSpecialVar_0x8005 = GetHoennPokedexCount(0); gSpecialVar_0x8005 = GetHoennPokedexCount(FLAG_GET_SEEN);
gSpecialVar_0x8006 = GetHoennPokedexCount(1); gSpecialVar_0x8006 = GetHoennPokedexCount(FLAG_GET_CAUGHT);
} }
else else
{ {
gSpecialVar_0x8005 = GetNationalPokedexCount(0); gSpecialVar_0x8005 = GetNationalPokedexCount(FLAG_GET_SEEN);
gSpecialVar_0x8006 = GetNationalPokedexCount(1); gSpecialVar_0x8006 = GetNationalPokedexCount(FLAG_GET_CAUGHT);
} }
return IsNationalPokedexEnabled(); return IsNationalPokedexEnabled();
src/main_menu.c
+2 -2
View File
@@ -2172,9 +2172,9 @@ static void MainMenu_FormatSavegamePokedex(void)
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
{ {
if (IsNationalPokedexEnabled()) if (IsNationalPokedexEnabled())
dexCount = GetNationalPokedexCount(1); dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
else else
dexCount = GetHoennPokedexCount(1); dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex); StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex);
AddTextPrinterParameterized3(2, 1, 0, 33, sTextColor_PlayerGenderColor, -1, gStringVar4); AddTextPrinterParameterized3(2, 1, 0, 33, sTextColor_PlayerGenderColor, -1, gStringVar4);
ConvertIntToDecimalStringN(str, dexCount, STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(str, dexCount, STR_CONV_MODE_LEFT_ALIGN, 3);
src/menu.c
+2 -2
View File
@@ -2148,9 +2148,9 @@ void sub_819A344(u8 a0, u8 *dest, u8 color)
break; break;
case 1: case 1:
if (IsNationalPokedexEnabled()) 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 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; *string = EOS;
break; break;
case 2: case 2:
src/pokedex.c
+6 -6
View File
@@ -1347,13 +1347,13 @@ void CB2_Pokedex(void)
sPokedexView->selectedScreen = 0; sPokedexView->selectedScreen = 0;
if (!IsNationalPokedexEnabled()) if (!IsNationalPokedexEnabled())
{ {
sPokedexView->seenCount = GetHoennPokedexCount(0); sPokedexView->seenCount = GetHoennPokedexCount(FLAG_GET_SEEN);
sPokedexView->ownCount = GetHoennPokedexCount(1); sPokedexView->ownCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
} }
else else
{ {
sPokedexView->seenCount = GetNationalPokedexCount(0); sPokedexView->seenCount = GetNationalPokedexCount(FLAG_GET_SEEN);
sPokedexView->ownCount = GetNationalPokedexCount(1); sPokedexView->ownCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
} }
sPokedexView->initialVOffset = 8; sPokedexView->initialVOffset = 8;
gMain.state++; gMain.state++;
@@ -2583,7 +2583,7 @@ static void CreateInterfaceSprites(u8 a)
spriteId = CreateSprite(&gUnknown_0855D20C, 17, 91, 1); spriteId = CreateSprite(&gUnknown_0855D20C, 17, 91, 1);
StartSpriteAnim(&gSprites[spriteId], 1); StartSpriteAnim(&gSprites[spriteId], 1);
r6 = GetHoennPokedexCount(0); r6 = GetHoennPokedexCount(FLAG_GET_SEEN);
_a = 0; _a = 0;
spriteId = CreateSprite(&gUnknown_0855D23C, 40, 45, 1); spriteId = CreateSprite(&gUnknown_0855D23C, 40, 45, 1);
@@ -2626,7 +2626,7 @@ static void CreateInterfaceSprites(u8 a)
r5 = (sPokedexView->seenCount % 100) % 10; r5 = (sPokedexView->seenCount % 100) % 10;
StartSpriteAnim(&gSprites[spriteId], r5); StartSpriteAnim(&gSprites[spriteId], r5);
r6 = GetHoennPokedexCount(1); r6 = GetHoennPokedexCount(FLAG_GET_CAUGHT);
_a = 0; _a = 0;
spriteId = CreateSprite(&gUnknown_0855D23C, 40, 81, 1); spriteId = CreateSprite(&gUnknown_0855D23C, 40, 81, 1);
src/start_menu.c
+1 -1
View File
@@ -570,7 +570,7 @@ static bool8 HandleStartMenuInput(void)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void == StartMenuPokedexCallback) if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void == StartMenuPokedexCallback)
{ {
if (GetNationalPokedexCount(0) == 0) if (GetNationalPokedexCount(FLAG_GET_SEEN) == 0)
return FALSE; return FALSE;
} }
src/tv.c
+2 -2
View File
@@ -1955,11 +1955,11 @@ void sub_80EDB44(void)
show->rivalTrainer.badgeCount = nBadges; show->rivalTrainer.badgeCount = nBadges;
if (IsNationalPokedexEnabled()) if (IsNationalPokedexEnabled())
{ {
show->rivalTrainer.dexCount = GetNationalPokedexCount(0x01); show->rivalTrainer.dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
} }
else else
{ {
show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01); show->rivalTrainer.dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT);
} }
show->rivalTrainer.location = gMapHeader.regionMapSectionId; show->rivalTrainer.location = gMapHeader.regionMapSectionId;
show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId; show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId;