Label remaining scripts

data/maps/OneIsland_PokemonCenter_1F/scripts.inc

@@ -167,12 +167,12 @@ OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio::
 	step_end
 
 @ Unused
-Movement_170E8F::
+OneIsland_PokemonCenter_1F_Movement_WalkUp:
 	walk_up
 	step_end
 
 @ Unused
-Movement_170E91::
+OneIsland_PokemonCenter_1F_Movement_StepAsideLeft::
 	walk_left
 	walk_in_place_faster_right
 	step_end
@@ -535,7 +535,7 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom::
 	step_end
 
 @ Unused
-Movement_17131F::
+OneIsland_PokemonCenter_1F_Movement_DelayWalkInPlaceLeft::
 	delay_16
 	delay_16
 	delay_4
@@ -543,7 +543,7 @@ Movement_17131F::
 	step_end
 
 @ Unused
-Movement_171324::
+OneIsland_PokemonCenter_1F_Movement_WalkInPlaceDown::
 	walk_in_place_fast_down
 	step_end
 

data/maps/PalletTown_ProfessorOaksLab/scripts.inc

@@ -870,7 +870,7 @@ PalletTown_ProfessorOaksLab_Movement_OakExcitedWest::
 	step_end
 
 @ Unused
-Movement_1699AC::
+PalletTown_ProfessorOaksLab_Movement_Search:
 	walk_left
 	walk_in_place_faster_down
 	delay_8
@@ -898,7 +898,7 @@ Movement_1699AC::
 	step_end
 
 @ Unused
-Movement_1699C5:
+PalletTown_ProfessorOaksLab_Movement_VerticalPacing:
 	walk_up
 	walk_down
 	walk_down

data/maps/TrainerTower_Lobby/scripts.inc

@@ -72,7 +72,7 @@ TrainerTower_Lobby_EventScript_Enter::
 	ttower_getchallengestatus
 	switch VAR_RESULT
 	case CHALLENGE_STATUS_LOST, TrainerTower_Lobby_EventScript_LostChallenge
-	case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938
+	case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_ExitChallengeSpeakToReceptionist
 	case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd
 
 TrainerTower_Lobby_EventScript_LostChallenge::
@@ -84,7 +84,7 @@ TrainerTower_Lobby_EventScript_LostChallenge::
 	goto TrainerTower_Lobby_EventScript_ExitChallenge
 
 @ Presumably E-Reader related
-TrainerTower_Lobby_EventScript_164938::
+TrainerTower_Lobby_EventScript_ExitChallengeSpeakToReceptionist::
 	lock
 	faceplayer
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist

data/maps/TwoIsland_JoyfulGameCorner/scripts.inc

@@ -52,7 +52,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
 TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
 	lockall
 	textcolor NPC_TEXT_COLOR_MALE
-	applymovement LOCALID_DADDY, Movement_171520
+	applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyPacing
 	waitmovement 0
 	msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo
 	closemessage
@@ -63,7 +63,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
 	waitmovement 0
 	applymovement LOCALID_DADDY, Common_Movement_Delay48
 	waitmovement 0
-	applymovement LOCALID_DADDY, Movement_171527
+	applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
 	waitmovement 0
@@ -71,7 +71,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
 	closemessage
 	playse SE_RS_DOOR
 	waitse
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C
+	applymovement OBJ_EVENT_ID_PLAYER, TwoIsland_JoyfulGameCorner_Movement_PlayerFaceDaddy
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_BOY, 0
 	addobject LOCALID_BIKER
@@ -96,7 +96,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
 	releaseall
 	end
 
-Movement_171520::
+TwoIsland_JoyfulGameCorner_Movement_DaddyPacing::
 	walk_left
 	walk_right
 	walk_right
@@ -105,14 +105,14 @@ Movement_171520::
 	delay_16
 	step_end
 
-Movement_171527::
+TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer::
 	walk_down
 	walk_down
 	walk_down
 	walk_in_place_faster_left
 	step_end
 
-Movement_17152C::
+TwoIsland_JoyfulGameCorner_Movement_PlayerFaceDaddy::
 	walk_left
 	walk_in_place_faster_right
 	step_end

data/scripts/hole.inc

@@ -19,8 +19,8 @@ EventScript_FallDownHole::
 	waitstate
 	end
 
-@ TODO: EventScript_FallDownHoleMtPyre in pokeemerald, needs generic name
+@ Differs from the script above by assuming the warp destination has already been set
-EventScript_1C1361::
+EventScript_DoFallWarp::
 	lockall
 	delay 20
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible

include/event_scripts.h

@@ -1257,7 +1257,7 @@ extern const u8 EventScript_CantUseWaterfall[];
 extern const u8 EventScript_VsSeekerChargingDone[];
 extern const u8 EventScript_FieldPoison[];
 extern const u8 EventScript_EggHatch[];
-extern const u8 EventScript_1C1361[];
+extern const u8 EventScript_DoFallWarp[];
 
 // overworld
 

src/field_control_avatar.c

@@ -889,7 +889,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB
         if (MetatileBehavior_IsFallWarp(metatileBehavior) == TRUE)
         {
             ResetInitialPlayerAvatarState();
-            ScriptContext_SetupScript(EventScript_1C1361);
+            ScriptContext_SetupScript(EventScript_DoFallWarp);
             return TRUE;
         }
         DoWarp();