7 files changed, 21 insertions, 17 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 01b0d9b34..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
@@ -702,7 +702,11 @@ TradeCenter_EventScript_Chair3:: @ 81BB974
 	end
 
 @ Nop in FRLG
-RecordCenter_EventScript_Spot:: @ 81BB980
+@ Separate labels to match GetDirectionForEventScript
+RecordCenter_EventScript_Spot0:: @ 81BB980
+RecordCenter_EventScript_Spot1:: @ 81BB980
+RecordCenter_EventScript_Spot2:: @ 81BB980
+RecordCenter_EventScript_Spot3:: @ 81BB980
 	end
 
 CableClub_EventScript_ReadTrainerCard:: @ 81BB981
@@ -771,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
@@ -881,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
@@ -1191,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
@@ -1221,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/field_moves.inc b/data/scripts/field_moves.inc
index 282071755..7ae90849d 100644
--- a/data/scripts/field_moves.inc
+++ b/data/scripts/field_moves.inc
@@ -125,7 +125,7 @@ EventScript_StrengthBoulder:: @ 81BE11D
 	goto_if_questlog EventScript_ReleaseEnd
 	lockall
 	goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder
-	goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength
+	goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_AlreadyUsedStrength
 	checkpartymove MOVE_STRENGTH
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_CantMoveBoulder
@@ -147,7 +147,7 @@ EventScript_FldEffStrength:: @ 81BE16E
 	end
 
 EventScript_UseStrength:: @ 81BE179
-	setflag FLAG_SYS_STRENGTH_ACTIVE
+	setflag FLAG_SYS_USE_STRENGTH
 	msgbox Text_MonUsedStrengthCanMoveBoulders, MSGBOX_SIGN
 	end
 
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