diff options
author | xCrystal <rgr.crystal@gmail.com> | 2018-01-02 16:04:21 +0100 |
---|---|---|
committer | xCrystal <rgr.crystal@gmail.com> | 2018-01-02 16:04:21 +0100 |
commit | 6f0b81504d6471afe7df6adae83791cc81933ca6 (patch) | |
tree | 0b82cb9aa2c8396a132e69756f342e3d39538cbc /engine | |
parent | 7a24703398aba3ab112ed770368805a17c601c03 (diff) |
More unreferenced labels cleanup
Diffstat (limited to 'engine')
-rw-r--r-- | engine/battle/core.asm | 13 | ||||
-rwxr-xr-x | engine/billspc.asm | 2 | ||||
-rwxr-xr-x | engine/billspctop.asm | 2 | ||||
-rwxr-xr-x | engine/breeding.asm | 3 | ||||
-rw-r--r-- | engine/color.asm | 9 | ||||
-rwxr-xr-x | engine/crystal_colors.asm | 2 | ||||
-rw-r--r-- | engine/events.asm | 2 | ||||
-rwxr-xr-x | engine/events/overworld.asm | 2 | ||||
-rwxr-xr-x | engine/intro_menu.asm | 10 | ||||
-rwxr-xr-x | engine/link.asm | 11 | ||||
-rwxr-xr-x | engine/main_menu.asm | 2 | ||||
-rw-r--r-- | engine/map_objects.asm | 3 | ||||
-rw-r--r-- | engine/map_setup.asm | 2 | ||||
-rwxr-xr-x | engine/mart.asm | 2 | ||||
-rwxr-xr-x | engine/menu.asm | 6 | ||||
-rw-r--r-- | engine/menu_2.asm | 4 | ||||
-rwxr-xr-x | engine/mon_icons.asm | 3 | ||||
-rwxr-xr-x | engine/mystery_gift.asm | 2 | ||||
-rwxr-xr-x | engine/npc_movement.asm | 4 | ||||
-rwxr-xr-x | engine/npctrade.asm | 6 | ||||
-rw-r--r-- | engine/pack.asm | 6 | ||||
-rw-r--r-- | engine/predef.asm | 2 | ||||
-rw-r--r-- | engine/routines/correcterrorsinplayerparty.asm | 2 | ||||
-rwxr-xr-x | engine/rtc.asm | 4 | ||||
-rw-r--r-- | engine/scripting.asm | 5 | ||||
-rwxr-xr-x | engine/scrolling_menu.asm | 2 | ||||
-rwxr-xr-x | engine/slot_machine.asm | 10 | ||||
-rwxr-xr-x | engine/stats_screen.asm | 6 | ||||
-rwxr-xr-x | engine/tmhm2.asm | 6 | ||||
-rwxr-xr-x | engine/trainer_card.asm | 6 |
30 files changed, 57 insertions, 82 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 93eefb19c..c82ae93c5 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1951,8 +1951,7 @@ GetMaxHP: ; 3ccac ret ; 3ccc2 -GetHalfHP: ; 3ccc2 -; unreferenced +Unreferenced_GetHalfHP: ; 3ccc2 ld hl, BattleMonHP ld a, [hBattleTurn] and a @@ -6769,8 +6768,7 @@ CheckUnownLetter: ; 3eb75 ; 3ebc7 -SwapBattlerLevels: ; 3ebc7 -; unreferenced +Unreferenced_SwapBattlerLevels: ; 3ebc7 push bc ld a, [BattleMonLevel] ld b, a @@ -7162,7 +7160,7 @@ _LoadHPBar: ; 3eda6 ret ; 3edad -LoadHPExpBarGFX: ; unreferenced +Unreferenced_LoadHPExpBarGFX: ld de, EnemyHPBarBorderGFX ld hl, vTiles2 tile $6c lb bc, BANK(EnemyHPBarBorderGFX), 4 @@ -8104,7 +8102,7 @@ TextJump_ComeBack: ; 3f35b db "@" ; 3f360 -HandleSafariAngerEatingStatus: ; unreferenced +Unreferenced_HandleSafariAngerEatingStatus: ld hl, wSafariMonEating ld a, [hl] and a @@ -8371,8 +8369,7 @@ StartBattle: ; 3f4c1 ret ; 3f4d9 -_DoBattle: ; 3f4d9 -; unreferenced +Unreferenced_DoBattle: ; 3f4d9 call DoBattle ret ; 3f4dd diff --git a/engine/billspc.asm b/engine/billspc.asm index cf25be280..07bdf884a 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -245,7 +245,7 @@ BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d) db "CANCEL@" ; 0xe2564 (38:6564) -BillsPC_ClearThreeBoxes: ; e2564 +Unreferenced_BillsPCClearThreeBoxes: ; e2564 ; unreferenced hlcoord 0, 0 ld b, 4 diff --git a/engine/billspctop.asm b/engine/billspctop.asm index c36cbe45d..699fa7887 100755 --- a/engine/billspctop.asm +++ b/engine/billspctop.asm @@ -268,7 +268,7 @@ CopyBoxmonToTempMon: ; e5bb call CloseSRAM ret -Functione5d9: ; unreferenced +Unreferenced_Functione5d9: ld a, [wCurBox] cp b jr z, .same_box diff --git a/engine/breeding.asm b/engine/breeding.asm index 234e05448..7d2209de9 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -981,8 +981,7 @@ DayCareMonCompatibilityText: ; 1746c db "@" ; 0x174b5 -DayCareMonPrintEmptyString: ; 174b5 -; unreferenced +Unreferenced_DayCareMonPrintEmptyString: ; 174b5 ld hl, .string ret ; 174b9 diff --git a/engine/color.asm b/engine/color.asm index 552adf1b5..92d14e560 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -43,8 +43,7 @@ CheckShininess: 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 @@ SGB_ApplyPartyMenuHPPals: ; 8ade ld [hl], e ret -Function8b07: -; Unreferenced +Unreferenced_Function8b07: call CheckCGB ret z ; CGB only @@ -169,8 +167,7 @@ Function8b07: RGB 08, 16, 28 RGB 00, 00, 00 -Function8b3f: -; Unreferenced +Unreferenced_Function8b3f: call CheckCGB ret nz ld a, [hSGB] diff --git a/engine/crystal_colors.asm b/engine/crystal_colors.asm index 5d2ba236c..e1c4336d9 100755 --- a/engine/crystal_colors.asm +++ b/engine/crystal_colors.asm @@ -322,5 +322,5 @@ InitMG_Mobile_LinkTradePalMap: ; 49856 ret ; 4985a -Unknown_4985a: ; unreferenced +; unused INCLUDE "data/palettes/unknown/4985a.asm" diff --git a/engine/events.asm b/engine/events.asm index 7356a8910..7dd87a318 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -1060,7 +1060,7 @@ Invalid_0x96c2d: ; 96c2d end ; 96c2e -; unreferenced +; unused end ; 96c2f diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 36ba20302..4583733ee 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -986,7 +986,7 @@ StrengthFunction: ; cce5 jr c, .Failed jr .UseStrength -.AlreadyUsing: ; unreferenced +.Unreferenced_AlreadyUsing: ld hl, .JumpText call MenuTextBoxBackup ld a, $80 diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 7d17b62e5..d51e32a54 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -10,7 +10,7 @@ _MainMenu: ; 5ae8 jp StartTitleScreen ; 5b04 -; unreferenced +; unused ret ; 5b05 @@ -827,7 +827,7 @@ NamePlayer: ; 0x6074 db "KRIS@@@@@@@" ; 60e9 -Function60e9: ; Unreferenced +Unreferenced_Function60e9: call LoadMenuDataHeader call VerticalMenu ld a, [wMenuCursorY] @@ -1094,7 +1094,7 @@ RunTitleScreen: ; 627b ret ; 6292 -Function6292: ; 6292 ; unreferenced +Unreferenced_Function6292: ; 6292 ld a, [hVBlankCounter] and $7 ret nz @@ -1125,7 +1125,7 @@ TitleScreenScene: ; 62a3 dw TitleScreenEnd ; 62b7 -.NextScene: ; Unreferenced +.Unreferenced_NextScene: ld hl, wJumptableIndex inc [hl] ret @@ -1329,7 +1329,7 @@ ResetClock: ; 6392 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 diff --git a/engine/link.asm b/engine/link.asm index 70fd3b852..5ea609496 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1597,8 +1597,7 @@ Function28b22: ; 28b22 ret ; 28b42 -Function28b42: ; 28b42 -; unreferenced +Unreferenced_Function28b42: ; 28b42 hlcoord 0, 16 ld a, "┘" ld bc, 2 * SCREEN_WIDTH @@ -2020,8 +2019,7 @@ SetTradeRoomBGPals: ; 28eff ret ; 28f09 -Function28f09: ; 28f09 -; unreferenced +Unreferenced_Function28f09: ; 28f09 hlcoord 0, 0 ld b, 6 ld c, 18 @@ -2577,12 +2575,11 @@ Special_CableClubCheckWhichChris: ; 29f47 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 diff --git a/engine/main_menu.asm b/engine/main_menu.asm index cbd516cd7..d7ca810da 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -279,7 +279,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09 ret .min -; unreferenced +; unused db "min.@" ; 49e75 diff --git a/engine/map_objects.asm b/engine/map_objects.asm index fe3c13a13..b0cc073a6 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -418,8 +418,7 @@ UpdatePlayerStep: ; 4738 ret ; 4759 -Function4759: ; 4759 -; unreferenced +Unreferenced_Function4759: ; 4759 push bc ld e, a ld d, 0 diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 078e6a2fd..a4d9d1636 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -137,7 +137,7 @@ LoadObjectsRunCallback_02: ; 154d7 ret ; 154ea (5:54ea) -; unreferenced +; unused ret ; 154eb diff --git a/engine/mart.asm b/engine/mart.asm index 4a8d9e17b..060aba8e9 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -797,7 +797,7 @@ SellMenu: ; 15eb3 ret ; 15ed3 -.NothingToSell: ; unreferenced +.Unreferenced_NothingToSell: ld hl, .NothingToSellText call MenuTextBoxBackup and a diff --git a/engine/menu.asm b/engine/menu.asm index 6fbed2848..196d45ea9 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -291,8 +291,7 @@ MobileMenuJoypad: ; 241ba ; 241d5 -Function241d5: ; 241d5 -; Unreferenced +Unreferenced_Function241d5: ; 241d5 call Place2DMenuCursor .loop call Move2DMenuCursor @@ -725,8 +724,7 @@ _ExitMenu:: ; 243e8 ret ; 24423 -Function24423: ; 24423 -; Unreferenced +Unreferenced_Function24423: ; 24423 ld a, [VramState] bit 0, a ret z diff --git a/engine/menu_2.asm b/engine/menu_2.asm index d88b75152..66c2b169d 100644 --- a/engine/menu_2.asm +++ b/engine/menu_2.asm @@ -112,8 +112,8 @@ CoinString: ; 24b89 ShowMoney_TerminatorString: ; 24b8e db "@" -Function24b8f: ; 24b8f -; unreferenced, related to safari? +Unreferenced_Function24b8f: ; 24b8f +; related to safari? ld hl, Options ld a, [hl] push af diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 316ff3bac..d6013ea62 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -281,8 +281,7 @@ FlyFunction_GetMonIcon: ; 8e9bc (23:69bc) ret ; 8e9cc (23:69cc) -GetMonIcon2: ; 8e9cc -; unreferenced +Unreferenced_GetMonIcon2: ; 8e9cc push de ld a, [wd265] call ReadMonMenuIcon diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm index 67ce10168..c4a047e7e 100755 --- a/engine/mystery_gift.asm +++ b/engine/mystery_gift.asm @@ -1369,7 +1369,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153) jr .gfx_loop ; 105232 (41:5232) -.Load6GFX: ; unreferenced +.Unreferenced_Load6GFX: ld b, 6 jr .gfx_loop diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index a2508e0f6..0b43e09eb 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -279,7 +279,7 @@ WillObjectBumpIntoSomeoneElse: ; 7009 jr IsNPCAtCoord ; 7015 -Function7015: ; unreferenced +Unreferenced_Function7015: ld a, [hMapObjectIndexBuffer] call GetObjectStruct call .CheckWillBeFacingNPC @@ -482,7 +482,7 @@ IsObjectMovingOffEdgeOfScreen: ; 70ed ret ; 7113 -Function7113: ; unreferenced +Unreferenced_Function7113: ld a, [PlayerStandingMapX] ld d, a ld a, [PlayerStandingMapY] diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 1455dce62..49c22829e 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -332,8 +332,7 @@ CopyTradeName: ; fcdf4 ret ; fcdfb -Functionfcdfb: ; fcdfb -; unreferenced +Unreferenced_Functionfcdfb: ; fcdfb ld bc, 4 call CopyBytes ld a, "@" @@ -341,8 +340,7 @@ Functionfcdfb: ; fcdfb ret ; fce05 -Functionfce05: ; fce05 -; unreferenced +Unreferenced_Functionfce05: ; fce05 ld bc, 3 call CopyBytes ld a, "@" diff --git a/engine/pack.asm b/engine/pack.asm index 047924cb0..59b7f8caa 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -534,8 +534,7 @@ TossMenu: ; 10364 ret ; 1039d -ResetPocketCursorPositions: ; 1039d -; unreferenced +Unreferenced_ResetPocketCursorPositions: ; 1039d ld a, [wCurrPocket] and a jr z, .items @@ -1511,8 +1510,7 @@ Pack_GetItemName: ; 10a1d ret ; 10a2a -Pack_ClearTilemap: ; 10a2a -; unreferenced +Unreferenced_Pack_ClearTilemap: ; 10a2a hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " diff --git a/engine/predef.asm b/engine/predef.asm index c0a10a91b..e799e7466 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -81,7 +81,7 @@ PredefPointers:: ; 856b 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 diff --git a/engine/routines/correcterrorsinplayerparty.asm b/engine/routines/correcterrorsinplayerparty.asm index 2fa98a545..639e5c544 100644 --- 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 diff --git a/engine/rtc.asm b/engine/rtc.asm index ab198ee0f..70b114c7a 100755 --- 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 @@ TimesOfDay: ; 14044 db -1, MORN_F ; 1404e -Unknown_1404e: ; unreferenced +Unreferenced_1404e: db 20, NITE_F db 40, MORN_F db 60, DAY_F diff --git a/engine/scripting.asm b/engine/scripting.asm index 8d9a394d5..5965e372e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2806,7 +2806,8 @@ Script_warpcheck: farcall EnableEvents ret -Script_enableevents: ; unreferenced +Script_enableevents: +; unused farcall EnableEvents ret @@ -3037,7 +3038,7 @@ Script_check_save: ret -; unreferenced +; unused ld a, [.byte] ld [ScriptVar], a ret diff --git a/engine/scrolling_menu.asm b/engine/scrolling_menu.asm index 32f22188a..32acf2def 100755 --- a/engine/scrolling_menu.asm +++ b/engine/scrolling_menu.asm @@ -84,7 +84,7 @@ ScrollingMenuJoyAction: ; 24609 jr .loop ; 24640 -.unreferenced ; unreferenced +.unreferenced ; unused ld a, -1 and a ret diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index aea08f16a..e2292a6d8 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -232,8 +232,8 @@ SlotsLoop: ; 927af (24:67af) ; 92811 (24:6811) -Function92811: ; 92811 -; unreferenced - debug function? +Unreferenced_Function92811: ; 92811 +; debug function? ld a, [wSlotBias] add 0 daa @@ -252,8 +252,7 @@ Function92811: ; 92811 ; 9282c -Function9282c: ; 9282c -; unreferenced +Unreferenced_Function9282c: ; 9282c ; animate OAM tiles? ld hl, wcf66 ld a, [hl] @@ -854,8 +853,7 @@ Slots_UpdateReelPositionAndOAM: ; 92b53 (24:6b53) ; 92bbe (24:6bbe) -; unreferenced -Function92bbe: ; 92bbe +Unreferenced_Function92bbe: ; 92bbe push hl srl a srl a diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 9f632f388..a8f831408 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -447,8 +447,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea) dw wBufferMonNick ; 4df7f -Function4df7f: ; 4df7f -; unreferenced +Unreferenced_Function4df7f: ; 4df7f hlcoord 7, 0 ld bc, SCREEN_WIDTH ld d, SCREEN_HEIGHT @@ -962,8 +961,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307) ret ; 4e32a (13:632a) -; unreferenced -Unknown_4e32a: ; 4e32a +Unreferenced_4e32a: ; 4e32a ; A blank tile? ds 16 ; 4e33a diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm index c111fa7f9..90e993a8b 100755 --- a/engine/tmhm2.asm +++ b/engine/tmhm2.asm @@ -447,8 +447,7 @@ TMHMPocket_GetCurrentLineCoord: ; 2ca86 (b:4a86) ret ; 2ca95 (b:4a95) -Function2ca95: ; 2ca95 -; unreferenced +Unreferenced_Function2ca95: ; 2ca95 pop hl ld bc, 3 add hl, bc @@ -499,8 +498,7 @@ TMHM_PlaySFX_ReadText2: ; 2cad6 (b:4ad6) ret ; 2cadf (b:4adf) -Function2cadf: ; 2cadf -; unreferenced +Unreferenced_Function2cadf: ; 2cadf call ConvertCurItemIntoCurTMHM call .CheckHaveRoomForTMHM ld hl, .NoRoomText diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 87cab0103..67bc05533 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -117,8 +117,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7) ld [wJumptableIndex], a ret -.KantoCheck: -; unreferenced +.Unreferenced_KantoCheck: ld a, [wKantoBadges] and a ret z @@ -163,8 +162,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221) ld [wJumptableIndex], a ret -.KantoCheck: -; unreferenced +.Unreferenced_KantoCheck: ld a, [wKantoBadges] and a ret z |