Merge branch 'master' of github.com:pret/pokefirered into modern_gcc

5 files changed, 9 insertions, 9 deletions

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