Identify movement labels in map scripts

13 files changed, 185 insertions, 185 deletions

diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index dd3aca706..321467c22 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -23,9 +23,9 @@ FastShip1F_MapScripts:
 	end
 
 .EnterFastShipScript:
-	applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
-	applymovement PLAYER, MovementData_0x75217
-	applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211
+	applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorStepAsideMovement
+	applymovement PLAYER, FastShip1F_PlayerEntersShipMovement
+	applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorBlocksDoorMovement
 	pause 30
 	playsound SFX_BOAT
 	earthquake 30
@@ -89,13 +89,13 @@ FastShip1FSailor1Script:
 .LetThePlayerOut:
 	readvar VAR_FACING
 	ifequal RIGHT, .YouAreFacingRight
-	applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
-	applymovement PLAYER, MovementData_0x75235
+	applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorStepAsideMovement
+	applymovement PLAYER, FastShip1F_PlayerLeavesShipMovement
 	end
 
 .YouAreFacingRight:
-	applymovement FASTSHIP1F_SAILOR1, MovementData_0x75214
-	applymovement PLAYER, MovementData_0x75238
+	applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorStepAsideDownMovement
+	applymovement PLAYER, FastShip1F_PlayerLeavesShipRightMovement
 	end
 
 FastShip1FSailor2Script:
@@ -122,53 +122,53 @@ WorriedGrandpaSceneRight:
 
 WorriedGrandpaSceneLeft:
 	appear FASTSHIP1F_GENTLEMAN
-	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b
+	applymovement FASTSHIP1F_GENTLEMAN, FastShip1F_GrandpaRunsInMovement
 	playsound SFX_TACKLE
-	applymovement PLAYER, MovementData_0x7522e
-	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220
+	applymovement PLAYER, FastShip1F_PlayerHitByGrandpaMovement
+	applymovement FASTSHIP1F_GENTLEMAN, FastShip1F_GrandpaApproachesPlayerMovement
 	opentext
 	writetext FastShip1FGrandpaText
 	waitbutton
 	closetext
 	turnobject PLAYER, RIGHT
-	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
+	applymovement FASTSHIP1F_GENTLEMAN, FastShip1F_GrandpaRunsOutMovement
 	disappear FASTSHIP1F_GENTLEMAN
 	setscene SCENE_DEFAULT
 	end
 
-MovementData_0x7520e:
+FastShip1F_SailorStepAsideMovement:
 	slow_step LEFT
 	turn_head RIGHT
 	step_end
 
-MovementData_0x75211:
+FastShip1F_SailorBlocksDoorMovement:
 	slow_step RIGHT
 	turn_head DOWN
 	step_end
 
-MovementData_0x75214:
+FastShip1F_SailorStepAsideDownMovement:
 	slow_step DOWN
 	turn_head UP
 	step_end
 
-MovementData_0x75217:
+FastShip1F_PlayerEntersShipMovement:
 	step DOWN
 	step DOWN
 	turn_head DOWN
 	step_end
 
-MovementData_0x7521b:
+FastShip1F_GrandpaRunsInMovement:
 	big_step RIGHT
 	big_step RIGHT
 	big_step RIGHT
 	big_step RIGHT
 	step_end
 
-MovementData_0x75220:
+FastShip1F_GrandpaApproachesPlayerMovement:
 	step RIGHT
 	step_end
 
-MovementData_0x75222:
+FastShip1F_GrandpaRunsOutMovement:
 	big_step DOWN
 	big_step RIGHT
 	big_step RIGHT
@@ -182,25 +182,25 @@ MovementData_0x75222:
 	big_step DOWN
 	step_end
 
-MovementData_0x7522e:
+FastShip1F_PlayerHitByGrandpaMovement:
 	big_step RIGHT
 	turn_head LEFT
 	step_end
 
-MovementData_0x75231:
+FastShip1F_StepUpMovement: ; unreferenced
 	step UP
 	step_end
 
-MovementData_0x75233:
+FastShip1F_StepDownMovement: ; unreferenced
 	step DOWN
 	step_end
 
-MovementData_0x75235:
+FastShip1F_PlayerLeavesShipMovement:
 	step UP
 	step UP
 	step_end
 
-MovementData_0x75238:
+FastShip1F_PlayerLeavesShipRightMovement:
 	step RIGHT
 	step UP
 	step_end
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index d1d65ac90..f6d61ed71 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -49,7 +49,7 @@ SSAquaGranddaughterBefore:
 	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2
-	applymovement PLAYER, MovementData_0x76004
+	applymovement PLAYER, SSAquaCaptainsCabinWarpsToGrandpasCabinMovement
 	moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19
 	appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
 	turnobject PLAYER, UP
@@ -57,7 +57,7 @@ SSAquaGranddaughterBefore:
 	special FadeInQuickly
 	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
 	showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
-	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
+	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, SSAquaGranddaughterEntersCabinMovement
 	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .PlayerIsFemale
@@ -74,7 +74,7 @@ SSAquaGranddaughterBefore:
 	closetext
 .cont:
 	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
-	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
+	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, SSAquaGrandpaApproachesPlayerMovement
 	opentext
 	writetext SSAquaEntertainedGranddaughterText
 	promptbutton
@@ -218,7 +218,7 @@ TrainerSupernerdShawn:
 FastShipCaptainsCabinTrashcan:
 	jumpstd TrashCanScript
 
-MovementData_0x76004:
+SSAquaCaptainsCabinWarpsToGrandpasCabinMovement:
 	big_step RIGHT
 	big_step UP
 	big_step UP
@@ -228,13 +228,13 @@ MovementData_0x76004:
 	big_step UP
 	step_end
 
-MovementData_0x7600c:
+SSAquaGranddaughterEntersCabinMovement:
 	step UP
 	step UP
 	turn_head LEFT
 	step_end
 
-MovementData_0x76010:
+SSAquaGrandpaApproachesPlayerMovement:
 	step DOWN
 	step_end
 
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 6cd75d075..00663b10d 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -26,13 +26,13 @@ MahoganyTown_MapScripts:
 
 MahoganyTownTryARageCandyBarScript:
 	showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15
-	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900a9
+	applymovement MAHOGANYTOWN_POKEFAN_M, MahoganyTownRageCandyBarMerchantBlocksYouMovement
 	follow PLAYER, MAHOGANYTOWN_POKEFAN_M
-	applymovement PLAYER, MovementData_0x1900a7
+	applymovement PLAYER, MahoganyTownPlayerStepLeftMovement
 	stopfollow
 	turnobject PLAYER, RIGHT
 	scall RageCandyBarMerchantScript
-	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
+	applymovement MAHOGANYTOWN_POKEFAN_M, MahoganyTownRageCandyBarMerchantReturnsMovement
 	end
 
 MahoganyTownPokefanMScript:
@@ -121,21 +121,21 @@ MahoganyGymSign:
 MahoganyTownPokecenterSign:
 	jumpstd PokecenterSignScript
 
-MovementData_0x1900a4:
+MahoganyTownCollideDownFaceLeftMovement: ; unreferenced
 	step DOWN
 	big_step UP
 	turn_head DOWN
-MovementData_0x1900a7:
+MahoganyTownPlayerStepLeftMovement:
 	step LEFT
 	step_end
 
-MovementData_0x1900a9:
+MahoganyTownRageCandyBarMerchantBlocksYouMovement:
 	step RIGHT
 	step DOWN
 	turn_head LEFT
 	step_end
 
-MovementData_0x1900ad:
+MahoganyTownRageCandyBarMerchantReturnsMovement:
 	step UP
 	turn_head DOWN
 	step_end
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index ca233a96a..93a450a76 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -30,13 +30,13 @@ NewBarkTown_TeacherStopsYouScene1:
 	waitbutton
 	closetext
 	turnobject PLAYER, RIGHT
-	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT
+	applymovement NEWBARKTOWN_TEACHER, NewBarkTown_TeacherRunsToYouMovement1
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
 	waitbutton
 	closetext
 	follow NEWBARKTOWN_TEACHER, PLAYER
-	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherBringsYouBack1_NBT
+	applymovement NEWBARKTOWN_TEACHER, NewBarkTown_TeacherBringsYouBackMovement1
 	stopfollow
 	opentext
 	writetext Text_ItsDangerousToGoAlone
@@ -53,14 +53,14 @@ NewBarkTown_TeacherStopsYouScene2:
 	waitbutton
 	closetext
 	turnobject PLAYER, RIGHT
-	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT
+	applymovement NEWBARKTOWN_TEACHER, NewBarkTown_TeacherRunsToYouMovement2
 	turnobject PLAYER, UP
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
 	waitbutton
 	closetext
 	follow NEWBARKTOWN_TEACHER, PLAYER
-	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherBringsYouBack2_NBT
+	applymovement NEWBARKTOWN_TEACHER, NewBarkTown_TeacherBringsYouBackMovement2
 	stopfollow
 	opentext
 	writetext Text_ItsDangerousToGoAlone
@@ -115,14 +115,14 @@ NewBarkTownSilverScript:
 	waitbutton
 	closetext
 	follow PLAYER, NEWBARKTOWN_SILVER
-	applymovement PLAYER, Movement_SilverPushesYouAway_NBT
+	applymovement PLAYER, NewBarkTown_SilverPushesYouAwayMovement
 	stopfollow
 	pause 5
 	turnobject NEWBARKTOWN_SILVER, DOWN
 	pause 5
 	playsound SFX_TACKLE
-	applymovement PLAYER, Movement_SilverShovesYouOut_NBT
-	applymovement NEWBARKTOWN_SILVER, Movement_SilverReturnsToTheShadows_NBT
+	applymovement PLAYER, NewBarkTown_SilverShovesYouOutMovement
+	applymovement NEWBARKTOWN_SILVER, NewBarkTown_SilverReturnsToTheShadowsMovement
 	end
 
 NewBarkTownSign:
@@ -137,14 +137,14 @@ NewBarkTownElmsLabSign:
 NewBarkTownElmsHouseSign:
 	jumptext NewBarkTownElmsHouseSignText
 
-Movement_TeacherRunsToYou1_NBT:
+NewBarkTown_TeacherRunsToYouMovement1:
 	step LEFT
 	step LEFT
 	step LEFT
 	step LEFT
 	step_end
 
-Movement_TeacherRunsToYou2_NBT:
+NewBarkTown_TeacherRunsToYouMovement2:
 	step LEFT
 	step LEFT
 	step LEFT
@@ -153,7 +153,7 @@ Movement_TeacherRunsToYou2_NBT:
 	turn_head DOWN
 	step_end
 
-Movement_TeacherBringsYouBack1_NBT:
+NewBarkTown_TeacherBringsYouBackMovement1:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -161,7 +161,7 @@ Movement_TeacherBringsYouBack1_NBT:
 	turn_head LEFT
 	step_end
 
-Movement_TeacherBringsYouBack2_NBT:
+NewBarkTown_TeacherBringsYouBackMovement2:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -170,19 +170,19 @@ Movement_TeacherBringsYouBack2_NBT:
 	turn_head LEFT
 	step_end
 
-Movement_SilverPushesYouAway_NBT:
+NewBarkTown_SilverPushesYouAwayMovement:
 	turn_head UP
 	step DOWN
 	step_end
 
-Movement_SilverShovesYouOut_NBT:
+NewBarkTown_SilverShovesYouOutMovement:
 	turn_head UP
 	fix_facing
 	jump_step DOWN
 	remove_fixed_facing
 	step_end
 
-Movement_SilverReturnsToTheShadows_NBT:
+NewBarkTown_SilverReturnsToTheShadowsMovement:
 	step RIGHT
 	step_end
 
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index b1809ab63..ad20726f2 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -30,15 +30,15 @@ OlivineCityRivalSceneTop:
 	playsound SFX_ENTER_DOOR
 	appear OLIVINECITY_OLIVINE_RIVAL
 	waitsfx
-	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d2
+	applymovement OLIVINECITY_OLIVINE_RIVAL, OlivineCityRivalApproachesTopMovement
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext OlivineCityRivalText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x1a88f4
+	applymovement PLAYER, OlivineCityPlayerStepsAsideTopMovement
 	turnobject PLAYER, RIGHT
-	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
+	applymovement OLIVINECITY_OLIVINE_RIVAL, OlivineCityRivalLeavesTopMovement
 	setscene SCENE_FINISHED
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	special RestartMapMusic
@@ -54,15 +54,15 @@ OlivineCityRivalSceneBottom:
 	playsound SFX_ENTER_DOOR
 	appear OLIVINECITY_OLIVINE_RIVAL
 	waitsfx
-	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d6
+	applymovement OLIVINECITY_OLIVINE_RIVAL, OlivineCityRivalApproachesBottomMovement
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext OlivineCityRivalText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x1a88f7
+	applymovement PLAYER, OlivineCityPlayerStepsAsideBottomMovement
 	turnobject PLAYER, RIGHT
-	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
+	applymovement OLIVINECITY_OLIVINE_RIVAL, OlivineCityRivalLeavesBottomMovement
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	setscene SCENE_FINISHED
 	special RestartMapMusic
@@ -113,20 +113,20 @@ OlivineCityPokecenterSign:
 OlivineCityMartSign:
 	jumpstd MartSignScript
 
-MovementData_0x1a88d2:
+OlivineCityRivalApproachesTopMovement:
 	step DOWN
 	step RIGHT
 	step RIGHT
 	step_end
 
-MovementData_0x1a88d6:
+OlivineCityRivalApproachesBottomMovement:
 	step DOWN
 	step DOWN
 	step RIGHT
 	step RIGHT
 	step_end
 
-MovementData_0x1a88db:
+OlivineCityRivalLeavesTopMovement:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -141,7 +141,7 @@ MovementData_0x1a88db:
 	step UP
 	step_end
 
-MovementData_0x1a88e8:
+OlivineCityRivalLeavesBottomMovement:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -155,12 +155,12 @@ MovementData_0x1a88e8:
 	step UP
 	step_end
 
-MovementData_0x1a88f4:
+OlivineCityPlayerStepsAsideTopMovement:
 	step DOWN
 	turn_head UP
 	step_end
 
-MovementData_0x1a88f7:
+OlivineCityPlayerStepsAsideBottomMovement:
 	step UP
 	turn_head DOWN
 	step_end
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 62b7b3d2c..ad99fb999 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -70,17 +70,17 @@ OlivineLighthouseJasmine:
 	readvar VAR_FACING
 	ifequal DOWN, .FacingDown
 	ifequal RIGHT, .FacingRight
-	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68
+	applymovement OLIVINELIGHTHOUSE6F_JASMINE, OlivineLighthouseJasmineLeavesUpMovement
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
 .FacingDown:
-	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70
+	applymovement OLIVINELIGHTHOUSE6F_JASMINE, OlivineLighthouseJasmineLeavesDownMovement
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
 .FacingRight:
-	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79
+	applymovement OLIVINELIGHTHOUSE6F_JASMINE, OlivineLighthouseJasmineLeavesRightMovement
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
@@ -129,7 +129,7 @@ OlivineLighthouseAmphy:
 OlivineLighthouse6FSuperPotion:
 	itemball SUPER_POTION
 
-MovementData_0x60c68:
+OlivineLighthouseJasmineLeavesUpMovement:
 	slow_step UP
 	slow_step UP
 	slow_step RIGHT
@@ -139,7 +139,7 @@ MovementData_0x60c68:
 	step_sleep 8
 	step_end
 
-MovementData_0x60c70:
+OlivineLighthouseJasmineLeavesDownMovement:
 	slow_step DOWN
 	slow_step RIGHT
 	slow_step RIGHT
@@ -150,7 +150,7 @@ MovementData_0x60c70:
 	slow_step RIGHT
 	step_end
 
-MovementData_0x60c79:
+OlivineLighthouseJasmineLeavesRightMovement:
 	slow_step UP
 	slow_step UP
 	slow_step RIGHT
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index a87f08ba2..358a7f438 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -22,7 +22,7 @@ OlivinePort_MapScripts:
 	end
 
 .LeaveFastShipScript:
-	applymovement PLAYER, MovementData_0x74a32
+	applymovement PLAYER, OlivinePortLeaveFastShipMovement
 	appear OLIVINEPORT_SAILOR1
 	setscene SCENE_DEFAULT
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -42,7 +42,7 @@ OlivinePortSailorAtGangwayScript:
 	playsound SFX_EXIT_BUILDING
 	disappear OLIVINEPORT_SAILOR1
 	waitsfx
-	applymovement PLAYER, MovementData_0x74a30
+	applymovement PLAYER, OlivinePortEnterFastShipMovement
 	playsound SFX_EXIT_BUILDING
 	special FadeOutPalettes
 	waitsfx
@@ -100,28 +100,28 @@ OlivinePortWalkUpToShipScript:
 	waitbutton
 	closetext
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
-	applymovement PLAYER, MovementData_0x74a37
+	applymovement PLAYER, OlivinePortApproachFastShipFirstTimeMovement
 	sjump OlivinePortSailorAtGangwayScript
 
 .NoTicket:
 	writetext OlivinePortNoTicketText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74a34
+	applymovement PLAYER, OlivinePortCannotEnterFastShipMovement
 	end
 
 .NextShipMonday:
 	writetext OlivinePortMondayShipText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74a34
+	applymovement PLAYER, OlivinePortCannotEnterFastShipMovement
 	end
 
 .NextShipFriday:
 	writetext OlivinePortFridayShipText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74a34
+	applymovement PLAYER, OlivinePortCannotEnterFastShipMovement
 	end
 
 .skip:
@@ -137,7 +137,7 @@ OlivinePortNotRidingMoveAwayScript:
 	writetext OlivinePortComeAgainText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74a34
+	applymovement PLAYER, OlivinePortCannotEnterFastShipMovement
 	end
 
 OlivinePortSailorAfterHOFScript:
@@ -167,11 +167,11 @@ OlivinePortSailorAfterHOFScript:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	readvar VAR_FACING
 	ifequal RIGHT, .Right
-	applymovement PLAYER, MovementData_0x74a3f
+	applymovement PLAYER, OlivinePortApproachFastShipAfterHOFMovement
 	sjump OlivinePortSailorAtGangwayScript
 
 .Right:
-	applymovement PLAYER, MovementData_0x74a49
+	applymovement PLAYER, OlivinePortApproachFastShipAfterHOFRightMovement
 	sjump OlivinePortSailorAtGangwayScript
 
 .NoTicket:
@@ -234,20 +234,20 @@ OlivinePortCooltrainerFScript:
 OlivinePortHiddenProtein:
 	hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN
 
-MovementData_0x74a30:
+OlivinePortEnterFastShipMovement:
 	step DOWN
 	step_end
 
-MovementData_0x74a32:
+OlivinePortLeaveFastShipMovement:
 	step UP
 	step_end
 
-MovementData_0x74a34:
+OlivinePortCannotEnterFastShipMovement:
 	step RIGHT
 	turn_head LEFT
 	step_end
 
-MovementData_0x74a37:
+OlivinePortApproachFastShipFirstTimeMovement:
 	step DOWN
 	step DOWN
 	step DOWN
@@ -257,7 +257,7 @@ MovementData_0x74a37:
 	step DOWN
 	step_end
 
-MovementData_0x74a3f:
+OlivinePortApproachFastShipAfterHOFMovement:
 	step RIGHT
 	step DOWN
 	step DOWN
@@ -269,7 +269,7 @@ MovementData_0x74a3f:
 	step DOWN
 	step_end
 
-MovementData_0x74a49:
+OlivinePortApproachFastShipAfterHOFRightMovement:
 	step UP
 	step RIGHT
 	step RIGHT
diff --git a/maps/Route25.asm b/maps/Route25.asm
index a95e08d1d..a20cb3f21 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -29,21 +29,21 @@ Route25MistyDate1Script:
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
 	turnobject ROUTE25_MISTY, DOWN
-	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8
+	applymovement ROUTE25_COOLTRAINER_M1, Route25MistysDateLeavesMovement1
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
 	turnobject ROUTE25_MISTY, UP
 	pause 10
-	applymovement ROUTE25_MISTY, MovementData_0x19efed
+	applymovement ROUTE25_MISTY, Route25MistyApproachesPlayerMovement1
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
 	turnobject PLAYER, DOWN
-	applymovement ROUTE25_MISTY, MovementData_0x19effa
+	applymovement ROUTE25_MISTY, Route25MistyLeavesPlayerMovement1
 	turnobject PLAYER, LEFT
-	applymovement ROUTE25_MISTY, MovementData_0x19f000
+	applymovement ROUTE25_MISTY, Route25MistyLeavesMovement
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
 	setscene SCENE_ROUTE25_NOTHING
@@ -55,21 +55,21 @@ Route25MistyDate2Script:
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
 	turnobject ROUTE25_MISTY, DOWN
-	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea
+	applymovement ROUTE25_COOLTRAINER_M1, Route25MistysDateLeavesMovement2
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
 	turnobject ROUTE25_MISTY, UP
 	pause 10
-	applymovement ROUTE25_MISTY, MovementData_0x19eff4
+	applymovement ROUTE25_MISTY, Route25MistyApproachesPlayerMovement2
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
 	turnobject PLAYER, UP
-	applymovement ROUTE25_MISTY, MovementData_0x19effd
+	applymovement ROUTE25_MISTY, Route25MistyLeavesPlayerMovement2
 	turnobject PLAYER, LEFT
-	applymovement ROUTE25_MISTY, MovementData_0x19f000
+	applymovement ROUTE25_MISTY, Route25MistyLeavesMovement
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
 	setscene SCENE_ROUTE25_NOTHING
@@ -191,16 +191,16 @@ Route25Protein:
 Route25HiddenPotion:
 	hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION
 
-MovementData_0x19efe8:
+Route25MistysDateLeavesMovement1:
 	big_step DOWN
 	step_end
 
-MovementData_0x19efea:
+Route25MistysDateLeavesMovement2:
 	big_step DOWN
 	big_step DOWN
 	step_end
 
-MovementData_0x19efed:
+Route25MistyApproachesPlayerMovement1:
 	step UP
 	step UP
 	step UP
@@ -209,7 +209,7 @@ MovementData_0x19efed:
 	step LEFT
 	step_end
 
-MovementData_0x19eff4:
+Route25MistyApproachesPlayerMovement2:
 	step UP
 	step UP
 	step LEFT
@@ -217,17 +217,17 @@ MovementData_0x19eff4:
 	step LEFT
 	step_end
 
-MovementData_0x19effa:
+Route25MistyLeavesPlayerMovement1:
 	step DOWN
 	step LEFT
 	step_end
 
-MovementData_0x19effd:
+Route25MistyLeavesPlayerMovement2:
 	step UP
 	step LEFT
 	step_end
 
-MovementData_0x19f000:
+Route25MistyLeavesMovement:
 	step LEFT
 	step LEFT
 	step LEFT
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 956551e1c..f7506822d 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -29,7 +29,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	endcallback
 
 .GetUnownDexScript:
-	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f
+	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, RuinsOfAlphResearchCenterApproachesComputerMovement
 	playsound SFX_BOOT_PC
 	pause 60
 	playsound SFX_SWITCH_POKEMON
@@ -43,7 +43,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	writetext RuinsOfAlphResearchCenterModifiedDexText
 	waitbutton
 	closetext
-	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59274
+	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, RuinsOfAlphResearchCenterApproachesPlayerMovement
 	opentext
 	writetext RuinsOfAlphResearchCenterDexUpgradedText
 	playsound SFX_ITEM
@@ -52,7 +52,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	writetext RuinsOfAlphResearchCenterScientist3Text
 	waitbutton
 	closetext
-	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276
+	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, RuinsOfAlphResearchCenterLeavesPlayerMovement
 	setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING
 	special RestartMapMusic
 	end
@@ -174,18 +174,18 @@ RuinsOfAlphResearchCenterPhoto:
 RuinsOfAlphResearchCenterBookshelf:
 	jumptext RuinsOfAlphResearchCenterAcademicBooksText
 
-MovementData_0x5926f:
+RuinsOfAlphResearchCenterApproachesComputerMovement:
 	step UP
 	step UP
 	step LEFT
 	turn_head UP
 	step_end
 
-MovementData_0x59274:
+RuinsOfAlphResearchCenterApproachesPlayerMovement:
 	step DOWN
 	step_end
 
-MovementData_0x59276:
+RuinsOfAlphResearchCenterLeavesPlayerMovement:
 	step UP
 	step_end
 
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index b79433e5b..d7d3ffa91 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -31,8 +31,8 @@ SproutTower3FRivalScene:
 	playsound SFX_TACKLE
 	playsound SFX_ELEVATOR
 	earthquake 79
-	applymovement PLAYER, MovementData_0x184a1d
-	applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a22
+	applymovement PLAYER, SproutTower3FPlayerApproachesRivalMovement
+	applymovement SPROUTTOWER3F_SILVER, SproutTower3FRivalApproachesElderMovement
 	opentext
 	writetext SproutTowerElderLecturesRivalText
 	waitbutton
@@ -40,7 +40,7 @@ SproutTower3FRivalScene:
 	showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15
 	turnobject SPROUTTOWER3F_SILVER, DOWN
 	pause 15
-	applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24
+	applymovement SPROUTTOWER3F_SILVER, SproutTower3FRivalLeavesElderMovement
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext SproutTowerRivalOnlyCareAboutStrongText
@@ -135,18 +135,18 @@ SproutTower3FPotion:
 SproutTower3FEscapeRope:
 	itemball ESCAPE_ROPE
 
-MovementData_0x184a1d:
+SproutTower3FPlayerApproachesRivalMovement:
 	step UP
 	step UP
 	step UP
 	step UP
 	step_end
 
-MovementData_0x184a22:
+SproutTower3FRivalApproachesElderMovement:
 	step UP
 	step_end
 
-MovementData_0x184a24:
+SproutTower3FRivalLeavesElderMovement:
 	step RIGHT
 	step DOWN
 	step_end
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 899c47d73..7c4dc38d0 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -63,11 +63,11 @@ RocketBaseBossFScript:
 	closetext
 	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	applymovement PLAYER, MovementData_0x6d21f
+	applymovement PLAYER, RocketBasePlayerApproachesBossFMovement
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224
+	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, RocketBaseBossFApproachesPlayerMovement
 	turnobject PLAYER, UP
-	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f
+	applymovement TEAMROCKETBASEB2F_ROCKET1, RocketBaseGruntApproachesPlayerMovement
 	opentext
 	writetext RocketBaseBossFThrashText
 	waitbutton
@@ -76,23 +76,23 @@ RocketBaseBossFScript:
 	turnobject TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
 	turnobject PLAYER, LEFT
 	appear TEAMROCKETBASEB2F_DRAGON
-	applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236
-	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b
-	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24c
+	applymovement TEAMROCKETBASEB2F_DRAGON, RocketBaseDragoniteAttacksMovement
+	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, RocketBaseBossFHitMovement
+	applymovement TEAMROCKETBASEB2F_ROCKET1, RocketBaseGruntProtectsBossFMovement
 	appear TEAMROCKETBASEB2F_LANCE
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLanceApproachesBossFMovement
 	opentext
 	writetext RocketBaseLanceShareFunText
 	waitbutton
 	closetext
 	turnobject PLAYER, RIGHT
-	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241
+	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, RocketBaseBossFFacesPlayerMovement
 	opentext
 	writetext RocketBaseBossDontMeddleText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a
-	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248
+	applymovement TEAMROCKETBASEB2F_ROCKET1, RocketBaseGruntBattlesLanceMovement
+	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, RocketBaseBossFBattlesPlayerMovement
 	winlosstext RocketBaseBossWinText, 0
 	setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL
 	loadtrainer EXECUTIVEF, EXECUTIVEF_2
@@ -123,25 +123,25 @@ RocketBaseBossFScript:
 	writetext RocketBaseLancePostBattleText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLanceChecksPlayerMovement
 	turnobject PLAYER, UP
 	opentext
 	writetext RocketBaseLancePowerOffText
 	waitbutton
 	closetext
 	follow TEAMROCKETBASEB2F_LANCE, PLAYER
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d254
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLanceApproachesMachineMovement
 	stopfollow
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLancePacesMovement
 	opentext
 	writetext RockerBaseLanceElectrodeFaintText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLanceApproachesElectrodesMovement
 	disappear TEAMROCKETBASEB2F_LANCE
 
 RocketBaseCantLeaveScript:
-	applymovement PLAYER, MovementData_0x6d271
+	applymovement PLAYER, RocketBasePlayerCantLeaveElectrodesMovement
 	end
 
 RocketBaseLancesSideScript:
@@ -149,7 +149,7 @@ RocketBaseLancesSideScript:
 	writetext RocketBaseLancesSideText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x6d278
+	applymovement PLAYER, RocketBasePlayerCantGoRightMovement
 	end
 
 LanceHealsScript1:
@@ -177,12 +177,12 @@ LanceHealsCommon:
 	setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	readvar VAR_FACING
 	ifequal RIGHT, .FacingRight
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLanceLeavesAfterHealMovement
 	disappear TEAMROCKETBASEB2F_LANCE
 	end
 
 .FacingRight:
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d219
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLanceLeavesAfterHealRightMovement
 	disappear TEAMROCKETBASEB2F_LANCE
 	end
 
@@ -234,7 +234,7 @@ RocketElectrode1:
 	iffalse TeamRocketBaseB2FReloadMap
 	reloadmapafterbattle
 	special PlayMapMusic
-	applymovement PLAYER, MovementData_0x6d28c
+	applymovement PLAYER, RocketBasePlayerLeavesElectrodesMovement1
 	sjump RocketBaseElectrodeScript
 
 RocketElectrode2:
@@ -252,7 +252,7 @@ RocketElectrode2:
 	iffalse TeamRocketBaseB2FReloadMap
 	reloadmapafterbattle
 	special PlayMapMusic
-	applymovement PLAYER, MovementData_0x6d299
+	applymovement PLAYER, RocketBasePlayerLeavesElectrodesMovement2
 	sjump RocketBaseElectrodeScript
 
 RocketElectrode3:
@@ -270,7 +270,7 @@ RocketElectrode3:
 	iffalse TeamRocketBaseB2FReloadMap
 	reloadmapafterbattle
 	special PlayMapMusic
-	applymovement PLAYER, MovementData_0x6d2a4
+	applymovement PLAYER, RocketBasePlayerLeavesElectrodesMovement3
 	sjump RocketBaseElectrodeScript
 
 TeamRocketBaseB2FReloadMap:
@@ -280,7 +280,7 @@ TeamRocketBaseB2FReloadMap:
 RocketBaseElectrodeScript:
 	moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
 	appear TEAMROCKETBASEB2F_LANCE
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLanceLeavesElectrodesMovement
 	turnobject PLAYER, RIGHT
 	opentext
 	writetext RocketBaseLanceElectrodeDoneText
@@ -296,7 +296,7 @@ RocketBaseElectrodeScript:
 	waitbutton
 	closetext
 	turnobject PLAYER, DOWN
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283
+	applymovement TEAMROCKETBASEB2F_LANCE, RocketBaseLanceLeavesBaseMovement
 	disappear TEAMROCKETBASEB2F_LANCE
 	setevent EVENT_CLEARED_ROCKET_HIDEOUT
 	clearflag ENGINE_ROCKET_SIGNAL_ON_CH20
@@ -356,7 +356,7 @@ TeamRocketBaseB2FTMThief:
 TeamRocketBaseB2FHiddenFullHeal:
 	hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL
 
-MovementData_0x6d212:
+RocketBaseLanceLeavesAfterHealMovement:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -365,7 +365,7 @@ MovementData_0x6d212:
 	step RIGHT
 	step_end
 
-MovementData_0x6d219:
+RocketBaseLanceLeavesAfterHealRightMovement:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -373,14 +373,14 @@ MovementData_0x6d219:
 	step RIGHT
 	step_end
 
-MovementData_0x6d21f:
+RocketBasePlayerApproachesBossFMovement:
 	step DOWN
 	step DOWN
 	step DOWN
 	turn_head RIGHT
 	step_end
 
-MovementData_0x6d224:
+RocketBaseBossFApproachesPlayerMovement:
 	big_step LEFT
 	big_step LEFT
 	big_step UP
@@ -393,7 +393,7 @@ MovementData_0x6d224:
 	turn_head DOWN
 	step_end
 
-MovementData_0x6d22f:
+RocketBaseGruntApproachesPlayerMovement:
 	big_step LEFT
 	big_step LEFT
 	big_step UP
@@ -402,14 +402,14 @@ MovementData_0x6d22f:
 	big_step LEFT
 	step_end
 
-MovementData_0x6d236:
+RocketBaseDragoniteAttacksMovement:
 	big_step RIGHT
 	big_step RIGHT
 	big_step RIGHT
 	big_step RIGHT
 	step_end
 
-MovementData_0x6d23b:
+RocketBaseBossFHitMovement:
 	fix_facing
 	set_sliding
 	jump_step RIGHT
@@ -417,44 +417,44 @@ MovementData_0x6d23b:
 	remove_fixed_facing
 	step_end
 
-MovementData_0x6d241:
+RocketBaseBossFFacesPlayerMovement:
 	slow_step DOWN
 	turn_head LEFT
 	step_end
 
-MovementData_0x6d244:
+RocketBaseLanceApproachesBossFMovement:
 	step RIGHT
 	step RIGHT
 	step RIGHT
 	step_end
 
-MovementData_0x6d248:
+RocketBaseBossFBattlesPlayerMovement:
 	big_step LEFT
 	step_end
 
-MovementData_0x6d24a:
+RocketBaseGruntBattlesLanceMovement:
 	big_step LEFT
 	step_end
 
-MovementData_0x6d24c:
+RocketBaseGruntProtectsBossFMovement:
 	big_step LEFT
 	big_step UP
 	turn_head LEFT
 	step_end
 
-MovementData_0x6d250:
+RocketBaseLanceChecksPlayerMovement:
 	step RIGHT
 	step RIGHT
 	turn_head DOWN
 	step_end
 
-MovementData_0x6d254:
+RocketBaseLanceApproachesMachineMovement:
 	step UP
 	step UP
 	step UP
 	step_end
 
-MovementData_0x6d258:
+RocketBaseLancePacesMovement:
 	step_sleep 8
 	step LEFT
 	step LEFT
@@ -471,7 +471,7 @@ MovementData_0x6d258:
 	turn_head DOWN
 	step_end
 
-MovementData_0x6d267:
+RocketBaseLanceApproachesElectrodesMovement:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -483,7 +483,7 @@ MovementData_0x6d267:
 	step UP
 	step_end
 
-MovementData_0x6d271:
+RocketBasePlayerCantLeaveElectrodesMovement:
 	step UP
 	step LEFT
 	step LEFT
@@ -492,11 +492,11 @@ MovementData_0x6d271:
 	turn_head UP
 	step_end
 
-MovementData_0x6d278:
+RocketBasePlayerCantGoRightMovement:
 	step LEFT
 	step_end
 
-MovementData_0x6d27a:
+RocketBaseLanceLeavesElectrodesMovement:
 	step DOWN
 	step DOWN
 	step DOWN
@@ -507,7 +507,7 @@ MovementData_0x6d27a:
 	step LEFT
 	step_end
 
-MovementData_0x6d283:
+RocketBaseLanceLeavesBaseMovement:
 	step DOWN
 	step DOWN
 	step LEFT
@@ -518,7 +518,7 @@ MovementData_0x6d283:
 	step LEFT
 	step_end
 
-MovementData_0x6d28c:
+RocketBasePlayerLeavesElectrodesMovement1:
 	step RIGHT
 	step RIGHT
 	step DOWN
@@ -533,7 +533,7 @@ MovementData_0x6d28c:
 	step RIGHT
 	step_end
 
-MovementData_0x6d299:
+RocketBasePlayerLeavesElectrodesMovement2:
 	step RIGHT
 	step RIGHT
 	step DOWN
@@ -546,7 +546,7 @@ MovementData_0x6d299:
 	step RIGHT
 	step_end
 
-MovementData_0x6d2a4:
+RocketBasePlayerLeavesElectrodesMovement3:
 	step RIGHT
 	step RIGHT
 	step DOWN
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 34c996feb..35061b6f5 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -51,12 +51,12 @@ LanceGetPasswordScript:
 	pause 5
 	turnobject TEAMROCKETBASEB3F_MOLTRES, RIGHT
 	pause 20
-	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a
+	applymovement TEAMROCKETBASEB3F_LANCE, RocketBaseLanceApproachesPlayerMovement
 	opentext
 	writetext LanceGetPasswordText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c
+	applymovement TEAMROCKETBASEB3F_LANCE, RocketBaseLanceLeavesMovement
 	disappear TEAMROCKETBASEB3F_LANCE
 	setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
 	end
@@ -75,7 +75,7 @@ RocketBaseRival:
 	closetext
 	playsound SFX_TACKLE
 	applymovement PLAYER, RocketBaseRivalShovesPlayerMovement
-	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement
+	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeavesMovement
 	disappear TEAMROCKETBASEB3F_SILVER
 	setscene SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
 	special RestartMapMusic
@@ -85,11 +85,11 @@ TeamRocketBaseB3FRocketScript:
 	jumptextfaceplayer TeamRocketBaseB3FRocketText
 
 RocketBaseBossLeft:
-	applymovement PLAYER, MovementData_0x6e133
+	applymovement PLAYER, RocketBasePlayerApproachesBossLeftMovement
 	sjump RocketBaseBoss
 
 RocketBaseBossRight:
-	applymovement PLAYER, MovementData_0x6e13a
+	applymovement PLAYER, RocketBasePlayerApproachesBossRightMovement
 RocketBaseBoss:
 	pause 30
 	showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
@@ -99,7 +99,7 @@ RocketBaseBoss:
 	writetext ExecutiveM4BeforeText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142
+	applymovement TEAMROCKETBASEB3F_ROCKET1, RocketBaseBossApproachesPlayerMovement
 	winlosstext ExecutiveM4BeatenText, 0
 	setlasttalked TEAMROCKETBASEB3F_ROCKET1
 	loadtrainer EXECUTIVEM, EXECUTIVEM_4
@@ -110,9 +110,9 @@ RocketBaseBoss:
 	writetext ExecutiveM4AfterText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144
+	applymovement TEAMROCKETBASEB3F_ROCKET1, RocketBaseBossHitsTableMovement
 	playsound SFX_TACKLE
-	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147
+	applymovement TEAMROCKETBASEB3F_ROCKET1, RocketBaseBossLeavesMovement
 	disappear TEAMROCKETBASEB3F_ROCKET1
 	setscene SCENE_TEAMROCKETBASEB3F_NOTHING
 	end
@@ -217,11 +217,11 @@ TeamRocketBaseB3FIceHeal:
 TeamRocketBaseB3FUltraBall:
 	itemball ULTRA_BALL
 
-MovementData_0x6e12a:
+RocketBaseLanceApproachesPlayerMovement:
 	step RIGHT
 	step_end
 
-MovementData_0x6e12c:
+RocketBaseLanceLeavesMovement:
 	step DOWN
 	step LEFT
 	step LEFT
@@ -230,7 +230,7 @@ MovementData_0x6e12c:
 	step LEFT
 	step_end
 
-MovementData_0x6e133:
+RocketBasePlayerApproachesBossLeftMovement:
 	step UP
 	step UP
 	step UP
@@ -239,7 +239,7 @@ MovementData_0x6e133:
 	turn_head UP
 	step_end
 
-MovementData_0x6e13a:
+RocketBasePlayerApproachesBossRightMovement:
 	step UP
 	step UP
 	step LEFT
@@ -249,16 +249,16 @@ MovementData_0x6e13a:
 	turn_head UP
 	step_end
 
-MovementData_0x6e142:
+RocketBaseBossApproachesPlayerMovement:
 	step DOWN
 	step_end
 
-MovementData_0x6e144:
+RocketBaseBossHitsTableMovement:
 	big_step RIGHT
 	big_step RIGHT
 	step_end
 
-MovementData_0x6e147:
+RocketBaseBossLeavesMovement:
 	fix_facing
 	fast_jump_step LEFT
 	remove_fixed_facing
@@ -300,7 +300,7 @@ RocketBaseRivalEnterMovement:
 	step RIGHT
 	step_end
 
-RocketBaseRivalLeaveMovement:
+RocketBaseRivalLeavesMovement:
 	step LEFT
 	step LEFT
 	step UP
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 043c8ee0b..be906ee69 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -23,7 +23,7 @@ VermilionPort_MapScripts:
 	endcallback
 
 .LeaveFastShipScript:
-	applymovement PLAYER, MovementData_0x74ef3
+	applymovement PLAYER, VermilionPortLeaveFastShipMovement
 	appear VERMILIONPORT_SAILOR1
 	setscene SCENE_DEFAULT
 	setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
@@ -48,7 +48,7 @@ VermilionPortSailorAtGangwayScript:
 	playsound SFX_EXIT_BUILDING
 	disappear VERMILIONPORT_SAILOR1
 	waitsfx
-	applymovement PLAYER, MovementData_0x74ef1
+	applymovement PLAYER, VermilionPortEnterFastShipMovement
 	playsound SFX_EXIT_BUILDING
 	special FadeOutPalettes
 	waitsfx
@@ -101,28 +101,28 @@ VermilionPortWalkUpToShipScript:
 	waitbutton
 	closetext
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
-	applymovement PLAYER, MovementData_0x74ef8
+	applymovement PLAYER, VermilionPortApproachFastShipMovement
 	sjump VermilionPortSailorAtGangwayScript
 
 .NoTicket:
 	writetext VermilionPortNoTicketText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74ef5
+	applymovement PLAYER, VermilionPortCannotEnterFastShipMovement
 	end
 
 .NextShipWednesday:
 	writetext VermilionPortSailMondayText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74ef5
+	applymovement PLAYER, VermilionPortCannotEnterFastShipMovement
 	end
 
 .NextShipSunday:
 	writetext VermilionPortSailSundayText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74ef5
+	applymovement PLAYER, VermilionPortCannotEnterFastShipMovement
 	end
 
 .skip:
@@ -138,7 +138,7 @@ VermilionPortNotRidingMoveAwayScript:
 	writetext VermilionPortComeAgainText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74ef5
+	applymovement PLAYER, VermilionPortCannotEnterFastShipMovement
 	end
 
 VermilionPortSailorScript:
@@ -163,7 +163,7 @@ VermilionPortSailorScript:
 	waitbutton
 	closetext
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
-	applymovement PLAYER, MovementData_0x74efe
+	applymovement PLAYER, VermilionPortApproachFastShipRightMovement
 	sjump VermilionPortSailorAtGangwayScript
 
 .NoTicket:
@@ -195,20 +195,20 @@ VermilionPortSuperNerdScript:
 VermilionPortHiddenIron:
 	hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON
 
-MovementData_0x74ef1:
+VermilionPortEnterFastShipMovement:
 	step DOWN
 	step_end
 
-MovementData_0x74ef3:
+VermilionPortLeaveFastShipMovement:
 	step UP
 	step_end
 
-MovementData_0x74ef5:
+VermilionPortCannotEnterFastShipMovement:
 	step RIGHT
 	turn_head LEFT
 	step_end
 
-MovementData_0x74ef8:
+VermilionPortApproachFastShipMovement:
 	step DOWN
 	step DOWN
 	step DOWN
@@ -216,7 +216,7 @@ MovementData_0x74ef8:
 	step DOWN
 	step_end
 
-MovementData_0x74efe:
+VermilionPortApproachFastShipRightMovement:
 	step RIGHT
 	step DOWN
 	step DOWN