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 CheckUserIsCharging
jr nz, .asm_3742b
jr nz, .charging
ld a, [wBattleAnimParam]
push af
@ -11,7 +11,7 @@ BattleCommand_Metronome:
pop af
ld [wBattleAnimParam], a
.asm_3742b
.charging
call LoadMoveAnim
.GetMove:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -399,7 +399,7 @@ SetMinTwoStepWildEncounterCooldown:
Dummy_CheckScriptFlags3Bit5:
call CheckBit5_ScriptFlags3
ret z
call Function2f3e
call SetXYCompareFlags
ret
RunSceneScript:
@ -975,7 +975,7 @@ DoPlayerEvent:
PlayerEventScriptPointers:
; entries correspond to PLAYEREVENT_* constants
dba Invalid_0x96c2d ; PLAYEREVENT_NONE
dba InvalidEventScript ; PLAYEREVENT_NONE
dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER
dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER
dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL
@ -985,12 +985,12 @@ PlayerEventScriptPointers:
dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT
dba HatchEggScript ; PLAYEREVENT_HATCH
dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING
dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS)
dba InvalidEventScript ; (NUM_PLAYER_EVENTS)
Invalid_0x96c2d:
InvalidEventScript:
end
; unused
UnusedPlayerEventScript: ; unreferenced
end
HatchEggScript:
@ -1005,12 +1005,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
@ -1018,10 +1018,10 @@ LandAfterPitfallScript:
earthquake 16
end
EdgeWarpScript: ; 4
EdgeWarpScript:
reloadend MAPSETUP_CONNECTION
ChangeDirectionScript: ; 9
ChangeDirectionScript:
deactivatefacing 3
callasm EnableWildEncounters
end

View File

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

View File

@ -1,6 +1,6 @@
MomPhoneCalleeScript:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iftrue .bcec5
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
.bcec5
.started_quest
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
iftrue MomPhoneHangUpScript
farwritetext MomPhoneGreetingText

View File

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

View File

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

View File

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

View File

@ -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:

View File

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

View File

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

View File

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