summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-21 18:33:40 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-21 18:33:40 -0400
commitf680408489f026cce3d1d3344bc3d944a679e5aa (patch)
treeb6f8e8f945d899e8a5d4fe6e0b8e56931f9b0b7f
parent9dee89fae39ce638beed51edbc3f837a6222bd68 (diff)
Comment more ROM labels as unreferenced
(Some unreferenced labels are above code which is still used via fallthrough!)
-rw-r--r--constants/map_setup_constants.asm2
-rw-r--r--data/maps/setup_scripts.asm2
-rw-r--r--engine/events/std_scripts.asm2
-rw-r--r--engine/overworld/map_setup.asm2
-rw-r--r--gfx/tilesets.asm4
-rw-r--r--home/audio.asm4
-rw-r--r--home/farcall.asm3
-rw-r--r--home/gfx.asm9
-rw-r--r--home/joypad.asm5
-rw-r--r--home/map.asm6
-rw-r--r--home/palettes.asm3
-rw-r--r--home/serial.asm2
-rw-r--r--home/sine.asm2
-rw-r--r--home/sprite_anims.asm2
-rw-r--r--home/text.asm8
-rw-r--r--hram.asm1
16 files changed, 30 insertions, 27 deletions
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index b38a3c52..fa3d3596 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -24,7 +24,7 @@
const map_fade_music_and_palettes ; 06
const map_play_music_bike ; 07
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_connection_block_data ; 0b
const map_save_screen ; 0c
diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm
index e4dbb927..114d809b 100644
--- a/data/maps/setup_scripts.asm
+++ b/data/maps/setup_scripts.asm
@@ -35,7 +35,7 @@ MapSetupScript_Warp:
db map_spawn_in_facing_down
db map_refresh_sprites
db map_play_music_bike
- db map_fade_in_music
+ db map_fade_in_to_music
db map_fade_in_palettes
db map_activate_anims
db map_load_wild_mon_data
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 0ec1e76c..c21c3347 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -14,7 +14,7 @@ StdScripts::
add_stdscript TownMapScript
add_stdscript WindowScript
add_stdscript TVScript
- add_stdscript HomepageScript
+ add_stdscript HomepageScript ; unused
add_stdscript Radio1Script
add_stdscript Radio2Script
add_stdscript TrashCanScript
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm
index 210a7b0f..e5800ba8 100644
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -69,7 +69,7 @@ MapSetupCommands:
dba FadeMapMusicAndPalettes ; 06
dba PlayMapMusicBike ; 07
dba ForceMapMusic ; 08
- dba FadeInMusic ; 09
+ dba FadeInToMusic ; 09
dba LoadBlockData ; 0a (callback 1)
dba LoadConnectionBlockData ; 0b
dba SaveScreen ; 0c
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index bda2a5ee..47b66ffb 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -35,10 +35,10 @@ INCBIN "data/tilesets/johto_modern_metatiles.bin"
TilesetJohtoModernColl::
INCLUDE "data/tilesets/johto_modern_collision.asm"
-UnusedTilesetJohtoMeta::
+UnusedTilesetJohtoMeta:: ; unreferenced
INCBIN "data/tilesets/unused_johto_metatiles.bin"
-UnusedTilesetJohtoColl::
+UnusedTilesetJohtoColl:: ; unreferenced
INCLUDE "data/tilesets/unused_johto_collision.asm"
TilesetTraditionalHouseGFX::
diff --git a/home/audio.asm b/home/audio.asm
index e4e5df03..9b750d49 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -259,12 +259,12 @@ MinVolume::
ld [wVolume], a
ret
-Unused_FadeOutMusic::
+FadeOutToMusic:: ; unreferenced
ld a, 4
ld [wMusicFade], a
ret
-FadeInMusic::
+FadeInToMusic::
ld a, 4 | (1 << MUSIC_FADE_IN_F)
ld [wMusicFade], a
ret
diff --git a/home/farcall.asm b/home/farcall.asm
index 0c8e9e39..5416bd7e 100644
--- a/home/farcall.asm
+++ b/home/farcall.asm
@@ -8,8 +8,9 @@ FarCall_hl::
ld a, [wTempBank]
rst Bankswitch
call FarCall_JumpToHL
+ ; fallthrough
-ReturnFarCall::
+ReturnFarCall:: ; unreferenced
; We want to retain the contents of f.
; To do this, we can pop to bc instead of af.
diff --git a/home/gfx.asm b/home/gfx.asm
index dd41ce51..3b2417c8 100644
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -1,6 +1,6 @@
TILES_PER_CYCLE EQU 8
-FarCopyBytesDouble_DoubleBankSwitch::
+FarCopyBytesDouble_DoubleBankSwitch:: ; unreferenced
ld b, a
ldh a, [hROMBank]
push af
@@ -206,8 +206,9 @@ Get2bpp::
ldh a, [rLCDC]
bit rLCDC_ENABLE, a
jp nz, Request2bpp
+ ; fallthrough
-Copy2bpp:
+Copy2bpp: ; unreferenced
; copy c 2bpp tiles from b:de to hl
push hl
@@ -235,8 +236,9 @@ Get1bpp::
ldh a, [rLCDC]
bit rLCDC_ENABLE, a
jp nz, Request1bpp
+ ; fallthrough
-Copy1bpp::
+Copy1bpp:: ; unreferenced
; copy c 1bpp tiles from b:de to hl
push de
@@ -264,6 +266,7 @@ DuplicateGet2bpp:: ; unreferenced
ldh a, [rLCDC]
add a
jp c, Request2bpp
+ ; fallthrough
DuplicateCopy2bpp: ; unreferenced
push de
diff --git a/home/joypad.asm b/home/joypad.asm
index fd441178..66d5649e 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -261,19 +261,20 @@ StopAutoInput::
ld [wInputType], a
ret
-JoyTitleScreenInput::
+JoyTitleScreenInput:: ; unreferenced
.loop
-
call DelayFrame
push bc
call JoyTextDelay
pop bc
+; Save data can be deleted by pressing Up + B + Select.
ldh a, [hJoyDown]
cp D_UP | SELECT | B_BUTTON
jr z, .keycombo
+; Press Start or A to start the game.
ldh a, [hJoyLast]
and START | A_BUTTON
jr nz, .keycombo
diff --git a/home/map.asm b/home/map.asm
index 22ea0b06..0fa63ec0 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -1014,14 +1014,14 @@ ObjectEventText::
text_far _ObjectEventText
text_end
-BGEvent::
+BGEvent:: ; unreferenced
jumptext BGEventText
BGEventText::
text_far _BGEventText
text_end
-CoordinatesEvent::
+CoordinatesEvent:: ; unreferenced
jumptext CoordinatesEventText
CoordinatesEventText::
@@ -1915,7 +1915,7 @@ SwitchToAnyMapAttributesBank::
rst Bankswitch
ret
-GetMapAttributesBank::
+GetMapAttributesBank:: ; unreferenced
ld a, [wMapGroup]
ld b, a
ld a, [wMapNumber]
diff --git a/home/palettes.asm b/home/palettes.asm
index 330233af..4c98b1df 100644
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -16,8 +16,9 @@ UpdateCGBPals::
ldh a, [hCGBPalUpdate]
and a
ret z
+ ; fallthrough
-ForceUpdateCGBPals::
+ForceUpdateCGBPals:: ; unreferenced
ld hl, wBGPals2
; copy 8 pals to bgpd
diff --git a/home/serial.asm b/home/serial.asm
index be00058d..1bae8039 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -270,7 +270,7 @@ Serial_PrintWaitingTextAndSyncAndExchangeNybble::
call WaitLinkTransfer
jp SafeLoadTempTilemapToTilemap
-Serial_SyncAndExchangeNybble::
+Serial_SyncAndExchangeNybble:: ; unreferenced
call LoadTilemapToTempTilemap
callfar PlaceWaitingText
jp WaitLinkTransfer
diff --git a/home/sine.asm b/home/sine.asm
index 821f7c47..3601e1eb 100644
--- a/home/sine.asm
+++ b/home/sine.asm
@@ -1,4 +1,4 @@
-Cosine::
+Cosine:: ; unreferenced
; a = d * cos(a * pi/32)
add %010000 ; cos(x) = sin(x + pi/2)
; fallthrough
diff --git a/home/sprite_anims.asm b/home/sprite_anims.asm
index e20c63ac..67f36fe2 100644
--- a/home/sprite_anims.asm
+++ b/home/sprite_anims.asm
@@ -14,7 +14,7 @@ InitSpriteAnimStruct::
ret
-ReinitSpriteAnimFrame::
+ReinitSpriteAnimFrame:: ; unreferenced
ld [wSpriteAnimIDBuffer], a
ldh a, [hROMBank]
push af
diff --git a/home/text.asm b/home/text.asm
index a5ab8fa3..fcde3679 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -3,7 +3,7 @@ ClearBox::
ld a, " "
; fallthrough
-FillBoxWithByte::
+FillBoxWithByte:: ; unreferenced
ld de, SCREEN_WIDTH
.row
push hl
@@ -374,9 +374,7 @@ String_Space:: db " @"
; These strings have been dummied out.
PlaceJPRouteText::
PlaceWatashiText::
-PlaceKokoWaText::
-KunSuffixText::
-ChanSuffixText:: db "@"
+PlaceKokoWaText:: db "@"
NextLineChar::
pop hl
@@ -562,7 +560,7 @@ FarString::
rst Bankswitch
ret
-PokeFluteTerminatorCharacter::
+PokeFluteTerminator:: ; unreferenced
ld hl, .stop
ret
diff --git a/hram.asm b/hram.asm
index 84c72c30..7422df03 100644
--- a/hram.asm
+++ b/hram.asm
@@ -147,7 +147,6 @@ hTileAnimFrame:: db
hLastTalked:: db
-hRandom::
hRandomAdd:: db
hRandomSub:: db