Merge branch 'master' into weather-15

data/maps/AncientTomb/scripts.inc

@@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
 AncientTomb_EventScript_238FCD:: @ 8238FCD
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne AncientTomb_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 

data/maps/AquaHideout_B1F/scripts.inc

@@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne AquaHideout_B1F_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 

data/maps/AquaHideout_B2F/scripts.inc

@@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
 	lockall
 	setvar VAR_0x8008, 1
 	playse SE_PIN
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598
+	applymovement VAR_0x8008, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
 	releaseall
@@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09
 AquaHideout_B2F_EventScript_233E25:: @ 8233E25
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 4
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	delay 20
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
 	applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
 	waitmovement 0
 	removeobject VAR_0x8009
 	delay 20
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
 	setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE

data/maps/BattleFrontier_BattleArenaLobby/scripts.inc

@@ -199,7 +199,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleArenaLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
 	random 2
 	copyvar VAR_TEMP_D, VAR_RESULT
 	compare VAR_TEMP_D, 0
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setobjectxyperm 6, 2, 0
 	setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
 	compare VAR_TEMP_D, 0
-	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
 	return
 

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -248,7 +248,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleDomeLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A

data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc

@@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
 	end
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
-	applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
-	applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
-	applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
-	applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement 3, Common_Movement_WalkInPlaceRight
+	applymovement 4, Common_Movement_WalkInPlaceRight
+	applymovement 5, Common_Movement_WalkInPlaceLeft
+	applymovement 6, Common_Movement_WalkInPlaceLeft
+	applymovement 7, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 

data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

@@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
 	special CallFrontierUtilFunc
 	closemessage
 	delay 2
-	call BattleFrontier_BattleFactoryLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783

data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

@@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
 	special CallFrontierUtilFunc
 	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement 3, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
 	special CallFrontierUtilFunc
 	applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
 	waitmovement 0
-	applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
-	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement 3, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -223,7 +223,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattlePalaceLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A

data/maps/BattleFrontier_BattlePikeLobby/scripts.inc

@@ -195,7 +195,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattlePikeLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	setvar VAR_0x8004, 26
 	special CallBattlePikeFunction

data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc

@@ -200,7 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattlePyramidLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
@@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC
 
 BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE
 	lockall
-	applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidLobby_EventScript_250AF0

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -233,9 +233,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
 	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6
 	waitmovement 0
 	playse SE_PIN
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6
 	applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB

data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc

@@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
 	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
 	waitmovement 0
 	delay 40
-	applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
-	applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceUp
+	applymovement 2, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	opendoor 7, 1
 	waitdooranim

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -300,7 +300,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
@@ -380,7 +380,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
@@ -461,7 +461,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
@@ -544,7 +544,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
 	setvar VAR_0x8004, 6
 	setvar VAR_0x8005, 0
 	special sub_8161F74
-	call BattleFrontier_BattleTowerLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc

@@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
 	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
 	waitmovement 0
 	moveobjectoffscreen 1
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT
 	special HealPlayerParty
@@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	opendoor 10, 1
 	waitdooranim

data/maps/BattleFrontier_Lounge3/scripts.inc

@@ -198,7 +198,7 @@ BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1
 
 BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1
 	closemessage
-	applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/BattleFrontier_Mart/scripts.inc

@@ -36,7 +36,7 @@ BattleFrontier_Mart_EventScript_267B02:: @ 8267B02
 
 BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B
 	lock
-	applymovement 2, BattleFrontier_Mart_Movement_2725B0
+	applymovement 2, Common_Movement_FaceDown
 	waitmovement 0
 	msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT
 	release

data/maps/BattleFrontier_OutsideEast/map.json

@@ -515,7 +515,7 @@
       "y": 51,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -523,7 +523,7 @@
       "y": 51,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideEast_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     }
   ]
 }

data/maps/BattleFrontier_OutsideEast/scripts.inc

@@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
 BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 

data/maps/BattleFrontier_OutsideWest/map.json

@@ -444,7 +444,7 @@
       "y": 51,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideWest_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -452,7 +452,7 @@
       "y": 51,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "BattleFrontier_OutsideWest_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     }
   ]
 }

data/maps/BattleFrontier_OutsideWest/scripts.inc

@@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
 
 BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
 	closemessage
-	applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
 	faceplayer
 	message BattleFrontier_OutsideWest_Text_23DA60
 	waitmessage
-	applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0
+	applymovement 18, Common_Movement_FaceAwayPlayer
 	waitmovement 0
 	waitbuttonpress
 	release
@@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
-	applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8
+	applymovement 9, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT
-	applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4
+	applymovement 10, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT
 	closemessage
 	delay 25
-	applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6
-	applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6
+	applymovement 9, Common_Movement_WalkInPlaceUp
+	applymovement 10, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	release
 	end
@@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
 	end
 
 BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
-	applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6
+	applymovement 14, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
@@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7
 	faceplayer
 	msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT
 	closemessage
-	applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2
+	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/BattleFrontier_ReceptionGate/scripts.inc

@@ -15,9 +15,9 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
 	lockall
 	setvar VAR_0x40D0, 1
 	playse SE_PIN
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT
 	closemessage
@@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
 	msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
 	msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
+	applymovement 2, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_272598
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
+	applymovement 2, Common_Movement_ExclamationMark
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
 	msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT
 	closemessage

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
 	compare VAR_FACING, 3
 	call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
 	msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
 	compare VAR_0x40D1, 13
@@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
 	end
 
 BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34
-	applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 

data/maps/BirthIsland_Exterior/scripts.inc

@@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
 	return
 
 BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
-	goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	clearflag FLAG_DEOXYS_ROCK_COMPLETE
 	return
@@ -35,7 +35,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne BirthIsland_Exterior_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 2
 	return
 

data/maps/BirthIsland_Harbor/scripts.inc

@@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D
 	goto_if_eq BirthIsland_Harbor_EventScript_2680A2
 	msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR

data/maps/CaveOfOrigin_B1F/scripts.inc

@@ -6,16 +6,16 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9
 	faceplayer
 	msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, CaveOfOrigin_B1F_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 60
 	playse SE_PIN
-	applymovement 1, CaveOfOrigin_B1F_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, CaveOfOrigin_B1F_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	delay 30
-	applymovement 1, CaveOfOrigin_B1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	message CaveOfOrigin_B1F_Text_235ACE
 	waitmessage

data/maps/DesertRuins/scripts.inc

@@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
 DesertRuins_EventScript_22D975:: @ 822D975
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne DesertRuins_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 

data/maps/DewfordTown/map.json

@@ -152,7 +152,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -160,7 +160,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",

data/maps/DewfordTown_Gym/scripts.inc

@@ -169,7 +169,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 	call DewfordTown_Gym_EventScript_1FC75D
 	message DewfordTown_Gym_Text_1FD07D
 	waitmessage
-	call DewfordTown_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_DEWFORD_GYM
 	setflag FLAG_BADGE02_GET
@@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
 	giveitem_std ITEM_TM08
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	return
@@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
 	giveitem_std ITEM_TM08
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	release

data/maps/DewfordTown_Hall/scripts.inc

@@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547
 	call DewfordTown_Hall_EventScript_271E8B
 	msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, DewfordTown_Hall_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	release
 	end
@@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563
 	call DewfordTown_Hall_EventScript_271E8B
 	msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, DewfordTown_Hall_Movement_2725A6
+	applymovement 5, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	release
 	end
@@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
 DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
 	compare VAR_FACING, 4
 	goto_if_eq DewfordTown_Hall_EventScript_1FD739
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
 	return
 
 DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	return
 
 DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
 	compare VAR_FACING, 3
 	goto_if_eq DewfordTown_Hall_EventScript_1FD739
-	applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
 	msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM36
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Hall_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM36
 	release
 	end

data/maps/EverGrandeCity/map.json

@@ -166,7 +166,7 @@
       "y": 48,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "EverGrandeCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -190,7 +190,7 @@
       "y": 48,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "EverGrandeCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     }
   ]
 }

data/maps/EverGrandeCity/scripts.inc

@@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B
 	.byte 0
 
 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21
-	call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	end
 
 EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
 	.byte 0
 
 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF
-	call EverGrandeCity_ChampionsRoom_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	end
 
 EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
@@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6
 	msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	call EverGrandeCity_ChampionsRoom_EventScript_228C12
 	msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT
@@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB
 	msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	call EverGrandeCity_ChampionsRoom_EventScript_228C12
 	msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT
@@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
 	addobject 3
 	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
 	call EverGrandeCity_ChampionsRoom_EventScript_272184
 	msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 20
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B
 	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceUp
 	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38
 	waitmovement 0
 	delay 20
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT
 	checkplayergender
@@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4
 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD
 	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 

data/maps/EverGrandeCity_HallOfFame/scripts.inc

@@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
 	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901
 	waitmovement 0
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT
 	closemessage
@@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908
 	waitmovement 0
 	delay 20
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6
+	applymovement 1, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 20
 	dofieldeffect 62

data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc

@@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
 	end
 
 EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
-	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E
+	goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	return
 

data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc

@@ -90,11 +90,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE
 	end
 
 EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB
-	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end

data/maps/FallarborTown/map.json

@@ -123,7 +123,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FallarborTown_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -131,7 +131,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FallarborTown_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -147,7 +147,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FallarborTown_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -163,7 +163,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FallarborTown_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",

data/maps/FallarborTown_BattleTentLobby/scripts.inc

@@ -191,7 +191,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call FallarborTown_BattleTentLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB

data/maps/FallarborTown_House1/scripts.inc

@@ -20,7 +20,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38
 	msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM27
 	compare VAR_RESULT, 0
-	goto_if_eq FallarborTown_House1_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setvar VAR_0x8004, 280
 	call FallarborTown_House1_EventScript_2723E4
 	setflag FLAG_RECEIVED_TM27

data/maps/FallarborTown_House2/scripts.inc

@@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8201382
 
 FallarborTown_House2_EventScript_201383:: @ 8201383
 	lockall
-	applymovement 1, FallarborTown_House2_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8
 	msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT

data/maps/FarawayIsland_Entrance/scripts.inc

@@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
 	goto_if_eq FarawayIsland_Entrance_EventScript_267CE7
 	msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE

data/maps/FarawayIsland_Interior/scripts.inc

@@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne FarawayIsland_Interior_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
@@ -44,7 +44,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
 	end
 
 FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
-	goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_MEW
 	setvar VAR_TEMP_1, 0
 	return
@@ -56,9 +56,9 @@ FarawayIsland_Interior_MapScript2_267D98: @ 8267D98
 FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2
 	lockall
 	playse SE_PIN
-	applymovement 1, FarawayIsland_Interior_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, FarawayIsland_Interior_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 1, FarawayIsland_Interior_Movement_267DCE
 	waitmovement 0

data/maps/FortreeCity/map.json

@@ -198,7 +198,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -206,7 +206,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -222,7 +222,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -230,7 +230,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     }
   ]
 }

data/maps/FortreeCity_Gym/scripts.inc

@@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
 FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 	message FortreeCity_Gym_Text_216EEC
 	waitmessage
-	call FortreeCity_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_FORTREE_GYM
 	setflag FLAG_BADGE06_GET
@@ -51,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 FortreeCity_Gym_EventScript_216646:: @ 8216646
 	giveitem_std ITEM_TM40
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM40
 	release
@@ -60,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646
 FortreeCity_Gym_EventScript_21666A:: @ 821666A
 	giveitem_std ITEM_TM40
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM40
 	return

data/maps/FortreeCity_House2/scripts.inc

@@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB
 	msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM10
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_House2_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM10
 	msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT
 	release

data/maps/FortreeCity_House4/scripts.inc

@@ -21,25 +21,25 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
 	end
 
 FortreeCity_House4_EventScript_217CC4:: @ 8217CC4
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FortreeCity_House4_EventScript_217CD8:: @ 8217CD8
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT
 	giveitem_std ITEM_MENTAL_HERB
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_House4_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MENTAL_HERB
 	releaseall
 	end
 
 FortreeCity_House4_EventScript_217D06:: @ 8217D06
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT
 	releaseall

data/maps/IslandCave/scripts.inc

@@ -11,7 +11,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A
 IslandCave_EventScript_238E44:: @ 8238E44
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne IslandCave_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 

data/maps/JaggedPass/scripts.inc

@@ -71,27 +71,27 @@ JaggedPass_EventScript_230718:: @ 8230718
 	goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766
 	waitse
 	playse SE_PIN
-	applymovement 5, JaggedPass_Movement_272598
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, JaggedPass_Movement_27259A
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 5, JaggedPass_Movement_27259E
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT
 	closemessage
 	trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D
 	setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS
-	applymovement 5, JaggedPass_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 JaggedPass_EventScript_230766:: @ 8230766
-	applymovement 5, JaggedPass_Movement_27259E
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, JaggedPass_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end

data/maps/LavaridgeTown/map.json

@@ -216,7 +216,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -232,7 +232,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -240,7 +240,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -248,7 +248,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "hidden_item",

data/maps/LavaridgeTown/scripts.inc

@@ -7,8 +7,8 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
 	setflag FLAG_VISITED_LAVARIDGE_TOWN
 	call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
 	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
-	call LavaridgeTown_EventScript_271ED7
-	call LavaridgeTown_EventScript_271EFB
+	call Common_EventScript_SetupRivalGender
+	call Common_EventScript_SetupRivalOnBikeGender
 	compare VAR_0x4053, 1
 	call_if_eq LavaridgeTown_EventScript_1EA518
 	compare VAR_0x4053, 1
@@ -110,12 +110,12 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635
 	return
 
 LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
-	applymovement 8, LavaridgeTown_Movement_2725A6
+	applymovement 8, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 8, LavaridgeTown_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_27259A
+	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
 	return
 
@@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
 	waitmovement 0
 	closedoor 12, 15
 	waitdooranim
-	applymovement 8, LavaridgeTown_Movement_2725A4
+	applymovement 8, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 8, LavaridgeTown_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_27259A
+	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 

data/maps/LavaridgeTown_Gym_1F/scripts.inc

@@ -71,7 +71,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
 LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 	message LavaridgeTown_Gym_1F_Text_1FF32F
 	waitmessage
-	call LavaridgeTown_Gym_1F_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT
 	setflag FLAG_FLANNERY_GIVES_BADGE_INFO
 	setflag FLAG_DEFEATED_LAVARIDGE_GYM
@@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
 	giveitem_std ITEM_TM50
 	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	release
@@ -107,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
 LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841
 	giveitem_std ITEM_TM50
 	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	return

data/maps/LavaridgeTown_HerbShop/scripts.inc

@@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505
 	msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT
 	giveitem_std ITEM_CHARCOAL
 	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_HerbShop_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLFLAG_RECEIVED_CHARCOAL
 	release
 	end

data/maps/LilycoveCity/map.json

@@ -428,7 +428,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LilycoveCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -444,7 +444,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LilycoveCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",

data/maps/LilycoveCity/scripts.inc

@@ -7,8 +7,8 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47
 	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar VAR_0x4086, 0
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
-	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A
-	call LilycoveCity_EventScript_271ED7
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+	call Common_EventScript_SetupRivalGender
 	end
 
 LilycoveCity_MapScript1_1E2B61: @ 81E2B61
@@ -40,7 +40,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY
 	msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
 	release
@@ -134,13 +134,13 @@ LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4
 LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD
 	lockall
 	msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC
-	applymovement 20, LilycoveCity_Movement_2725A2
+	applymovement 20, Common_Movement_FaceOriginalDirection
 	end
 
 LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE
 	lockall
 	msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC
-	applymovement 19, LilycoveCity_Movement_2725A2
+	applymovement 19, Common_Movement_FaceOriginalDirection
 	end
 
 LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF
@@ -197,10 +197,10 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
 	lockall
 	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0
 	msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_MET_WAILMER_TRAINER
 	releaseall
@@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD
 
 LilycoveCity_EventScript_1E3006:: @ 81E3006
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1

data/maps/LilycoveCity_ContestHall/scripts.inc

@@ -22,7 +22,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -32,7 +32,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -42,7 +42,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT
 	closemessage
-	applymovement 6, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -52,7 +52,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -62,7 +62,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -72,7 +72,7 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT
 	closemessage
-	applymovement 9, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 9, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -86,7 +86,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT
 	closemessage
-	applymovement 12, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -96,7 +96,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT
 	closemessage
-	applymovement 22, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 22, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -106,7 +106,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT
 	closemessage
-	applymovement 11, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 11, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -116,7 +116,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT
 	closemessage
-	applymovement 13, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -126,7 +126,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT
 	closemessage
-	applymovement 14, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -136,7 +136,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT
 	closemessage
-	applymovement 15, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -146,7 +146,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT
 	closemessage
-	applymovement 16, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 16, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -156,7 +156,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 17, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 17, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -166,7 +166,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT
 	closemessage
-	applymovement 18, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 18, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -176,7 +176,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 19, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -186,7 +186,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT
 	closemessage
-	applymovement 21, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 21, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -196,7 +196,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT
 	closemessage
-	applymovement 20, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 20, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -206,7 +206,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 23, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -216,7 +216,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT
 	closemessage
-	applymovement 24, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 24, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -226,7 +226,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 25, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 25, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -236,7 +236,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT
 	closemessage
-	applymovement 26, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 26, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -246,7 +246,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT
 	closemessage
-	applymovement 27, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -256,18 +256,18 @@ LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT
 	closemessage
-	applymovement 28, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA
 	lockall
-	applymovement 29, LilycoveCity_ContestHall_Movement_27259E
+	applymovement 29, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 29, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	delay 25
 	msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT
@@ -279,7 +279,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT
 	closemessage
-	applymovement 31, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -289,7 +289,7 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT
 	closemessage
-	applymovement 30, LilycoveCity_ContestHall_Movement_2725A2
+	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -86,7 +86,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
 	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A
 	waitmovement 0
 	playse SE_PIN
-	applymovement 4, LilycoveCity_ContestLobby_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E
 	waitmovement 0
@@ -259,7 +259,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4
 	applymovement 11, LilycoveCity_ContestLobby_Movement_21A547
 	waitmovement 0
 	playse SE_PIN
-	applymovement 11, LilycoveCity_ContestLobby_Movement_272598
+	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B
 	waitmovement 0
@@ -614,7 +614,7 @@ LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9
 
 LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -642,7 +642,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856
 	msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	call LilycoveCity_ContestLobby_EventScript_27134F
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
 	message LilycoveCity_ContestLobby_Text_27C8FD

data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc

@@ -6,33 +6,33 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -40,11 +40,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA
 LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
 	lockall
 	playse SE_PIN
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT
 	closemessage

data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc

@@ -26,7 +26,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702
 LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F
 	message LilycoveCity_CoveLilyMotel_2F_Text_21881C
 	waitmessage
-	call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	special Special_ShowDiploma
 	waitstate
 	release

data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc

@@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
 	special sub_8139C10
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	waitse
 	special ShakeScreenInElevator

data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc

@@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	copyvar VAR_0x8008, VAR_RESULT
 	special BufferLottoTicketNumber
 	msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT
-	applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	playse SE_PC_ON
 	special DoLotteryCornerComputerEffect
@@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	delay 220
 	special EndLotteryCornerComputerEffect
 	delay 10
-	applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x8004, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1

data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc

@@ -123,7 +123,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C
 
 LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075
 	lockall
-	applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E
+	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x405E, 0
 	goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C
@@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C
 LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7
 	msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6
+	applymovement 7, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	releaseall
 	end

data/maps/LilycoveCity_Harbor/scripts.inc

@@ -107,45 +107,45 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171
 
 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
 	setvar VAR_TEMP_E, 0
-	goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn
 	checkitem ITEM_EON_TICKET, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_E, 1
-	goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_EON_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_E, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
 	setvar VAR_TEMP_D, 0
-	goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_AURORA_TICKET, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_D, 1
-	goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_AURORA_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_D, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
 	setvar VAR_TEMP_C, 0
-	goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_OLD_SEA_MAP, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_C, 1
-	goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_OLD_SEA_MAP, Common_EventScript_NopReturn
 	setvar VAR_TEMP_C, 2
 	return
 
 LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
 	setvar VAR_TEMP_9, 0
-	goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn
 	checkitem ITEM_MYSTIC_TICKET, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_27374E
+	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_9, 1
-	goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E
+	goto_if_set FLAG_HAS_MYSTIC_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_9, 2
 	return
 
@@ -246,12 +246,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
 	call LilycoveCity_Harbor_EventScript_21E4EE
 	msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 4, LilycoveCity_Harbor_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LilycoveCity_Harbor_Movement_27259A
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_FACING, 2
 	call_if_eq LilycoveCity_Harbor_EventScript_21E656
@@ -328,12 +328,12 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D
 LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6
 	msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	removeobject 4
 	delay 30
-	applymovement 1, LilycoveCity_Harbor_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	showobjectat 1, MAP_LILYCOVE_CITY_HARBOR
 	delay 30
@@ -342,19 +342,19 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6
 	end
 
 LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE
-	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
 	delay 60
 	addobject 4
 	delay 30
-	applymovement 4, LilycoveCity_Harbor_Movement_27259E
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_21E514:: @ 821E514
-	applymovement 4, LilycoveCity_Harbor_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	removeobject 4
@@ -415,7 +415,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0
 LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC
 	msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -494,22 +494,22 @@ LilycoveCity_Harbor_Movement_21E671: @ 821E671
 	step_end
 
 LilycoveCity_Harbor_EventScript_21E675:: @ 821E675
-	applymovement 5, LilycoveCity_Harbor_Movement_2725A4
+	applymovement 5, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_21E680:: @ 821E680
-	applymovement 5, LilycoveCity_Harbor_Movement_2725AA
+	applymovement 5, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B
-	applymovement 5, LilycoveCity_Harbor_Movement_2725AA
+	applymovement 5, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_21E696:: @ 821E696
-	applymovement 5, LilycoveCity_Harbor_Movement_2725A4
+	applymovement 5, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 

data/maps/LilycoveCity_House2/scripts.inc

@@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75
 	msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM44
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_House2_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM44
 	msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT
 	release

data/maps/LilycoveCity_House3/scripts.inc

@@ -15,7 +15,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B
 	goto_if_eq LilycoveCity_House3_EventScript_21EE75
 	msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B
 LilycoveCity_House3_EventScript_21EE75:: @ 821EE75
 	msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A
 	faceplayer
 	msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc

@@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2
 	lockall
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	message LilycoveCity_LilycoveMuseum_1F_Text_218EBC
 	waitmessage
 	multichoice 20, 8, 16, 1
@@ -154,7 +154,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B
 	faceplayer
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc

@@ -62,7 +62,7 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
 	lockall
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN
@@ -71,7 +71,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
 	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
 	waitmovement 0
@@ -107,7 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT
 	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
@@ -116,7 +116,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT
 	givedecoration_std 44
 	compare VAR_RESULT, 0
@@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911
-	call LilycoveCity_LilycoveMuseum_2F_EventScript_272071
+	call Common_EventScript_NoRoomLeftForAnother
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT
 	closemessage
 	releaseall

data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc

@@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A
 
 LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B
 	lockall
-	applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO
 	switch VAR_RESULT

data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc

@@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
 	lockall
-	applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA
+	applymovement 1, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
 	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
 	waitmovement 0

data/maps/LittlerootTown/scripts.inc

@@ -6,7 +6,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB
 
 LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
 	setflag FLAG_VISITED_LITTLEROOT_TOWN
-	call LittlerootTown_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	compare VAR_0x4092, 2
 	call_if_eq LittlerootTown_EventScript_1E7E67
 	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
@@ -186,7 +186,7 @@ LittlerootTown_Movement_1E7FAC: @ 81E7FAC
 LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
 	lockall
 	playse SE_PIN
-	applymovement 8, LittlerootTown_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
 	delay 80
 	msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT
@@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D
 	special GetPlayerBigGuyGirlString
 	msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setvar VAR_0x4050, 2
 	release
@@ -357,14 +357,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118
 
 LittlerootTown_EventScript_1E811F:: @ 81E811F
 	lockall
-	applymovement 1, LittlerootTown_Movement_2725A8
+	applymovement 1, Common_Movement_WalkInPlaceRight
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	special GetPlayerBigGuyGirlString
 	msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setvar VAR_0x4050, 2
 	releaseall
@@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C
 	return
 
 LittlerootTown_EventScript_1E8297:: @ 81E8297
-	applymovement 4, LittlerootTown_Movement_2725A8
+	applymovement 4, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E82A2:: @ 81E82A2
-	applymovement 4, LittlerootTown_Movement_2725A4
+	applymovement 4, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0
 	return
 
 LittlerootTown_EventScript_1E8333:: @ 81E8333
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85D1
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8348:: @ 81E8348
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85D8
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E835D:: @ 81E835D
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85DF
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8372:: @ 81E8372
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85E4
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E8387:: @ 81E8387
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85EA
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E839C:: @ 81E839C
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85ED
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83B1:: @ 81E83B1
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F1
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83C6:: @ 81E83C6
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F5
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83DB:: @ 81E83DB
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85F8
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_1E83F0:: @ 81E83F0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_1E85FE
 	waitmovement 0
@@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
 	compare VAR_RESULT, FEMALE
 	call_if_eq LittlerootTown_EventScript_1E828C
 	call LittlerootTown_EventScript_1E8693
-	applymovement 4, LittlerootTown_Movement_2725A6
+	applymovement 4, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim

data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc

@@ -90,11 +90,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D
 LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
 	lockall
 	playse SE_PIN
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
 	waitmovement 0
 	special GetRivalSonDaughterString
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 0
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	goto LittlerootTown_BrendansHouse_1F_EventScript_292765
 	end
@@ -146,9 +146,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	addobject 7
 	delay 30
 	playse SE_PIN
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598
+	applymovement 7, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A
+	applymovement 7, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 1
 	call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981
@@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 

data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc

@@ -67,9 +67,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	delay 10
 	playbgm MUS_BOY_SUP, 1
@@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594
 	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
 	closemessage
@@ -307,7 +307,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F
 	.string "Record your progress with SAVE.\p"
 	.string "The remaining pages are blank…$"
 
-LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820
+Common_Text_LookCloserAtMap: @ 81F8820
 	.string "{PLAYER} took a closer look at the\n"
 	.string "HOENN region map.$"
 

data/maps/LittlerootTown_MaysHouse_1F/scripts.inc

@@ -90,11 +90,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D
 LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
 	lockall
 	playse SE_PIN
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
 	waitmovement 0
 	special GetRivalSonDaughterString
@@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
-	applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	goto LittlerootTown_MaysHouse_1F_EventScript_292765
 	end
@@ -183,9 +183,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	addobject 7
 	delay 30
 	playse SE_PIN
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598
+	applymovement 7, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A
+	applymovement 7, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 1
 	call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A
@@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 

data/maps/LittlerootTown_MaysHouse_2F/scripts.inc

@@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	delay 10
 	playbgm MUS_GIRL_SUP, 1
@@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
 LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440
 	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
 	closemessage
@@ -268,7 +268,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE

data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc

@@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
 	.byte 0
 
 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
-	call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
@@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07
 	setvar VAR_0x8004, 0
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
 	end
 
@@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	delay 10
 	playse SE_TK_KASYA
 	delay 20
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4
+	applymovement 3, Common_Movement_WalkInPlaceRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	delay 20
 	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58
 	waitmovement 0
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6
+	applymovement 3, Common_Movement_WalkInPlaceUp
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
@@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
 	release
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	drawmonpic SPECIES_CYNDAQUIL, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
@@ -299,7 +299,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
 	release
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	drawmonpic SPECIES_TOTODILE, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
@@ -312,7 +312,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
 	release
 	compare VAR_0x40D3, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	drawmonpic SPECIES_CHIKORITA, 10, 3
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
@@ -351,7 +351,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
 	end
 
@@ -396,7 +396,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
 	end
 
@@ -441,7 +441,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
 	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
 	end
 
@@ -530,7 +530,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
 	closemessage
 	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, MALE

data/maps/MagmaHideout_4F/scripts.inc

@@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	playfanfare MUS_ME_TAMA
 	playse SE_TAMA
 	special sub_80B0534
-	applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 150
 	removeobject 7
@@ -50,10 +50,10 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	waitmovement 0
 	msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 30
-	applymovement 6, MagmaHideout_4F_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT
 	closemessage

data/maps/MarineCave_End/scripts.inc

@@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA
 MarineCave_End_EventScript_23AFF4:: @ 823AFF4
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne MarineCave_End_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 
@@ -25,7 +25,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012
 
 MarineCave_End_EventScript_23B01B:: @ 823B01B
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	applymovement 1, MarineCave_End_Movement_23B09D
 	waitmovement 0

data/maps/MauvilleCity/map.json

@@ -238,7 +238,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -254,7 +254,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -262,7 +262,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -270,7 +270,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",

data/maps/MauvilleCity/scripts.inc

@@ -70,7 +70,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D
 	msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, MauvilleCity_Movement_2725A2
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -78,7 +78,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D
 MauvilleCity_EventScript_1DF43D:: @ 81DF43D
 	msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, MauvilleCity_Movement_2725A2
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -86,17 +86,17 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D
 MauvilleCity_EventScript_1DF452:: @ 81DF452
 	lockall
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
 	msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT
 	msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT
-	applymovement 6, MauvilleCity_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement 6, MauvilleCity_Movement_272598
+	applymovement 6, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_27259A
+	applymovement 6, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO
 	goto MauvilleCity_EventScript_1DF4AD
@@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
 	applymovement 6, MauvilleCity_Movement_1DF6A8
 	applymovement 7, MauvilleCity_Movement_1DF6E2
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 30
 	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE
@@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D
 	applymovement 6, MauvilleCity_Movement_1DF6AE
 	applymovement 7, MauvilleCity_Movement_1DF6E8
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 30
 	applymovement 7, MauvilleCity_Movement_1DF6F7
@@ -164,7 +164,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
 	call_if_eq MauvilleCity_EventScript_1DF5F3
 	compare VAR_FACING, 4
 	call_if_eq MauvilleCity_EventScript_1DF601
-	applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
 	closemessage
@@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628
 MauvilleCity_EventScript_1DF63A:: @ 81DF63A
 	msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT
-	applymovement 6, MauvilleCity_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT
-	applymovement 6, MauvilleCity_Movement_2725A8
+	applymovement 6, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT
 	return
@@ -223,7 +223,7 @@ MauvilleCity_EventScript_1DF683:: @ 81DF683
 	end
 
 MauvilleCity_EventScript_1DF690:: @ 81DF690
-	applymovement 6, MauvilleCity_Movement_27259E
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO
 	goto MauvilleCity_EventScript_1DF4AD
@@ -440,7 +440,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784
 	msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM24
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_GOT_TM24_FROM_WATTSON
 	msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
 	release

data/maps/MauvilleCity_GameCorner/scripts.inc

@@ -215,7 +215,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79
 	end
 
 MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87
-	call MauvilleCity_GameCorner_EventScript_272071
+	call Common_EventScript_NoRoomLeftForAnother
 	goto MauvilleCity_GameCorner_EventScript_20FD20
 	end
 
@@ -383,7 +383,7 @@ MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF
 	end
 
 MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D
-	call MauvilleCity_GameCorner_EventScript_27205E
+	call Common_EventScript_BagIsFull
 	goto MauvilleCity_GameCorner_EventScript_20FECE
 	end
 
@@ -448,7 +448,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0
 	end
 
 MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA
-	call MauvilleCity_GameCorner_EventScript_272071
+	call Common_EventScript_NoRoomLeftForAnother
 	msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT
 	release
 	end
@@ -513,7 +513,7 @@ MauvilleCity_GameCorner_EventScript_210299:: @ 8210299
 
 MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9
 	closemessage
-	applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/MauvilleCity_Gym/scripts.inc

@@ -88,7 +88,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
 MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
 	message MauvilleCity_Gym_Text_20E77F
 	waitmessage
-	call MauvilleCity_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT
 	setvar VAR_0x40D2, 3
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
@@ -117,7 +117,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
 MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D
 	giveitem_std ITEM_TM34
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM34
 	release
@@ -126,7 +126,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D
 MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1
 	giveitem_std ITEM_TM34
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM34
 	return

data/maps/MauvilleCity_House2/scripts.inc

@@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D
 
 MauvilleCity_House2_EventScript_210C82:: @ 8210C82
 	playse SE_PIN
-	applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598
+	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A
+	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO
 	compare VAR_RESULT, 1

data/maps/MeteorFalls_1F_1R/scripts.inc

@@ -16,20 +16,20 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
 MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	lockall
 	playbgm MUS_MGM0, 0
-	applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown
 	waitmovement 0
 	delay 30
 	applymovement 5, MeteorFalls_1F_1R_Movement_2725B4
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A6
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A6
+	applymovement 5, Common_Movement_WalkInPlaceUp
+	applymovement 6, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 5, MeteorFalls_1F_1R_Movement_272598
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_27259A
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT
 	closemessage
@@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement 5, Common_Movement_WalkInPlaceLeft
+	applymovement 6, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	addobject 7
 	addobject 8
@@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0
 	applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8
 	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement 5, Common_Movement_WalkInPlaceLeft
+	applymovement 6, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT
 	closemessage
@@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	applymovement 9, MeteorFalls_1F_1R_Movement_22BF18
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT
-	applymovement 7, MeteorFalls_1F_1R_Movement_2725AA
+	applymovement 7, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT
-	applymovement 7, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement 7, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT
 	closemessage

data/maps/MeteorFalls_StevensCave/scripts.inc

@@ -6,11 +6,11 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD
 	waitse
 	playse SE_PIN
-	applymovement 1, MeteorFalls_StevensCave_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, MeteorFalls_StevensCave_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 1, MeteorFalls_StevensCave_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D
@@ -20,7 +20,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	end
 
 MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD
-	applymovement 1, MeteorFalls_StevensCave_Movement_27259E
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT
 	release

data/maps/MossdeepCity/map.json

@@ -439,7 +439,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MossdeepCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -447,7 +447,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MossdeepCity_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -463,7 +463,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MossdeepCity_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -471,7 +471,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MossdeepCity_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",

data/maps/MossdeepCity/scripts.inc

@@ -7,7 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
 	end
 
 MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
@@ -216,7 +216,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10
 	lock
 	faceplayer
 	msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -231,7 +231,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26
 	msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT
 	giveitem_std ITEM_KINGS_ROCK
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_KINGS_ROCK
 	release
 	end

data/maps/MossdeepCity_Gym/scripts.inc

@@ -57,7 +57,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898
 MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
 	message MossdeepCity_Gym_Text_22196A
 	waitmessage
-	call MossdeepCity_Gym_EventScript_27207E
+	call Common_EventScript_PlayGymBadgeFanfare
 	msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_MOSSDEEP_GYM
 	setflag FLAG_BADGE07_GET
@@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
 MossdeepCity_Gym_EventScript_220937:: @ 8220937
 	giveitem_std ITEM_TM04
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_Gym_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM04
 	release
@@ -98,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937
 MossdeepCity_Gym_EventScript_22095B:: @ 822095B
 	giveitem_std ITEM_TM04
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_Gym_EventScript_27205E
+	goto_if_eq Common_EventScript_BagIsFull
 	msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM04
 	return

data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc

@@ -60,7 +60,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
 	compare VAR_RESULT, 1
 	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -82,7 +82,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
 	compare VAR_RESULT, 1
 	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	release
 	end
@@ -106,7 +106,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
 
 MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	release
 	end
@@ -120,7 +120,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUN_STONE
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT
 	release
@@ -136,17 +136,17 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUN_STONE
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	release
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	release
 	end
@@ -186,7 +186,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168
 MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F
 	msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F
 MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -203,7 +203,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9
 	lock
 	faceplayer
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end

data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc

@@ -32,9 +32,9 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5
 
 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF
 	playse SE_PIN
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO
 	compare VAR_RESULT, 1
@@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
 	trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461
 	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499
 	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1
@@ -173,7 +173,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59
 	lock
 	faceplayer
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -231,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF
 	step_end
 
 MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C
 	msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	releaseall
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	special SavePlayerParty
 	fadescreen 1
@@ -277,12 +277,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4
-	applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA
+	applymovement 9, Common_Movement_WalkInPlaceLeft
+	applymovement 8, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 60
-	applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6
-	applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8
+	applymovement 9, Common_Movement_WalkInPlaceUp
+	applymovement 8, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 20
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT

data/maps/MossdeepCity_StevensHouse/scripts.inc

@@ -28,12 +28,12 @@ MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
 
 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	lockall
-	applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4
+	applymovement 1, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, MossdeepCity_StevensHouse_Movement_272598
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_27259A
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 1, MossdeepCity_StevensHouse_Movement_222833
 	waitmovement 0
@@ -99,7 +99,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_222901
 	call MossdeepCity_StevensHouse_EventScript_27378B
-	call MossdeepCity_StevensHouse_EventScript_2723DD
+	call Common_EventScript_NameReceivedPokemon
 	goto MossdeepCity_StevensHouse_EventScript_222901
 	end
 

data/maps/MtChimney/scripts.inc

@@ -17,7 +17,7 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5
 	call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9
 	call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02
 	closemessage
-	applymovement 1, MtChimney_Movement_2725A2
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_EVIL_LEADER_PLEASE_STOP
 	release
@@ -35,12 +35,12 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	lockall
 	playbgm MUS_MGM0, 0
 	msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT
-	applymovement 2, MtChimney_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement 2, MtChimney_Movement_272598
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, MtChimney_Movement_27259A
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF
@@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	call_if_eq MtChimney_EventScript_22EEC7
 	compare VAR_FACING, 2
 	call_if_eq MtChimney_EventScript_22EED2
-	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT
 	closemessage
@@ -121,7 +121,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3
 	end
 
 MtChimney_EventScript_22EF51:: @ 822EF51
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox
 	nop
 	nop

data/maps/MtPyre_1F/scripts.inc

@@ -8,7 +8,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F
 	msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT
 	giveitem_std ITEM_CLEANSE_TAG
 	compare VAR_RESULT, 0
-	goto_if_eq MtPyre_1F_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CLEANSE_TAG
 	release
 	end

data/maps/MtPyre_Summit/scripts.inc

@@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030
 
 MtPyre_Summit_EventScript_23203C:: @ 823203C
 	playbgm MUS_AQA_0, 0
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725AA
+	applymovement 2, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 50
 	compare VAR_0x8008, 0
@@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC
 MtPyre_Summit_EventScript_2320F7:: @ 82320F7
 	applymovement 3, MtPyre_Summit_Movement_23212C
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C
 MtPyre_Summit_EventScript_232117:: @ 8232117
 	applymovement 3, MtPyre_Summit_Movement_232132
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
 	waitmovement 0
 	return
 
@@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204
 	end
 
 MtPyre_Summit_EventScript_232210:: @ 8232210
-	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 60
 	compare VAR_0x8008, 0
@@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
 	compare VAR_0x8008, 2
 	call_if_eq MtPyre_Summit_EventScript_2322F6
 	playse SE_PIN
-	applymovement 8, MtPyre_Summit_Movement_272598
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 8, MtPyre_Summit_Movement_27259A
+	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
 	delay 30
 	compare VAR_0x8008, 0
@@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A
 	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
 	applymovement 8, MtPyre_Summit_Movement_2323ED
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376
 	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
 	applymovement 8, MtPyre_Summit_Movement_2323F3
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 
@@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392
 	applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
 	applymovement 8, MtPyre_Summit_Movement_2323F8
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
+	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	return
 

data/maps/NavelRock_Bottom/scripts.inc

@@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273
 	return
 
 NavelRock_Bottom_EventScript_269277:: @ 8269277
-	goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_LUGIA
 	return
 
@@ -24,7 +24,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284
 NavelRock_Bottom_EventScript_26928E:: @ 826928E
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne NavelRock_Bottom_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 

data/maps/NavelRock_Harbor/scripts.inc

@@ -9,7 +9,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
 	goto_if_eq NavelRock_Harbor_EventScript_269102
 	msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_NAVEL_ROCK_HARBOR

data/maps/NavelRock_Top/scripts.inc

@@ -15,7 +15,7 @@ NavelRock_Top_EventScript_269131:: @ 8269131
 
 NavelRock_Top_EventScript_26913A:: @ 826913A
 	setvar VAR_TEMP_1, 1
-	goto_if_set FLAG_DEFEATED_HO_OH, NavelRock_Top_EventScript_27374E
+	goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn
 	setvar VAR_TEMP_1, 0
 	clearflag FLAG_HIDE_HO_OH
 	return
@@ -27,7 +27,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151
 NavelRock_Top_EventScript_26915B:: @ 826915B
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne NavelRock_Top_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject 1
 	return
 

data/maps/NewMauville_Entrance/scripts.inc

@@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB
 
 NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT
 	checkitem ITEM_BASEMENT_KEY, 1

data/maps/NewMauville_Inside/scripts.inc

@@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7
 NewMauville_Inside_EventScript_237407:: @ 8237407
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
-	goto_if_ne NewMauville_Inside_EventScript_27374E
+	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 

data/maps/OldaleTown/map.json

@@ -166,7 +166,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "OldaleTown_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -174,7 +174,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "OldaleTown_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     },
     {
       "type": "sign",
@@ -182,7 +182,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "OldaleTown_EventScript_271E73"
+      "script": "Common_EventScript_ShowPokemonCenterSign"
     },
     {
       "type": "sign",
@@ -190,7 +190,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "OldaleTown_EventScript_271E6A"
+      "script": "Common_EventScript_ShowPokemartSign"
     }
   ]
 }

data/maps/OldaleTown/scripts.inc

@@ -3,7 +3,7 @@ OldaleTown_MapScripts:: @ 81E8EA2
 	.byte 0
 
 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8
-	call OldaleTown_EventScript_271ED7
+	call Common_EventScript_SetupRivalGender
 	setflag FLAG_VISITED_OLDALE_TOWN
 	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2
 	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE
@@ -85,7 +85,7 @@ OldaleTown_EventScript_1E8FB9:: @ 81E8FB9
 	end
 
 OldaleTown_EventScript_1E8FC3:: @ 81E8FC3
-	msgbox gUnknown_08272AD0, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	fadedefaultbgm
 	release
 	end
@@ -193,7 +193,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F
 	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066
 	msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, OldaleTown_Movement_2725A2
+	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -217,7 +217,7 @@ OldaleTown_EventScript_1E9066:: @ 81E9066
 
 OldaleTown_EventScript_1E9070:: @ 81E9070
 	lockall
-	applymovement 4, OldaleTown_Movement_27259E
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	setvar VAR_0x8009, 0
 	goto OldaleTown_EventScript_1E90E6
@@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086
 	lockall
 	applymovement 4, OldaleTown_Movement_1E9170
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
 	goto OldaleTown_EventScript_1E90E6
@@ -237,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6
 	lockall
 	applymovement 4, OldaleTown_Movement_1E9173
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
 	goto OldaleTown_EventScript_1E90E6
@@ -247,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6
 	lockall
 	applymovement 4, OldaleTown_Movement_1E9175
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	setvar VAR_0x8009, 1
 	goto OldaleTown_EventScript_1E90E6