diff options
Diffstat (limited to 'engine')
-rw-r--r-- | engine/battle/effect_commands.asm | 6 | ||||
-rw-r--r-- | engine/debug/color_picker.asm | 4 | ||||
-rw-r--r-- | engine/events/diploma.asm | 3 | ||||
-rw-r--r-- | engine/events/mom_phone.asm | 7 | ||||
-rw-r--r-- | engine/events/overworld.asm | 2 | ||||
-rw-r--r-- | engine/gfx/pic_animation.asm | 2 | ||||
-rw-r--r-- | engine/menus/intro_menu.asm | 2 | ||||
-rw-r--r-- | engine/menus/naming_screen.asm | 2 | ||||
-rw-r--r-- | engine/menus/trainer_card.asm | 3 | ||||
-rw-r--r-- | engine/movie/intro.asm | 11 | ||||
-rw-r--r-- | engine/overworld/map_setup.asm | 2 | ||||
-rw-r--r-- | engine/overworld/player_movement.asm | 2 | ||||
-rw-r--r-- | engine/overworld/scripting.asm | 5 | ||||
-rw-r--r-- | engine/overworld/time.asm | 4 | ||||
-rw-r--r-- | engine/pokegear/pokegear.asm | 4 | ||||
-rw-r--r-- | engine/pokemon/bills_pc.asm | 2 | ||||
-rw-r--r-- | engine/pokemon/evolve.asm | 2 |
17 files changed, 34 insertions, 29 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index d3f9290fa..14f1afd82 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -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" diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index c8545b734..d14efc59f 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -1437,8 +1437,8 @@ DebugTileset_CalculatePalette: ld [hl], d ret -; unused +.dummy1: ; unreferenced ret -; unused +.dummy2: ; unreferenced ret diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index f0008b7fd..814c9644c 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -87,4 +87,5 @@ INCBIN "gfx/diploma/page1.tilemap" DiplomaPage2Tilemap: INCBIN "gfx/diploma/page2.tilemap" - ret ; unused +Diploma_DummyFunction: ; unreferenced + ret diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index f18685df8..3ff5f2b3e 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -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 diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 258b13b1a..0ca448930 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -1722,7 +1722,7 @@ Script_GetOnBike_Register: special UpdatePlayerSprite end -; unused +Overworld_DummyFunction: ; unreferenced nop ret diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index f2a59b75a..90bb06620 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -648,7 +648,7 @@ PokeAnim_ConvertAndApplyBitmask: .skip2 ret -; unused +.UnusedSizeData: ; unreferenced db 6, 5, 4 .GetTilemap: diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 2683fbe70..509777fb5 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -9,7 +9,7 @@ Intro_MainMenu: farcall MainMenu jp StartTitleScreen -; unused +IntroMenu_DummyFunction: ; unreferenced ret PrintDayOfWeek: diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index da15dc83c..0a436b273 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -1334,7 +1334,7 @@ MailComposition_TryAddLastCharacter: ld a, [wNamingScreenLastCharacter] jp MailComposition_TryAddCharacter -; unused +.add_dakuten ; unreferenced ld a, [wNamingScreenCurNameLength] and a ret z diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 6a7477e14..8dead3429 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -296,7 +296,8 @@ TrainerCard_Page1_PrintDexCaught_GameTime: db "#DEX" next "PLAY TIME@" - db "@" ; unused +.Unused: ; unreferenced + db "@" .Badges: db " BADGES▶@" diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 1da3576e3..623b92ed4 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -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 diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index 9a96d6700..e70f9ab7b 100644 --- a/engine/overworld/map_setup.asm +++ b/engine/overworld/map_setup.asm @@ -82,7 +82,7 @@ LoadMapObjects: farcall InitializeVisibleSprites ret -; unused +MapSetup_DummyFunction: ; unreferenced ret ResetPlayerObjectAction: diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index fcf147dd0..4ef04d79b 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -311,7 +311,7 @@ DoPlayerMovement:: scf ret -; unused +.unused ; unreferenced xor a ret diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 457b75a5d..9ba79f5e0 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -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 diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index 0f3aa64b6..4299a69ab 100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -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] diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 5dae16865..90f90d07f 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -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 diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 8230ec7f3..a38e78e4a 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -2475,7 +2475,7 @@ BillsPC_ChangeBoxSubmenu: call CopyName2 ret - hlcoord 11, 7 ; unused + hlcoord 11, 7 ; unreferenced .MenuHeader: db MENU_BACKUP_TILES ; flags diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 1fbca90d5..16138de22 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -327,7 +327,7 @@ EvolveAfterBattle_MasterLoop: inc hl jp .loop -; unused +.UnusedReturnToMap: ; unreferenced pop hl .ReturnToMap: pop de |