diff options
Diffstat (limited to 'data')
34 files changed, 56 insertions, 56 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index c6dc96bf4..c267575a3 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -418,7 +418,7 @@ gBattleAnims_General:: .4byte General_StatsChange .4byte General_SubstituteFade .4byte General_SubstituteAppear - .4byte General_PokeblockThrow + .4byte General_BaitThrow .4byte General_ItemKnockoff .4byte General_TurnTrap .4byte General_ItemEffect @@ -437,11 +437,11 @@ gBattleAnims_General:: .4byte General_FocusPunchSetUp .4byte General_IngrainHeal .4byte General_WishHeal - .4byte gUnknown_81D628A - .4byte gUnknown_81D6301 - .4byte gUnknown_81D637B - .4byte gUnknown_81D6394 - .4byte gUnknown_81D63DC + .4byte General_MonScared + .4byte General_GhostGetOut + .4byte General_SilphScoped + .4byte General_SafariRockThrow + .4byte General_SafariReaction gBattleAnims_Special:: .4byte Special_LevelUp @@ -10584,17 +10584,17 @@ General_SubstituteAppear:: @ 81D5C04 createvisualtask AnimTask_MonToSubstitute, 2, end -General_PokeblockThrow:: @ 81D5C0C +General_BaitThrow:: @ 81D5C0C createvisualtask sub_80F1C8C, 2, 0 - createvisualtask AnimTask_LoadPokeblockGfx, 2, + createvisualtask AnimTask_LoadBaitGfx, 2, delay 0 waitplaysewithpan SE_W026, 192, 22 - createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 + createsprite gSafariBaitSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 loopsewithpan SE_W039, 63, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish - createvisualtask AnimTask_FreePokeblockGfx, 2, + createvisualtask AnimTask_FreeBaitGfx, 2, end General_ItemKnockoff:: @ 81D5C54 @@ -10925,7 +10925,7 @@ General_WishHeal:: @ 81D6250 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, 0 end -gUnknown_81D628A:: @ 81D628A +General_MonScared:: @ 81D628A createvisualtask sub_80F1C8C, 2, 1 waitforvisualfinish loadspritegfx ANIM_TAG_SWEAT_BEAD @@ -10942,7 +10942,7 @@ gUnknown_81D628A:: @ 81D628A waitforvisualfinish end -gUnknown_81D6301:: @ 81D6301 +General_GhostGetOut:: @ 81D6301 createvisualtask sub_80F1C8C, 2, 1 waitforvisualfinish fadetobg 2 @@ -10967,7 +10967,7 @@ gUnknown_81D6301:: @ 81D6301 waitbgfadein end -gUnknown_81D637B:: @ 81D637B +General_SilphScoped:: @ 81D637B monbg 0 playsewithpan SE_W100, 192 waitplaysewithpan SE_W107, 192, 48 @@ -10977,7 +10977,7 @@ gUnknown_81D637B:: @ 81D637B clearmonbg 0 end -gUnknown_81D6394:: @ 81D6394 +General_SafariRockThrow:: @ 81D6394 createvisualtask sub_80F1C8C, 2, 0 waitforvisualfinish loadspritegfx ANIM_TAG_ROCKS @@ -10997,7 +10997,7 @@ gUnknown_81D6394:: @ 81D6394 waitforvisualfinish end -gUnknown_81D63DC:: @ 81D63DC +General_SafariReaction:: @ 81D63DC createvisualtask sub_80F1CE4, 2, waitforvisualfinish jumpargeq 7, 0, gUnknown_81D63FD diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 01417f0d1..30f3b3891 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 fe0d13a8a..dfd19d51f 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 ee0cd370e..0cd5f2628 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lock faceplayer waitse diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index 5d63feb07..bb4e69bcc 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 19115df34..e32c16494 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 0d70919dd..9610f62e1 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 875cb284e..b07235406 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 17f509515..ac670db55 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lock faceplayer special GetDaycareMonNicknames diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 815a86ddc..f34e9ff6f 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 46a308ce9..9bfe16f79 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 a47454024..9308f1ee1 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lock faceplayer waitse diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 93e1fcdb1..d7459dcde 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lockall setvar VAR_TEMP_1, 1 special SpawnCameraObject diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index a595182fe..b9ce39e52 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 fecfd0b48..277bc579b 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1000,7 +1000,7 @@ PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9 PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB goto_if_questlog EventScript_ReleaseEnd - special QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index bb20b6ac3..529defec3 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 59ba7c6cc..ad6d3fe6a 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 af0ab05a4..9e3aa0ad0 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 646987ddb..60ba742b3 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 2096b6a2a..f13b2ac6f 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 3659a1cc6..361849355 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lock faceplayer checkitem ITEM_POKE_DOLL, 1 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 47accfa73..306a70562 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -159,7 +159,7 @@ SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC goto_if_questlog EventScript_ReleaseEnd - special QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 ce1520ce0..34d0839be 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 faa340706..dae40d985 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 297a82295..e975add34 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lock faceplayer clearflag HAS_BIG_MUSHROOM diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 07abeefd0..84ef9e183 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 b7e07a106..2ac39f40e 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 5eef02b91..5e66c480f 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording special StartOldManTutorialBattle waitstate release @@ -239,7 +239,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C msgbox ViridianCity_Text_ShowYouHowToCatchMons closemessage goto_if_questlog EventScript_ReleaseEnd - special QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording special StartOldManTutorialBattle waitstate lock diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 8bb85bc9f..52720d0cc 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording execram @ Unused @@ -775,7 +775,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 goto_if_questlog EventScript_ReleaseEnd - special QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lock faceplayer message Text_DescribeWhichGame @@ -1225,7 +1225,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4 JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE goto_if_questlog EventScript_ReleaseEnd - special QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lock faceplayer message Text_WelcomeCanYouWait diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index ceea4f7bb..205b452c5 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording lock faceplayer goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 5cea3a753..05d27ffa9 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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/seagallop.inc b/data/scripts/seagallop.inc index ca3b2bc6b..2367e2dd1 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording fadescreen FADE_TO_BLACK special DoSeagallopFerryScene waitstate diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 0f2171d7c..589d84a64 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 QuestLog_OnInteractionWithSpecialNpc + special QuestLog_CutRecording 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 c06019606..8788a6105 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -400,7 +400,7 @@ gSpecials:: @ 815FD60 def_special GetMartClerkObjectId def_special BattleCardAction def_special GetQuestLogState - def_special QuestLog_OnInteractionWithSpecialNpc + def_special QuestLog_CutRecording def_special GetMENewsJisanItemAndState def_special GetPCBoxToSendMon def_special OpenMuseumFossilPic |