Identify some more unnamed labels

2026-04-25 16:20:19 -05:00 · 2020-10-04 19:43:19 -04:00 · 2020-10-04 19:43:19 -04:00 · e128fbeadb
commit e128fbeadb
parent 8443840f97
26 changed files with 83 additions and 84 deletions
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@ -148,6 +148,8 @@ CMDQUEUE_CAPACITY EQU 4
 	const CMDQUEUE_TYPE4
 NUM_CMDQUEUE_TYPES EQU const_value

+MAX_XYCOMPARE_LENGTH EQU 32
+
 ; elevfloor macro values
 ; ElevatorFloorNames indexes (see data/events/elevator_floors.asm)
 	const_def
--- a/engine/battle/move_effects/metronome.asm
+++ b/engine/battle/move_effects/metronome.asm
@ -3,7 +3,7 @@ BattleCommand_Metronome:

 	call ClearLastMove
 	call CheckUserIsCharging
-	jr nz, .asm_3752a
+	jr nz, .charging

 	ld a, [wBattleAnimParam]
 	push af
@ -11,7 +11,7 @@ BattleCommand_Metronome:
 	pop af
 	ld [wBattleAnimParam], a

-.asm_3752a
+.charging
 	call LoadMoveAnim

 .GetMove:
--- a/engine/battle/move_effects/protect.asm
+++ b/engine/battle/move_effects/protect.asm
@ -16,9 +16,9 @@ ProtectChance:
 	ld de, wPlayerProtectCount
 	ldh a, [hBattleTurn]
 	and a
-	jr z, .asm_37736
+	jr z, .got_count
 	ld de, wEnemyProtectCount
-.asm_37736
+.got_count

 	call CheckOpponentWentFirst
 	jr nz, .failed
--- a/engine/battle/move_effects/spikes.asm
+++ b/engine/battle/move_effects/spikes.asm
@ -4,9 +4,9 @@ BattleCommand_Spikes:
 	ld hl, wEnemyScreens
 	ldh a, [hBattleTurn]
 	and a
-	jr z, .asm_3778d
+	jr z, .got_screens
 	ld hl, wPlayerScreens
-.asm_3778d
+.got_screens

 ; Fails if spikes are already down!

--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@ -1066,14 +1066,14 @@ TryStrengthOW:
 WhirlpoolFunction:
 	call FieldMoveJumptableReset
 .loop
-	ld hl, Jumptable_cdb1
+	ld hl, .Jumptable
 	call FieldMoveJumptable
 	jr nc, .loop
 	and $7f
 	ld [wFieldMoveSucceeded], a
 	ret

-Jumptable_cdb1:
+.Jumptable:
 	dw .TryWhirlpool
 	dw .DoWhirlpool
 	dw .FailWhirlpool
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@ -211,7 +211,7 @@ _PlayersHousePC:
 	ld b, PLAYERSPC_HOUSE
 	call _PlayersPC
 	and a
-	jr nz, .asm_159d0
+	jr nz, .changed_deco_tiles
 	call OverworldTextModeSwitch
 	call ApplyTilemap
 	call UpdateSprites
@ -219,7 +219,7 @@ _PlayersHousePC:
 	ld c, FALSE
 	ret

-.asm_159d0
+.changed_deco_tiles
 	call ClearBGPalettes
 	ld c, TRUE
 	ret
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@ -135,7 +135,7 @@ LoadSGBLayout:
 	ret

 .SGB_MoveList:
-	ld hl, PalPacket_Routes
+	ld hl, PalPacket_AllPal0
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@ -347,7 +347,7 @@ endr
 	ret

 .SGB_MapPals:
-	ld hl, PalPacket_Routes
+	ld hl, PalPacket_AllPal0
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
@ -415,7 +415,7 @@ endr
 	ret

 .SGB_Pokepic:
-	ld hl, PalPacket_Routes
+	ld hl, PalPacket_AllPal0
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@ -1345,17 +1345,16 @@ HealPowderEffect:
 	jp c, StatusHealer_ExitMenu

 	call UseStatusHealer
+	cp FALSE
+	jr nz, .not_used

-	cp $0
-	jr nz, .asm_f01f
 	ld c, HAPPINESS_BITTERPOWDER
 	farcall ChangeHappiness
-
 	call LooksBitterMessage

 	ld a, $0

-.asm_f01f
+.not_used
 	jp StatusHealer_Jumptable

 StatusHealingEffect:
@ -1369,7 +1368,7 @@ FullyHealStatus:

 UseStatusHealer:
 	call IsMonFainted
-	ld a, $1
+	ld a, TRUE
 	ret z
 	call GetItemHealingAction
 	ld a, MON_STATUS
@ -1378,7 +1377,7 @@ UseStatusHealer:
 	and c
 	jr nz, .good
 	call IsItemUsedOnConfusedMon
-	ld a, $1
+	ld a, TRUE
 	ret nc
 	ld b, PARTYMENUTEXT_HEAL_CONFUSION
 .good
@ -1390,7 +1389,7 @@ UseStatusHealer:
 	call Play_SFX_FULL_HEAL
 	call ItemActionTextWaitButton
 	call UseDisposableItem
-	ld a, $0
+	ld a, FALSE
 	ret

 IsItemUsedOnConfusedMon:
@ -1480,15 +1479,16 @@ RevivalHerbEffect:
 	jp c, StatusHealer_ExitMenu

 	call RevivePokemon
-	cp 0
-	jr nz, .asm_f11b
+	cp FALSE
+	jr nz, .not_used

 	ld c, HAPPINESS_REVIVALHERB
 	farcall ChangeHappiness
 	call LooksBitterMessage
-	ld a, 0

-.asm_f11b
+	ld a, $0
+
+.not_used
 	jp StatusHealer_Jumptable

 ReviveEffect:
@ -1501,7 +1501,7 @@ ReviveEffect:

 RevivePokemon:
 	call IsMonFainted
-	ld a, 1
+	ld a, TRUE
 	ret nz
 	ld a, [wBattleMode]
 	and a
@ -1542,7 +1542,7 @@ RevivePokemon:
 	ld [wPartyMenuActionText], a
 	call ItemActionTextWaitButton
 	call UseDisposableItem
-	ld a, 0
+	ld a, FALSE
 	ret

 FullRestoreEffect:
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@ -1312,7 +1312,7 @@ Function2884a:
 	call DelayFrames
 	farcall ValidateOTTrademon
 	jr c, .abnormal
-	farcall Functionfb6ed
+	farcall CheckAnyOtherAliveMonsForTrade
 	jp nc, LinkTrade
 	xor a
 	ld [wce57], a
--- a/engine/link/time_capsule.asm
+++ b/engine/link/time_capsule.asm
@ -64,7 +64,7 @@ ValidateOTTrademon:
 	scf
 	ret

-Functionfb6ed:
+CheckAnyOtherAliveMonsForTrade:
 	ld a, [wceed]
 	ld d, a
 	ld a, [wPartyCount]
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@ -556,14 +556,14 @@ _ExitMenu::
 	call CloseSRAM
 	ld hl, wWindowStackSize
 	dec [hl]
-	call Function2434b
+	call RestoreOverworldMapTiles
 	ld a, [wSpriteUpdatesEnabled]
 	cp 0
 	ret z
 	call ReloadPalettes
 	ret

-Function2434b:
+RestoreOverworldMapTiles:
 	ld a, [wVramState]
 	bit 0, a
 	ret z
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@ -28,17 +28,17 @@ PlaceMenuItemQuantity:
 	ret

 PlaceMoneyTopRight:
-	ld hl, MenuHeader_0x24a3d
+	ld hl, MoneyTopRightMenuHeader
 	call CopyMenuHeader
 	jr PlaceMoneyTextbox

 PlaceMoneyBottomLeft:
-	ld hl, MenuHeader_0x24a45
+	ld hl, MoneyBottomLeftMenuHeader
 	call CopyMenuHeader
 	jr PlaceMoneyTextbox

 PlaceMoneyAtTopLeftOfTextbox:
-	ld hl, MenuHeader_0x24a3d
+	ld hl, MoneyTopRightMenuHeader
 	lb de, 0, 11
 	call OffsetMenuHeader

@ -52,13 +52,13 @@ PlaceMoneyTextbox:
 	call PrintNum
 	ret

-MenuHeader_0x24a3d:
+MoneyTopRightMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, 2
 	dw NULL
 	db 1 ; default option

-MenuHeader_0x24a45:
+MoneyBottomLeftMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 8, 13
 	dw NULL
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@ -477,7 +477,7 @@ endr
 GetCreditsPalette:
 	ldh a, [hCGB]
 	and a
-	jr nz, .asm_6bcf
+	jr nz, .cgb

 	ldh a, [hSGB]
 	and a
@ -496,7 +496,7 @@ GetCreditsPalette:
 	farcall SGB_ApplyCreditsPals
 	ret

-.asm_6bcf
+.cgb
 	call .GetPalAddress

 	push hl
--- a/engine/overworld/cmd_queue.asm
+++ b/engine/overworld/cmd_queue.asm
@ -158,7 +158,7 @@ CmdQueue_Null:
 	ret

 CmdQueue_Type1:
-	call Function2ffe
+	call SetXYCompareFlags
 	ret

 CmdQueue_Type4:
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@ -827,7 +827,7 @@ WhichSidePutAwayText:

 DecoAction_AskWhichSide:
 	call MenuTextbox
-	ld hl, MenuHeader_0x2707e
+	ld hl, DecoSideMenuHeader
 	call GetMenu2
 	call ExitMenu
 	call CopyMenuData
@ -860,13 +860,13 @@ QueryWhichSide:
 	pop de
 	ret

-MenuHeader_0x2707e:
+DecoSideMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 12, 7
-	dw MenuData_0x27086
+	dw .MenuData
 	db 1 ; default option

-MenuData_0x27086:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "RIGHT SIDE@"
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@ -386,7 +386,7 @@ SetMinTwoStepWildEncounterCooldown:
 Dummy_CheckScriptFlags3Bit5:
 	call CheckBit5_ScriptFlags3
 	ret z
-	call Function2ffe
+	call SetXYCompareFlags
 	ret

 RunSceneScript:
@ -963,7 +963,7 @@ DoPlayerEvent:

 PlayerEventScriptPointers:
 ; entries correspond to PLAYEREVENT_* constants
-	dba Invalid_0x96b60         ; PLAYEREVENT_NONE
+	dba InvalidEventScript      ; PLAYEREVENT_NONE
 	dba SeenByTrainerScript     ; PLAYEREVENT_SEENBYTRAINER
 	dba TalkToTrainerScript     ; PLAYEREVENT_TALKTOTRAINER
 	dba FindItemInBallScript    ; PLAYEREVENT_ITEMBALL
@ -973,12 +973,12 @@ PlayerEventScriptPointers:
 	dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT
 	dba HatchEggScript          ; PLAYEREVENT_HATCH
 	dba ChangeDirectionScript   ; PLAYEREVENT_JOYCHANGEFACING
-	dba Invalid_0x96b60         ; (NUM_PLAYER_EVENTS)
+	dba InvalidEventScript      ; (NUM_PLAYER_EVENTS)

-Invalid_0x96b60:
+InvalidEventScript:
 	end

-; unused
+UnusedPlayerEventScript: ; unreferenced
 	end

 HatchEggScript:
@ -993,12 +993,12 @@ WarpToNewMapScript:
 FallIntoMapScript:
 	newloadmap MAPSETUP_FALL
 	playsound SFX_KINESIS
-	applymovement PLAYER, MovementData_0x96c48
+	applymovement PLAYER, .SkyfallMovement
 	playsound SFX_STRENGTH
 	scall LandAfterPitfallScript
 	end

-MovementData_0x96c48:
+.SkyfallMovement:
 	skyfall
 	step_end

--- a/engine/overworld/init_map.asm
+++ b/engine/overworld/init_map.asm
@ -64,11 +64,11 @@ ReanchorBGMap_NoOAMUpdate::
 	ldh [hOAMUpdate], a
 	ld a, 3
 	ldh [hBlackOutBGMapThird], a
-.asm_65bc
+.wait_loop
 	call DelayFrame
 	ldh a, [hBlackOutBGMapThird]
 	and a
-	jr nz, .asm_65bc
+	jr nz, .wait_loop
 	pop af
 	ldh [hOAMUpdate], a
 	pop af
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@ -168,7 +168,7 @@ LoadUsedSpritesGFX:
 	call GetUsedSprites
 	ret c

-	call _LoadMiscTiles
+	call LoadStillSpriteTiles
 	call LoadMiscTiles
 	ret

@ -213,27 +213,24 @@ GetUsedSprites:
 	scf
 	ret

-_LoadMiscTiles:
+LoadStillSpriteTiles:
 	ld a, [wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 2) * 2]
 	and a
-	jr z, .asm_14274
-
+	jr z, .no_still_sprite_1
 	call GetSprite
 	ld hl, vTiles0 tile $78
 	call Get2bpp
-
-.asm_14274
+.no_still_sprite_1
 	ld a, $78
 	ld [wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 2) * 2 + 1], a
+
 	ld a, [wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2]
 	and a
-	jr z, .asm_14288
-
+	jr z, .no_still_sprite_2
 	call GetSprite
 	ld hl, vTiles0 tile $7c
 	call Get2bpp
-
-.asm_14288
+.no_still_sprite_2
 	ld a, $7c
 	ld [wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2 + 1], a
 	ret
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@ -364,7 +364,7 @@ DoPlayerMovement::
 	and 7
 	ld e, a
 	ld d, 0
-	ld hl, .data_1021e
+	ld hl, .ledge_table
 	add hl, de
 	ld a, [wFacingDirection]
 	and [hl]
@ -382,7 +382,7 @@ DoPlayerMovement::
 	xor a
 	ret

-.data_1021e
+.ledge_table
 	db FACE_RIGHT             ; COLL_HOP_RIGHT
 	db FACE_LEFT              ; COLL_HOP_LEFT
 	db FACE_UP                ; COLL_HOP_UP
--- a/engine/phone/scripts/mom.asm
+++ b/engine/phone/scripts/mom.asm
@ -1,6 +1,6 @@
 MomPhoneCalleeScript:
 	checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
-	iftrue .script_10401f
+	iftrue .started_quest
 	checkevent EVENT_DUDE_TALKED_TO_YOU
 	iftrue MomPhoneLectureScript
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@ -9,7 +9,7 @@ MomPhoneCalleeScript:
 	iftrue MomPhoneNoPokedexScript
 	sjump MomPhoneNoPokemonScript

-.script_10401f
+.started_quest
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
 	iftrue MomPhoneHangUpScript
 	writetext MomPhoneGreetingText
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@ -498,16 +498,16 @@ _MovePKMNWithoutMail:
 	inc a
 	ld [wBillsPC_LoadedBox], a
 	call DelayFrame
-.asm_e2f6f
+.loop
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	bit 7, a
-	jr nz, .asm_e2f81
+	jr nz, .done
 	call .RunJumptable
 	call DelayFrame
-	jr .asm_e2f6f
+	jr .loop

-.asm_e2f81
+.done
 	call ClearSprites
 	pop af
 	ldh [hInMenu], a
--- a/engine/pokemon/mon_submenu.asm
+++ b/engine/pokemon/mon_submenu.asm
@ -245,7 +245,7 @@ AddMonMenuItem:
 	ret

 BattleMonMenu:
-	ld hl, MenuHeader_0x24e44
+	ld hl, .MenuHeader
 	call CopyMenuHeader
 	xor a
 	ldh [hBGMapMode], a
@ -276,13 +276,13 @@ BattleMonMenu:
 	and a
 	ret

-MenuHeader_0x24e44:
+.MenuHeader:
 	db 0 ; flags
 	menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw MenuData_0x24e4c
+	dw .MenuData
 	db 1 ; default option

-MenuData_0x24e4c:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "SWITCH@"
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@ -903,7 +903,7 @@ Printer_PlaceEmptyBoxSlotString:
 .loop
 	push bc
 	push hl
-	ld de, String84a21
+	ld de, .EmptyBoxSlotString
 	call PlaceString
 	pop hl
 	ld bc, 3 * SCREEN_WIDTH
@ -913,5 +913,5 @@ Printer_PlaceEmptyBoxSlotString:
 	jr nz, .loop
 	ret

-String84a21:
+.EmptyBoxSlotString:
 	db "  ------@"
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@ -28,7 +28,7 @@ PalPacket_BetaPoker:
 PalPacket_UnownPuzzle:
 	sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE

-PalPacket_Routes:
+PalPacket_AllPal0:
 	sgb_pal_set ROUTES, ROUTES, ROUTES, ROUTES

 PalPacket_GSIntroShellderLapras:
--- a/home/region.asm
+++ b/home/region.asm
@ -31,10 +31,10 @@ IsInJohto::
 	ld a, KANTO_REGION
 	ret

-Function2ffe::
+SetXYCompareFlags::
 	push hl
 	xor a
-	ld hl, wd17c
+	ld hl, wXYCompareFlags
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@ -52,13 +52,13 @@ Function2ffe::
 	add $4
 	ld d, a
 	ld a, [wPlayerStandingMapY]
-	ld a, $4 ; should be "add $4"?
+	ld a, $4 ; should be "add $4"
 	ld e, a
 	push bc
 	ld c, 0
 .loop
 	ld a, [hl]
-	cp $ff
+	cp -1 ; end?
 	jr z, .done
 	push hl
 	ld a, d
@ -68,7 +68,7 @@ Function2ffe::
 	ld a, e
 	cp [hl]
 	jr nz, .next
-	ld hl, wd17c
+	ld hl, wXYCompareFlags
 	ld b, SET_FLAG
 	push de
 	push bc
@ -83,7 +83,7 @@ Function2ffe::
 	inc hl
 	inc c
 	ld a, c
-	cp 32
+	cp MAX_XYCOMPARE_LENGTH
 	jr c, .loop
 .done
 	pop bc
--- a/wram.asm
+++ b/wram.asm
@ -2067,9 +2067,9 @@ wScriptTextAddr::
 	dw
 	ds 1
 wWildEncounterCooldown:: db
-wXYComparePointer:: dw

-wd17c:: flag_array 32
+wXYComparePointer:: dw
+wXYCompareFlags:: flag_array MAX_XYCOMPARE_LENGTH

 wBattleScriptFlags:: db
 	ds 1