More unreferenced labels cleanup

This commit is contained in:
xCrystal 2018-01-02 16:04:21 +01:00
parent 7a24703398
commit 6f0b81504d
48 changed files with 89 additions and 130 deletions

View File

@ -1951,8 +1951,7 @@ GetMaxHP: ; 3ccac
ret
; 3ccc2
GetHalfHP: ; 3ccc2
; unreferenced
Unreferenced_GetHalfHP: ; 3ccc2
ld hl, BattleMonHP
ld a, [hBattleTurn]
and a
@ -6769,8 +6768,7 @@ CheckUnownLetter: ; 3eb75
; 3ebc7
SwapBattlerLevels: ; 3ebc7
; unreferenced
Unreferenced_SwapBattlerLevels: ; 3ebc7
push bc
ld a, [BattleMonLevel]
ld b, a
@ -7162,7 +7160,7 @@ _LoadHPBar: ; 3eda6
ret
; 3edad
LoadHPExpBarGFX: ; unreferenced
Unreferenced_LoadHPExpBarGFX:
ld de, EnemyHPBarBorderGFX
ld hl, vTiles2 tile $6c
lb bc, BANK(EnemyHPBarBorderGFX), 4
@ -8104,7 +8102,7 @@ TextJump_ComeBack: ; 3f35b
db "@"
; 3f360
HandleSafariAngerEatingStatus: ; unreferenced
Unreferenced_HandleSafariAngerEatingStatus:
ld hl, wSafariMonEating
ld a, [hl]
and a
@ -8371,8 +8369,7 @@ StartBattle: ; 3f4c1
ret
; 3f4d9
_DoBattle: ; 3f4d9
; unreferenced
Unreferenced_DoBattle: ; 3f4d9
call DoBattle
ret
; 3f4dd

View File

@ -245,7 +245,7 @@ BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
db "CANCEL@"
; 0xe2564 (38:6564)
BillsPC_ClearThreeBoxes: ; e2564
Unreferenced_BillsPCClearThreeBoxes: ; e2564
; unreferenced
hlcoord 0, 0
ld b, 4

View File

@ -268,7 +268,7 @@ CopyBoxmonToTempMon: ; e5bb
call CloseSRAM
ret
Functione5d9: ; unreferenced
Unreferenced_Functione5d9:
ld a, [wCurBox]
cp b
jr z, .same_box

View File

@ -981,8 +981,7 @@ DayCareMonCompatibilityText: ; 1746c
db "@"
; 0x174b5
DayCareMonPrintEmptyString: ; 174b5
; unreferenced
Unreferenced_DayCareMonPrintEmptyString: ; 174b5
ld hl, .string
ret
; 174b9

View File

@ -43,8 +43,7 @@ CheckShininess:
and a
ret
; unreferenced
CheckContestMon:
Unreferenced_CheckContestMon:
; Check a mon's DVs at hl in the bug catching contest.
; Return carry if its DVs are good enough to place in the contest.
@ -135,8 +134,7 @@ SGB_ApplyPartyMenuHPPals: ; 8ade
ld [hl], e
ret
Function8b07:
; Unreferenced
Unreferenced_Function8b07:
call CheckCGB
ret z
; CGB only
@ -169,8 +167,7 @@ Function8b07:
RGB 08, 16, 28
RGB 00, 00, 00
Function8b3f:
; Unreferenced
Unreferenced_Function8b3f:
call CheckCGB
ret nz
ld a, [hSGB]

View File

@ -322,5 +322,5 @@ InitMG_Mobile_LinkTradePalMap: ; 49856
ret
; 4985a
Unknown_4985a: ; unreferenced
; unused
INCLUDE "data/palettes/unknown/4985a.asm"

View File

@ -1060,7 +1060,7 @@ Invalid_0x96c2d: ; 96c2d
end
; 96c2e
; unreferenced
; unused
end
; 96c2f

View File

@ -986,7 +986,7 @@ StrengthFunction: ; cce5
jr c, .Failed
jr .UseStrength
.AlreadyUsing: ; unreferenced
.Unreferenced_AlreadyUsing:
ld hl, .JumpText
call MenuTextBoxBackup
ld a, $80

View File

@ -10,7 +10,7 @@ _MainMenu: ; 5ae8
jp StartTitleScreen
; 5b04
; unreferenced
; unused
ret
; 5b05
@ -827,7 +827,7 @@ NamePlayer: ; 0x6074
db "KRIS@@@@@@@"
; 60e9
Function60e9: ; Unreferenced
Unreferenced_Function60e9:
call LoadMenuDataHeader
call VerticalMenu
ld a, [wMenuCursorY]
@ -1094,7 +1094,7 @@ RunTitleScreen: ; 627b
ret
; 6292
Function6292: ; 6292 ; unreferenced
Unreferenced_Function6292: ; 6292
ld a, [hVBlankCounter]
and $7
ret nz
@ -1125,7 +1125,7 @@ TitleScreenScene: ; 62a3
dw TitleScreenEnd
; 62b7
.NextScene: ; Unreferenced
.Unreferenced_NextScene:
ld hl, wJumptableIndex
inc [hl]
ret
@ -1329,7 +1329,7 @@ ResetClock: ; 6392
jp Init
; 639b
Function639b: ; unreferenced
Unreferenced_Function639b:
; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here.
ld a, [wTitleScreenTimer]
and $3

View File

@ -1597,8 +1597,7 @@ Function28b22: ; 28b22
ret
; 28b42
Function28b42: ; 28b42
; unreferenced
Unreferenced_Function28b42: ; 28b42
hlcoord 0, 16
ld a, "┘"
ld bc, 2 * SCREEN_WIDTH
@ -2020,8 +2019,7 @@ SetTradeRoomBGPals: ; 28eff
ret
; 28f09
Function28f09: ; 28f09
; unreferenced
Unreferenced_Function28f09: ; 28f09
hlcoord 0, 0
ld b, 6
ld c, 18
@ -2577,12 +2575,11 @@ Special_CableClubCheckWhichChris: ; 29f47
ret
; 29f54
UnusedGen1LinkCommsBorderGFX: ; 29f54
; unreferenced
Unreferenced_Gen1LinkCommsBorderGFX: ; 29f54
INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp"
; 29fe4
Function29fe4: ; unreferenced
Unreferenced_Function29fe4:
ld a, BANK(sPartyMail)
call GetSRAMBank
ld d, $0

View File

@ -279,7 +279,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
ret
.min
; unreferenced
; unused
db "min.@"
; 49e75

View File

@ -418,8 +418,7 @@ UpdatePlayerStep: ; 4738
ret
; 4759
Function4759: ; 4759
; unreferenced
Unreferenced_Function4759: ; 4759
push bc
ld e, a
ld d, 0

View File

@ -137,7 +137,7 @@ LoadObjectsRunCallback_02: ; 154d7
ret
; 154ea (5:54ea)
; unreferenced
; unused
ret
; 154eb

View File

@ -797,7 +797,7 @@ SellMenu: ; 15eb3
ret
; 15ed3
.NothingToSell: ; unreferenced
.Unreferenced_NothingToSell:
ld hl, .NothingToSellText
call MenuTextBoxBackup
and a

View File

@ -291,8 +291,7 @@ MobileMenuJoypad: ; 241ba
; 241d5
Function241d5: ; 241d5
; Unreferenced
Unreferenced_Function241d5: ; 241d5
call Place2DMenuCursor
.loop
call Move2DMenuCursor
@ -725,8 +724,7 @@ _ExitMenu:: ; 243e8
ret
; 24423
Function24423: ; 24423
; Unreferenced
Unreferenced_Function24423: ; 24423
ld a, [VramState]
bit 0, a
ret z

View File

@ -112,8 +112,8 @@ CoinString: ; 24b89
ShowMoney_TerminatorString: ; 24b8e
db "@"
Function24b8f: ; 24b8f
; unreferenced, related to safari?
Unreferenced_Function24b8f: ; 24b8f
; related to safari?
ld hl, Options
ld a, [hl]
push af

View File

@ -281,8 +281,7 @@ FlyFunction_GetMonIcon: ; 8e9bc (23:69bc)
ret
; 8e9cc (23:69cc)
GetMonIcon2: ; 8e9cc
; unreferenced
Unreferenced_GetMonIcon2: ; 8e9cc
push de
ld a, [wd265]
call ReadMonMenuIcon

View File

@ -1369,7 +1369,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
jr .gfx_loop
; 105232 (41:5232)
.Load6GFX: ; unreferenced
.Unreferenced_Load6GFX:
ld b, 6
jr .gfx_loop

View File

@ -279,7 +279,7 @@ WillObjectBumpIntoSomeoneElse: ; 7009
jr IsNPCAtCoord
; 7015
Function7015: ; unreferenced
Unreferenced_Function7015:
ld a, [hMapObjectIndexBuffer]
call GetObjectStruct
call .CheckWillBeFacingNPC
@ -482,7 +482,7 @@ IsObjectMovingOffEdgeOfScreen: ; 70ed
ret
; 7113
Function7113: ; unreferenced
Unreferenced_Function7113:
ld a, [PlayerStandingMapX]
ld d, a
ld a, [PlayerStandingMapY]

View File

@ -332,8 +332,7 @@ CopyTradeName: ; fcdf4
ret
; fcdfb
Functionfcdfb: ; fcdfb
; unreferenced
Unreferenced_Functionfcdfb: ; fcdfb
ld bc, 4
call CopyBytes
ld a, "@"
@ -341,8 +340,7 @@ Functionfcdfb: ; fcdfb
ret
; fce05
Functionfce05: ; fce05
; unreferenced
Unreferenced_Functionfce05: ; fce05
ld bc, 3
call CopyBytes
ld a, "@"

View File

@ -534,8 +534,7 @@ TossMenu: ; 10364
ret
; 1039d
ResetPocketCursorPositions: ; 1039d
; unreferenced
Unreferenced_ResetPocketCursorPositions: ; 1039d
ld a, [wCurrPocket]
and a
jr z, .items
@ -1511,8 +1510,7 @@ Pack_GetItemName: ; 10a1d
ret
; 10a2a
Pack_ClearTilemap: ; 10a2a
; unreferenced
Unreferenced_Pack_ClearTilemap: ; 10a2a
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, " "

View File

@ -81,7 +81,7 @@ PredefPointers:: ; 856b
add_predef InitSGBBorder ; $30
add_predef LoadSGBLayout
add_predef Pokedex_GetArea
add_predef CheckContestMon
add_predef Unreferenced_CheckContestMon
add_predef DoBattleTransition
add_predef DummyPredef35
add_predef DummyPredef36

View File

@ -1,4 +1,4 @@
CorrectErrorsInPlayerParty: ; unreferenced
Unreferenced_CorrectErrorsInPlayerParty:
ld hl, PartyCount
ld a, [hl]
and a

View File

@ -1,4 +1,4 @@
StopRTC: ; Unreferenced
Unreferenced_StopRTC:
ld a, SRAM_ENABLE
ld [MBC3SRamEnable], a
call LatchClock
@ -58,7 +58,7 @@ TimesOfDay: ; 14044
db -1, MORN_F
; 1404e
Unknown_1404e: ; unreferenced
Unreferenced_1404e:
db 20, NITE_F
db 40, MORN_F
db 60, DAY_F

View File

@ -2806,7 +2806,8 @@ Script_warpcheck:
farcall EnableEvents
ret
Script_enableevents: ; unreferenced
Script_enableevents:
; unused
farcall EnableEvents
ret
@ -3037,7 +3038,7 @@ Script_check_save:
ret
; unreferenced
; unused
ld a, [.byte]
ld [ScriptVar], a
ret

View File

@ -84,7 +84,7 @@ ScrollingMenuJoyAction: ; 24609
jr .loop
; 24640
.unreferenced ; unreferenced
.unreferenced ; unused
ld a, -1
and a
ret

View File

@ -232,8 +232,8 @@ SlotsLoop: ; 927af (24:67af)
; 92811 (24:6811)
Function92811: ; 92811
; unreferenced - debug function?
Unreferenced_Function92811: ; 92811
; debug function?
ld a, [wSlotBias]
add 0
daa
@ -252,8 +252,7 @@ Function92811: ; 92811
; 9282c
Function9282c: ; 9282c
; unreferenced
Unreferenced_Function9282c: ; 9282c
; animate OAM tiles?
ld hl, wcf66
ld a, [hl]
@ -854,8 +853,7 @@ Slots_UpdateReelPositionAndOAM: ; 92b53 (24:6b53)
; 92bbe (24:6bbe)
; unreferenced
Function92bbe: ; 92bbe
Unreferenced_Function92bbe: ; 92bbe
push hl
srl a
srl a

View File

@ -447,8 +447,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
dw wBufferMonNick
; 4df7f
Function4df7f: ; 4df7f
; unreferenced
Unreferenced_Function4df7f: ; 4df7f
hlcoord 7, 0
ld bc, SCREEN_WIDTH
ld d, SCREEN_HEIGHT
@ -962,8 +961,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307)
ret
; 4e32a (13:632a)
; unreferenced
Unknown_4e32a: ; 4e32a
Unreferenced_4e32a: ; 4e32a
; A blank tile?
ds 16
; 4e33a

View File

@ -447,8 +447,7 @@ TMHMPocket_GetCurrentLineCoord: ; 2ca86 (b:4a86)
ret
; 2ca95 (b:4a95)
Function2ca95: ; 2ca95
; unreferenced
Unreferenced_Function2ca95: ; 2ca95
pop hl
ld bc, 3
add hl, bc
@ -499,8 +498,7 @@ TMHM_PlaySFX_ReadText2: ; 2cad6 (b:4ad6)
ret
; 2cadf (b:4adf)
Function2cadf: ; 2cadf
; unreferenced
Unreferenced_Function2cadf: ; 2cadf
call ConvertCurItemIntoCurTMHM
call .CheckHaveRoomForTMHM
ld hl, .NoRoomText

View File

@ -117,8 +117,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7)
ld [wJumptableIndex], a
ret
.KantoCheck:
; unreferenced
.Unreferenced_KantoCheck:
ld a, [wKantoBadges]
and a
ret z
@ -163,8 +162,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221)
ld [wJumptableIndex], a
ret
.KantoCheck:
; unreferenced
.Unreferenced_KantoCheck:
ld a, [wKantoBadges]
and a
ret z

View File

@ -57,8 +57,7 @@ INCLUDE "home/predef.asm"
INCLUDE "home/window.asm"
INCLUDE "home/flag.asm"
Function2ebb:: ; 2ebb
; unreferenced
Unreferenced_Function2ebb:: ; 2ebb
ld a, [wMonStatusFlags]
bit 1, a
ret z
@ -79,8 +78,7 @@ xor_a_dec_a:: ; 2ec8
ret
; 2ecb
Function2ecb:: ; 2ecb
; unreferenced
Unreferenced_Function2ecb:: ; 2ecb
push hl
ld hl, wMonStatusFlags
bit 1, [hl]

View File

@ -502,10 +502,9 @@ GetMapMusic:: ; 3d97
ret
; 3d9f
Function3d9f:: ; 3d9f
Unreferenced_Function3d9f:: ; 3d9f
; Places a BCD number at the
; upper center of the screen.
; Unreferenced.
ld a, 4 * 8
ld [Sprites + 38 * 4], a
ld [Sprites + 39 * 4], a

View File

@ -1,8 +1,7 @@
; LCD handling
Function547:: ; 547
; Unreferenced
Unreferenced_Function547:: ; 547
ld a, [hLCDCPointer]
cp rSCX - $ff00
ret nz

View File

@ -1383,7 +1383,7 @@ UpdateBGMapColumn:: ; 27f8
ret
; 2816
; unreferenced
Unreferenced_Function2816::
ld hl, BGMapBuffer
ld bc, BGMapBufferEnd - BGMapBuffer
xor a

View File

@ -28,8 +28,7 @@ MenuTextBox:: ; 1d4f
jp PrintText
; 1d57
ret_1d57:: ; 1d57
; unreferenced
; unused
ret
; 1d58
@ -453,8 +452,7 @@ PlaceNthMenuStrings:: ; 1f8d
ret
; 1f9e
Function1f9e:: ; 1f9e
; unreferenced
Unreferenced_Function1f9e:: ; 1f9e
call GetMenuDataPointerTableEntry
inc hl
inc hl

View File

@ -127,8 +127,7 @@ Timer:: ; 3e93
reti
; 3ed7
Function3ed7:: ; 3ed7
; unreferenced
Unreferenced_Function3ed7:: ; 3ed7
ld [$dc02], a
ld a, [hROMBank]
push af
@ -160,8 +159,7 @@ Function3eea:: ; 3eea
ret
; 3efd
Function3efd:: ; 3efd
; unreferenced
Unreferenced_Function3efd:: ; 3efd
push hl
hlcoord 0, 12
ld b, 4

View File

@ -240,7 +240,7 @@ PrintWinLossText:: ; 3718
cp BATTLETYPE_CANLOSE
jr .canlose ; ??????????
; unreferenced
; unused
ld hl, wWinTextPointer
jr .ok

View File

@ -9515,8 +9515,7 @@ Function113eb8: ; 113eb8
jp Function111f97
; 113ec7
Function113ec7: ; 113ec7
; Unreferenced
Unreferenced_Function113ec7: ; 113ec7
ld hl, $c822
ld a, [hl]
push af

View File

@ -210,7 +210,7 @@ SECTION "bank13", ROMX
INCLUDE "engine/map_palettes.asm"
INCLUDE "tilesets/palette_maps.asm"
; unreferenced
; unused
; 0x4ce05
rept 26
db $06
@ -273,7 +273,7 @@ INCLUDE "engine/move_mon_wo_mail.asm"
INCLUDE "data/pokemon/base_stats.asm"
INCLUDE "data/pokemon/names.asm"
Unknown_53d84: ; unreferenced
Unreferenced_53d84:
db $1a, $15
db $33, $16
db $4b, $17

View File

@ -144,7 +144,7 @@ MapCeladonGameCornerSignpost9Script:
end
MovementData_0x721cd:
; Unreferenced.
; unused
step RIGHT
turn_head LEFT
step_end

View File

@ -634,8 +634,7 @@ SkipBattleTowerTrainer: ; 1704c9
ret
; 1704ca
Function1704ca: ; 1704ca
; unreferenced mobile function
Unreferenced_Function1704ca: ; 1704ca
ld a, [$be46]
cp $7
jr c, .asm_1704d3

View File

@ -1621,9 +1621,8 @@ Function48c63: ; 48c63
ret
; 48c8e
Function48c8e: ; 48c8e
; unreferenced
ld hl, $d02a
Unreferenced_Function48c8e: ; 48c8e
ld hl, wd019 + $11
ld d, h
ld e, l
farcall Function48c63

View File

@ -3093,7 +3093,7 @@ Function1013dd: ; 1013dd
ret
; 1013e1
Function1013e1: ; 1013e1 ; unreferenced
Unreferenced_Function1013e1: ; 1013e1
push de
inc de
ld b, a
@ -3130,7 +3130,7 @@ Function1013f5: ; 1013f5
ret
; 101400
Function101400: ; 101400 ; unreferenced
Unreferenced_Function101400: ; 101400
ld a, [de]
inc de
cp [hl]
@ -3318,7 +3318,7 @@ Function101507: ; 101507
ret
; 10151d
Function10151d: ; 10151d ; unreferenced
Unreferenced_Function10151d: ; 10151d
ld a, $34
call Function3e32
ld a, [wMobileCommsJumptableIndex]
@ -3513,7 +3513,7 @@ Function101663: ; 101663
ret
; 101674
Function101674: ; 101674 ; unreferenced
Unreferenced_Function101674: ; 101674
ld a, $05
ld hl, w5_dc00
call Function101635
@ -4402,7 +4402,7 @@ Function101cbc: ; 101cbc
ret
; 101cc2
Function101cc2: ; 101cc2 ; unreferenced
Unreferenced_Function101cc2: ; 101cc2
ld a, $02
ld [wcd2b], a
ret
@ -4683,7 +4683,7 @@ Function101e64: ; 101e64
ret
; 101e82
Function101e82: ; 101e82 ; unreferenced
Unreferenced_Function101e82: ; 101e82
call Function101ecc
ld a, [wMobileCommsJumptableIndex]
inc a
@ -4691,7 +4691,7 @@ Function101e82: ; 101e82 ; unreferenced
ret
; 101e8d
Function101e8d: ; 101e8d ; unreferenced
Unreferenced_Function101e8d: ; 101e8d
call Function101ed3
ld a, [wMobileCommsJumptableIndex]
inc a
@ -6506,7 +6506,7 @@ Function102b4e: ; 102b4e
ret
; 102b68
Function102b68: ; 102b68 ; unreferenced
Unreferenced_Function102b68: ; 102b68
xor a
ld hl, wWindowStackPointer
ld bc, $10

View File

@ -244,8 +244,7 @@ TrainerRankings_StepCount: mobile ; 10602e (41:602e)
ld hl, sTrainerRankingStepCount
jp TrainerRankings_Increment4Byte
; Unreferenced in English version.
TrainerRankings_BattleTowerWins: mobile ; 106035
Unreferenced_TrainerRankings_BattleTowerWins: mobile ; 106035
ld a, $5
call GetSRAMBank
ld a, [$aa8d]
@ -520,8 +519,7 @@ RestoreMobileEventIndex: ; 10619d (41:619d)
ret
; 1061b3 (41:61b3)
; Unreferenced in English version.
VerifyTrainerRankingsChecksum: ; 1061b3
Unreferenced_VerifyTrainerRankingsChecksum: ; 1061b3
call CalculateTrainerRankingsChecksum
ld hl, sTrainerRankingsChecksum
ld a, d

View File

@ -1825,7 +1825,7 @@ LZ_1090a7:
INCBIN "gfx/unknown/1090a7.tilemap.lz"
Palette_1090f7:
; unreferenced
; unused
RGB 31, 31, 31
RGB 0, 0, 0

View File

@ -1559,8 +1559,7 @@ IndexDownloadURL: ; 0x118ce5
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
Function118d35: ; 118d35
; unreferenced
Unreferenced_Function118d35: ; 118d35
ld hl, $d200
ld a, [wcd38]
and a
@ -6957,8 +6956,7 @@ Function11b397: ; 11b397
jr .loop
; 11b3b6
Function11b3b6: ; 11b3b6
; unreferenced
Unreferenced_Function11b3b6: ; 11b3b6
.loop
ld a, [hl]
cp -1

View File

@ -1,5 +1,4 @@
Function16c000: ; 16c000
; unreferenced
Unreferenced_Function16c000: ; 16c000
; Only for CGB
ld a, [hCGB]
and a

View File

@ -5246,7 +5246,7 @@ String_17fe63: ; 17fe63
next "せつめいしょを ごらんください"
db "@"
String_17fe9a: ; 17fe9a ; unreferenced
String_17fe9a: ; 17fe9a ; unused
db "ポケモンニュースが"
next "あたらしくなっているので"
next "レポートを おくれません"