diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-26 15:45:57 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-26 20:29:58 -0400 |
| commit | 9dcdad5e60fbc10ba81ae127743c78a6b00d3dd5 (patch) | |
| tree | 1bbe56fe1c3b0ad4c95d191f0137007becef7169 /engine/items | |
| parent | a2b6befd7d12b2ad8bb97979a10519500dcdd870 (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 | 2 |
4 files changed, 15 insertions, 16 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index bc185500e..24bc22add 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1062,14 +1062,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 @@ -1896,14 +1895,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] @@ -2353,7 +2352,6 @@ RestorePPEffect: jr c, .do_ppup .CantUsePPUpOnSketch: -.pp_is_maxed_out ld hl, PPIsMaxedOutText call PrintText jr .loop2 @@ -2650,16 +2648,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. @@ -2711,11 +2710,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 78b0e2cd9..42381b411 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 4f8e7617f..17662cf60 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -1531,7 +1531,7 @@ PC_Mart_BallsPocketMenuHeader: dba PlaceMenuItemQuantity dba UpdateItemDescription -PackNoItemText: +PackNoItemText: ; unreferenced text_far _PackNoItemText text_end @@ -1571,7 +1571,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 fd8293603..ea990d849 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -159,7 +159,7 @@ TeachTMHM: and a ret -.unused +.didnt_use ; unreferenced ld a, 2 ld [wItemEffectSucceeded], a .learned_move |