diff options
Diffstat (limited to 'data')
68 files changed, 314 insertions, 482 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 485159e9a..05468c8ca 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -27,6 +27,7 @@ #include "constants/field_weather.h" #include "constants/union_room.h" #include "constants/trade.h" +#include "constants/quest_log.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -1179,7 +1180,7 @@ EventScript_ResetAllMapFlags:: @ 81A6481 EventScript_1A651A:: @ 81A651A clearflag FLAG_HIDE_POSTGAME_GOSSIPERS call EventScript_ResetEliteFour - special sub_81130A8 + special Special_UpdateTrainerFanClubGameClear specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, FALSE call_if_eq EventScript_1A653B @@ -1247,9 +1248,7 @@ EventScript_OutOfCenterPartyHeal:: @ 81A6C26 EventScript_WallTownMap:: @ 81A6C32 lockall msgbox Text_ATownMap - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd fadescreen FADE_TO_BLACK special Special_TownMap waitstate @@ -1594,7 +1593,7 @@ gUnknown_81A7ADB:: @ 81A7ADB release end -EventScript_1A7AE0:: @ 81A7AE0 +EventScript_ReleaseEnd:: @ 81A7AE0 release end @@ -2005,9 +2004,7 @@ EventScript_1B2993:: @ 81B2993 EventScript_1B2994:: @ 81B2994 applymovement 1, Movement_FacePlayer waitmovement 0 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 compare VAR_0x8008, 0 goto_if_eq EventScript_1B29C6 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 2b13d4440..d58a16b85 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -42,9 +42,7 @@ BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 lock faceplayer - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 special DoDeoxysRockInteraction waitstate diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index dfa1836f0..d7bb14293 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -31,9 +31,7 @@ EventScript_16C418:: @ 816C418 message Text_1963CD waitmessage delay 60 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special Special_ShowDiploma waitstate release diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 3289f08b3..24d4771b2 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 end CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou @@ -42,9 +40,7 @@ Items_16BB38:: @ 816BB38 end CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 233bfefc9..f04968b1e 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 end CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 5163273c5..9056d2b2d 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 end CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou @@ -40,9 +38,7 @@ Items_16BC84:: @ 816BC84 end CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 6b19ebe66..48f682567 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -2,9 +2,7 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC .byte 0 CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 064e939e4..20b2ba04c 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -19,9 +19,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 end CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer showmoneybox 0, 0, 0 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index f14f92430..c9eb1eec6 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -13,9 +13,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CBB2 @@ -250,9 +248,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CE47 @@ -347,9 +343,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CFB2 diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 874bfce06..8fcf7cbf1 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -23,9 +23,7 @@ EventScript_1624F1:: @ 81624F1 return CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index 3fb71aeae..3d96fd67c 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -2,9 +2,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE .byte 0 CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 5f4378c7e..04615b895 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -174,9 +174,7 @@ CeruleanCity_House5_EventScript_NotEnoughBerryPowder:: @ 816B0CC CeruleanCity_House5_EventScript_BerryCrushRankings:: @ 816B0DA lockall - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special ShowBerryCrushRankings waitstate releaseall diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index fb4cb7f7c..1ff7b2c47 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -10,9 +10,7 @@ CeruleanCity_Mart_EventScript_Woman:: @ 816ACA7 end CeruleanCity_Mart_EventScript_Clerk:: @ 816ACB0 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 5d512a32b..f5ecf68d8 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -10,9 +10,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 end CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 3b3dffc4d..8610c7c2d 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -24,9 +24,7 @@ EventScript_164C52:: @ 8164C52 applymovement 1, Movement_164CC8 waitmovement 0 msgbox gUnknown_817D062 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_164CB6 + goto_if_questlog EventScript_164CB6 trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086 msgbox gUnknown_817D0B2 closemessage diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index b193e830e..98de6167e 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -32,9 +32,7 @@ EventScript_168A22:: @ 8168A22 end FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lockall goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 946508db5..50fe74879 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -2,9 +2,7 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD .byte 0 FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 605b05065..ed82fc5eb 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -2,9 +2,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D .byte 0 FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8f84b1e6c..576e16390 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -70,9 +70,7 @@ Movement_167D52:: @ 8167D52 step_end FourIsland_EventScript_167D55:: @ 8167D55 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 0d0d1c6df..5f85eaae4 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -2,9 +2,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD .byte 0 FourIsland_Mart_EventScript_171CAE:: @ 8171CAE - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index f3b695231..d158be282 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -2,9 +2,7 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F .byte 0 FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer specialvar VAR_RESULT, GetDaycareState diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index 7d2df7e8f..631be4033 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -10,9 +10,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA end FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index d1496398b..67a3e4f6a 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -41,9 +41,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 end IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 1007b34cf..bd81b99a8 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -14,9 +14,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362 end LavenderTown_Mart_EventScript_16B36B:: @ 816B36B - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 76261b037..e7e926ec1 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -23,9 +23,7 @@ EventScript_163B2F:: @ 8163B2F return MtEmber_Summit_EventScript_163B33:: @ 8163B33 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 4a844fe12..46bc6f2ee 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -29,9 +29,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 return NavelRock_Base_EventScript_Lugia:: @ 8165134 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 97eb64ff2..b151bbbfe 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -32,9 +32,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 return NavelRock_Summit_EventScript_HoOh:: @ 8164FFB - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lockall setvar VAR_TEMP_1, 1 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 80cb0a484..c6222ad7b 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -44,9 +44,7 @@ EventScript_168DAF:: @ 8168DAF end EventScript_168DB9:: @ 8168DB9 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if_lt EventScript_168E46 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 0c623394d..7e8c8ee73 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -31,9 +31,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall setvar VAR_0x8004, 32 special Special_SetSomeVariable diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 0b5008f79..c8f00bfbe 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -978,9 +978,7 @@ EventScript_1699F9:: @ 81699F9 end EventScript_1699FB:: @ 81699FB - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78 diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 1735013a5..963417631 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -10,9 +10,7 @@ PewterCity_Mart_EventScript_Boy:: @ 816A6D7 end PewterCity_Mart_EventScript_Clerk:: @ 816A6E0 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index a0f5b8379..bf0283a1f 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -55,9 +55,7 @@ EventScript_162B76:: @ 8162B76 delay 20 call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3 call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_162C68 + goto_if_questlog EventScript_162C68 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 8c6b9924e..56619200c 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -139,7 +139,7 @@ EventScript_162AA1:: @ 8162AA1 EventScript_162AAB:: @ 8162AAB setvar VAR_0x8004, 0 - special sub_8113530 + special Special_TryGainNewFanFromCounter setflag FLAG_DEFEATED_LANCE call EventScript_1A7563 msgbox gUnknown_8178A52 diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 8f4500615..4cd13a1f1 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -5,9 +5,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 lockall textcolor 2 msgbox gUnknown_817A2F8 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special ScrSpecial_StartMarowakBattle waitstate diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index bc6e108f8..f21a5fa26 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -34,9 +34,7 @@ EventScript_1637B4:: @ 81637B4 return PowerPlant_EventScript_1637B8:: @ 81637B8 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer @@ -75,9 +73,7 @@ EventScript_163824:: @ 8163824 end PowerPlant_EventScript_16382F:: @ 816382F - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -106,9 +102,7 @@ EventScript_163884:: @ 8163884 end PowerPlant_EventScript_16388D:: @ 816388D - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 80a037a65..8b80dccee 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -14,9 +14,7 @@ Route12_EventScript_168014:: @ 8168014 lock faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare VAR_RESULT, NO diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 792f9c883..e1cd920d7 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -30,9 +30,7 @@ EventScript_16FF75:: @ 816FF75 end EventScript_16FF7F:: @ 816FF7F - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index eb866388b..ec6e7270b 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -33,9 +33,7 @@ Route16_EventScript_168121:: @ 8168121 lock faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_1681A3 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare VAR_RESULT, NO diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index f7efeddb1..17714d816 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -18,9 +18,7 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 end SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 78452151b..5361c07a8 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -10,9 +10,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC end SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index ad839b0ad..ffb4678b2 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -78,38 +78,38 @@ SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 end EventScript_16F15B:: @ 816F15B - special UpdateMovedSaffronFanClubMembers - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 0 + special Special_TryLoseFansFromPlayTime + setvar VAR_0x8004, FANCLUB_MEMBER1 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, FALSE call_if_eq EventScript_16F207 - setvar VAR_0x8004, 1 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 0 + setvar VAR_0x8004, FANCLUB_MEMBER2 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, FALSE call_if_eq EventScript_16F213 - setvar VAR_0x8004, 2 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 0 + setvar VAR_0x8004, FANCLUB_MEMBER3 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, FALSE call_if_eq EventScript_16F21F - setvar VAR_0x8004, 3 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 0 + setvar VAR_0x8004, FANCLUB_MEMBER4 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, FALSE call_if_eq EventScript_16F22B - setvar VAR_0x8004, 4 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 0 + setvar VAR_0x8004, FANCLUB_MEMBER5 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, FALSE call_if_eq EventScript_16F237 - setvar VAR_0x8004, 5 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 0 + setvar VAR_0x8004, FANCLUB_MEMBER6 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, FALSE call_if_eq EventScript_16F243 - setvar VAR_0x8004, 6 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 0 + setvar VAR_0x8004, FANCLUB_MEMBER7 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, FALSE call_if_eq EventScript_16F24F - setvar VAR_0x8004, 7 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 0 + setvar VAR_0x8004, FANCLUB_MEMBER8 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, FALSE call_if_eq EventScript_16F25B end @@ -164,22 +164,22 @@ EventScript_16F267:: @ 816F267 SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 lock faceplayer - setvar VAR_0x8004, 0 - special BufferStreakTrainerText + setvar VAR_0x8004, FANCLUB_MEMBER1 + special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq EventScript_16F2EE - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 1 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, TRUE goto_if_eq EventScript_16F2C0 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare VAR_RESULT, 7 + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq EventScript_16F2E4 msgbox gUnknown_819C420 release end EventScript_16F2C0:: @ 816F2C0 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq EventScript_16F2DA msgbox gUnknown_819C390 @@ -204,22 +204,22 @@ EventScript_16F2EE:: @ 816F2EE SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 lock faceplayer - setvar VAR_0x8004, 3 - special BufferStreakTrainerText + setvar VAR_0x8004, FANCLUB_MEMBER4 + special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq EventScript_16F365 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 1 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, TRUE goto_if_eq EventScript_16F337 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare VAR_RESULT, 7 + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq EventScript_16F35B msgbox gUnknown_819CBD3 release end EventScript_16F337:: @ 816F337 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq EventScript_16F351 msgbox gUnknown_819CB32 @@ -244,22 +244,22 @@ EventScript_16F365:: @ 816F365 SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F lock faceplayer - setvar VAR_0x8004, 1 - special BufferStreakTrainerText + setvar VAR_0x8004, FANCLUB_MEMBER2 + special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq EventScript_16F3DC - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 1 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, TRUE goto_if_eq EventScript_16F3AE - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare VAR_RESULT, 7 + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq EventScript_16F3D2 msgbox gUnknown_819C6BA release end EventScript_16F3AE:: @ 816F3AE - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq EventScript_16F3C8 msgbox gUnknown_819C5A9 @@ -284,22 +284,22 @@ EventScript_16F3DC:: @ 816F3DC SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 lock faceplayer - setvar VAR_0x8004, 2 - special BufferStreakTrainerText + setvar VAR_0x8004, FANCLUB_MEMBER3 + special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq EventScript_16F453 - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 1 + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, TRUE goto_if_eq EventScript_16F425 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare VAR_RESULT, 7 + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq EventScript_16F449 msgbox gUnknown_819C986 release end EventScript_16F425:: @ 816F425 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq EventScript_16F43F msgbox gUnknown_819C81E @@ -324,20 +324,20 @@ EventScript_16F453:: @ 816F453 SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D lock faceplayer - setvar VAR_0x8004, 5 - special BufferStreakTrainerText - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 1 + setvar VAR_0x8004, FANCLUB_MEMBER6 + special Special_BufferFanClubTrainerName + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, TRUE goto_if_eq EventScript_16F491 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare VAR_RESULT, 7 + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq EventScript_16F4B5 msgbox gUnknown_819D01F release end EventScript_16F491:: @ 816F491 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq EventScript_16F4AB msgbox gUnknown_819CEDF @@ -357,20 +357,20 @@ EventScript_16F4B5:: @ 816F4B5 SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF lock faceplayer - setvar VAR_0x8004, 4 - special BufferStreakTrainerText - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 1 + setvar VAR_0x8004, FANCLUB_MEMBER5 + special Special_BufferFanClubTrainerName + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, TRUE goto_if_eq EventScript_16F4F3 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare VAR_RESULT, 7 + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq EventScript_16F517 msgbox gUnknown_819CDDA release end EventScript_16F4F3:: @ 816F4F3 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq EventScript_16F50D msgbox gUnknown_819CCF3 @@ -390,20 +390,20 @@ EventScript_16F517:: @ 816F517 SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 lock faceplayer - setvar VAR_0x8004, 6 - special BufferStreakTrainerText - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 1 + setvar VAR_0x8004, FANCLUB_MEMBER7 + special Special_BufferFanClubTrainerName + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, TRUE goto_if_eq EventScript_16F555 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare VAR_RESULT, 7 + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq EventScript_16F579 msgbox gUnknown_819D1AE release end EventScript_16F555:: @ 816F555 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq EventScript_16F56F msgbox gUnknown_819D0E3 @@ -423,20 +423,20 @@ EventScript_16F579:: @ 816F579 SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 lock faceplayer - setvar VAR_0x8004, 7 - special BufferStreakTrainerText - specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare VAR_RESULT, 1 + setvar VAR_0x8004, FANCLUB_MEMBER8 + special Special_BufferFanClubTrainerName + specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + compare VAR_RESULT, TRUE goto_if_eq EventScript_16F5B7 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare VAR_RESULT, 7 + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq EventScript_16F5DB msgbox gUnknown_819D3D2 release end EventScript_16F5B7:: @ 816F5B7 - specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers + specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq EventScript_16F5D1 msgbox gUnknown_819D2B4 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index c18472399..1882fb3a3 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -153,9 +153,7 @@ Movement_1631AA:: @ 81631AA step_end SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 0fc710d8a..2757fba07 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -2,9 +2,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 .byte 0 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 713400e2a..0558b5a8b 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -124,9 +124,7 @@ EventScript_164990:: @ 8164990 end SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 1edcae092..777948764 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -2,9 +2,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65 .byte 0 SixIsland_Mart_EventScript_171E66:: @ 8171E66 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index e8784d75c..a8efb4608 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -4,9 +4,7 @@ SixIsland_WaterPath_House1_MapScripts:: @ 817206C SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D lock faceplayer - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 9ac90a4c4..cf1693258 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -17,9 +17,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 applymovement 1, Movement_163D22 waitmovement 0 msgbox gUnknown_817AE8E - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd waitse playmoncry SPECIES_HYPNO, 2 waitmoncry diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 074d78cd9..02afb8eb4 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -2,9 +2,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C .byte 0 ThreeIsland_Mart_EventScript_17188D:: @ 817188D - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 59c4ca6f9..acfb2c38b 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -58,9 +58,7 @@ EventScript_167606:: @ 8167606 return TwoIsland_EventScript_16760F:: @ 816760F - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND, 4 diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index f6268567d..9177de9cb 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -2,9 +2,7 @@ TwoIsland_House_MapScripts:: @ 8171618 .byte 0 TwoIsland_House_EventScript_171619:: @ 8171619 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 7767bbb2b..ad6a36007 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -83,9 +83,7 @@ EventScript_166996:: @ 8166996 end EventScript_1669BB:: @ 81669BB - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 call EventScript_166958 compare VAR_RESULT, 1 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index baf3d82df..0d95d76f8 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -136,9 +136,7 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 end EventScript_16B843:: @ 816B843 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 copyvar VAR_0x8004, VAR_TEMP_0 copyvar VAR_0x8005, VAR_TEMP_1 diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index ccb50f313..3af796ada 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -10,9 +10,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D end VermilionCity_Mart_EventScript_16B666:: @ 816B666 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index cbd813d03..c317a92eb 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -140,9 +140,7 @@ EventScript_165A5B:: @ 8165A5B EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 special ScrSpecial_StartOldManTutorialBattle waitstate @@ -235,9 +233,7 @@ ViridianCity_EventScript_165B2E:: @ 8165B2E EventScript_165B4C:: @ 8165B4C msgbox gUnknown_817DD4E closemessage - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 special ScrSpecial_StartOldManTutorialBattle waitstate diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index fb77b7924..1f66937cf 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -54,9 +54,7 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if_eq EventScript_16A2A4 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd message Text_MayIHelpYou waitmessage pokemart Items_16A298 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f51720a7f..c75ebdcfd 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -14,9 +14,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE return CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 execram @@ -599,9 +597,7 @@ Movement_PlayerEnterMinigameRoom:: @ 81BB8A2 step_end CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall fadescreen FADE_TO_BLACK setvar VAR_0x8004, 0 @@ -774,9 +770,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC end CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer @@ -886,9 +880,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92 return CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer @@ -1149,9 +1141,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88 end CableClub_EventScript_81BBFD8:: @ 81BBFD8 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet specialvar VAR_RESULT, IsWirelessAdapterConnected @@ -1200,9 +1190,7 @@ CableClub_OnResume:: @ 81BC05C end JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer @@ -1232,9 +1220,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4 end JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer @@ -1371,9 +1357,7 @@ CableClub_EventScript_ExplainDodrioBerryPickingRequirements:: @ 81BC2DE return TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall special ShowPokemonJumpRecords waitstate @@ -1381,9 +1365,7 @@ TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7 end TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords:: @ 81BC2FC - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall special ShowDodrioBerryPickingRecords waitstate diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index e96f52e20..9937bf704 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,7 +1,5 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lock faceplayer showmoneybox 0, 0, 0 diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index b5efb263a..73ee4d947 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -1,7 +1,5 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree checkpartymove MOVE_CUT @@ -61,9 +59,7 @@ Text_TreeCanBeCutDown:: @ 81BDFE3 .string "down!$" EventScript_InteractWithRockSmashRockObject:: @ 81BE00C - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock checkpartymove MOVE_ROCK_SMASH @@ -126,9 +122,7 @@ Text_MonMaySmashRock:: @ 81BE0E2 .string "may be able to smash it.$" EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength @@ -189,9 +183,7 @@ Text_StrengthMadeMovingBouldersPossible:: @ 81BE284 .string "boulders around.$" EventScript_InteractWithWaterfall:: @ 81BE2B7 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall checkpartymove MOVE_WATERFALL compare VAR_RESULT, PARTY_SIZE diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 702889e5d..40fcd43db 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -447,9 +447,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2 end TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index ff61d2e2e..6e266bdfc 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -1,7 +1,5 @@ EventScript_PC:: @ 81A6955 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd lockall goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled setvar VAR_0x8004, 27 diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index cfa96774d..fddd3fd72 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -1,7 +1,5 @@ EventScript_PkmnCenterNurse:: @ 81A6578 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd message Text_WelcomeWantToHealPkmn waitmessage multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1) @@ -16,7 +14,7 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8 message Text_TakeYourPkmnForFewSeconds waitmessage call EventScript_PkmnCenterNurse_TakeAndHealPkmn - special sub_80CC524 + special SetUsedPkmnCenterQuestLogEvent goto EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom end diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index c9d836aee..4a3d39042 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,7 +1,5 @@ ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index c14cda778..77ed21b7a 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -109,9 +109,7 @@ EventScript_1A90CC:: @ 81A90CC EventScript_1A90DA:: @ 81A90DA closemessage delay 20 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if_questlog EventScript_ReleaseEnd special sub_8112364 fadescreen FADE_TO_BLACK special ScrSpecial_SeagallopFerry diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index 456cad9e9..e1d44968b 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -1,7 +1,5 @@ EventScript_UseSurf:: @ 81A6AC8 - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_UseSurfEnd + goto_if_questlog EventScript_UseSurfEnd checkpartymove MOVE_SURF compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_UseSurfEnd diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index f16e30ada..ccb279300 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -48,9 +48,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 special PlayTrainerEncounterMusic - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A501A + goto_if_questlog EventScript_1A501A battlebegin ontrainerbattleend @@ -64,9 +62,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E special ScrSpecial_ShowTrainerIntroSpeech waitmessage waitbuttonpress - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A4FB8 + goto_if_questlog EventScript_1A4FB8 special ScrSpecial_StartTrainerEyeRematch waitstate releaseall @@ -87,9 +83,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 special ScrSpecial_ShowTrainerIntroSpeech waitmessage waitbuttonpress - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A4FB8 + goto_if_questlog EventScript_1A4FB8 special ScrSpecial_StartTrainerEyeRematch waitstate releaseall @@ -122,9 +116,7 @@ EventScript_1A4FC7:: @ 81A4FC7 special ScrSpecial_ShowTrainerIntroSpeech waitmessage waitbuttonpress - special sub_8110AB4 - compare VAR_RESULT, 2 - goto_if_eq EventScript_1A501A + goto_if_questlog EventScript_1A501A battlebegin specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode compare VAR_RESULT, 0 diff --git a/data/specials.inc b/data/specials.inc index d554b6c0f..0841bc885 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -171,14 +171,14 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special ShouldMoveSaffronFanClubMember - def_special GetNumMovedSaffronFanClubMembers - def_special BufferStreakTrainerText - def_special sub_8113064 - def_special UpdateMovedSaffronFanClubMembers - def_special sub_8113510 - def_special sub_81130A8 - def_special sub_8113530 + def_special Special_IsFanClubMemberFanOfPlayer + def_special Special_GetNumFansOfPlayerInTrainerFanClub + def_special Special_BufferFanClubTrainerName + def_special Special_TryLoseFansFromPlayTimeAfterLinkBattle + def_special Special_TryLoseFansFromPlayTime + def_special Special_SetPlayerGotFirstFans + def_special Special_UpdateTrainerFanClubGameClear + def_special Special_TryGainNewFanFromCounter def_special ScrSpecial_RockSmashWildEncounter def_special nullsub_75 def_special nullsub_75 @@ -369,7 +369,7 @@ gSpecials:: @ 815FD60 def_special ChangeBoxPokemonNickname def_special Special_UpdateTrainerCardPhotoIcons def_special Special_StickerLadyGetBragFlags - def_special sub_80CC524 + def_special SetUsedPkmnCenterQuestLogEvent def_special IsWirelessAdapterConnected def_special TryBecomeLinkLeader def_special TryJoinLinkGroup @@ -399,7 +399,7 @@ gSpecials:: @ 815FD60 def_special sub_811390C def_special Special_GetMartClerkObjectId def_special Special_BattleCardAction - def_special sub_8110AB4 + def_special Special_GetQuestLogState def_special sub_8112364 def_special Special_GetMENewsJisanItemAndState def_special GetPCBoxToSendMon diff --git a/data/strings.s b/data/strings.s index 50b329490..0b928174f 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1356,10 +1356,10 @@ gText_Withdraw:: gText_ReturnToPC:: @ 84178BE .string "Return to the PC.$" -gUnknown_84178D0:: @ 84178D0 +gText_LtSurge:: @ 84178D0 .string "LT. SURGE$" -gUnknown_84178DA:: @ 84178DA +gText_Koga:: @ 84178DA .string "KOGA$" gUnknown_84178DF:: @ 0x84178DF @@ -2435,7 +2435,7 @@ gUnknown_8418BF3:: @ 0x8418BF3 gUnknown_8418C12:: @ 0x8418C12 .string "ポケモン リ-グ$" -gUnknown_8418C1B:: @ 8418C1B +gText_PokemonCenter:: @ 8418C1B .string "POKéMON CENTER$" gUnknown_8418C2A:: @ 8418C2A diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc index a9a22429b..f03343802 100644 --- a/data/text/quest_log.inc +++ b/data/text/quest_log.inc @@ -1,481 +1,482 @@ -gUnknown_841A155:: @ 841A155 +QuestLog_Text_PreviouslyOnYourQuest:: @ 841A155 .string "Previously on your quest…$" -gUnknown_841A16F:: @ 841A16F +QuestLog_Text_SwitchMon1WithMon2:: @ 841A16F .string "{PLAYER} switched the POKéMON\n" .string "{STR_VAR_1} with {STR_VAR_2}.$" -gUnknown_841A193:: @ 841A193 +QuestLog_Text_SwappedHeldItemsOnMon:: @ 841A193 .string "Took the item {STR_VAR_2} from\n" .string "{STR_VAR_1} and gave it the item\n" .string "{STR_VAR_3} to hold.$" -gUnknown_841A1CD:: @ 841A1CD +QuestLog_Text_TookHeldItemFromMon:: @ 841A1CD .string "Took the item {STR_VAR_2} from\n" .string "{STR_VAR_1}.$" -gUnknown_841A1E7:: @ 841A1E7 +QuestLog_Text_UsedItemOnMonAtThisLocation:: @ 841A1E7 .string "Used the item {STR_VAR_1} on {STR_VAR_2}\n" .string "at this location.$" -gUnknown_841A210:: @ 841A210 +QuestLog_Text_UsedTheItem:: @ 841A210 .string "{PLAYER} used the\n" .string "{STR_VAR_1}.$" -gUnknown_841A220:: @ 841A220 +QuestLog_Text_UsedTheKeyItem:: @ 841A220 .string "Used the item {STR_VAR_1}, which was\n" .string "in the KEY ITEMS POCKET.$" -gUnknown_841A255:: @ 841A255 +QuestLog_Text_MonLearnedMoveFromTM:: @ 841A255 .string "{STR_VAR_1} learned the move\n" .string "{STR_VAR_2} from a TM.$" -gUnknown_841A277:: @ 841A277 +QuestLog_Text_MonReplacedMoveWithTM:: @ 841A277 .string "{STR_VAR_1} learned the move\n" .string "{STR_VAR_2} from a TM and forgot\n" .string "the move {STR_VAR_3}.$" -gUnknown_841A2B0:: @ 841A2B0 +QuestLog_Text_MonsWereFullyRestoredAtCenter:: @ 841A2B0 .string "POKéMON were fully restored\n" .string "at a POKéMON CENTER.$" -gUnknown_841A2E1:: @ 841A2E1 +QuestLog_Text_PlayerBattledChampionRival:: @ 841A2E1 .string "{DYNAMIC 0x00} had a marvelous battle\n" .string "with the CHAMPION, {DYNAMIC 0x01}.$" -gUnknown_841A312:: @ 841A312 +QuestLog_Text_PlayerSentOutMon1RivalSentOutMon2:: @ 841A312 .string "In the end, {DYNAMIC 0x00} sent out {DYNAMIC 0x01}\n" .string "while {DYNAMIC 0x02} countered with\n" .string "{DYNAMIC 0x03}.$" -gUnknown_841A349:: @ 841A349 +QuestLog_Text_WonTheMatchAsAResult:: @ 841A349 .string "And, as a result of battling with every\n" .string "bit of power, {DYNAMIC 0x00} won\n" .string "the match.$" -gUnknown_841A391:: @ 841A391 +QuestLog_Text_StoredItemInPC:: @ 841A391 .string "Removed the item {STR_VAR_1} from\n" .string "the BAG's ITEMS POCKET and stored it\n" .string "on the PC.$" -gUnknown_841A3DA:: @ 841A3DA +QuestLog_Text_WithdrewItemFromPC:: @ 841A3DA .string "{PLAYER} withdrew the item {STR_VAR_1}\n" .string "from the PC.$" -gUnknown_841A3FF:: @ 841A3FF +QuestLog_Text_TradedMon1ForPersonsMon2:: @ 841A3FF .string "Traded {STR_VAR_3} in exchange for\n" .string "{STR_VAR_1}'s {STR_VAR_2}.$" -gUnknown_841A422:: @ 841A422 +QuestLog_Text_SingleBattleWithPersonResultedInOutcome:: @ 841A422 .string "Took on {DYNAMIC 0x00} in a SINGLE BATTLE.\n" .string "It was a hotly contested match that\n" .string "resulted in a {DYNAMIC 0x01}.$" -gUnknown_841A477:: @ 841A477 +QuestLog_Text_DoubleBattleWithPersonResultedInOutcome:: @ 841A477 .string "Took on {DYNAMIC 0x00} in a DOUBLE BATTLE.\n" .string "It was an extended match that resulted\n" .string "in a {DYNAMIC 0x01}.$" -gUnknown_841A4C6:: @ 841A4C6 +QuestLog_Text_MultiBattleWithPeopleResultedInOutcome:: @ 841A4C6 .string "{DYNAMIC 0x00} and {DYNAMIC 0x01} took on\n" .string "{DYNAMIC 0x02} and {DYNAMIC 0x03} in a\n" .string "MULTI BATTLE and got a {DYNAMIC 0x04}.$" -gUnknown_841A502:: +QuestLog_Text_Win:: .string "win$" -gUnknown_841A506:: +QuestLog_Text_Loss:: .string "loss$" -gUnknown_841A50B:: @ 841A50B +QuestLog_Text_MingledInUnionRoom:: @ 841A50B .string "Mingled with other TRAINERS in\n" .string "the UNION ROOM.$" -gUnknown_841A53A:: +QuestLog_Text_DepartedPlaceInTownForNextDestination:: @ 841A53A .string "Departed {STR_VAR_2}\n" .string "in {STR_VAR_1} for the next\n" .string "destination.$" -gUnknown_841A566:: @ 841A566 +QuestLog_Text_SwitchedMonsBetweenBoxes:: @ 841A566 .string "After consideration, switched\n" .string "{DYNAMIC 0x01} in {DYNAMIC 0x00} with\n" .string "{DYNAMIC 0x03} in {DYNAMIC 0x02}.$" -gUnknown_841A59C:: @ 841A59C +QuestLog_Text_MovedMonToNewBox:: @ 841A59C .string "After deep thought, switched\n" .string "{DYNAMIC 0x01} in BOX “{DYNAMIC 0x00}” to\n" .string "the BOX “{DYNAMIC 0x02}.”$" -gUnknown_841A5D9:: @ 841A5D9 +QuestLog_Text_SwitchedMonsWithinBox:: @ 841A5D9 .string "Switched around {DYNAMIC 0x01} and\n" .string "{DYNAMIC 0x02} in {DYNAMIC 0x00}.$" -gUnknown_841A5FA:: @ 841A5FA +QuestLog_Text_MovedMonWithinBox:: @ 841A5FA .string "Moved {DYNAMIC 0x01} in {DYNAMIC 0x00}.$" -gUnknown_841A60A:: @ 841A60A +QuestLog_Text_SwitchedPartyMonForPCMon:: @ 841A60A .string "Switched {DYNAMIC 0x01} in {DYNAMIC 0x00}\n" .string "with {DYNAMIC 0x02} in the party.$" -gUnknown_841A632:: @ 841A632 +QuestLog_Text_WithdrewMonFromPC:: @ 841A632 .string "Added {DYNAMIC 0x01} in {DYNAMIC 0x00}\n" .string "to the party.$" -gUnknown_841A64F:: @ 841A64F +QuestLog_Text_DepositedMonInPC:: @ 841A64F .string "Moved {DYNAMIC 0x00} from the party\n" .string "to {DYNAMIC 0x01}.$" -gUnknown_841A66E:: @ 841A66E +QuestLog_Text_SwitchedMultipleMons:: @ 841A66E .string "Moved a group of POKéMON in\n" .string "{DYNAMIC 0x00} to {DYNAMIC 0x01}.$" -gUnknown_841A694:: @ 841A694 +QuestLog_Text_ADifferentSpot:: @ 841A694 .string "a different spot$" -gUnknown_841A6A5:: @ 841A6A5 +QuestLog_Text_GaveMonHeldItemFromPC:: @ 841A6A5 .string "Removed the item {STR_VAR_1} from\n" .string "{PLAYER}'s PC and gave it to {STR_VAR_2}\n" .string "to hold.$" -gUnknown_841A6E1:: @ 841A6E1 +QuestLog_Text_SwappedHeldItemFromPC:: @ 841A6E1 .string "Removed the item {STR_VAR_1} from\n" .string "a PC, gave it to {STR_VAR_2}, and put\n" .string "the {STR_VAR_3} it held in the BAG.$" -gUnknown_841A732:: @ 841A732 +QuestLog_Text_ChattedWithManyTrainers:: @ 841A732 .string "Chatted with many TRAINERS.$" -gUnknown_841A74E:: +QuestLog_Text_Handily:: .string "handily$" -gUnknown_841A756:: +QuestLog_Text_Tenaciously:: .string "tenaciously$" -gUnknown_841A762:: +QuestLog_Text_Somehow:: .string "somehow$" -gUnknown_841A76A:: @ 841A76A +QuestLog_Text_TradedMon1ForTrainersMon2:: @ 841A76A .string "Met and traded with {STR_VAR_1}.\n" .string "Obtained the TRAINER's {STR_VAR_2} in\n" .string "exchange for {STR_VAR_3}.$" -gUnknown_841A7B0:: @ 841A7B0 +QuestLog_Text_BattledTrainerEndedInOutcome:: @ 841A7B0 .string "Met and battled {STR_VAR_1}.\n" .string "The match ended in a {STR_VAR_2}.$" -gUnknown_841A7DD:: @ 841A7DD +QuestLog_Text_BoughtItem:: @ 841A7DD .string "Went to the POKéMON MART in\n" .string "{DYNAMIC 0x00} and bought one \n" .string "{DYNAMIC 0x01}.$" -gUnknown_841A810:: @ 841A810 +QuestLog_Text_BoughtItemsIncludingItem:: @ 841A810 .string "Went to the POKéMON MART in\n" .string "{DYNAMIC 0x00} and spent ¥{DYNAMIC 0x02} for\n" .string "items including {DYNAMIC 0x01}(s).$" -gUnknown_841A858:: @ 841A858 +QuestLog_Text_SoldNumOfItem:: @ 841A858 .string "{DYNAMIC 0x00} went to the POKéMON MART in\n" .string "{DYNAMIC 0x01} and sold {DYNAMIC 0x03} of\n" .string "the item {DYNAMIC 0x02}.$" -gUnknown_841A896:: @ 841A896 - .string "Sold items including {DYNAMIC 0x01} at\n" +QuestLog_Text_SoldItemsIncludingItem:: @ 841A896 + .string "Sold items including {DYNAMIC 0x01} at\n" .string "the POKéMON MART in {DYNAMIC 0x00},\n" .string "worth ¥{DYNAMIC 0x02}.$" -gUnknown_841A8D4:: @ 841A8D4 +QuestLog_Text_JustOne:: @ 841A8D4 .string "just one$" -gUnknown_841A8DD:: @ 841A8DD +QuestLog_Text_Num:: @ 841A8DD .string "{DYNAMIC 0x04}$" -gUnknown_841A8E0:: @ 841A8E0 +QuestLog_Text_UsedSoftboiled:: @ 841A8E0 .string "{STR_VAR_1} shared its HP using the move\n" .string "SOFTBOILED.$" -gUnknown_841A90C:: @ 841A90C +QuestLog_Text_UsedMilkDrink:: @ 841A90C .string "{STR_VAR_1} shared its HP using the move\n" .string "MILK DRINK.$" -gUnknown_841A938:: @ 841A938 +QuestLog_Text_MonLearnedMoveFromHM:: @ 841A938 .string "{STR_VAR_1} securely learned the move\n" .string "{STR_VAR_2} using an HM.$" -gUnknown_841A965:: @ 841A965 +QuestLog_Text_MonReplacedMoveWithHM:: @ 841A965 .string "{STR_VAR_1} securely learned the move\n" .string "{STR_VAR_2} using an HM and forgot\n" .string "the move {STR_VAR_3}.$" -gUnknown_841A9A9:: @ 841A9A9 +QuestLog_Text_DefeatedWildMon:: @ 841A9A9 .string "{DYNAMIC 0x05} managed to defeat the POKéMON\n" .string "{DYNAMIC 0x01} in {DYNAMIC 0x00}.$" -gUnknown_841A9D4:: @ 841A9D4 +QuestLog_Text_DefeatedWildMons:: @ 841A9D4 .string "Defeated {DYNAMIC 0x02} wild POKéMON including\n" .string "{DYNAMIC 0x01} in {DYNAMIC 0x00}.$" -gUnknown_841AA01:: @ 841AA01 +QuestLog_Text_CaughtWildMon:: @ 841AA01 .string "{DYNAMIC 0x05} managed to catch the POKéMON\n" .string "{DYNAMIC 0x03} in {DYNAMIC 0x00}.$" -gUnknown_841AA2B:: @ 841AA2B +QuestLog_Text_CaughtWildMons:: @ 841AA2B .string "Threw POKé BALLS in a frenzy, catching\n" .string "{DYNAMIC 0x04} POKéMON including {DYNAMIC 0x03} here\n" .string "in {DYNAMIC 0x00}.$" -gUnknown_841AA76:: @ 841AA76 +QuestLog_Text_DefeatedWildMonAndCaughtWildMon:: @ 841AA76 .string "{DYNAMIC 0x05} defeated the POKéMON\n" .string "{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\n" .string "in {DYNAMIC 0x00}.$" -gUnknown_841AAAA:: @ 841AAAA +QuestLog_Text_DefeatedWildMonAndCaughtWildMons:: @ 841AAAA .string "Defeated the POKéMON {DYNAMIC 0x01}\n" .string "and caught {DYNAMIC 0x04} POKéMON including\n" .string "{DYNAMIC 0x03} in {DYNAMIC 0x00}.$" -gUnknown_841AAEC:: @ 841AAEC +QuestLog_Text_DefeatedWildMonsAndCaughtWildMon:: @ 841AAEC .string "{DYNAMIC 0x05} defeated {DYNAMIC 0x02} POKéMON including\n" .string "{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\n" .string "in {DYNAMIC 0x00}.$" -gUnknown_841AB29:: @ 841AB29 +QuestLog_Text_DefeatedWildMonsAndCaughtWildMons:: @ 841AB29 .string "Defeated {DYNAMIC 0x02} POKéMON including\n" .string "{DYNAMIC 0x01} and caught {DYNAMIC 0x04} POKéMON\n" .string "including {DYNAMIC 0x03} in {DYNAMIC 0x00}.$" -gUnknown_841AB74:: @ 841AB74 +QuestLog_Text_GaveMonHeldItem:: @ 841AB74 .string "Made {STR_VAR_1} hold the item\n" .string "{STR_VAR_2}.$" -gUnknown_841AB8E:: @ 841AB8E +QuestLog_Text_GaveMonHeldItem2:: @ 841AB8E .string "{PLAYER} made {STR_VAR_1} hold the item\n" .string "{STR_VAR_2}.$" -gUnknown_841ABAB:: @ 841ABAB +QuestLog_Text_UsedCut:: @ 841ABAB .string "{STR_VAR_1} used the Hidden Move\n" .string "CUT here.$" -gUnknown_841ABCD:: @ 841ABCD +QuestLog_Text_UsedFly:: @ 841ABCD .string "{STR_VAR_1} used the Hidden Move\n" .string "FLY and flew to {STR_VAR_2}.$" -gUnknown_841ABF9:: @ 841ABF9 +QuestLog_Text_UsedSurf:: @ 841ABF9 .string "{STR_VAR_1} used the Hidden Move\n" .string "SURF and rode the waves.$" -gUnknown_841AC2A:: @ 841AC2A +QuestLog_Text_UsedStrength:: @ 841AC2A .string "{STR_VAR_1} used the Hidden Move\n" .string "STRENGTH here.$" -gUnknown_841AC51:: @ 841AC51 +QuestLog_Text_UsedFlash:: @ 841AC51 .string "{STR_VAR_1} used the Hidden Move\n" .string "FLASH and illuminated a pitch-black\n" .string "cave.$" -gUnknown_841AC93:: @ 841AC93 +QuestLog_Text_UsedRockSmash:: @ 841AC93 .string "{STR_VAR_1} used the Hidden Move\n" .string "ROCK SMASH here.$" -gUnknown_841ACBC:: @ 841ACBC +QuestLog_Text_UsedWaterfall:: @ 841ACBC .string "{STR_VAR_1} used the Hidden Move\n" .string "WATERFALL to scale a raging torrent.$" -gUnknown_841ACF9:: @ 841ACF9 - .string "{STR_VAR_1}è êÉÁ Ñこª& òざÏ\n" - .string "éで+わざ\n" - .string "ダ¡ビング& ÚÉっŒ!$" +@ Unused +QuestLog_Text_UsedDive:: @ 841ACF9 + .string "{STR_VAR_1}は ふかい ところを めざし\n" + .string "ひでんわざ\n" + .string "ダイビングを つかった！$" -gUnknown_841AD1D:: @ 841AD1D +QuestLog_Text_UsedDigInLocation:: @ 841AD1D .string "{STR_VAR_1} used DIG to escape from\n" .string "{STR_VAR_2}.$" -gUnknown_841AD3C:: @ 841AD3C +QuestLog_Text_UsedSweetScent:: @ 841AD3C .string "{STR_VAR_1} used SWEET SCENT to attract\n" .string "wild POKéMON.$" -gUnknown_841AD69:: @ 841AD69 +QuestLog_Text_UsedTeleportToLocation:: @ 841AD69 .string "{STR_VAR_1} used TELEPORT, transporting\n" .string "the party to {STR_VAR_2}'s\n" .string "{STR_VAR_3}.$" -gUnknown_841AD9E:: @ 841AD9E +QuestLog_Text_LeftTownsLocationForNextDestination:: @ 841AD9E .string "{PLAYER} left {STR_VAR_1}'s\n" .string "{STR_VAR_2} for the next\n" .string "destination.$" -gUnknown_841ADC8:: @ 841ADC8 +QuestLog_Text_PlayedGamesAtGameCorner:: @ 841ADC8 .string "Played a lot of games at the ROCKET\n" .string "GAME CORNER in {STR_VAR_1}.$" -gUnknown_841ADFF:: @ 841ADFF +QuestLog_Text_RestedAtHome:: @ 841ADFF .string "{PLAYER} rested comfortably at home.$" -gUnknown_841AE1E:: @ 841AE1E +QuestLog_Text_LeftOaksLab:: @ 841AE1E .string "{PLAYER} left PROF. OAK's POKéMON\n" .string "RESEARCH LAB.$" -gUnknown_841AE48:: @ 841AE48 +QuestLog_Text_GymWasFullOfToughTrainers:: @ 841AE48 .string "The GYM in {STR_VAR_1} was full of\n" .string "tough TRAINERS…\n" .string "Preparations had to be made.$" -gUnknown_841AE8F:: @ 841AE8F +QuestLog_Text_DepartedGym:: @ 841AE8F .string "Departed the GYM in {STR_VAR_1}.$" -gUnknown_841AEA7:: @ 841AEA7 +QuestLog_Text_HadGreatTimeInSafariZone:: @ 841AEA7 .string "{PLAYER} had a great time with POKéMON\n" .string "in the SAFARI ZONE.$" -gUnknown_841AEDC:: @ 841AEDC +QuestLog_Text_ManagedToGetOutOfLocation:: @ 841AEDC .string "Managed to get out of {STR_VAR_2}\n" .string "after wandering about.$" -gUnknown_841AF0C:: @ 841AF0C +QuestLog_Text_TookOnGymLeadersMonWithMonAndWon:: @ 841AF0C .string "Took on {DYNAMIC 0x00} GYM LEADER\n" .string "{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\n" .string "and won {DYNAMIC 0x04}!$" -gUnknown_841AF3E:: @ 841AF3E +QuestLog_Text_TookOnEliteFoursMonWithMonAndWon:: @ 841AF3E .string "Took on ELITE FOUR {DYNAMIC 0x00}'s\n" .string "{DYNAMIC 0x01} with {DYNAMIC 0x02} and\n" .string "won {DYNAMIC 0x03}!$" -gUnknown_841AF6D:: @ 841AF6D +QuestLog_Text_TookOnTrainersMonWithMonAndWon:: @ 841AF6D .string "In {DYNAMIC 0x00}, took on\n" .string "{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\n" .string "and won {DYNAMIC 0x04}!$" -gUnknown_841AF98:: @ 841AF98 +QuestLog_Text_Coolly:: @ 841AF98 .string "coolly$" -gUnknown_841AF9F:: @ 841AF9F +QuestLog_Text_Barely:: @ 841AF9F .string "barely$" -gUnknown_841AFA6:: @ 841AFA6 +QuestLog_Text_UsedEscapeRope:: @ 841AFA6 .string "{PLAYER} used an ESCAPE ROPE to get\n" .string "out from {STR_VAR_2}.$" -gUnknown_841AFD1:: @ 841AFD1 +QuestLog_Text_Draw:: @ 841AFD1 .string "draw$" -gUnknown_841AFD6:: @ 841AFD6 +QuestLog_Text_DepartedTheLocationForNextDestination:: @ 841AFD6 .string "Departed from the {STR_VAR_2}\n" .string "for the next destination.$" -gUnknown_841B005:: @ 841B005 +QuestLog_Text_DepartedFromLocationToNextDestination:: @ 841B005 .string "{PLAYER} departed from\n" .string "{STR_VAR_2} and made way\n" .string "to the next destination.$" -gUnknown_841B03F:: @ 841B03F +QuestLog_Text_ObtainedItemInLocation:: @ 841B03F .string "Here in {STR_VAR_1}, {PLAYER}\n" .string "obtained the item {STR_VAR_2}.$" -gUnknown_841B064:: @ 841B064 +QuestLog_Text_ArrivedInLocation:: @ 841B064 .string "Arrived in {STR_VAR_1}.$" -gUnknown_841B073:: @ 841B073 +QuestLog_Text_SavedGameAtLocation:: @ 841B073 .string "And {PLAYER} saved the game at this\n" .string "location: {STR_VAR_1}.$" -gQuestLogString_Home:: @ 841B09F +QuestLog_Text_Home:: @ 841B09F .string "HOME$" -gQuestLogString_OakResearchLab:: @ 841B0A4 +QuestLog_Text_OakResearchLab:: @ 841B0A4 .string "OAK RESEARCH LAB$" -gQuestLogString_Gym:: @ 841B0B5 +QuestLog_Text_Gym:: @ 841B0B5 .string "GYM$" -gQuestLogString_PokemonLeagueGate:: @ 841B0B9 +QuestLog_Text_PokemonLeagueGate:: @ 841B0B9 .string "POKéMON LEAGUE GATE$" -gQuestLogString_ViridianForest:: @ 841B0CD +QuestLog_Text_ViridianForest:: @ 841B0CD .string "VIRIDIAN FOREST$" -gQuestLogString_PewterMuseumOfScience:: @ 841B0DD +QuestLog_Text_PewterMuseumOfScience:: @ 841B0DD .string "PEWTER MUSEUM OF SCIENCE$" -gQuestLogString_MtMoon:: @ 841B0F6 +QuestLog_Text_MtMoon:: @ 841B0F6 .string "MT. MOON$" -gQuestLogString_BikeShop:: @ 841B0FF +QuestLog_Text_BikeShop:: @ 841B0FF .string "BIKE SHOP$" -gQuestLogString_BillSHouse:: @ 841B109 +QuestLog_Text_BillsHouse:: @ 841B109 .string "BILL'S HOUSE$" -gQuestLogString_DayCare:: @ 841B116 +QuestLog_Text_DayCare:: @ 841B116 .string "DAY CARE$" -gQuestLogString_UndergroundPath:: @ 841B11F +QuestLog_Text_UndergroundPath:: @ 841B11F .string "UNDERGROUND PATH$" -gQuestLogString_PokemonFanClub:: @ 841B130 +QuestLog_Text_PokemonFanClub:: @ 841B130 .string "POKéMON FAN CLUB$" -gQuestLogString_SSAnne:: @ 841B141 +QuestLog_Text_SSAnne:: @ 841B141 .string "S.S. ANNE$" -gQuestLogString_DiglettSCave:: @ 841B14B +QuestLog_Text_DiglettsCave:: @ 841B14B .string "DIGLETT'S CAVE$" -gQuestLogString_RockTunnel:: @ 841B15A +QuestLog_Text_RockTunnel:: @ 841B15A .string "ROCK TUNNEL$" -gQuestLogString_PowerPlant:: @ 841B166 +QuestLog_Text_PowerPlant:: @ 841B166 .string "POWER PLANT$" -gQuestLogString_PokemonTower:: @ 841B172 +QuestLog_Text_PokemonTower:: @ 841B172 .string "POKéMON TOWER$" -gQuestLogString_VolunteerHouse:: @ 841B180 +QuestLog_Text_VolunteerHouse:: @ 841B180 .string "VOLUNTEER HOUSE$" -gQuestLogString_NameRaterSHouse:: @ 841B190 +QuestLog_Text_NameRatersHouse:: @ 841B190 .string "NAME RATER'S HOUSE$" -gQuestLogString_CeladonDeptStore:: @ 841B1A3 +QuestLog_Text_CeladonDeptStore:: @ 841B1A3 .string "CELADON DEPT. STORE$" -gQuestLogString_CeladonMansion:: @ 841B1B7 +QuestLog_Text_CeladonMansion:: @ 841B1B7 .string "CELADON MANSION$" -gQuestLogString_RocketGameCorner:: @ 841B1C7 +QuestLog_Text_RocketGameCorner:: @ 841B1C7 .string "ROCKET GAME CORNER$" -gQuestLogString_Restaurant:: @ 841B1DA +QuestLog_Text_Restaurant:: @ 841B1DA .string "RESTAURANT$" -gQuestLogString_RocketHideout:: @ 841B1E5 +QuestLog_Text_RocketHideout:: @ 841B1E5 .string "ROCKET HIDEOUT$" -gQuestLogString_SafariZone:: @ 841B1F4 +QuestLog_Text_SafariZone:: @ 841B1F4 .string "SAFARI ZONE$" -gQuestLogString_WardenSHome:: @ 841B200 +QuestLog_Text_WardensHome:: @ 841B200 .string "WARDEN'S HOME$" -gQuestLogString_FightingDojo:: @ 841B20E +QuestLog_Text_FightingDojo:: @ 841B20E .string "FIGHTING DOJO$" -gQuestLogString_SilphCo:: @ 841B21C +QuestLog_Text_SilphCo:: @ 841B21C .string "SILPH CO.$" -gQuestLogString_SeafoamIslands:: @ 841B226 +QuestLog_Text_SeafoamIslands:: @ 841B226 .string "SEAFOAM ISLANDS$" -gQuestLogString_PokemonMansion:: @ 841B236 +QuestLog_Text_PokemonMansion:: @ 841B236 .string "POKéMON MANSION$" -gQuestLogString_PokemonResearchLab:: @ 841B246 +QuestLog_Text_PokemonResearchLab:: @ 841B246 .string "POKéMON RESEARCH LAB$" -gQuestLogString_VictoryRoad:: @ 841B25B +QuestLog_Text_VictoryRoad:: @ 841B25B .string "VICTORY ROAD$" -gQuestLogString_PokemonLeague:: @ 841B268 +QuestLog_Text_PokemonLeague:: @ 841B268 .string "POKéMON LEAGUE$" -gQuestLogString_CeruleanCave:: @ 841B277 +QuestLog_Text_CeruleanCave:: @ 841B277 .string "CERULEAN CAVE$" |