Replace many '; unused' with '; unreferenced'

This commit is contained in:
Rangi 2020-10-28 10:21:10 -04:00
parent 446f1846b1
commit 6d333bed5f
31 changed files with 70 additions and 57 deletions

View File

@ -1615,9 +1615,9 @@ Music_JumpIf:
ret
MusicEE:
; unused
; conditional jump
; checks a byte in ram corresponding to the current channel
; doesn't seem to be set by any commands
; params: 2
; ll hh ; pointer
@ -1667,15 +1667,15 @@ MusicEE:
ret
MusicF9:
; unused
; sets some flag
; seems to be unused
; params: 0
ld a, TRUE
ld [wUnusedMusicF9Flag], a
ret
MusicE2:
; seems to have been dummied out
; unused
; params: 1
call GetMusicByte
ld hl, CHANNEL_FIELD2C

View File

@ -63,7 +63,7 @@ BattleCommandPointers:
dw BattleCommand_Charge
dw BattleCommand_CheckCharge
dw BattleCommand_TrapTarget
dw BattleCommand3c
dw BattleCommand_Unused3C
dw BattleCommand_Rampage
dw BattleCommand_CheckRampage
dw BattleCommand_ConstantDamage
@ -96,7 +96,7 @@ BattleCommandPointers:
dw BattleCommand_Endure
dw BattleCommand_CheckCurl
dw BattleCommand_RolloutPower
dw BattleCommand5d
dw BattleCommand_Unused5D
dw BattleCommand_FuryCutter
dw BattleCommand_Attract
dw BattleCommand_HappinessPower

View File

@ -245,45 +245,45 @@ SpriteAnimFrameData:
frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2, 8, OAM_X_FLIP
dorestart
; unused
.Frameset_Unknown1: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_43, 8
frame SPRITE_ANIM_OAMSET_UNUSED_44, 8
dorestart
; unused
.Frameset_Unknown2: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_45, 8
frame SPRITE_ANIM_OAMSET_UNUSED_46, 8
dorestart
; unused
.Frameset_Unknown3: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_47, 8
frame SPRITE_ANIM_OAMSET_UNUSED_48, 8
dorestart
; unused
.Frameset_Unknown4: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_49, 1
frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP
frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP, OAM_Y_FLIP
frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_Y_FLIP
dorestart
; unused
.Frameset_Unknown5: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_4A, 32
endanim
; unused
.Frameset_Unknown6: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_4B, 32
endanim
; unused
.Frameset_Unknown7: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_4C, 32
endanim
; unused
.Frameset_Unknown8: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_4D, 32
endanim
; unused
.Frameset_Unknown9: ; unreferenced
frame SPRITE_ANIM_OAMSET_UNUSED_4E, 3
dowait 3
dorestart

View File

@ -181,7 +181,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 0, 0, $00, 7 | Y_FLIP
dbsprite 0, 0, 0, 0, $00, 7 | X_FLIP | Y_FLIP
; unused
.OAMData_Unknown1: ; unreferenced
db 4
dbsprite -1, -1, 0, 0, $00, 0 | PRIORITY
dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP | PRIORITY
@ -305,7 +305,7 @@ SpriteAnimOAMData:
dbsprite 1, 0, 4, 4, $17, 0
dbsprite 1, 1, 4, 4, $18, 0
; unused
.OAMData_Unknown2: ; unreferenced
db 36
dbsprite -3, -3, 0, 0, $00, 0
dbsprite -2, -3, 0, 0, $01, 0

View File

@ -349,7 +349,7 @@ BattleText_StringBuffer1GrewToLevel:
sound_dex_fanfare_50_79
text_end
text_end ; unused
text_end ; unreferenced
BattleText_WildMonIsEating:
text "Wild @"

View File

@ -5714,8 +5714,7 @@ BattleCommand_Charge:
text_far _BattleDugText
text_end
BattleCommand3c:
; unused
BattleCommand_Unused3C: ; unreferenced
ret
BattleCommand_TrapTarget:
@ -6489,8 +6488,7 @@ INCLUDE "engine/battle/move_effects/sandstorm.asm"
INCLUDE "engine/battle/move_effects/rollout.asm"
BattleCommand5d:
; unused
BattleCommand_Unused5D: ; unreferenced
ret
INCLUDE "engine/battle/move_effects/fury_cutter.asm"

View File

@ -1437,8 +1437,8 @@ DebugTileset_CalculatePalette:
ld [hl], d
ret
; unused
.dummy1: ; unreferenced
ret
; unused
.dummy2: ; unreferenced
ret

View File

@ -87,4 +87,5 @@ INCBIN "gfx/diploma/page1.tilemap"
DiplomaPage2Tilemap:
INCBIN "gfx/diploma/page2.tilemap"
ret ; unused
Diploma_DummyFunction: ; unreferenced
ret

View File

@ -228,9 +228,12 @@ MomItsInYourRoomText:
text_far _MomItsInYourRoomText
text_end
db 0 ; unused
DummyPredef3A_DummyData: ; unreferenced
db 0
DummyPredef3A:
ret
ret ; unused
DummyPredef3A_DummyFunction: ; unreferenced
ret

View File

@ -1722,7 +1722,7 @@ Script_GetOnBike_Register:
special UpdatePlayerSprite
end
; unused
Overworld_DummyFunction: ; unreferenced
nop
ret

View File

@ -648,7 +648,7 @@ PokeAnim_ConvertAndApplyBitmask:
.skip2
ret
; unused
.UnusedSizeData: ; unreferenced
db 6, 5, 4
.GetTilemap:

View File

@ -9,7 +9,7 @@ Intro_MainMenu:
farcall MainMenu
jp StartTitleScreen
; unused
IntroMenu_DummyFunction: ; unreferenced
ret
PrintDayOfWeek:

View File

@ -1334,7 +1334,7 @@ MailComposition_TryAddLastCharacter:
ld a, [wNamingScreenLastCharacter]
jp MailComposition_TryAddCharacter
; unused
.add_dakuten ; unreferenced
ld a, [wNamingScreenCurNameLength]
and a
ret z

View File

@ -296,7 +296,8 @@ TrainerCard_Page1_PrintDexCaught_GameTime:
db "#DEX"
next "PLAY TIME@"
db "@" ; unused
.Unused: ; unreferenced
db "@"
.Badges:
db " BADGES▶@"

View File

@ -21,7 +21,7 @@ CrystalIntro:
call DelayFrame
jp .loop
.ShutOffMusic:
.ShutOffMusic
ld de, MUSIC_NONE
call PlayMusic
@ -152,14 +152,14 @@ IntroScene2:
cp $80
jr nc, .endscene
cp $60
jr nz, .DontPlaySound
jr nz, .nosound
push af
depixel 11, 11
call CrystalIntro_InitUnownAnim
ld de, SFX_INTRO_UNOWN_1
call PlaySFX
pop af
.DontPlaySound:
.nosound
ld [wIntroSceneTimer], a
xor a
call CrystalIntro_UnownFade
@ -971,7 +971,8 @@ IntroScene20:
xor a
call Intro_Scene20_AppearUnown
ret
; unused
.AppearUnownPal2: ; unreferenced
ld a, c
and $1c
srl a
@ -981,7 +982,7 @@ IntroScene20:
call Intro_Scene20_AppearUnown
ret
.finished
.finished:
call NextIntroScene
ret

View File

@ -82,7 +82,7 @@ LoadMapObjects:
farcall InitializeVisibleSprites
ret
; unused
MapSetup_DummyFunction: ; unreferenced
ret
ResetPlayerObjectAction:

View File

@ -311,7 +311,7 @@ DoPlayerMovement::
scf
ret
; unused
.unused ; unreferenced
xor a
ret

View File

@ -2203,7 +2203,8 @@ Script_writeunusedbytebuffer:
ld [wUnusedScriptByteBuffer], a
ret
db closetext_command ; unused
UnusedClosetextScript: ; unreferenced
closetext
Script_closetext:
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
@ -2352,7 +2353,7 @@ Script_checksave:
ld [wScriptVar], a
ret
; unused
Script_checkver_duplicate: ; unreferenced
ld a, [.gs_version]
ld [wScriptVar], a
ret

View File

@ -220,12 +220,12 @@ CheckUnusedTwoDayTimer:
call UpdateTimeRemaining
ret
; unused
UnusedSetSwarmFlag: ; unreferenced
ld hl, wDailyFlags1
set DAILYFLAGS1_FISH_SWARM_F, [hl]
ret
; unused
UnusedCheckSwarmFlag: ; unreferenced
and a
ld hl, wDailyFlags1
bit DAILYFLAGS1_FISH_SWARM_F, [hl]

View File

@ -1271,7 +1271,7 @@ PokegearPhoneContactSubmenu:
dw .Call
dw .Cancel
; unused
GetAMPMHours: ; unreferenced
ldh a, [hHours]
cp 12
jr c, .am
@ -1442,7 +1442,7 @@ UpdateRadioStation:
ldh [hBGMapMode], a
ret
; unused
LoadPokegearRadioChannelPointer: ; unreferenced
ld [wPokegearRadioChannelBank], a
ld a, [hli]
ld [wPokegearRadioChannelAddr], a

View File

@ -2475,7 +2475,7 @@ BillsPC_ChangeBoxSubmenu:
call CopyName2
ret
hlcoord 11, 7 ; unused
hlcoord 11, 7 ; unreferenced
.MenuHeader:
db MENU_BACKUP_TILES ; flags

View File

@ -327,7 +327,7 @@ EvolveAfterBattle_MasterLoop:
inc hl
jp .loop
; unused
.UnusedReturnToMap: ; unreferenced
pop hl
.ReturnToMap:
pop de

View File

@ -2163,7 +2163,8 @@ GetMapEnvironment::
pop hl
ret
ret ; unused
Map_DummyFunction:: ; unreferenced
ret
GetAnyMapEnvironment::
push hl

View File

@ -330,7 +330,7 @@ MenuTextbox::
pop hl
jp PrintText
; unused
Menu_DummyFunction:: ; unreferenced
ret
LoadMenuTextbox::

View File

@ -141,12 +141,15 @@ RadioTerminator::
PrintText::
call SetUpTextbox
; fallthrough
BuenaPrintText::
push hl
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW
call ClearBox
pop hl
; fallthrough
PrintTextboxText::
bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
@ -163,6 +166,7 @@ SetUpTextbox::
PlaceString::
push hl
; fallthrough
PlaceNextChar::
ld a, [de]
@ -173,7 +177,9 @@ PlaceNextChar::
pop hl
ret
pop de ; unused
DummyChar:: ; unreferenced
pop de
; fallthrough
NextChar::
inc de
@ -319,12 +325,13 @@ PlaceKokoWa: print_name PlaceKokoWaText
PlaceMoveTargetsName::
ldh a, [hBattleTurn]
xor 1
jr PlaceMoveUsersName.place
jr PlaceBattlersName
PlaceMoveUsersName::
ldh a, [hBattleTurn]
; fallthrough
.place:
PlaceBattlersName:
push de
and a
jr nz, .enemy

View File

@ -60,7 +60,7 @@ CGBOnly_CopyTilemapAtOnce::
CopyTilemapAtOnce::
jr _CopyTilemapAtOnce
; unused
CopyAttrmapAndTilemapToWRAMBank3: ; unreferenced
farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ret

View File

@ -92,6 +92,6 @@ SafeUpdateSprites::
ldh [hOAMUpdate], a
ret
; unused
SetCarryFlag:: ; unreferenced
scf
ret

View File

@ -6858,7 +6858,7 @@ Function112d33:
dec a
jp .asm_112e46
; unused
.asm_112d4c ; unreferenced
ret
.asm_112d4d

View File

@ -204,7 +204,8 @@ LakeOfRageMagikarpHouseUnusedRecordText:
text_ram wStringBuffer4
text_end
text_end ; unused
LakeOfRageMagikarpHouseUnusedDummyText: ; unreferenced
text_end
LakeOfRageMagikarpHouse_MapEvents:
db 0, 0 ; filler

View File

@ -423,7 +423,7 @@ BillsHouseSignText:
line "BILL'S HOUSE"
done
; unused
UnusedBillsHouseSignText: ; unreferenced
text "BILL'S HOUSE"
done

View File

@ -725,7 +725,6 @@ CooltrainerfKateAfterText:
done
Route34IlexForestSignText:
; unused
text "ILEX FOREST"
line "THROUGH THE GATE"
done