diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-23 20:39:20 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-26 20:30:09 -0400 |
| commit | 46f6cc4d41494c044f1091491c712afc2a5bfd3a (patch) | |
| tree | fee103b542f99af23954d6610029b481e8f6742b /engine/items | |
| parent | 26ddba8cfd8f035c06bd6419b64a6c4d7dbc226f (diff) | |
Comment, remove, or revise many unreferenced labels
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 23 | ||||
| -rw-r--r-- | engine/items/items.asm | 2 | ||||
| -rw-r--r-- | engine/items/pack.asm | 4 | ||||
| -rw-r--r-- | engine/items/tmhm.asm | 3 |
4 files changed, 15 insertions, 17 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index a00aee8c..f9eeebec 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1029,14 +1029,13 @@ LevelBallMultiplier: ld b, $ff ret -; These two texts were carried over from gen 1. -; They are not used in gen 2, and are dummied out. +; BallDodgedText and BallMissedText were used in Gen 1. -BallDodgedText: +BallDodgedText: ; unreferenced text_far _BallDodgedText text_end -BallMissedText: +BallMissedText: ; unreferenced text_far _BallMissedText text_end @@ -1864,14 +1863,14 @@ LoadCurHPIntoBuffer5: ld [wBuffer5], a ret -LoadHPIntoBuffer5: +LoadHPIntoBuffer5: ; unreferenced ld a, d ld [wBuffer6], a ld a, e ld [wBuffer5], a ret -LoadHPFromBuffer5: +LoadHPFromBuffer5: ; unreferenced ld a, [wBuffer6] ld d, a ld a, [wBuffer5] @@ -2315,7 +2314,6 @@ RestorePPEffect: jr c, .do_ppup .CantUsePPUpOnSketch: -.pp_is_maxed_out ld hl, PPIsMaxedOutText call PrintText jr .loop2 @@ -2612,16 +2610,17 @@ WontHaveAnyEffectMessage: ld hl, ItemWontHaveEffectText jr CantUseItemMessage -BelongsToSomeoneElseMessage: +BelongsToSomeoneElseMessage: ; unreferenced ld hl, ItemBelongsToSomeoneElseText jr CantUseItemMessage -CyclingIsntAllowedMessage: +CyclingIsntAllowedMessage: ; unreferenced ld hl, NoCyclingText jr CantUseItemMessage -CantGetOnYourBikeMessage: +CantGetOnYourBikeMessage: ; unreferenced ld hl, ItemCantGetOnText + ; fallthrough CantUseItemMessage: ; Item couldn't be used. @@ -2673,11 +2672,11 @@ ItemUsedText: text_far _ItemUsedText text_end -ItemGotOnText: +ItemGotOnText: ; unreferenced text_far _ItemGotOnText text_end -ItemGotOffText: +ItemGotOffText: ; unreferenced text_far _ItemGotOffText text_end diff --git a/engine/items/items.asm b/engine/items/items.asm index 78b0e2cd..42381b41 100644 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -481,7 +481,7 @@ GetNumberedTMHM: jr c, .done cp ITEM_DC - (TM01 - 1) - 1 jr c, .skip_one -.skip_two +; skip two inc a .skip_one inc a diff --git a/engine/items/pack.asm b/engine/items/pack.asm index b3e1c5f1..994c7c5a 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -1520,7 +1520,7 @@ PC_Mart_BallsPocketMenuHeader: dba PlaceMenuItemQuantity dba UpdateItemDescription -PackNoItemText: +PackNoItemText: ; unreferenced text_far _PackNoItemText text_end @@ -1560,7 +1560,7 @@ PackEmptyText: text_far _PackEmptyText text_end -YouCantUseItInABattleText: +YouCantUseItInABattleText: ; unreferenced text_far _YouCantUseItInABattleText text_end diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index e7c622d7..0a14ca50 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -76,7 +76,6 @@ ChooseMonToLearnTMHM: ld bc, 12 call CopyBytes call ClearBGPalettes -ChooseMonToLearnTMHM_NoRefresh: farcall LoadPartyMenuGFX farcall InitPartyMenuWithCancel farcall InitPartyMenuGFX @@ -158,7 +157,7 @@ TeachTMHM: and a ret -.unused +.didnt_use ; unreferenced ld a, 2 ld [wItemEffectSucceeded], a .learned_move |