Identify some more unnamed labels

This commit is contained in:
Rangi 2020-10-04 19:43:28 -04:00
parent 5a546068a8
commit 306c85750e
23 changed files with 66 additions and 66 deletions

View File

@ -3,7 +3,7 @@ BattleCommand_Metronome:
call ClearLastMove call ClearLastMove
call CheckUserIsCharging call CheckUserIsCharging
jr nz, .asm_3742b jr nz, .charging
ld a, [wBattleAnimParam] ld a, [wBattleAnimParam]
push af push af
@ -11,7 +11,7 @@ BattleCommand_Metronome:
pop af pop af
ld [wBattleAnimParam], a ld [wBattleAnimParam], a
.asm_3742b .charging
call LoadMoveAnim call LoadMoveAnim
.GetMove: .GetMove:

View File

@ -16,9 +16,9 @@ ProtectChance:
ld de, wPlayerProtectCount ld de, wPlayerProtectCount
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
jr z, .asm_37637 jr z, .got_count
ld de, wEnemyProtectCount ld de, wEnemyProtectCount
.asm_37637 .got_count
call CheckOpponentWentFirst call CheckOpponentWentFirst
jr nz, .failed jr nz, .failed

View File

@ -4,9 +4,9 @@ BattleCommand_Spikes:
ld hl, wEnemyScreens ld hl, wEnemyScreens
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
jr z, .asm_3768e jr z, .got_screens
ld hl, wPlayerScreens ld hl, wPlayerScreens
.asm_3768e .got_screens
; Fails if spikes are already down! ; Fails if spikes are already down!

View File

@ -1089,14 +1089,14 @@ TryStrengthOW:
WhirlpoolFunction: WhirlpoolFunction:
call FieldMoveJumptableReset call FieldMoveJumptableReset
.loop .loop
ld hl, Jumptable_cdae ld hl, .Jumptable
call FieldMoveJumptable call FieldMoveJumptable
jr nc, .loop jr nc, .loop
and $7f and $7f
ld [wFieldMoveSucceeded], a ld [wFieldMoveSucceeded], a
ret ret
Jumptable_cdae: .Jumptable:
dw .TryWhirlpool dw .TryWhirlpool
dw .DoWhirlpool dw .DoWhirlpool
dw .FailWhirlpool dw .FailWhirlpool

View File

@ -211,7 +211,7 @@ _PlayersHousePC:
ld b, PLAYERSPC_HOUSE ld b, PLAYERSPC_HOUSE
call _PlayersPC call _PlayersPC
and a and a
jr nz, .asm_156f9 jr nz, .changed_deco_tiles
call OverworldTextModeSwitch call OverworldTextModeSwitch
call ApplyTilemap call ApplyTilemap
call UpdateSprites call UpdateSprites
@ -219,7 +219,7 @@ _PlayersHousePC:
ld c, FALSE ld c, FALSE
ret ret
.asm_156f9 .changed_deco_tiles
call ClearBGPalettes call ClearBGPalettes
ld c, TRUE ld c, TRUE
ret ret

View File

@ -134,7 +134,7 @@ LoadSGBLayout:
ret ret
.SGB_MoveList: .SGB_MoveList:
ld hl, PalPacket_Routes ld hl, PalPacket_AllPal0
ld de, wSGBPals ld de, wSGBPals
ld bc, PALPACKET_LENGTH ld bc, PALPACKET_LENGTH
call CopyBytes call CopyBytes
@ -341,7 +341,7 @@ endr
ret ret
.SGB_MapPals: .SGB_MapPals:
ld hl, PalPacket_Routes ld hl, PalPacket_AllPal0
ld de, wSGBPals ld de, wSGBPals
ld bc, PALPACKET_LENGTH ld bc, PALPACKET_LENGTH
call CopyBytes call CopyBytes
@ -409,7 +409,7 @@ endr
ret ret
.SGB_Pokepic: .SGB_Pokepic:
ld hl, PalPacket_Routes ld hl, PalPacket_AllPal0
ld de, wSGBPals ld de, wSGBPals
ld bc, PALPACKET_LENGTH ld bc, PALPACKET_LENGTH
call CopyBytes call CopyBytes

View File

@ -1377,17 +1377,16 @@ HealPowderEffect:
jp c, StatusHealer_ExitMenu jp c, StatusHealer_ExitMenu
call UseStatusHealer call UseStatusHealer
cp FALSE
jr nz, .not_used
cp $0
jr nz, .asm_efc9
ld c, HAPPINESS_BITTERPOWDER ld c, HAPPINESS_BITTERPOWDER
farcall ChangeHappiness farcall ChangeHappiness
call LooksBitterMessage call LooksBitterMessage
ld a, $0 ld a, $0
.asm_efc9 .not_used
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
StatusHealingEffect: StatusHealingEffect:
@ -1401,7 +1400,7 @@ FullyHealStatus:
UseStatusHealer: UseStatusHealer:
call IsMonFainted call IsMonFainted
ld a, $1 ld a, TRUE
ret z ret z
call GetItemHealingAction call GetItemHealingAction
ld a, MON_STATUS ld a, MON_STATUS
@ -1410,7 +1409,7 @@ UseStatusHealer:
and c and c
jr nz, .good jr nz, .good
call IsItemUsedOnConfusedMon call IsItemUsedOnConfusedMon
ld a, $1 ld a, TRUE
ret nc ret nc
ld b, PARTYMENUTEXT_HEAL_CONFUSION ld b, PARTYMENUTEXT_HEAL_CONFUSION
.good .good
@ -1422,7 +1421,7 @@ UseStatusHealer:
call Play_SFX_FULL_HEAL call Play_SFX_FULL_HEAL
call ItemActionTextWaitButton call ItemActionTextWaitButton
call UseDisposableItem call UseDisposableItem
ld a, $0 ld a, FALSE
ret ret
IsItemUsedOnConfusedMon: IsItemUsedOnConfusedMon:
@ -1512,15 +1511,16 @@ RevivalHerbEffect:
jp c, StatusHealer_ExitMenu jp c, StatusHealer_ExitMenu
call RevivePokemon call RevivePokemon
cp 0 cp FALSE
jr nz, .asm_f0c5 jr nz, .not_used
ld c, HAPPINESS_REVIVALHERB ld c, HAPPINESS_REVIVALHERB
farcall ChangeHappiness farcall ChangeHappiness
call LooksBitterMessage call LooksBitterMessage
ld a, 0
.asm_f0c5 ld a, $0
.not_used
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
ReviveEffect: ReviveEffect:
@ -1533,7 +1533,7 @@ ReviveEffect:
RevivePokemon: RevivePokemon:
call IsMonFainted call IsMonFainted
ld a, 1 ld a, TRUE
ret nz ret nz
ld a, [wBattleMode] ld a, [wBattleMode]
and a and a
@ -1574,7 +1574,7 @@ RevivePokemon:
ld [wPartyMenuActionText], a ld [wPartyMenuActionText], a
call ItemActionTextWaitButton call ItemActionTextWaitButton
call UseDisposableItem call UseDisposableItem
ld a, 0 ld a, FALSE
ret ret
FullRestoreEffect: FullRestoreEffect:

View File

@ -1435,7 +1435,7 @@ Function28926:
call DelayFrames call DelayFrames
farcall ValidateOTTrademon farcall ValidateOTTrademon
jr c, .abnormal jr c, .abnormal
farcall Functionfb5dd farcall CheckAnyOtherAliveMonsForTrade
jp nc, LinkTrade jp nc, LinkTrade
xor a xor a
ld [wcf57], a ld [wcf57], a

View File

@ -64,7 +64,7 @@ ValidateOTTrademon:
scf scf
ret ret
Functionfb5dd: CheckAnyOtherAliveMonsForTrade:
ld a, [wd002] ld a, [wd002]
ld d, a ld d, a
ld a, [wPartyCount] ld a, [wPartyCount]

View File

@ -690,7 +690,7 @@ _ExitMenu::
dec [hl] dec [hl]
ret ret
Function24423: ; unreferenced RestoreOverworldMapTiles: ; unreferenced
ld a, [wVramState] ld a, [wVramState]
bit 0, a bit 0, a
ret z ret z

View File

@ -28,17 +28,17 @@ PlaceMenuItemQuantity:
ret ret
PlaceMoneyTopRight: PlaceMoneyTopRight:
ld hl, MenuHeader_0x24b15 ld hl, MoneyTopRightMenuHeader
call CopyMenuHeader call CopyMenuHeader
jr PlaceMoneyTextbox jr PlaceMoneyTextbox
PlaceMoneyBottomLeft: PlaceMoneyBottomLeft:
ld hl, MenuHeader_0x24b1d ld hl, MoneyBottomLeftMenuHeader
call CopyMenuHeader call CopyMenuHeader
jr PlaceMoneyTextbox jr PlaceMoneyTextbox
PlaceMoneyAtTopLeftOfTextbox: PlaceMoneyAtTopLeftOfTextbox:
ld hl, MenuHeader_0x24b15 ld hl, MoneyTopRightMenuHeader
lb de, 0, 11 lb de, 0, 11
call OffsetMenuHeader call OffsetMenuHeader
@ -52,13 +52,13 @@ PlaceMoneyTextbox:
call PrintNum call PrintNum
ret ret
MenuHeader_0x24b15: MoneyTopRightMenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, 2 menu_coords 11, 0, SCREEN_WIDTH - 1, 2
dw NULL dw NULL
db 1 ; default option db 1 ; default option
MenuHeader_0x24b1d: MoneyBottomLeftMenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 11, 8, 13 menu_coords 0, 11, 8, 13
dw NULL dw NULL

View File

@ -158,7 +158,7 @@ CmdQueue_Null:
ret ret
CmdQueue_Type1: CmdQueue_Type1:
call Function2f3e call SetXYCompareFlags
ret ret
CmdQueue_Type4: CmdQueue_Type4:

View File

@ -834,7 +834,7 @@ WhichSidePutAwayText:
DecoAction_AskWhichSide: DecoAction_AskWhichSide:
call MenuTextbox call MenuTextbox
ld hl, MenuHeader_0x26eab ld hl, DecoSideMenuHeader
call GetMenu2 call GetMenu2
call ExitMenu call ExitMenu
call CopyMenuData call CopyMenuData
@ -867,13 +867,13 @@ QueryWhichSide:
pop de pop de
ret ret
MenuHeader_0x26eab: DecoSideMenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 13, 7 menu_coords 0, 0, 13, 7
dw MenuData_0x26eb3 dw .MenuData
db 1 ; default option db 1 ; default option
MenuData_0x26eb3: .MenuData:
db STATICMENU_CURSOR ; flags db STATICMENU_CURSOR ; flags
db 3 ; items db 3 ; items
db "RIGHT SIDE@" db "RIGHT SIDE@"

View File

@ -399,7 +399,7 @@ SetMinTwoStepWildEncounterCooldown:
Dummy_CheckScriptFlags3Bit5: Dummy_CheckScriptFlags3Bit5:
call CheckBit5_ScriptFlags3 call CheckBit5_ScriptFlags3
ret z ret z
call Function2f3e call SetXYCompareFlags
ret ret
RunSceneScript: RunSceneScript:
@ -975,7 +975,7 @@ DoPlayerEvent:
PlayerEventScriptPointers: PlayerEventScriptPointers:
; entries correspond to PLAYEREVENT_* constants ; entries correspond to PLAYEREVENT_* constants
dba Invalid_0x96c2d ; PLAYEREVENT_NONE dba InvalidEventScript ; PLAYEREVENT_NONE
dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER
dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER
dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL
@ -985,12 +985,12 @@ PlayerEventScriptPointers:
dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT
dba HatchEggScript ; PLAYEREVENT_HATCH dba HatchEggScript ; PLAYEREVENT_HATCH
dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING
dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS) dba InvalidEventScript ; (NUM_PLAYER_EVENTS)
Invalid_0x96c2d: InvalidEventScript:
end end
; unused UnusedPlayerEventScript: ; unreferenced
end end
HatchEggScript: HatchEggScript:
@ -1005,12 +1005,12 @@ WarpToNewMapScript:
FallIntoMapScript: FallIntoMapScript:
newloadmap MAPSETUP_FALL newloadmap MAPSETUP_FALL
playsound SFX_KINESIS playsound SFX_KINESIS
applymovement PLAYER, MovementData_0x96c48 applymovement PLAYER, .SkyfallMovement
playsound SFX_STRENGTH playsound SFX_STRENGTH
scall LandAfterPitfallScript scall LandAfterPitfallScript
end end
MovementData_0x96c48: .SkyfallMovement:
skyfall skyfall
step_end step_end
@ -1018,10 +1018,10 @@ LandAfterPitfallScript:
earthquake 16 earthquake 16
end end
EdgeWarpScript: ; 4 EdgeWarpScript:
reloadend MAPSETUP_CONNECTION reloadend MAPSETUP_CONNECTION
ChangeDirectionScript: ; 9 ChangeDirectionScript:
deactivatefacing 3 deactivatefacing 3
callasm EnableWildEncounters callasm EnableWildEncounters
end end

View File

@ -364,7 +364,7 @@ DoPlayerMovement::
and 7 and 7
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, .data_8021e ld hl, .ledge_table
add hl, de add hl, de
ld a, [wFacingDirection] ld a, [wFacingDirection]
and [hl] and [hl]
@ -382,7 +382,7 @@ DoPlayerMovement::
xor a xor a
ret ret
.data_8021e .ledge_table
db FACE_RIGHT ; COLL_HOP_RIGHT db FACE_RIGHT ; COLL_HOP_RIGHT
db FACE_LEFT ; COLL_HOP_LEFT db FACE_LEFT ; COLL_HOP_LEFT
db FACE_UP ; COLL_HOP_UP db FACE_UP ; COLL_HOP_UP

View File

@ -1,6 +1,6 @@
MomPhoneCalleeScript: MomPhoneCalleeScript:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iftrue .bcec5 iftrue .started_quest
checkevent EVENT_DUDE_TALKED_TO_YOU checkevent EVENT_DUDE_TALKED_TO_YOU
iftrue MomPhoneLectureScript iftrue MomPhoneLectureScript
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@ -9,7 +9,7 @@ MomPhoneCalleeScript:
iftrue MomPhoneNoPokedexScript iftrue MomPhoneNoPokedexScript
sjump MomPhoneNoPokemonScript sjump MomPhoneNoPokemonScript
.bcec5 .started_quest
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
iftrue MomPhoneHangUpScript iftrue MomPhoneHangUpScript
farwritetext MomPhoneGreetingText farwritetext MomPhoneGreetingText

View File

@ -513,16 +513,16 @@ _MovePKMNWithoutMail:
inc a inc a
ld [wBillsPC_LoadedBox], a ld [wBillsPC_LoadedBox], a
call DelayFrame call DelayFrame
.asm_e2781 .loop
call JoyTextDelay call JoyTextDelay
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit 7, a
jr nz, .asm_e2793 jr nz, .done
call .RunJumptable call .RunJumptable
call DelayFrame call DelayFrame
jr .asm_e2781 jr .loop
.asm_e2793 .done
call ClearSprites call ClearSprites
pop af pop af
ldh [hInMenu], a ldh [hInMenu], a

View File

@ -245,7 +245,7 @@ AddMonMenuItem:
ret ret
BattleMonMenu: BattleMonMenu:
ld hl, MenuHeader_0x24ed4 ld hl, .MenuHeader
call CopyMenuHeader call CopyMenuHeader
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
@ -276,13 +276,13 @@ BattleMonMenu:
and a and a
ret ret
MenuHeader_0x24ed4: .MenuHeader:
db 0 ; flags db 0 ; flags
menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24edc dw .MenuData
db 1 ; default option db 1 ; default option
MenuData_0x24edc: .MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3 ; items db 3 ; items
db "SWITCH@" db "SWITCH@"

View File

@ -907,7 +907,7 @@ Printer_PlaceEmptyBoxSlotString:
.loop .loop
push bc push bc
push hl push hl
ld de, String84a25 ld de, .EmptyBoxSlotString
call PlaceString call PlaceString
pop hl pop hl
ld bc, 3 * SCREEN_WIDTH ld bc, 3 * SCREEN_WIDTH
@ -917,5 +917,5 @@ Printer_PlaceEmptyBoxSlotString:
jr nz, .loop jr nz, .loop
ret ret
String84a25: .EmptyBoxSlotString:
db " ------@" db " ------@"

View File

@ -28,7 +28,7 @@ PalPacket_BetaPoker:
PalPacket_UnownPuzzle: PalPacket_UnownPuzzle:
sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
PalPacket_Routes: PalPacket_AllPal0:
sgb_pal_set ROUTES, ROUTES, ROUTES, ROUTES sgb_pal_set ROUTES, ROUTES, ROUTES, ROUTES
PalPacket_GSIntroShellderLapras: PalPacket_GSIntroShellderLapras:

View File

@ -31,5 +31,5 @@ IsInJohto::
ld a, KANTO_REGION ld a, KANTO_REGION
ret ret
Function2f3e:: ; dummied out SetXYCompareFlags:: ; dummied out
ret ret

View File

@ -5276,7 +5276,7 @@ Function10250c:
call Function102b9c call Function102b9c
call Function102bdc call Function102bdc
jr c, .asm_10256d jr c, .asm_10256d
farcall Functionfb5dd farcall CheckAnyOtherAliveMonsForTrade
jr c, .asm_102568 jr c, .asm_102568
ld hl, wcd4b ld hl, wcd4b
set 1, [hl] set 1, [hl]

View File

@ -2448,8 +2448,8 @@ wScriptTextAddr::
dw dw
ds 1 ds 1
wWildEncounterCooldown:: db wWildEncounterCooldown:: db
wXYComparePointer:: dw
wXYComparePointer:: dw
ds 4 ds 4
wBattleScriptFlags:: db wBattleScriptFlags:: db