diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-31 08:49:47 -0400 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-31 08:49:47 -0400 |
commit | af3253561005bccb62ef41a08810d4dd1a5b4ded (patch) | |
tree | 3eaec499311f0dda67f49e3440c0e2dac6f18acc /data | |
parent | 4134baf3eb64cc6c17ade48ed27507f9f84a96c5 (diff) |
Name all specials
Diffstat (limited to 'data')
38 files changed, 63 insertions, 63 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 0a54d8e1a..ec9409782 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1223,10 +1223,10 @@ EventScript_DoInGameTrade:: @ 81A8CD9 faceplayer return -gUnknown_81A8CED:: @ 81A8CED - special sub_810C3A4 +EventScript_VsSeekerChargingDone:: @ 81A8CED + special VsSeekerFreezeObjectsAfterChargeComplete waitstate - special sub_810C444 + special VsSeekerResetObjectMovementAfterChargeComplete releaseall end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 2f26f58ab..01417f0d1 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -43,7 +43,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 lock faceplayer goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special DoDeoxysTriangleInteraction waitstate switch VAR_RESULT diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index fb7cac74d..fe0d13a8a 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -3,7 +3,7 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index e040978fc..ee0cd370e 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -24,7 +24,7 @@ CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1 CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer waitse diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index b27579cee..5d63feb07 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -3,7 +3,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock specialvar VAR_0x8004, GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 7fd2a810d..19115df34 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -33,7 +33,7 @@ FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lockall goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 4a5662865..0d70919dd 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 956652eb7..875cb284e 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -3,7 +3,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index f8de01374..17f509515 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -73,7 +73,7 @@ FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52 FourIsland_EventScript_DaycareMan:: @ 8167D55 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer special GetDaycareMonNicknames diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index fef05c1ce..815a86ddc 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -24,7 +24,7 @@ MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F MtEmber_Summit_EventScript_Moltres:: @ 8163B33 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 515242568..46a308ce9 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -63,7 +63,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B removeobject LOCALID_DOME_FOSSIL giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc delay 10 applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil waitmovement 0 @@ -95,7 +95,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F removeobject LOCALID_HELIX_FOSSIL giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc delay 10 applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil waitmovement 0 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 707ad84f7..a47454024 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -30,7 +30,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 NavelRock_Base_EventScript_Lugia:: @ 8165134 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer waitse diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index b2983cf47..93e1fcdb1 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -33,7 +33,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 NavelRock_Summit_EventScript_HoOh:: @ 8164FFB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lockall setvar VAR_TEMP_1, 1 special SpawnCameraObject diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 67c48c033..524c99272 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -289,7 +289,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou - special sub_810B82C + special SetPostgameFlags setflag FLAG_SYS_CAN_LINK_WITH_RS setflag FLAG_HIDE_CERULEAN_CAVE_GUARD setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 1b98d4cb4..62e9d8a01 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -451,7 +451,7 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 setvar SIGN_LADY_READY, FALSE special SetWalkingIntoSignVars - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox PalletTown_Text_PressStartToOpenMenuCopy normalmsg diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index be4e8dd09..a595182fe 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -50,7 +50,7 @@ PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index facebea6b..fecfd0b48 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -723,7 +723,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E waitfanfare call EventScript_RestorePrevTextColor setflag FLAG_SYS_POKEDEX_GET - special sub_810B810 + special SetUnlockedPokedexFlags setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 @@ -1000,7 +1000,7 @@ PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9 PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls checkitem ITEM_POKE_BALL, 1 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index c50fcdb2d..5bb795169 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -724,7 +724,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE waitmessage waitfanfare msgbox PewterCity_Text_SwitchedShoesWithRunningShoes - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox PewterCity_Text_ExplainRunningShoes normalmsg diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index d5236139c..bb20b6ac3 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special StartMarowakBattle waitstate - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 3877d5f57..59ba7c6cc 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -35,7 +35,7 @@ PowerPlant_EventScript_ShowElectrode2:: @ 81637B4 PowerPlant_EventScript_Zapdos:: @ 81637B8 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE @@ -84,7 +84,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode1 @@ -113,7 +113,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode2 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 9ace7b7b0..af0ab05a4 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -15,7 +15,7 @@ Route12_EventScript_Snorlax:: @ 8168014 faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route12_EventScript_DontUsePokeFlute diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 70c8bf48f..646987ddb 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -31,7 +31,7 @@ Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75 Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, FALSE diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 62d47983f..2096b6a2a 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -34,7 +34,7 @@ Route16_EventScript_Snorlax:: @ 8168121 faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route16_EventScript_DontUsePokeFlute diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc index a8e74c94b..3659a1cc6 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -19,7 +19,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70 SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer checkitem ITEM_POKE_DOLL, 1 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 3e63ff0ed..47accfa73 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -100,7 +100,7 @@ SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121 call_if_lt SeafoamIslands_B4F_EventScript_RideCurrentFar compare VAR_0x8008, 9 call_if_ge SeafoamIslands_B4F_EventScript_RideCurrentClose - special sub_805D1A8 + special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand setvar VAR_TEMP_1, 0 releaseall end @@ -159,7 +159,7 @@ SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 9f9b33c7f..ce1520ce0 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -5,7 +5,7 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D lock faceplayer goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, FALSE diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index dab6cb795..faa340706 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -23,7 +23,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 waitmoncry setwildbattle SPECIES_HYPNO, 30, ITEM_NONE dowildbattle - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc applymovement 1, Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 20b0a2710..297a82295 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -8,7 +8,7 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_MoveManiac:: @ 8171619 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer clearflag HAS_BIG_MUSHROOM diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 0485cd89e..07abeefd0 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -86,7 +86,7 @@ VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996 VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc call VermilionCity_EventScript_CheckHasMysticTicket compare VAR_RESULT, TRUE goto_if_eq VermilionCity_EventScript_HasMysticTicket diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 232453543..b7e07a106 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -142,7 +142,7 @@ VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837 VermilionCity_Gym_EventScript_TrashCan:: @ 816B843 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc copyvar SWITCH1_ID, VAR_TEMP_0 copyvar SWITCH2_ID, VAR_TEMP_1 goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_LocksAlreadyOpen diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5309c0493..5eef02b91 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -146,7 +146,7 @@ ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B ViridianCity_EventScript_TutorialUnused:: @ 8165A65 msgbox ViridianCity_Text_ThatWasEducationalTakeThis goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special StartOldManTutorialBattle waitstate release @@ -239,7 +239,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C msgbox ViridianCity_Text_ShowYouHowToCatchMons closemessage goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special StartOldManTutorialBattle waitstate lock diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 1053c1028..8bb85bc9f 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -15,7 +15,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc execram @ Unused @@ -111,7 +111,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 special CloseLink special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -137,7 +137,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367 special CloseLink special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -161,7 +161,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4 special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -775,7 +775,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements @@ -885,7 +885,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92 CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements @@ -1195,7 +1195,7 @@ CableClub_OnResume:: @ 81BC05C JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer message Text_DescribeWhichGame @@ -1225,7 +1225,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4 JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer message Text_WelcomeCanYouWait diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 46d4a7c52..ceea4f7bb 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -448,7 +448,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2 TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves @@ -556,7 +556,7 @@ EventScript_ChooseMoveTutorMon:: @ 81C4F30 EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37 textcolor 3 - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO normalmsg diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 79f4ad84c..5cea3a753 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,6 +1,6 @@ PokedexRating_EventScript_RateInPerson:: @ 81A737B goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro call PokedexRating_EventScript_Rate diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc index c7636ce22..75508be5c 100644 --- a/data/scripts/questionnaire.inc +++ b/data/scripts/questionnaire.inc @@ -29,7 +29,7 @@ EventScript_EnableMysteryGift:: @ 81A774D msgbox Text_YouKnowThoseWords setflag FLAG_SYS_MYSTERY_GIFT_ENABLED textcolor 3 - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox Text_YouCanAccessMysteryGift normalmsg diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 51fd0c675..ca3b2bc6b 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -111,7 +111,7 @@ EventScript_SetSail:: @ 81A90DA closemessage delay 20 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc fadescreen FADE_TO_BLACK special DoSeagallopFerryScene waitstate diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 993db55bc..0f2171d7c 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -92,7 +92,7 @@ FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994 applymovement 1, Movement_FacePlayer waitmovement 0 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_0x8008, 0 goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout message FourIsland_House2_Text_BragAboutWhatToday diff --git a/data/specials.inc b/data/specials.inc index ab7309c32..c06019606 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -100,7 +100,7 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special sub_8081128 + def_special TryContestLinkup def_special Field_AskSaveTheGame def_special DoWateringBerryTreeAnim def_special ShowEasyChatScreen @@ -349,14 +349,14 @@ gSpecials:: @ 815FD60 def_special Dummy_TryEnableBravoTrainerBattleTower def_special DoesPartyHaveEnigmaBerry def_special NullFieldSpecial - def_special sub_810B82C + def_special SetPostgameFlags def_special StartMarowakBattle def_special ForcePlayerOntoBike def_special ListMenu def_special ReturnToListMenu def_special DoPicboxCancel def_special SetVermilionTrashCans - def_special sub_805D1A8 + def_special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand def_special SampleResortGorgeousMonAndReward def_special CheckAddCoins def_special GetDaycarePokemonCount @@ -364,7 +364,7 @@ gSpecials:: @ 815FD60 def_special ForcePlayerToStartSurfing def_special GetStarterSpecies def_special SetSeenMon - def_special sub_810C444 + def_special VsSeekerResetObjectMovementAfterChargeComplete def_special ShouldShowBoxWasFullMessage def_special ChangeBoxPokemonNickname def_special UpdateTrainerCardPhotoIcons @@ -377,8 +377,8 @@ gSpecials:: @ 815FD60 def_special ShowWirelessCommunicationScreen def_special EnableNationalPokedex def_special SetWalkingIntoSignVars - def_special sub_80699BC - def_special sub_810C3A4 + def_special DisableMsgBoxWalkaway + def_special VsSeekerFreezeObjectsAfterChargeComplete def_special SetFlavorTextFlagFromSpecialVars def_special UpdatePickStateFromSpecialVar8005 def_special OverworldWhiteOutGetMoneyLoss @@ -393,14 +393,14 @@ gSpecials:: @ 815FD60 def_special BackupHelpContext def_special RestoreHelpContext def_special ValidateReceivedWonderCard - def_special sub_810B810 + def_special SetUnlockedPokedexFlags def_special InitUnionRoom def_special BufferUnionRoomPlayerName - def_special sub_811390C + def_special QuestLog_StartRecordingInputsAfterDeferredEvent def_special GetMartClerkObjectId def_special BattleCardAction def_special GetQuestLogState - def_special sub_8112364 + def_special QuestLog_OnInteractionWithSpecialNpc def_special GetMENewsJisanItemAndState def_special GetPCBoxToSendMon def_special OpenMuseumFossilPic @@ -418,7 +418,7 @@ gSpecials:: @ 815FD60 def_special DaisyMassageServices def_special HelpSystem_Disable def_special HelpSystem_Enable - def_special sub_810B82C + def_special SetPostgameFlags def_special CheckHasAtLeastOneBerry def_special DisplayBerryPowderVendorMenu def_special RemoveBerryPowderVendorMenu |