ref: 6f0b81504d6471afe7df6adae83791cc81933ca6
parent: 7a24703398aba3ab112ed770368805a17c601c03
author: xCrystal <rgr.crystal@gmail.com>
date: Tue Jan 2 11:04:21 EST 2018
More unreferenced labels cleanup
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1951,8 +1951,7 @@
ret
; 3ccc2
-GetHalfHP: ; 3ccc2
-; unreferenced
+Unreferenced_GetHalfHP: ; 3ccc2
ld hl, BattleMonHP
ld a, [hBattleTurn]
and a
@@ -6769,8 +6768,7 @@
; 3ebc7
-SwapBattlerLevels: ; 3ebc7
-; unreferenced
+Unreferenced_SwapBattlerLevels: ; 3ebc7
push bc
ld a, [BattleMonLevel]
ld b, a
@@ -7162,7 +7160,7 @@
ret
; 3edad
-LoadHPExpBarGFX: ; unreferenced
+Unreferenced_LoadHPExpBarGFX:
ld de, EnemyHPBarBorderGFX
ld hl, vTiles2 tile $6c
lb bc, BANK(EnemyHPBarBorderGFX), 4
@@ -8104,7 +8102,7 @@
db "@"
; 3f360
-HandleSafariAngerEatingStatus: ; unreferenced
+Unreferenced_HandleSafariAngerEatingStatus:
ld hl, wSafariMonEating
ld a, [hl]
and a
@@ -8371,8 +8369,7 @@
ret
; 3f4d9
-_DoBattle: ; 3f4d9
-; unreferenced
+Unreferenced_DoBattle: ; 3f4d9
call DoBattle
ret
; 3f4dd
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -245,7 +245,7 @@
db "CANCEL@"
; 0xe2564 (38:6564)
-BillsPC_ClearThreeBoxes: ; e2564
+Unreferenced_BillsPCClearThreeBoxes: ; e2564
; unreferenced
hlcoord 0, 0
ld b, 4
--- a/engine/billspctop.asm
+++ b/engine/billspctop.asm
@@ -268,7 +268,7 @@
call CloseSRAM
ret
-Functione5d9: ; unreferenced
+Unreferenced_Functione5d9:
ld a, [wCurBox]
cp b
jr z, .same_box
--- a/engine/breeding.asm
+++ b/engine/breeding.asm
@@ -981,8 +981,7 @@
db "@"
; 0x174b5
-DayCareMonPrintEmptyString: ; 174b5
-; unreferenced
+Unreferenced_DayCareMonPrintEmptyString: ; 174b5
ld hl, .string
ret
; 174b9
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -43,8 +43,7 @@
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 @@
ld [hl], e
ret
-Function8b07:
-; Unreferenced
+Unreferenced_Function8b07:
call CheckCGB
ret z
; CGB only
@@ -169,8 +167,7 @@
RGB 08, 16, 28
RGB 00, 00, 00
-Function8b3f:
-; Unreferenced
+Unreferenced_Function8b3f:
call CheckCGB
ret nz
ld a, [hSGB]
--- a/engine/crystal_colors.asm
+++ b/engine/crystal_colors.asm
@@ -322,5 +322,5 @@
ret
; 4985a
-Unknown_4985a: ; unreferenced
+; unused
INCLUDE "data/palettes/unknown/4985a.asm"
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -1060,7 +1060,7 @@
end
; 96c2e
-; unreferenced
+; unused
end
; 96c2f
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -986,7 +986,7 @@
jr c, .Failed
jr .UseStrength
-.AlreadyUsing: ; unreferenced
+.Unreferenced_AlreadyUsing:
ld hl, .JumpText
call MenuTextBoxBackup
ld a, $80
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -10,7 +10,7 @@
jp StartTitleScreen
; 5b04
-; unreferenced
+; unused
ret
; 5b05
@@ -827,7 +827,7 @@
db "KRIS@@@@@@@"
; 60e9
-Function60e9: ; Unreferenced
+Unreferenced_Function60e9:
call LoadMenuDataHeader
call VerticalMenu
ld a, [wMenuCursorY]
@@ -1094,7 +1094,7 @@
ret
; 6292
-Function6292: ; 6292 ; unreferenced
+Unreferenced_Function6292: ; 6292
ld a, [hVBlankCounter]
and $7
ret nz
@@ -1125,7 +1125,7 @@
dw TitleScreenEnd
; 62b7
-.NextScene: ; Unreferenced
+.Unreferenced_NextScene:
ld hl, wJumptableIndex
inc [hl]
ret
@@ -1329,7 +1329,7 @@
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
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -1597,8 +1597,7 @@
ret
; 28b42
-Function28b42: ; 28b42
-; unreferenced
+Unreferenced_Function28b42: ; 28b42
hlcoord 0, 16
ld a, "┘"
ld bc, 2 * SCREEN_WIDTH
@@ -2020,8 +2019,7 @@
ret
; 28f09
-Function28f09: ; 28f09
-; unreferenced
+Unreferenced_Function28f09: ; 28f09
hlcoord 0, 0
ld b, 6
ld c, 18
@@ -2577,12 +2575,11 @@
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
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -279,7 +279,7 @@
ret
.min
-; unreferenced
+; unused
db "min.@"
; 49e75
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -418,8 +418,7 @@
ret
; 4759
-Function4759: ; 4759
-; unreferenced
+Unreferenced_Function4759: ; 4759
push bc
ld e, a
ld d, 0
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -137,7 +137,7 @@
ret
; 154ea (5:54ea)
-; unreferenced
+; unused
ret
; 154eb
--- a/engine/mart.asm
+++ b/engine/mart.asm
@@ -797,7 +797,7 @@
ret
; 15ed3
-.NothingToSell: ; unreferenced
+.Unreferenced_NothingToSell:
ld hl, .NothingToSellText
call MenuTextBoxBackup
and a
--- a/engine/menu.asm
+++ b/engine/menu.asm
@@ -291,8 +291,7 @@
; 241d5
-Function241d5: ; 241d5
-; Unreferenced
+Unreferenced_Function241d5: ; 241d5
call Place2DMenuCursor
.loop
call Move2DMenuCursor
@@ -725,8 +724,7 @@
ret
; 24423
-Function24423: ; 24423
-; Unreferenced
+Unreferenced_Function24423: ; 24423
ld a, [VramState]
bit 0, a
ret z
--- a/engine/menu_2.asm
+++ b/engine/menu_2.asm
@@ -112,8 +112,8 @@
ShowMoney_TerminatorString: ; 24b8e
db "@"
-Function24b8f: ; 24b8f
-; unreferenced, related to safari?
+Unreferenced_Function24b8f: ; 24b8f
+; related to safari?
ld hl, Options
ld a, [hl]
push af
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -281,8 +281,7 @@
ret
; 8e9cc (23:69cc)
-GetMonIcon2: ; 8e9cc
-; unreferenced
+Unreferenced_GetMonIcon2: ; 8e9cc
push de
ld a, [wd265]
call ReadMonMenuIcon
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -1369,7 +1369,7 @@
jr .gfx_loop
; 105232 (41:5232)
-.Load6GFX: ; unreferenced
+.Unreferenced_Load6GFX:
ld b, 6
jr .gfx_loop
--- a/engine/npc_movement.asm
+++ b/engine/npc_movement.asm
@@ -279,7 +279,7 @@
jr IsNPCAtCoord
; 7015
-Function7015: ; unreferenced
+Unreferenced_Function7015:
ld a, [hMapObjectIndexBuffer]
call GetObjectStruct
call .CheckWillBeFacingNPC
@@ -482,7 +482,7 @@
ret
; 7113
-Function7113: ; unreferenced
+Unreferenced_Function7113:
ld a, [PlayerStandingMapX]
ld d, a
ld a, [PlayerStandingMapY]
--- a/engine/npctrade.asm
+++ b/engine/npctrade.asm
@@ -332,8 +332,7 @@
ret
; fcdfb
-Functionfcdfb: ; fcdfb
-; unreferenced
+Unreferenced_Functionfcdfb: ; fcdfb
ld bc, 4
call CopyBytes
ld a, "@"
@@ -341,8 +340,7 @@
ret
; fce05
-Functionfce05: ; fce05
-; unreferenced
+Unreferenced_Functionfce05: ; fce05
ld bc, 3
call CopyBytes
ld a, "@"
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -534,8 +534,7 @@
ret
; 1039d
-ResetPocketCursorPositions: ; 1039d
-; unreferenced
+Unreferenced_ResetPocketCursorPositions: ; 1039d
ld a, [wCurrPocket]
and a
jr z, .items
@@ -1511,8 +1510,7 @@
ret
; 10a2a
-Pack_ClearTilemap: ; 10a2a
-; unreferenced
+Unreferenced_Pack_ClearTilemap: ; 10a2a
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, " "
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -81,7 +81,7 @@
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
--- a/engine/routines/correcterrorsinplayerparty.asm
+++ b/engine/routines/correcterrorsinplayerparty.asm
@@ -1,4 +1,4 @@
-CorrectErrorsInPlayerParty: ; unreferenced
+Unreferenced_CorrectErrorsInPlayerParty:
ld hl, PartyCount
ld a, [hl]
and a
--- a/engine/rtc.asm
+++ b/engine/rtc.asm
@@ -1,4 +1,4 @@
-StopRTC: ; Unreferenced
+Unreferenced_StopRTC:
ld a, SRAM_ENABLE
ld [MBC3SRamEnable], a
call LatchClock
@@ -58,7 +58,7 @@
db -1, MORN_F
; 1404e
-Unknown_1404e: ; unreferenced
+Unreferenced_1404e:
db 20, NITE_F
db 40, MORN_F
db 60, DAY_F
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2806,7 +2806,8 @@
farcall EnableEvents
ret
-Script_enableevents: ; unreferenced
+Script_enableevents:
+; unused
farcall EnableEvents
ret
@@ -3037,7 +3038,7 @@
ret
-; unreferenced
+; unused
ld a, [.byte]
ld [ScriptVar], a
ret
--- a/engine/scrolling_menu.asm
+++ b/engine/scrolling_menu.asm
@@ -84,7 +84,7 @@
jr .loop
; 24640
-.unreferenced ; unreferenced
+.unreferenced ; unused
ld a, -1
and a
ret
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -232,8 +232,8 @@
; 92811 (24:6811)
-Function92811: ; 92811
-; unreferenced - debug function?
+Unreferenced_Function92811: ; 92811
+; debug function?
ld a, [wSlotBias]
add 0
daa
@@ -252,8 +252,7 @@
; 9282c
-Function9282c: ; 9282c
-; unreferenced
+Unreferenced_Function9282c: ; 9282c
; animate OAM tiles?
ld hl, wcf66
ld a, [hl]
@@ -854,8 +853,7 @@
; 92bbe (24:6bbe)
-; unreferenced
-Function92bbe: ; 92bbe
+Unreferenced_Function92bbe: ; 92bbe
push hl
srl a
srl a
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -447,8 +447,7 @@
dw wBufferMonNick
; 4df7f
-Function4df7f: ; 4df7f
-; unreferenced
+Unreferenced_Function4df7f: ; 4df7f
hlcoord 7, 0
ld bc, SCREEN_WIDTH
ld d, SCREEN_HEIGHT
@@ -962,8 +961,7 @@
ret
; 4e32a (13:632a)
-; unreferenced
-Unknown_4e32a: ; 4e32a
+Unreferenced_4e32a: ; 4e32a
; A blank tile?
ds 16
; 4e33a
--- a/engine/tmhm2.asm
+++ b/engine/tmhm2.asm
@@ -447,8 +447,7 @@
ret
; 2ca95 (b:4a95)
-Function2ca95: ; 2ca95
-; unreferenced
+Unreferenced_Function2ca95: ; 2ca95
pop hl
ld bc, 3
add hl, bc
@@ -499,8 +498,7 @@
ret
; 2cadf (b:4adf)
-Function2cadf: ; 2cadf
-; unreferenced
+Unreferenced_Function2cadf: ; 2cadf
call ConvertCurItemIntoCurTMHM
call .CheckHaveRoomForTMHM
ld hl, .NoRoomText
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -117,8 +117,7 @@
ld [wJumptableIndex], a
ret
-.KantoCheck:
-; unreferenced
+.Unreferenced_KantoCheck:
ld a, [wKantoBadges]
and a
ret z
@@ -163,8 +162,7 @@
ld [wJumptableIndex], a
ret
-.KantoCheck:
-; unreferenced
+.Unreferenced_KantoCheck:
ld a, [wKantoBadges]
and a
ret z
--- a/home.asm
+++ b/home.asm
@@ -57,8 +57,7 @@
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 @@
ret
; 2ecb
-Function2ecb:: ; 2ecb
-; unreferenced
+Unreferenced_Function2ecb:: ; 2ecb
push hl
ld hl, wMonStatusFlags
bit 1, [hl]
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -502,10 +502,9 @@
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
--- a/home/lcd.asm
+++ b/home/lcd.asm
@@ -1,8 +1,7 @@
; LCD handling
-Function547:: ; 547
-; Unreferenced
+Unreferenced_Function547:: ; 547
ld a, [hLCDCPointer]
cp rSCX - $ff00
ret nz
--- a/home/map.asm
+++ b/home/map.asm
@@ -1383,7 +1383,7 @@
ret
; 2816
-; unreferenced
+Unreferenced_Function2816::
ld hl, BGMapBuffer
ld bc, BGMapBufferEnd - BGMapBuffer
xor a
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -28,8 +28,7 @@
jp PrintText
; 1d57
-ret_1d57:: ; 1d57
-; unreferenced
+; unused
ret
; 1d58
@@ -453,8 +452,7 @@
ret
; 1f9e
-Function1f9e:: ; 1f9e
-; unreferenced
+Unreferenced_Function1f9e:: ; 1f9e
call GetMenuDataPointerTableEntry
inc hl
inc hl
--- a/home/mobile.asm
+++ b/home/mobile.asm
@@ -127,8 +127,7 @@
reti
; 3ed7
-Function3ed7:: ; 3ed7
-; unreferenced
+Unreferenced_Function3ed7:: ; 3ed7
ld [$dc02], a
ld a, [hROMBank]
push af
@@ -160,8 +159,7 @@
ret
; 3efd
-Function3efd:: ; 3efd
-; unreferenced
+Unreferenced_Function3efd:: ; 3efd
push hl
hlcoord 0, 12
ld b, 4
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -240,7 +240,7 @@
cp BATTLETYPE_CANLOSE
jr .canlose ; ??????????
-; unreferenced
+; unused
ld hl, wWinTextPointer
jr .ok
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -9515,8 +9515,7 @@
jp Function111f97
; 113ec7
-Function113ec7: ; 113ec7
-; Unreferenced
+Unreferenced_Function113ec7: ; 113ec7
ld hl, $c822
ld a, [hl]
push af
--- a/main.asm
+++ b/main.asm
@@ -210,7 +210,7 @@
INCLUDE "engine/map_palettes.asm"
INCLUDE "tilesets/palette_maps.asm"
-; unreferenced
+; unused
; 0x4ce05
rept 26
db $06
@@ -273,7 +273,7 @@
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
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -144,7 +144,7 @@
end
MovementData_0x721cd:
-; Unreferenced.
+; unused
step RIGHT
turn_head LEFT
step_end
--- a/mobile/battle_tower_5c.asm
+++ b/mobile/battle_tower_5c.asm
@@ -634,8 +634,7 @@
ret
; 1704ca
-Function1704ca: ; 1704ca
-; unreferenced mobile function
+Unreferenced_Function1704ca: ; 1704ca
ld a, [$be46]
cp $7
jr c, .asm_1704d3
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -1621,9 +1621,8 @@
ret
; 48c8e
-Function48c8e: ; 48c8e
-; unreferenced
- ld hl, $d02a
+Unreferenced_Function48c8e: ; 48c8e
+ ld hl, wd019 + $11
ld d, h
ld e, l
farcall Function48c63
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -3093,7 +3093,7 @@
ret
; 1013e1
-Function1013e1: ; 1013e1 ; unreferenced
+Unreferenced_Function1013e1: ; 1013e1
push de
inc de
ld b, a
@@ -3130,7 +3130,7 @@
ret
; 101400
-Function101400: ; 101400 ; unreferenced
+Unreferenced_Function101400: ; 101400
ld a, [de]
inc de
cp [hl]
@@ -3318,7 +3318,7 @@
ret
; 10151d
-Function10151d: ; 10151d ; unreferenced
+Unreferenced_Function10151d: ; 10151d
ld a, $34
call Function3e32
ld a, [wMobileCommsJumptableIndex]
@@ -3513,7 +3513,7 @@
ret
; 101674
-Function101674: ; 101674 ; unreferenced
+Unreferenced_Function101674: ; 101674
ld a, $05
ld hl, w5_dc00
call Function101635
@@ -4402,7 +4402,7 @@
ret
; 101cc2
-Function101cc2: ; 101cc2 ; unreferenced
+Unreferenced_Function101cc2: ; 101cc2
ld a, $02
ld [wcd2b], a
ret
@@ -4683,7 +4683,7 @@
ret
; 101e82
-Function101e82: ; 101e82 ; unreferenced
+Unreferenced_Function101e82: ; 101e82
call Function101ecc
ld a, [wMobileCommsJumptableIndex]
inc a
@@ -4691,7 +4691,7 @@
ret
; 101e8d
-Function101e8d: ; 101e8d ; unreferenced
+Unreferenced_Function101e8d: ; 101e8d
call Function101ed3
ld a, [wMobileCommsJumptableIndex]
inc a
@@ -6506,7 +6506,7 @@
ret
; 102b68
-Function102b68: ; 102b68 ; unreferenced
+Unreferenced_Function102b68: ; 102b68
xor a
ld hl, wWindowStackPointer
ld bc, $10
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -244,8 +244,7 @@
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 @@
ret
; 1061b3 (41:61b3)
-; Unreferenced in English version.
-VerifyTrainerRankingsChecksum: ; 1061b3
+Unreferenced_VerifyTrainerRankingsChecksum: ; 1061b3
call CalculateTrainerRankingsChecksum
ld hl, sTrainerRankingsChecksum
ld a, d
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1825,7 +1825,7 @@
INCBIN "gfx/unknown/1090a7.tilemap.lz"
Palette_1090f7:
-; unreferenced
+; unused
RGB 31, 31, 31
RGB 0, 0, 0
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1559,8 +1559,7 @@
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 @@
jr .loop
; 11b3b6
-Function11b3b6: ; 11b3b6
-; unreferenced
+Unreferenced_Function11b3b6: ; 11b3b6
.loop
ld a, [hl]
cp -1
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -1,5 +1,4 @@
-Function16c000: ; 16c000
-; unreferenced
+Unreferenced_Function16c000: ; 16c000
; Only for CGB
ld a, [hCGB]
and a
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -5246,7 +5246,7 @@
next "せつめいしょを ごらんください"
db "@"
-String_17fe9a: ; 17fe9a ; unreferenced
+String_17fe9a: ; 17fe9a ; unused
db "ポケモンニュースが"
next "あたらしくなっているので"
next "レポートを おくれません"
--
⑨