Comment more ROM labels as unreferenced

(Some unreferenced labels are above code which is still used via fallthrough!)
This commit is contained in:
Rangi 2020-06-21 18:33:31 -04:00
parent 91774f206e
commit c3c18dd196
21 changed files with 50 additions and 53 deletions

View File

@ -25,7 +25,7 @@
const map_fade_music_and_palettes ; 06 const map_fade_music_and_palettes ; 06
const map_play_music_bike ; 07 const map_play_music_bike ; 07
const map_force_music ; 08 const map_force_music ; 08
const map_fade_in_music ; 09 const map_fade_in_to_music ; 09
const map_load_block_data ; 0a const map_load_block_data ; 0a
const map_load_connection_block_data ; 0b const map_load_connection_block_data ; 0b
const map_save_screen ; 0c const map_save_screen ; 0c

View File

@ -37,7 +37,7 @@ MapSetupScript_Warp:
db map_spawn_in_facing_down db map_spawn_in_facing_down
db map_refresh_sprites db map_refresh_sprites
db map_play_music_bike db map_play_music_bike
db map_fade_in_music db map_fade_in_to_music
db map_fade_in_palettes db map_fade_in_palettes
db map_activate_anims db map_activate_anims
db map_load_wild_mon_data db map_load_wild_mon_data

View File

@ -215,32 +215,32 @@ _OakTimeIsItText::
; Mobile Adapter ; Mobile Adapter
UnknownText_0x1bc384:: UnknownText_0x1bc384:: ; unreferenced
text "There is nothing" text "There is nothing"
line "connected." line "connected."
done done
UnknownText_0x1bc3a1:: UnknownText_0x1bc3a1:: ; unreferenced
text "Check cell phone" text "Check cell phone"
line "adapter." line "adapter."
done done
UnknownText_0x1bc3bc:: UnknownText_0x1bc3bc:: ; unreferenced
text "Check CDMA" text "Check CDMA"
line "adapter." line "adapter."
done done
UnknownText_0x1bc3d1:: UnknownText_0x1bc3d1:: ; unreferenced
text "Check DOCOMO PHS" text "Check DOCOMO PHS"
line "adapter." line "adapter."
done done
UnknownText_0x1bc3ec:: UnknownText_0x1bc3ec:: ; unreferenced
text "Check DDI PHS" text "Check DDI PHS"
line "adapter." line "adapter."
done done
UnknownText_0x1bc404:: UnknownText_0x1bc404:: ; unreferenced
text "Check unlimited" text "Check unlimited"
line "battle mobile" line "battle mobile"
cont "adapter." cont "adapter."
@ -1258,17 +1258,17 @@ UnknownText_0x1bd223::
text "Closing link." text "Closing link."
done done
UnknownText_0x1bd232:: UnknownText_0x1bd232:: ; unreferenced
text "Clear the time" text "Clear the time"
line "limit?" line "limit?"
done done
UnknownText_0x1bd249:: UnknownText_0x1bd249:: ; unreferenced
text "The time limit was" text "The time limit was"
line "cleared." line "cleared."
done done
UnknownText_0x1bd266:: UnknownText_0x1bd266:: ; unreferenced
text "Pick which packet" text "Pick which packet"
line "as an error?" line "as an error?"
done done

View File

@ -889,18 +889,15 @@ _MailMovedFromBoxText::
line "from the MAILBOX." line "from the MAILBOX."
prompt prompt
; unreferenced _YesPromptText:: ; unreferenced
_YesPromptText::
text "Yes" text "Yes"
prompt prompt
; unreferenced _NoPromptText:: ; unreferenced
_NoPromptText::
text "No" text "No"
prompt prompt
; unreferenced _AnimationTypeText:: ; unreferenced
_AnimationTypeText::
text_decimal wcf64, 1, 3 text_decimal wcf64, 1, 3
text " @" text " @"
text_ram wStringBuffer1 text_ram wStringBuffer1
@ -911,8 +908,7 @@ _AnimationTypeText::
text_end ; unreferenced text_end ; unreferenced
; unreferenced _MonNumberText:: ; unreferenced
_MonNumberText::
text "#MON number?" text "#MON number?"
done done
@ -1352,8 +1348,7 @@ _OakPCText4::
line "OAK's PC closed." line "OAK's PC closed."
done done
; unreferenced _TrainerRankingExplanationText:: ; unreferenced
_TrainerRankingExplanationText::
text "Triple-theme" text "Triple-theme"
line "trainer ranking!" line "trainer ranking!"
@ -1364,8 +1359,7 @@ _TrainerRankingExplanationText::
para "" para ""
done done
; unreferenced _TrainerRankingNoDataText:: ; unreferenced
_TrainerRankingNoDataText::
text "There is no" text "There is no"
line "ranking data." line "ranking data."

View File

@ -22,7 +22,7 @@ _GiveOddEgg:
jr z, .done jr z, .done
.not_done .not_done
; Break when [hRandom] <= de. ; Break when the random word <= the next probability in de.
ldh a, [hRandomSub] ldh a, [hRandomSub]
cp d cp d
jr c, .done jr c, .done

View File

@ -14,7 +14,7 @@ StdScripts::
add_stdscript TownMapScript add_stdscript TownMapScript
add_stdscript WindowScript add_stdscript WindowScript
add_stdscript TVScript add_stdscript TVScript
add_stdscript HomepageScript add_stdscript HomepageScript ; unused
add_stdscript Radio1Script add_stdscript Radio1Script
add_stdscript Radio2Script add_stdscript Radio2Script
add_stdscript TrashCanScript add_stdscript TrashCanScript

View File

@ -297,15 +297,15 @@ Function81adb:
hlcoord 1, 3 hlcoord 1, 3
lb bc, 7, 18 lb bc, 7, 18
ld a, DEBUGTEST_WHITE ld a, DEBUGTEST_WHITE
call Bank20_FillBoxWithByte call DebugColor_FillBoxWithByte
hlcoord 11, 0 hlcoord 11, 0
lb bc, 2, 3 lb bc, 2, 3
ld a, DEBUGTEST_LIGHT ld a, DEBUGTEST_LIGHT
call Bank20_FillBoxWithByte call DebugColor_FillBoxWithByte
hlcoord 16, 0 hlcoord 16, 0
lb bc, 2, 3 lb bc, 2, 3
ld a, DEBUGTEST_DARK ld a, DEBUGTEST_DARK
call Bank20_FillBoxWithByte call DebugColor_FillBoxWithByte
call Function81bc0 call Function81bc0
call Function81bf4 call Function81bf4
ld a, [wcf66] ld a, [wcf66]
@ -880,7 +880,7 @@ Function81ee3:
jr nz, .asm_81ee3 jr nz, .asm_81ee3
ret ret
Bank20_FillBoxWithByte: DebugColor_FillBoxWithByte:
; For some reason, we have another copy of FillBoxWithByte here ; For some reason, we have another copy of FillBoxWithByte here
.row .row
push bc push bc

View File

@ -69,7 +69,7 @@ MapSetupCommands:
dba FadeMapMusicAndPalettes ; 06 dba FadeMapMusicAndPalettes ; 06
dba PlayMapMusicBike ; 07 dba PlayMapMusicBike ; 07
dba ForceMapMusic ; 08 dba ForceMapMusic ; 08
dba FadeInMusic ; 09 dba FadeInToMusic ; 09
dba LoadBlockData ; 0a (callback 1) dba LoadBlockData ; 0a (callback 1)
dba LoadConnectionBlockData ; 0b dba LoadConnectionBlockData ; 0b
dba SaveScreen ; 0c dba SaveScreen ; 0c

View File

@ -190,10 +190,10 @@ INCLUDE "data/tilesets/underground_collision.asm"
TilesetDarkCaveGFX:: TilesetDarkCaveGFX::
INCBIN "gfx/tilesets/dark_cave.2bpp.lz" INCBIN "gfx/tilesets/dark_cave.2bpp.lz"
UnusedTilesetJohtoMeta:: UnusedTilesetJohtoMeta:: ; unreferenced
INCBIN "data/tilesets/unused_johto_metatiles.bin" INCBIN "data/tilesets/unused_johto_metatiles.bin"
UnusedTilesetJohtoColl:: UnusedTilesetJohtoColl:: ; unreferenced
INCLUDE "data/tilesets/unused_johto_collision.asm" INCLUDE "data/tilesets/unused_johto_collision.asm"

View File

@ -286,12 +286,12 @@ MinVolume::
ld [wVolume], a ld [wVolume], a
ret ret
Unused_FadeOutMusic:: FadeOutToMusic:: ; unreferenced
ld a, 4 ld a, 4
ld [wMusicFade], a ld [wMusicFade], a
ret ret
FadeInMusic:: FadeInToMusic::
ld a, 4 | (1 << MUSIC_FADE_IN_F) ld a, 4 | (1 << MUSIC_FADE_IN_F)
ld [wMusicFade], a ld [wMusicFade], a
ret ret

View File

@ -117,7 +117,7 @@ GetFarWRAMByte::
ldh a, [hFarByte] ldh a, [hFarByte]
ret ret
GetFarWRAMWord:: GetFarWRAMWord:: ; unreferenced
ldh [hTempBank], a ldh [hTempBank], a
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af

View File

@ -24,6 +24,7 @@ FarCall_hl::
ldh a, [hTempBank] ldh a, [hTempBank]
rst Bankswitch rst Bankswitch
call FarCall_JumpToHL call FarCall_JumpToHL
; fallthrough
ReturnFarCall:: ReturnFarCall::
; We want to retain the contents of f. ; We want to retain the contents of f.

View File

@ -337,6 +337,7 @@ Get2bpp::
ldh a, [rLCDC] ldh a, [rLCDC]
bit rLCDC_ENABLE, a bit rLCDC_ENABLE, a
jp nz, Request2bpp jp nz, Request2bpp
; fallthrough
Copy2bpp: Copy2bpp:
; copy c 2bpp tiles from b:de to hl ; copy c 2bpp tiles from b:de to hl
@ -366,6 +367,7 @@ Get1bpp::
ldh a, [rLCDC] ldh a, [rLCDC]
bit rLCDC_ENABLE, a bit rLCDC_ENABLE, a
jp nz, Request1bpp jp nz, Request1bpp
; fallthrough
Copy1bpp:: Copy1bpp::
; copy c 1bpp tiles from b:de to hl ; copy c 1bpp tiles from b:de to hl

View File

@ -261,19 +261,20 @@ StopAutoInput::
ld [wInputType], a ld [wInputType], a
ret ret
JoyTitleScreenInput:: JoyTitleScreenInput:: ; unreferenced
.loop .loop
call DelayFrame call DelayFrame
push bc push bc
call JoyTextDelay call JoyTextDelay
pop bc pop bc
; Save data can be deleted by pressing Up + B + Select.
ldh a, [hJoyDown] ldh a, [hJoyDown]
cp D_UP | SELECT | B_BUTTON cp D_UP | SELECT | B_BUTTON
jr z, .keycombo jr z, .keycombo
; Press Start or A to start the game.
ldh a, [hJoyLast] ldh a, [hJoyLast]
and START | A_BUTTON and START | A_BUTTON
jr nz, .keycombo jr nz, .keycombo

View File

@ -1109,14 +1109,14 @@ ObjectEventText::
text_far _ObjectEventText text_far _ObjectEventText
text_end text_end
BGEvent:: BGEvent:: ; unreferenced
jumptext BGEventText jumptext BGEventText
BGEventText:: BGEventText::
text_far _BGEventText text_far _BGEventText
text_end text_end
CoordinatesEvent:: CoordinatesEvent:: ; unreferenced
jumptext CoordinatesEventText jumptext CoordinatesEventText
CoordinatesEventText:: CoordinatesEventText::
@ -2047,7 +2047,7 @@ SwitchToAnyMapAttributesBank::
rst Bankswitch rst Bankswitch
ret ret
GetMapAttributesBank:: GetMapAttributesBank:: ; unreferenced
ld a, [wMapGroup] ld a, [wMapGroup]
ld b, a ld b, a
ld a, [wMapNumber] ld a, [wMapNumber]

View File

@ -282,8 +282,9 @@ MenuBoxCoord2Attr::
ld c, a ld c, a
ld a, [wMenuBorderTopCoord] ld a, [wMenuBorderTopCoord]
ld b, a ld b, a
; fallthrough
Coord2Attr:: Coord2Attr:: ; unreferenced
; Return the address of wAttrmap(c, b) in hl. ; Return the address of wAttrmap(c, b) in hl.
xor a xor a
ld h, a ld h, a
@ -835,7 +836,7 @@ InterpretBattleMenu::
ld a, [wMenuCursorBuffer] ld a, [wMenuCursorBuffer]
ret ret
InterpretMobileMenu:: InterpretMobileMenu:: ; unreferenced
ldh a, [hROMBank] ldh a, [hROMBank]
ld [wMenuData_2DMenuItemStringsBank], a ld [wMenuData_2DMenuItemStringsBank], a
farcall _InterpretMobileMenu farcall _InterpretMobileMenu

View File

@ -16,6 +16,7 @@ UpdateCGBPals::
ldh a, [hCGBPalUpdate] ldh a, [hCGBPalUpdate]
and a and a
ret z ret z
; fallthrough
ForceUpdateCGBPals:: ForceUpdateCGBPals::
ldh a, [rSVBK] ldh a, [rSVBK]

View File

@ -1,4 +1,4 @@
Cosine:: Cosine:: ; unreferenced
; a = d * cos(a * pi/32) ; a = d * cos(a * pi/32)
add %010000 ; cos(x) = sin(x + pi/2) add %010000 ; cos(x) = sin(x + pi/2)
; fallthrough ; fallthrough

View File

@ -149,7 +149,6 @@ hTileAnimFrame:: db
hLastTalked:: db hLastTalked:: db
hRandom::
hRandomAdd:: db hRandomAdd:: db
hRandomSub:: db hRandomSub:: db

View File

@ -519,9 +519,9 @@ INCBIN "gfx/mobile/ez_chat_cursor.2bpp"
Function8942b: Function8942b:
ld de, vTiles0 tile $02 ld de, vTiles0 tile $02
ld hl, CardLargeSpriteGFX ld hl, CardLargeSpriteAndFolderGFX
ld bc, 8 tiles ld bc, 8 tiles ; just the large card sprite
ld a, BANK(CardLargeSpriteGFX) ld a, BANK(CardLargeSpriteAndFolderGFX)
call FarCopyBytes call FarCopyBytes
ld de, vTiles0 tile $0a ld de, vTiles0 tile $0a
ld hl, CardSpriteGFX ld hl, CardSpriteGFX
@ -544,10 +544,10 @@ Function89448:
ret ret
Function89455: Function89455:
ld hl, CardLargeSpriteGFX ld hl, CardLargeSpriteAndFolderGFX
ld de, vTiles2 tile $0c ld de, vTiles2 tile $0c
ld bc, (8 + 65) tiles ld bc, (8 + 65) tiles ; large card sprite + folder
ld a, BANK(CardLargeSpriteGFX) ; aka BANK(CardFolderGFX) ld a, BANK(CardLargeSpriteAndFolderGFX)
call FarCopyBytes call FarCopyBytes
ret ret

View File

@ -10,10 +10,8 @@ INCBIN "gfx/mobile/kris_silhouette.2bpp"
MobileCard2GFX:: MobileCard2GFX::
INCBIN "gfx/mobile/card_2.2bpp" INCBIN "gfx/mobile/card_2.2bpp"
CardLargeSpriteGFX:: CardLargeSpriteAndFolderGFX::
INCBIN "gfx/mobile/card_large_sprite.2bpp" INCBIN "gfx/mobile/card_large_sprite.2bpp"
CardFolderGFX::
INCBIN "gfx/mobile/card_folder.2bpp" INCBIN "gfx/mobile/card_folder.2bpp"
CardSpriteGFX:: CardSpriteGFX::