Identify more map script labels

15 files changed, 85 insertions, 86 deletions

diff --git a/scripts/CeladonMartElevator.asm b/scripts/CeladonMartElevator.asm
index c13ecd73..9a2842f3 100644
--- a/scripts/CeladonMartElevator.asm
+++ b/scripts/CeladonMartElevator.asm
@@ -3,26 +3,26 @@ CeladonMartElevator_Script:
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
-	call nz, CeladonMartElevatorScript_4861c
+	call nz, CeladonMartElevatorStoreWarpEntriesScript
 	pop hl
 	bit 7, [hl]
 	res 7, [hl]
-	call nz, CeladonMartElevatorScript_48654
+	call nz, CeladonMartElevatorShakeScript
 	xor a
 	ld [wAutoTextBoxDrawingControl], a
 	inc a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-CeladonMartElevatorScript_4861c:
+CeladonMartElevatorStoreWarpEntriesScript:
 	ld hl, wWarpEntries
 	ld a, [wWarpedFromWhichWarp]
 	ld b, a
 	ld a, [wWarpedFromWhichMap]
 	ld c, a
-	call CeladonMartElevatorScript_4862a
-
-CeladonMartElevatorScript_4862a:
+	call .StoreWarpEntry
+	; fallthrough
+.StoreWarpEntry:
 	inc hl
 	inc hl
 	ld a, b
@@ -31,12 +31,12 @@ CeladonMartElevatorScript_4862a:
 	ld [hli], a
 	ret
 
-CeladonMartElevatorScript_48631:
+CeladonMartElevatorCopyWarpMapsScript:
 	ld hl, CeladonMartElevatorFloors
 	call LoadItemList
 	ld hl, CeladonMartElevatorWarpMaps
 	ld de, wElevatorWarpMaps
-	ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps
+	ld bc, CeladonMartElevatorWarpMaps.End - CeladonMartElevatorWarpMaps
 	jp CopyData
 
 CeladonMartElevatorFloors:
@@ -56,9 +56,9 @@ CeladonMartElevatorWarpMaps:
 	db 2, CELADON_MART_3F
 	db 2, CELADON_MART_4F
 	db 2, CELADON_MART_5F
-CeladonMartElevatorWarpMapsEnd:
+.End:
 
-CeladonMartElevatorScript_48654:
+CeladonMartElevatorShakeScript:
 	farjp ShakeElevator
 
 CeladonMartElevator_TextPointers:
@@ -67,7 +67,7 @@ CeladonMartElevator_TextPointers:
 
 CeladonMartElevatorText:
 	text_asm
-	call CeladonMartElevatorScript_48631
+	call CeladonMartElevatorCopyWarpMapsScript
 	ld hl, CeladonMartElevatorWarpMaps
 	predef DisplayElevatorFloorMenu
 	jp TextScriptEnd
diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm
index de457ab8..417198e1 100644
--- a/scripts/CeruleanBadgeHouse.asm
+++ b/scripts/CeruleanBadgeHouse.asm
@@ -16,7 +16,7 @@ CeruleanBadgeHouseMiddleAgedManText:
 	xor a
 	ld [wCurrentMenuItem], a
 	ld [wListScrollOffset], a
-.asm_74e23
+.loop
 	ld hl, .WhichBadgeText
 	call PrintText
 	ld hl, .BadgeItemList
@@ -32,7 +32,7 @@ CeruleanBadgeHouseMiddleAgedManText:
 	ld a, SPECIALLISTMENU
 	ld [wListMenuID], a
 	call DisplayListMenuID
-	jr c, .asm_74e60
+	jr c, .done
 	ld hl, CeruleanBadgeHouseBadgeTextPointers
 	ld a, [wcf91]
 	sub BOULDERBADGE
@@ -44,8 +44,8 @@ CeruleanBadgeHouseMiddleAgedManText:
 	ld h, [hl]
 	ld l, a
 	call PrintText
-	jr .asm_74e23
-.asm_74e60
+	jr .loop
+.done
 	xor a
 	ld [wListScrollOffset], a
 	ld hl, .VisitAnyTimeText
@@ -54,7 +54,7 @@ CeruleanBadgeHouseMiddleAgedManText:
 
 .BadgeItemList:
 	table_width 1, .BadgeItemList
-	db NUM_BADGES
+	db NUM_BADGES ; #
 	db BOULDERBADGE
 	db CASCADEBADGE
 	db THUNDERBADGE
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index 6e480285..439c31ad 100644
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -4,7 +4,7 @@ CeruleanCity_Script:
 	ld a, [wCeruleanCityCurScript]
 	jp CallFunctionInTable
 
-CeruleanCityScript_1948c:
+CeruleanCityClearScripts:
 	xor a ; SCRIPT_CERULEANCITY_DEFAULT
 	ld [wJoyIgnore], a
 	ld [wCeruleanCityCurScript], a
@@ -23,7 +23,7 @@ CeruleanCity_ScriptPointers:
 CeruleanCityRocketDefeatedScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, CeruleanCityScript_1948c
+	jp z, CeruleanCityClearScripts
 	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
@@ -117,7 +117,7 @@ CeruleanCityMovement1:
 	db NPC_MOVEMENT_DOWN
 	db -1 ; end
 
-CeruleanCityScript_1955d:
+CeruleanCityFaceRivalScript:
 	ld a, CERULEANCITY_RIVAL
 	ldh [hSpriteIndex], a
 	xor a ; SPRITE_FACING_DOWN
@@ -160,7 +160,7 @@ CeruleanCityRivalBattleScript:
 
 	xor a
 	ldh [hJoyHeld], a
-	call CeruleanCityScript_1955d
+	call CeruleanCityFaceRivalScript
 	ld a, SCRIPT_CERULEANCITY_RIVAL_DEFEATED
 	ld [wCeruleanCityCurScript], a
 	ret
@@ -168,8 +168,8 @@ CeruleanCityRivalBattleScript:
 CeruleanCityRivalDefeatedScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, CeruleanCityScript_1948c
-	call CeruleanCityScript_1955d
+	jp z, CeruleanCityClearScripts
+	call CeruleanCityFaceRivalScript
 	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_CERULEAN_RIVAL
diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm
index 0837ae52..c6c7c1dd 100644
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -100,7 +100,7 @@ ChampionsRoomRivalDefeatedScript:
 	ld [wJoyIgnore], a
 	ld a, TEXT_CHAMPIONSROOM_RIVAL
 	ldh [hSpriteIndexOrTextID], a
-	call RivalScript_760c8
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
 	ld a, CHAMPIONSROOM_RIVAL
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
@@ -112,7 +112,7 @@ ChampionsRoomOakArrivesScript:
 	farcall Music_Cities1AlternateTempo
 	ld a, TEXT_CHAMPIONSROOM_OAK
 	ldh [hSpriteIndexOrTextID], a
-	call RivalScript_760c8
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
 	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
@@ -153,7 +153,7 @@ ChampionsRoomOakCongratulatesPlayerScript:
 	call SetSpriteFacingDirectionAndDelay
 	ld a, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER
 	ldh [hSpriteIndexOrTextID], a
-	call RivalScript_760c8
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
 	ld a, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL
 	ld [wChampionsRoomCurScript], a
 	ret
@@ -166,7 +166,7 @@ ChampionsRoomOakDisappointedWithRivalScript:
 	call SetSpriteFacingDirectionAndDelay
 	ld a, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL
 	ldh [hSpriteIndexOrTextID], a
-	call RivalScript_760c8
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
 	ld a, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME
 	ld [wChampionsRoomCurScript], a
 	ret
@@ -179,7 +179,7 @@ ChampionsRoomOakComeWithMeScript:
 	call SetSpriteFacingDirectionAndDelay
 	ld a, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME
 	ldh [hSpriteIndexOrTextID], a
-	call RivalScript_760c8
+	call ChampionsRoom_DisplayTextID_AllowABSelectStart
 	ld de, OakExitChampionsRoomMovement
 	ld a, CHAMPIONSROOM_OAK
 	ldh [hSpriteIndex], a
@@ -232,7 +232,7 @@ ChampionsRoomCleanupScript:
 	ld [wChampionsRoomCurScript], a
 	ret
 
-RivalScript_760c8:
+ChampionsRoom_DisplayTextID_AllowABSelectStart:
 	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	call DisplayTextID
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
index af7646be..a962aa2f 100644
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -93,7 +93,7 @@ CinnabarGymGetOpponentTextScript:
 
 CinnabarGymFlagAction:
 	predef_jump FlagActionPredef
-
+	; fallthrough
 CinnabarGymOpenGateScript:
 	ld a, [wIsInBattle]
 	cp $ff
@@ -107,12 +107,12 @@ CinnabarGymOpenGateScript:
 	call CinnabarGymFlagAction
 	ld a, c
 	and a
-	jr nz, .asm_7581b
+	jr nz, .no_sound
 	call WaitForSoundToFinish
 	ld a, SFX_GO_INSIDE
 	call PlaySound
 	call WaitForSoundToFinish
-.asm_7581b
+.no_sound
 	ld a, [wTrainerHeaderFlagBit]
 	ldh [hGymGateIndex], a
 	AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2
diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm
index fb9847d1..298c2fcb 100644
--- a/scripts/FightingDojo.asm
+++ b/scripts/FightingDojo.asm
@@ -7,7 +7,7 @@ FightingDojo_Script:
 	ld [wFightingDojoCurScript], a
 	ret
 
-FightingDojoScript_5cd70:
+FightingDojoResetScripts:
 	xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT
 	ld [wJoyIgnore], a
 	ld [wFightingDojoCurScript], a
@@ -56,10 +56,10 @@ FightingDojoDefaultScript:
 FightingDojoKarateMasterPostBattleScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, FightingDojoScript_5cd70
+	jp z, FightingDojoResetScripts
 	ld a, [wcf0d]
 	and a
-	jr z, .asm_5cde4
+	jr z, .already_facing
 	ld a, PLAYER_DIR_RIGHT
 	ld [wPlayerMovingDirection], a
 	ld a, FIGHTINGDOJO_KARATE_MASTER
@@ -67,8 +67,7 @@ FightingDojoKarateMasterPostBattleScript:
 	ld a, SPRITE_FACING_LEFT
 	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-
-.asm_5cde4
+.already_facing
 	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm
index 3944a2f9..68cdc333 100644
--- a/scripts/GameCorner.asm
+++ b/scripts/GameCorner.asm
@@ -14,9 +14,9 @@ GameCornerSelectLuckySlotMachine:
 	call Random
 	ldh a, [hRandomAdd]
 	cp $7
-	jr nc, .asm_48be2
+	jr nc, .not_max
 	ld a, $8
-.asm_48be2
+.not_max
 	srl a
 	srl a
 	srl a
@@ -63,18 +63,18 @@ GameCornerRocketBattleScript:
 	ld a, GAMECORNER_ROCKET
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
-	ld de, GameCornerMovement_Grunt_WalkAroundPlayer
+	ld de, GameCornerMovement_Rocket_WalkAroundPlayer
 	ld a, [wYCoord]
 	cp 6
-	jr nz, .asm_48c43
-	ld de, GameCornerMovement_Grunt_WalkDirect
-	jr .asm_48c4d
-.asm_48c43
+	jr nz, .not_direct_movement
+	ld de, GameCornerMovement_Rocket_WalkDirect
+	jr .got_rocket_movement
+.not_direct_movement
 	ld a, [wXCoord]
 	cp 8
-	jr nz, .asm_48c4d
-	ld de, GameCornerMovement_Grunt_WalkDirect
-.asm_48c4d
+	jr nz, .got_rocket_movement
+	ld de, GameCornerMovement_Rocket_WalkDirect
+.got_rocket_movement
 	ld a, GAMECORNER_ROCKET
 	ldh [hSpriteIndex], a
 	call MoveSprite
@@ -82,7 +82,7 @@ GameCornerRocketBattleScript:
 	ld [wGameCornerCurScript], a
 	ret
 
-GameCornerMovement_Grunt_WalkAroundPlayer:
+GameCornerMovement_Rocket_WalkAroundPlayer:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
@@ -93,7 +93,7 @@ GameCornerMovement_Grunt_WalkAroundPlayer:
 	db NPC_MOVEMENT_RIGHT
 	db -1 ; end
 
-GameCornerMovement_Grunt_WalkDirect:
+GameCornerMovement_Rocket_WalkDirect:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm
index 523567df..51f48af4 100644
--- a/scripts/HallOfFame.asm
+++ b/scripts/HallOfFame.asm
@@ -4,7 +4,7 @@ HallOfFame_Script:
 	ld a, [wHallOfFameCurScript]
 	jp CallFunctionInTable
 
-HallofFameRoomScript_5a4aa:
+HallofFameRoomClearScripts: ; unreferenced
 	xor a
 	ld [wJoyIgnore], a
 	ld [wHallOfFameCurScript], a
@@ -60,7 +60,7 @@ HallOfFameDefaultScript:
 	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld hl, wSimulatedJoypadStatesEnd
-	ld de, RLEMovement5a528
+	ld de, HallOfFakeEntryMovement
 	call DecodeRLEList
 	dec a
 	ld [wSimulatedJoypadStatesIndex], a
@@ -69,7 +69,7 @@ HallOfFameDefaultScript:
 	ld [wHallOfFameCurScript], a
 	ret
 
-RLEMovement5a528:
+HallOfFakeEntryMovement:
 	db D_UP, 5
 	db -1 ; end
 
diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm
index 6e2dc845..89871e35 100644
--- a/scripts/MtMoonB2F.asm
+++ b/scripts/MtMoonB2F.asm
@@ -7,18 +7,18 @@ MtMoonB2F_Script:
 	ld [wMtMoonB2FCurScript], a
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	ret z
-	ld hl, CoordsData_49d37
+	ld hl, MtMoonB2FFossilAreaCoords
 	call ArePlayerCoordsInArray
-	jr nc, .asm_49d31
+	jr nc, .enable_battles
 	ld hl, wd72e
 	set 4, [hl]
 	ret
-.asm_49d31
+.enable_battles
 	ld hl, wd72e
 	res 4, [hl]
 	ret
 
-CoordsData_49d37:
+MtMoonB2FFossilAreaCoords:
 	dbmapcoord 11,  5
 	dbmapcoord 12,  5
 	dbmapcoord 13,  5
diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm
index 01584f27..24bdd4a6 100644
--- a/scripts/RocketHideoutB4F.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -117,11 +117,11 @@ RocketHideoutB4FGiovanniText:
 	ld a, SCRIPT_ROCKETHIDEOUTB4F_BEAT_GIOVANNI
 	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
-	jr .asm_209f0
+	jr .done
 .beat_giovanni
 	ld hl, RocketHideoutB4FGiovanniHopeWeMeetAgainText
 	call PrintText
-.asm_209f0
+.done
 	jp TextScriptEnd
 
 .ImpressedYouGotHereText:
@@ -191,11 +191,11 @@ RocketHideoutB4FRocket2AfterBattleText:
 	ld hl, .Text
 	call PrintText
 	CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
-	jr nz, .asm_455e9
+	jr nz, .done
 	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5
 	ld [wMissableObjectIndex], a
 	predef ShowObject
-.asm_455e9
+.done
 	jp TextScriptEnd
 
 .Text:
diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm
index 9352a518..71ff0758 100644
--- a/scripts/RocketHideoutElevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -3,7 +3,7 @@ RocketHideoutElevator_Script:
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
-	call nz, RocketHideoutElevatorGetWarpsScript
+	call nz, RocketHideoutElevatorStoreWarpEntriesScript
 	pop hl
 	bit 7, [hl]
 	res 7, [hl]
@@ -14,15 +14,15 @@ RocketHideoutElevator_Script:
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-RocketHideoutElevatorGetWarpsScript:
+RocketHideoutElevatorStoreWarpEntriesScript:
 	ld hl, wWarpEntries
 	ld a, [wWarpedFromWhichWarp]
 	ld b, a
 	ld a, [wWarpedFromWhichMap]
 	ld c, a
-	call .SetWarpEntries
-
-.SetWarpEntries:
+	call .StoreWarpEntry
+	; fallthrough
+.StoreWarpEntry:
 	inc hl
 	inc hl
 	ld a, b
@@ -36,7 +36,7 @@ RocketHideoutElevatorScript:
 	call LoadItemList
 	ld hl, RocketHideoutElevatorWarpMaps
 	ld de, wElevatorWarpMaps
-	ld bc, RocketHideoutElevatorWarpMapsEnd - RocketHideoutElevatorWarpMaps
+	ld bc, RocketHideoutElevatorWarpMaps.End - RocketHideoutElevatorWarpMaps
 	call CopyData
 	ret
 
@@ -53,7 +53,7 @@ RocketHideoutElevatorWarpMaps:
 	db 4, ROCKET_HIDEOUT_B1F
 	db 4, ROCKET_HIDEOUT_B2F
 	db 2, ROCKET_HIDEOUT_B4F
-RocketHideoutElevatorWarpMapsEnd:
+.End:
 
 RocketHideoutElevatorShakeScript:
 	call Delay3
diff --git a/scripts/Route16.asm b/scripts/Route16.asm
index a1a6af78..f51bd00e 100644
--- a/scripts/Route16.asm
+++ b/scripts/Route16.asm
@@ -7,7 +7,7 @@ Route16_Script:
 	ld [wRoute16CurScript], a
 	ret
 
-Route16Script_59946:
+Route16ResetScripts:
 	xor a ; SCRIPT_ROUTE16_DEFAULT
 	ld [wJoyIgnore], a
 	ld [wRoute16CurScript], a
@@ -19,7 +19,7 @@ Route16_ScriptPointers:
 	dw_const Route16DefaultScript,                  SCRIPT_ROUTE16_DEFAULT
 	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE16_START_BATTLE
 	dw_const EndTrainerBattle,                      SCRIPT_ROUTE16_END_BATTLE
-	dw_const Route16SnorlaxBattleScript,            SCRIPT_ROUTE16_SNORLAX_BATTLE
+	dw_const Route16SnorlaxPostBattleScript,        SCRIPT_ROUTE16_SNORLAX_POST_BATTLE
 
 Route16DefaultScript:
 	CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX
@@ -38,15 +38,15 @@ Route16DefaultScript:
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	call UpdateSprites
-	ld a, SCRIPT_ROUTE16_SNORLAX_BATTLE
+	ld a, SCRIPT_ROUTE16_SNORLAX_POST_BATTLE
 	ld [wRoute16CurScript], a
 	ld [wCurMapScript], a
 	ret
 
-Route16SnorlaxBattleScript:
+Route16SnorlaxPostBattleScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, Route16Script_59946
+	jp z, Route16ResetScripts
 	call UpdateSprites
 	ld a, [wBattleResult]
 	cp $2
diff --git a/scripts/Route22.asm b/scripts/Route22.asm
index f692cb37..abf6c8e4 100644
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@@ -40,9 +40,9 @@ Route22MoveRivalRightScript:
 	ld de, Route22RivalMovementData
 	ld a, [wcf0d]
 	cp $1
-	jr z, .asm_50ef1
+	jr z, .skip_first_right
 	inc de
-.asm_50ef1
+.skip_first_right
 	call MoveSprite
 	ld a, SPRITE_FACING_RIGHT
 	ldh [hSpriteFacingDirection], a
diff --git a/scripts/Route23.asm b/scripts/Route23.asm
index 7863f8ac..044d5e50 100644
--- a/scripts/Route23.asm
+++ b/scripts/Route23.asm
@@ -26,25 +26,25 @@ Route23_ScriptPointers:
 	dw_const Route23ResetToDefaultScript, SCRIPT_ROUTE23_RESET_TO_DEFAULT
 
 Route23DefaultScript:
-	ld hl, YCoordsData_51255
+	ld hl, Route23GuardsYCoords
 	ld a, [wYCoord]
 	ld b, a
 	ld e, $0
 	EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK
-.asm_51224
+.loop
 	ld a, [hli]
 	cp -1
 	ret z
 	inc e
 	dec c
 	cp b
-	jr nz, .asm_51224
+	jr nz, .loop
 	cp 35
-	jr nz, .asm_51237
+	jr nz, .not_past_victory_road
 	ld a, [wXCoord]
 	cp 14
 	ret nc
-.asm_51237
+.not_past_victory_road
 	ld a, e
 	ldh [hSpriteIndexOrTextID], a
 	ld a, c
@@ -61,7 +61,7 @@ Route23DefaultScript:
 	ldh [hJoyHeld], a
 	ret
 
-YCoordsData_51255:
+Route23GuardsYCoords:
 	db 35
 	db 56
 	db 85
diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm
index 1d728e6b..a2ed009e 100644
--- a/scripts/SilphCoElevator.asm
+++ b/scripts/SilphCoElevator.asm
@@ -3,25 +3,25 @@ SilphCoElevator_Script:
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
-	call nz, SilphCoElevatorScript_457dc
+	call nz, SilphCoElevatorStoreWarpEntriesScript
 	pop hl
 	bit 7, [hl]
 	res 7, [hl]
-	call nz, SilphCoElevatorShakeElevatorScript
+	call nz, SilphCoElevatorShakeScript
 	xor a
 	ld [wAutoTextBoxDrawingControl], a
 	inc a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-SilphCoElevatorScript_457dc:
+SilphCoElevatorStoreWarpEntriesScript:
 	ld hl, wWarpEntries
 	ld a, [wWarpedFromWhichWarp]
 	ld b, a
 	ld a, [wWarpedFromWhichMap]
 	ld c, a
 	call .StoreWarpEntry
-
+	; fallthrough
 .StoreWarpEntry:
 	inc hl
 	inc hl
@@ -36,7 +36,7 @@ SilphCoElevatorCopyWarpMapsScript:
 	call LoadItemList
 	ld hl, SilphCoElevatorWarpMaps
 	ld de, wElevatorWarpMaps
-	ld bc, SilphCoElevatorWarpMapsEnd - SilphCoElevatorWarpMaps
+	ld bc, SilphCoElevatorWarpMaps.End - SilphCoElevatorWarpMaps
 	call CopyData
 	ret
 
@@ -69,9 +69,9 @@ SilphCoElevatorWarpMaps:
 	db 2, SILPH_CO_9F
 	db 2, SILPH_CO_10F
 	db 1, SILPH_CO_11F
-SilphCoElevatorWarpMapsEnd:
+.End:
 
-SilphCoElevatorShakeElevatorScript:
+SilphCoElevatorShakeScript:
 	call Delay3
 	farcall ShakeElevator
 	ret