Rename labels to stop cheating the unnamed.py script.

17 files changed, 190 insertions, 190 deletions

diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 21ae9739..626ed145 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, MovementData_0x16c980
+	applymovement PLAYER, MovementData_0x16c989
+	applymovement FASTSHIP1F_SAILOR1, MovementData_0x16c983
 	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, MovementData_0x16c980
+	applymovement PLAYER, MovementData_0x16c9a7
 	end
 
 .YouAreFacingRight:
-	applymovement FASTSHIP1F_SAILOR1, MovementData_0x75214
-	applymovement PLAYER, MovementData_0x75238
+	applymovement FASTSHIP1F_SAILOR1, MovementData_0x16c986
+	applymovement PLAYER, MovementData_0x16c9aa
 	end
 
 FastShip1FSailor2Script:
@@ -122,53 +122,53 @@ WorriedGrandpaSceneRight:
 
 WorriedGrandpaSceneLeft:
 	appear FASTSHIP1F_GENTLEMAN
-	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b
+	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x16c98d
 	playsound SFX_TACKLE
-	applymovement PLAYER, MovementData_0x7522e
-	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220
+	applymovement PLAYER, MovementData_0x16c9a0
+	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x16c992
 	opentext
 	writetext FastShip1FGrandpaText
 	waitbutton
 	closetext
 	turnobject PLAYER, RIGHT
-	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
+	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x16c994
 	disappear FASTSHIP1F_GENTLEMAN
 	setscene SCENE_DEFAULT
 	end
 
-MovementData_0x7520e:
+MovementData_0x16c980:
 	slow_step LEFT
 	turn_head RIGHT
 	step_end
 
-MovementData_0x75211:
+MovementData_0x16c983:
 	slow_step RIGHT
 	turn_head DOWN
 	step_end
 
-MovementData_0x75214:
+MovementData_0x16c986:
 	slow_step DOWN
 	turn_head UP
 	step_end
 
-MovementData_0x75217:
+MovementData_0x16c989:
 	step DOWN
 	step DOWN
 	turn_head DOWN
 	step_end
 
-MovementData_0x7521b:
+MovementData_0x16c98d:
 	big_step RIGHT
 	big_step RIGHT
 	big_step RIGHT
 	big_step RIGHT
 	step_end
 
-MovementData_0x75220:
+MovementData_0x16c992:
 	step RIGHT
 	step_end
 
-MovementData_0x75222:
+MovementData_0x16c994:
 	big_step DOWN
 	big_step RIGHT
 	big_step RIGHT
@@ -182,25 +182,25 @@ MovementData_0x75222:
 	big_step DOWN
 	step_end
 
-MovementData_0x7522e:
+MovementData_0x16c9a0:
 	big_step RIGHT
 	turn_head LEFT
 	step_end
 
-MovementData_0x75231:
+MovementData_0x16c9a3:
 	step UP
 	step_end
 
-MovementData_0x75233:
+MovementData_0x16c9a5:
 	step DOWN
 	step_end
 
-MovementData_0x75235:
+MovementData_0x16c9a7:
 	step UP
 	step UP
 	step_end
 
-MovementData_0x75238:
+MovementData_0x16c9aa:
 	step RIGHT
 	step UP
 	step_end
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 9ed2372e..0f86465e 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, MovementData_0x16d700
 	moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19
 	appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
 	turnobject PLAYER, UP
@@ -57,14 +57,14 @@ 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, MovementData_0x16d708
 	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
 	opentext
 	writetext SSAquaGranddaughterWasPlayingMText
 	waitbutton
 	closetext
 	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
-	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
+	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x16d70c
 	opentext
 	writetext SSAquaEntertainedGranddaughterText
 	promptbutton
@@ -208,7 +208,7 @@ TrainerSupernerdShawn:
 FastShipCaptainsCabinTrashcan:
 	jumpstd TrashCanScript
 
-MovementData_0x76004:
+MovementData_0x16d700:
 	big_step RIGHT
 	big_step UP
 	big_step UP
@@ -218,13 +218,13 @@ MovementData_0x76004:
 	big_step UP
 	step_end
 
-MovementData_0x7600c:
+MovementData_0x16d708:
 	step UP
 	step UP
 	turn_head LEFT
 	step_end
 
-MovementData_0x76010:
+MovementData_0x16d70c:
 	step DOWN
 	step_end
 
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 572be600..85f261fa 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -154,7 +154,7 @@ MahoganyMart1FLanceGoDownStairsMovement:
 	slow_step RIGHT
 	step_end
 
-UnknownText_0x6c414:
+UnknownText_0x1140cb:
 	text "Hello, youngster!"
 
 	para "How would you like"
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index f9b04f44..d76b3383 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, MovementData_0x124b5e
 	follow PLAYER, MAHOGANYTOWN_POKEFAN_M
-	applymovement PLAYER, MovementData_0x1900a7
+	applymovement PLAYER, MovementData_0x124b5c
 	stopfollow
 	turnobject PLAYER, RIGHT
 	scall RageCandyBarMerchantScript
-	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
+	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x124b62
 	end
 
 MahoganyTownPokefanMScript:
@@ -121,21 +121,21 @@ MahoganyGymSign:
 MahoganyTownPokecenterSign:
 	jumpstd PokecenterSignScript
 
-MovementData_0x1900a4:
+MovementData_0x124b59:
 	step DOWN
 	big_step UP
 	turn_head DOWN
-MovementData_0x1900a7:
+MovementData_0x124b5c:
 	step LEFT
 	step_end
 
-MovementData_0x1900a9:
+MovementData_0x124b5e:
 	step RIGHT
 	step DOWN
 	turn_head LEFT
 	step_end
 
-MovementData_0x1900ad:
+MovementData_0x124b62:
 	step UP
 	turn_head DOWN
 	step_end
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 18c4748d..dfcf8877 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, MovementData_0x1240af
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext OlivineCityRivalText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x1a88f4
+	applymovement PLAYER, MovementData_0x1240d1
 	turnobject PLAYER, RIGHT
-	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
+	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1240b8
 	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, MovementData_0x1240b3
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext OlivineCityRivalText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x1a88f7
+	applymovement PLAYER, MovementData_0x1240d4
 	turnobject PLAYER, RIGHT
-	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
+	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1240c5
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	setscene SCENE_FINISHED
 	special RestartMapMusic
@@ -110,20 +110,20 @@ OlivineCityPokecenterSign:
 OlivineCityMartSign:
 	jumpstd MartSignScript
 
-MovementData_0x1a88d2:
+MovementData_0x1240af:
 	step DOWN
 	step RIGHT
 	step RIGHT
 	step_end
 
-MovementData_0x1a88d6:
+MovementData_0x1240b3:
 	step DOWN
 	step DOWN
 	step RIGHT
 	step RIGHT
 	step_end
 
-MovementData_0x1a88db:
+MovementData_0x1240b8:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -138,7 +138,7 @@ MovementData_0x1a88db:
 	step UP
 	step_end
 
-MovementData_0x1a88e8:
+MovementData_0x1240c5:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -152,12 +152,12 @@ MovementData_0x1a88e8:
 	step UP
 	step_end
 
-MovementData_0x1a88f4:
+MovementData_0x1240d1:
 	step DOWN
 	turn_head UP
 	step_end
 
-MovementData_0x1a88f7:
+MovementData_0x1240d4:
 	step UP
 	turn_head DOWN
 	step_end
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 94792f8b..566f4239 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, MovementData_0x112da4
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
 .FacingDown:
-	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70
+	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x112dac
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
 .FacingRight:
-	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79
+	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x112db5
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
@@ -129,7 +129,7 @@ OlivineLighthouseAmphy:
 OlivineLighthouse6FSuperPotion:
 	itemball SUPER_POTION
 
-MovementData_0x60c68:
+MovementData_0x112da4:
 	slow_step UP
 	slow_step UP
 	slow_step RIGHT
@@ -139,7 +139,7 @@ MovementData_0x60c68:
 	step_sleep 8
 	step_end
 
-MovementData_0x60c70:
+MovementData_0x112dac:
 	slow_step DOWN
 	slow_step RIGHT
 	slow_step RIGHT
@@ -150,7 +150,7 @@ MovementData_0x60c70:
 	slow_step RIGHT
 	step_end
 
-MovementData_0x60c79:
+MovementData_0x112db5:
 	slow_step UP
 	slow_step UP
 	slow_step RIGHT
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 5489724e..1982546f 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -22,7 +22,7 @@ OlivinePort_MapScripts:
 	end
 
 .LeaveFastShipScript:
-	applymovement PLAYER, MovementData_0x74a32
+	applymovement PLAYER, MovementData_0x16c190
 	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, MovementData_0x16c18e
 	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, MovementData_0x16c195
 	sjump OlivinePortSailorAtGangwayScript
 
 .NoTicket:
 	writetext OlivinePortNoTicketText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74a34
+	applymovement PLAYER, MovementData_0x16c192
 	end
 
 .NextShipMonday:
 	writetext OlivinePortMondayShipText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74a34
+	applymovement PLAYER, MovementData_0x16c192
 	end
 
 .NextShipFriday:
 	writetext OlivinePortFridayShipText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74a34
+	applymovement PLAYER, MovementData_0x16c192
 	end
 
 .skip:
@@ -137,7 +137,7 @@ OlivinePortNotRidingMoveAwayScript:
 	writetext OlivinePortComeAgainText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74a34
+	applymovement PLAYER, MovementData_0x16c192
 	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, MovementData_0x16c19d
 	sjump OlivinePortSailorAtGangwayScript
 
 .Right:
-	applymovement PLAYER, MovementData_0x74a49
+	applymovement PLAYER, MovementData_0x16c1a7
 	sjump OlivinePortSailorAtGangwayScript
 
 .NoTicket:
@@ -234,20 +234,20 @@ OlivinePortCooltrainerFScript:
 OlivinePortHiddenProtein:
 	hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN
 
-MovementData_0x74a30:
+MovementData_0x16c18e:
 	step DOWN
 	step_end
 
-MovementData_0x74a32:
+MovementData_0x16c190:
 	step UP
 	step_end
 
-MovementData_0x74a34:
+MovementData_0x16c192:
 	step RIGHT
 	turn_head LEFT
 	step_end
 
-MovementData_0x74a37:
+MovementData_0x16c195:
 	step DOWN
 	step DOWN
 	step DOWN
@@ -257,7 +257,7 @@ MovementData_0x74a37:
 	step DOWN
 	step_end
 
-MovementData_0x74a3f:
+MovementData_0x16c19d:
 	step RIGHT
 	step DOWN
 	step DOWN
@@ -269,7 +269,7 @@ MovementData_0x74a3f:
 	step DOWN
 	step_end
 
-MovementData_0x74a49:
+MovementData_0x16c1a7:
 	step UP
 	step RIGHT
 	step RIGHT
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 91126ef4..399a76ec 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, MovementData_0x1408c9
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
 	turnobject ROUTE25_MISTY, UP
 	pause 10
-	applymovement ROUTE25_MISTY, MovementData_0x19efed
+	applymovement ROUTE25_MISTY, MovementData_0x1408ce
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
 	turnobject PLAYER, DOWN
-	applymovement ROUTE25_MISTY, MovementData_0x19effa
+	applymovement ROUTE25_MISTY, MovementData_0x1408db
 	turnobject PLAYER, LEFT
-	applymovement ROUTE25_MISTY, MovementData_0x19f000
+	applymovement ROUTE25_MISTY, MovementData_0x1408e1
 	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, MovementData_0x1408cb
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
 	turnobject ROUTE25_MISTY, UP
 	pause 10
-	applymovement ROUTE25_MISTY, MovementData_0x19eff4
+	applymovement ROUTE25_MISTY, MovementData_0x1408d5
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
 	turnobject PLAYER, UP
-	applymovement ROUTE25_MISTY, MovementData_0x19effd
+	applymovement ROUTE25_MISTY, MovementData_0x1408de
 	turnobject PLAYER, LEFT
-	applymovement ROUTE25_MISTY, MovementData_0x19f000
+	applymovement ROUTE25_MISTY, MovementData_0x1408e1
 	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:
+MovementData_0x1408c9:
 	big_step DOWN
 	step_end
 
-MovementData_0x19efea:
+MovementData_0x1408cb:
 	big_step DOWN
 	big_step DOWN
 	step_end
 
-MovementData_0x19efed:
+MovementData_0x1408ce:
 	step UP
 	step UP
 	step UP
@@ -209,7 +209,7 @@ MovementData_0x19efed:
 	step LEFT
 	step_end
 
-MovementData_0x19eff4:
+MovementData_0x1408d5:
 	step UP
 	step UP
 	step LEFT
@@ -217,17 +217,17 @@ MovementData_0x19eff4:
 	step LEFT
 	step_end
 
-MovementData_0x19effa:
+MovementData_0x1408db:
 	step DOWN
 	step LEFT
 	step_end
 
-MovementData_0x19effd:
+MovementData_0x1408de:
 	step UP
 	step LEFT
 	step_end
 
-MovementData_0x19f000:
+MovementData_0x1408e1:
 	step LEFT
 	step LEFT
 	step LEFT
diff --git a/maps/Route27.asm b/maps/Route27.asm
index ad1efd85..9a7f6010 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -25,13 +25,13 @@ Route27_MapScripts:
 FirstStepIntoKantoLeftScene:
 	turnobject ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
-	applymovement ROUTE27_FISHER, MovementData_0x1a0a66
+	applymovement ROUTE27_FISHER, MovementData_0x128865
 	sjump FirstStepIntoKantoScene_Continue
 
 FirstStepIntoKantoRightScene:
 	turnobject ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
-	applymovement ROUTE27_FISHER, MovementData_0x1a0a69
+	applymovement ROUTE27_FISHER, MovementData_0x128868
 FirstStepIntoKantoScene_Continue:
 	turnobject PLAYER, RIGHT
 	opentext
@@ -265,12 +265,12 @@ Route27TMSolarbeam:
 Route27RareCandy:
 	itemball RARE_CANDY
 
-MovementData_0x1a0a66:
+MovementData_0x128865:
 	step LEFT
 	step LEFT
 	step_end
 
-MovementData_0x1a0a69:
+MovementData_0x128868:
 	step LEFT
 	step_end
 
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 088f7405..6c45e6b4 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -117,7 +117,7 @@ Route40Rock:
 Route40HiddenHyperPotion:
 	hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION
 
-MovementData_0x1a621c:
+MovementData_0x130f71:
 	step RIGHT
 	step UP
 	step UP
@@ -127,7 +127,7 @@ MovementData_0x1a621c:
 	step UP
 	step_end
 
-MovementData_0x1a6224:
+MovementData_0x130f79:
 	step UP
 	step UP
 	step UP
@@ -135,7 +135,7 @@ MovementData_0x1a6224:
 	step UP
 	step_end
 
-MovementData_0x1a622a:
+MovementData_0x130f7f:
 	step UP
 	step UP
 	step UP
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 5600660c..58975839 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -60,10 +60,10 @@ RuinsOfAlphOutsideScientistSceneContinue:
 	closetext
 	playmusic MUSIC_SHOW_ME_AROUND
 	follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER
-	applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x580ba
+	applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x110092
 	disappear RUINSOFALPHOUTSIDE_SCIENTIST
 	stopfollow
-	applymovement PLAYER, MovementData_0x580c5
+	applymovement PLAYER, MovementData_0x11009d
 	setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
 	warpcheck
 	end
@@ -99,7 +99,7 @@ RuinsOfAlphSign:
 RuinsOfAlphResearchCenterSign:
 	jumptext RuinsOfAlphResearchCenterSignText
 
-MovementData_0x580ba:
+MovementData_0x110092:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -112,7 +112,7 @@ MovementData_0x580ba:
 	step UP
 	step_end
 
-MovementData_0x580c5:
+MovementData_0x11009d:
 	step UP
 	step_end
 
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index c5840c41..05948048 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -29,7 +29,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	return
 
 .GetUnownDexScript:
-	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f
+	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x110b15
 	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, MovementData_0x110b1a
 	opentext
 	writetext RuinsOfAlphResearchCenterDexUpgradedText
 	playsound SFX_ITEM
@@ -52,7 +52,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	writetext RuinsOfAlphResearchCenterScientist3Text
 	waitbutton
 	closetext
-	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276
+	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x110b1c
 	setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING
 	special RestartMapMusic
 	end
@@ -157,18 +157,18 @@ RuinsOfAlphResearchCenterPhoto:
 RuinsOfAlphResearchCenterBookshelf:
 	jumptext RuinsOfAlphResearchCenterAcademicBooksText
 
-MovementData_0x5926f:
+MovementData_0x110b15:
 	step UP
 	step UP
 	step LEFT
 	turn_head UP
 	step_end
 
-MovementData_0x59274:
+MovementData_0x110b1a:
 	step DOWN
 	step_end
 
-MovementData_0x59276:
+MovementData_0x110b1c:
 	step UP
 	step_end
 
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 7f521c65..7c84971e 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, MovementData_0x108521
+	applymovement SPROUTTOWER3F_SILVER, MovementData_0x108526
 	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, MovementData_0x108528
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext SproutTowerRivalOnlyCareAboutStrongText
@@ -135,18 +135,18 @@ SproutTower3FPotion:
 SproutTower3FEscapeRope:
 	itemball ESCAPE_ROPE
 
-MovementData_0x184a1d:
+MovementData_0x108521:
 	step UP
 	step UP
 	step UP
 	step UP
 	step_end
 
-MovementData_0x184a22:
+MovementData_0x108526:
 	step UP
 	step_end
 
-MovementData_0x184a24:
+MovementData_0x108528:
 	step RIGHT
 	step DOWN
 	step_end
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index cdceacc3..076e2ec3 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, MovementData_0x114ed7
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224
+	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x114edc
 	turnobject PLAYER, UP
-	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f
+	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x114ee7
 	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, MovementData_0x114eee
+	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x114ef3
+	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x114f04
 	appear TEAMROCKETBASEB2F_LANCE
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244
+	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114efc
 	opentext
 	writetext RocketBaseLanceShareFunText
 	waitbutton
 	closetext
 	turnobject PLAYER, RIGHT
-	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241
+	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x114ef9
 	opentext
 	writetext RocketBaseBossDontMeddleText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a
-	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248
+	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x114f02
+	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x114f00
 	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, MovementData_0x114f08
 	turnobject PLAYER, UP
 	opentext
 	writetext RocketBaseLancePowerOffText
 	waitbutton
 	closetext
 	follow TEAMROCKETBASEB2F_LANCE, PLAYER
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d254
+	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f0c
 	stopfollow
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258
+	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f10
 	opentext
 	writetext RockerBaseLanceElectrodeFaintText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267
+	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f1f
 	disappear TEAMROCKETBASEB2F_LANCE
 
 RocketBaseCantLeaveScript:
-	applymovement PLAYER, MovementData_0x6d271
+	applymovement PLAYER, MovementData_0x114f29
 	end
 
 RocketBaseLancesSideScript:
@@ -149,7 +149,7 @@ RocketBaseLancesSideScript:
 	writetext RocketBaseLancesSideText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x6d278
+	applymovement PLAYER, MovementData_0x114f30
 	end
 
 LanceHealsScript1:
@@ -176,12 +176,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, UnknownText_0x114eca
 	disappear TEAMROCKETBASEB2F_LANCE
 	end
 
 .FacingRight:
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d219
+	applymovement TEAMROCKETBASEB2F_LANCE, UnknownText_0x114ed1
 	disappear TEAMROCKETBASEB2F_LANCE
 	end
 
@@ -233,7 +233,7 @@ RocketElectrode1:
 	iffalse TeamRocketBaseB2FReloadMap
 	reloadmapafterbattle
 	special PlayMapMusic
-	applymovement PLAYER, MovementData_0x6d28c
+	applymovement PLAYER, MovementData_0x114f44
 	sjump RocketBaseElectrodeScript
 
 RocketElectrode2:
@@ -251,7 +251,7 @@ RocketElectrode2:
 	iffalse TeamRocketBaseB2FReloadMap
 	reloadmapafterbattle
 	special PlayMapMusic
-	applymovement PLAYER, MovementData_0x6d299
+	applymovement PLAYER, MovementData_0x114f51
 	sjump RocketBaseElectrodeScript
 
 RocketElectrode3:
@@ -269,7 +269,7 @@ RocketElectrode3:
 	iffalse TeamRocketBaseB2FReloadMap
 	reloadmapafterbattle
 	special PlayMapMusic
-	applymovement PLAYER, MovementData_0x6d2a4
+	applymovement PLAYER, MovementData_0x114f5c
 	sjump RocketBaseElectrodeScript
 
 TeamRocketBaseB2FReloadMap:
@@ -279,7 +279,7 @@ TeamRocketBaseB2FReloadMap:
 RocketBaseElectrodeScript:
 	moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
 	appear TEAMROCKETBASEB2F_LANCE
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
+	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f32
 	turnobject PLAYER, RIGHT
 	opentext
 	writetext RocketBaseLanceElectrodeDoneText
@@ -295,7 +295,7 @@ RocketBaseElectrodeScript:
 	waitbutton
 	closetext
 	turnobject PLAYER, DOWN
-	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283
+	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114f3b
 	disappear TEAMROCKETBASEB2F_LANCE
 	setevent EVENT_CLEARED_ROCKET_HIDEOUT
 	clearflag ENGINE_ROCKET_SIGNAL_ON_CH20
@@ -355,7 +355,7 @@ TeamRocketBaseB2FTMThief:
 TeamRocketBaseB2FHiddenFullHeal:
 	hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL
 
-MovementData_0x6d212:
+UnknownText_0x114eca:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -364,7 +364,7 @@ MovementData_0x6d212:
 	step RIGHT
 	step_end
 
-MovementData_0x6d219:
+UnknownText_0x114ed1:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -372,14 +372,14 @@ MovementData_0x6d219:
 	step RIGHT
 	step_end
 
-MovementData_0x6d21f:
+MovementData_0x114ed7:
 	step DOWN
 	step DOWN
 	step DOWN
 	turn_head RIGHT
 	step_end
 
-MovementData_0x6d224:
+MovementData_0x114edc:
 	big_step LEFT
 	big_step LEFT
 	big_step UP
@@ -392,7 +392,7 @@ MovementData_0x6d224:
 	turn_head DOWN
 	step_end
 
-MovementData_0x6d22f:
+MovementData_0x114ee7:
 	big_step LEFT
 	big_step LEFT
 	big_step UP
@@ -401,14 +401,14 @@ MovementData_0x6d22f:
 	big_step LEFT
 	step_end
 
-MovementData_0x6d236:
+MovementData_0x114eee:
 	big_step RIGHT
 	big_step RIGHT
 	big_step RIGHT
 	big_step RIGHT
 	step_end
 
-MovementData_0x6d23b:
+MovementData_0x114ef3:
 	fix_facing
 	set_sliding
 	jump_step RIGHT
@@ -416,44 +416,44 @@ MovementData_0x6d23b:
 	remove_fixed_facing
 	step_end
 
-MovementData_0x6d241:
+MovementData_0x114ef9:
 	slow_step DOWN
 	turn_head LEFT
 	step_end
 
-MovementData_0x6d244:
+MovementData_0x114efc:
 	step RIGHT
 	step RIGHT
 	step RIGHT
 	step_end
 
-MovementData_0x6d248:
+MovementData_0x114f00:
 	big_step LEFT
 	step_end
 
-MovementData_0x6d24a:
+MovementData_0x114f02:
 	big_step LEFT
 	step_end
 
-MovementData_0x6d24c:
+MovementData_0x114f04:
 	big_step LEFT
 	big_step UP
 	turn_head LEFT
 	step_end
 
-MovementData_0x6d250:
+MovementData_0x114f08:
 	step RIGHT
 	step RIGHT
 	turn_head DOWN
 	step_end
 
-MovementData_0x6d254:
+MovementData_0x114f0c:
 	step UP
 	step UP
 	step UP
 	step_end
 
-MovementData_0x6d258:
+MovementData_0x114f10:
 	step_sleep 8
 	step LEFT
 	step LEFT
@@ -470,7 +470,7 @@ MovementData_0x6d258:
 	turn_head DOWN
 	step_end
 
-MovementData_0x6d267:
+MovementData_0x114f1f:
 	step RIGHT
 	step RIGHT
 	step RIGHT
@@ -482,7 +482,7 @@ MovementData_0x6d267:
 	step UP
 	step_end
 
-MovementData_0x6d271:
+MovementData_0x114f29:
 	step UP
 	step LEFT
 	step LEFT
@@ -491,11 +491,11 @@ MovementData_0x6d271:
 	turn_head UP
 	step_end
 
-MovementData_0x6d278:
+MovementData_0x114f30:
 	step LEFT
 	step_end
 
-MovementData_0x6d27a:
+MovementData_0x114f32:
 	step DOWN
 	step DOWN
 	step DOWN
@@ -506,7 +506,7 @@ MovementData_0x6d27a:
 	step LEFT
 	step_end
 
-MovementData_0x6d283:
+MovementData_0x114f3b:
 	step DOWN
 	step DOWN
 	step LEFT
@@ -517,7 +517,7 @@ MovementData_0x6d283:
 	step LEFT
 	step_end
 
-MovementData_0x6d28c:
+MovementData_0x114f44:
 	step RIGHT
 	step RIGHT
 	step DOWN
@@ -532,7 +532,7 @@ MovementData_0x6d28c:
 	step RIGHT
 	step_end
 
-MovementData_0x6d299:
+MovementData_0x114f51:
 	step RIGHT
 	step RIGHT
 	step DOWN
@@ -545,7 +545,7 @@ MovementData_0x6d299:
 	step RIGHT
 	step_end
 
-MovementData_0x6d2a4:
+MovementData_0x114f5c:
 	step RIGHT
 	step RIGHT
 	step DOWN
@@ -731,7 +731,7 @@ RocketBaseLanceElectrodeDoneText:
 	done
 
 ; unused
-UnknownText_0x6d8e6:
+UnknownText_0x11559e:
 	text "<PLAYER> received"
 	line "HM06."
 	done
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index f9cd0354..209f0057 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -50,12 +50,12 @@ LanceGetPasswordScript:
 	pause 5
 	turnobject TEAMROCKETBASEB3F_MOLTRES, RIGHT
 	pause 20
-	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a
+	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x115de0
 	opentext
 	writetext LanceGetPasswordText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c
+	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x115de2
 	disappear TEAMROCKETBASEB3F_LANCE
 	setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
 	end
@@ -84,11 +84,11 @@ TeamRocketBaseB3FRocketScript:
 	jumptextfaceplayer TeamRocketBaseB3FRocketText
 
 RocketBaseBossLeft:
-	applymovement PLAYER, MovementData_0x6e133
+	applymovement PLAYER, MovementData_0x115de9
 	sjump RocketBaseBoss
 
 RocketBaseBossRight:
-	applymovement PLAYER, MovementData_0x6e13a
+	applymovement PLAYER, MovementData_0x115df0
 RocketBaseBoss:
 	pause 30
 	showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
@@ -98,7 +98,7 @@ RocketBaseBoss:
 	writetext ExecutiveM4BeforeText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142
+	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115df8
 	winlosstext ExecutiveM4BeatenText, 0
 	setlasttalked TEAMROCKETBASEB3F_ROCKET1
 	loadtrainer EXECUTIVEM, EXECUTIVEM_4
@@ -109,9 +109,9 @@ RocketBaseBoss:
 	writetext ExecutiveM4AfterText
 	waitbutton
 	closetext
-	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144
+	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115dfa
 	playsound SFX_TACKLE
-	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147
+	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115dfd
 	disappear TEAMROCKETBASEB3F_ROCKET1
 	setscene SCENE_TEAMROCKETBASEB3F_NOTHING
 	end
@@ -213,11 +213,11 @@ TeamRocketBaseB3FProtein:
 TeamRocketBaseB3FIceHeal:
 	itemball ICE_HEAL
 
-MovementData_0x6e12a:
+MovementData_0x115de0:
 	step RIGHT
 	step_end
 
-MovementData_0x6e12c:
+MovementData_0x115de2:
 	step DOWN
 	step LEFT
 	step LEFT
@@ -226,7 +226,7 @@ MovementData_0x6e12c:
 	step LEFT
 	step_end
 
-MovementData_0x6e133:
+MovementData_0x115de9:
 	step UP
 	step UP
 	step UP
@@ -235,7 +235,7 @@ MovementData_0x6e133:
 	turn_head UP
 	step_end
 
-MovementData_0x6e13a:
+MovementData_0x115df0:
 	step UP
 	step UP
 	step LEFT
@@ -245,16 +245,16 @@ MovementData_0x6e13a:
 	turn_head UP
 	step_end
 
-MovementData_0x6e142:
+MovementData_0x115df8:
 	step DOWN
 	step_end
 
-MovementData_0x6e144:
+MovementData_0x115dfa:
 	big_step RIGHT
 	big_step RIGHT
 	step_end
 
-MovementData_0x6e147:
+MovementData_0x115dfd:
 	fix_facing
 	fast_jump_step LEFT
 	remove_fixed_facing
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 409c3d73..494fdea3 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -23,7 +23,7 @@ VermilionPort_MapScripts:
 	return
 
 .LeaveFastShipScript:
-	applymovement PLAYER, MovementData_0x74ef3
+	applymovement PLAYER, MovementData_0x16c65b
 	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, MovementData_0x16c659
 	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, MovementData_0x16c660
 	sjump VermilionPortSailorAtGangwayScript
 
 .NoTicket:
 	writetext VermilionPortNoTicketText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74ef5
+	applymovement PLAYER, MovementData_0x16c65d
 	end
 
 .NextShipWednesday:
 	writetext VermilionPortSailMondayText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74ef5
+	applymovement PLAYER, MovementData_0x16c65d
 	end
 
 .NextShipSunday:
 	writetext VermilionPortSailSundayText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74ef5
+	applymovement PLAYER, MovementData_0x16c65d
 	end
 
 .skip:
@@ -138,7 +138,7 @@ VermilionPortNotRidingMoveAwayScript:
 	writetext VermilionPortComeAgainText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x74ef5
+	applymovement PLAYER, MovementData_0x16c65d
 	end
 
 VermilionPortSailorScript:
@@ -163,7 +163,7 @@ VermilionPortSailorScript:
 	waitbutton
 	closetext
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
-	applymovement PLAYER, MovementData_0x74efe
+	applymovement PLAYER, MovementData_0x16c666
 	sjump VermilionPortSailorAtGangwayScript
 
 .NoTicket:
@@ -195,20 +195,20 @@ VermilionPortSuperNerdScript:
 VermilionPortHiddenIron:
 	hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON
 
-MovementData_0x74ef1:
+MovementData_0x16c659:
 	step DOWN
 	step_end
 
-MovementData_0x74ef3:
+MovementData_0x16c65b:
 	step UP
 	step_end
 
-MovementData_0x74ef5:
+MovementData_0x16c65d:
 	step RIGHT
 	turn_head LEFT
 	step_end
 
-MovementData_0x74ef8:
+MovementData_0x16c660:
 	step DOWN
 	step DOWN
 	step DOWN
@@ -216,7 +216,7 @@ MovementData_0x74ef8:
 	step DOWN
 	step_end
 
-MovementData_0x74efe:
+MovementData_0x16c666:
 	step RIGHT
 	step DOWN
 	step DOWN
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index cf1cf5b5..115bc492 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -26,9 +26,9 @@ VictoryRoadRivalLeft:
 	special FadeOutMusic
 	pause 15
 	appear VICTORYROAD_SILVER
-	applymovement VICTORYROAD_SILVER, MovementData_0x74539
+	applymovement VICTORYROAD_SILVER, MovementData_0x109a61
 	scall VictoryRoadRivalNext
-	applymovement VICTORYROAD_SILVER, MovementData_0x7454c
+	applymovement VICTORYROAD_SILVER, MovementData_0x109a74
 	disappear VICTORYROAD_SILVER
 	setscene SCENE_FINISHED
 	playmapmusic
@@ -40,9 +40,9 @@ VictoryRoadRivalRight:
 	special FadeOutMusic
 	pause 15
 	appear VICTORYROAD_SILVER
-	applymovement VICTORYROAD_SILVER, MovementData_0x74542
+	applymovement VICTORYROAD_SILVER, MovementData_0x109a6a
 	scall VictoryRoadRivalNext
-	applymovement VICTORYROAD_SILVER, MovementData_0x74555
+	applymovement VICTORYROAD_SILVER, MovementData_0x109a7d
 	disappear VICTORYROAD_SILVER
 	setscene SCENE_FINISHED
 	playmapmusic
@@ -115,7 +115,7 @@ VictoryRoadHiddenMaxPotion:
 VictoryRoadHiddenFullHeal:
 	hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL
 
-MovementData_0x74539:
+MovementData_0x109a61:
 	step LEFT
 	step LEFT
 	step LEFT
@@ -126,7 +126,7 @@ MovementData_0x74539:
 	step UP
 	step_end
 
-MovementData_0x74542:
+MovementData_0x109a6a:
 	step UP
 	step UP
 	step LEFT
@@ -138,7 +138,7 @@ MovementData_0x74542:
 	step UP
 	step_end
 
-MovementData_0x7454c:
+MovementData_0x109a74:
 	step DOWN
 	step DOWN
 	step RIGHT
@@ -149,7 +149,7 @@ MovementData_0x7454c:
 	step RIGHT
 	step_end
 
-MovementData_0x74555:
+MovementData_0x109a7d:
 	step DOWN
 	step DOWN
 	step RIGHT