summaryrefslogtreecommitdiff
path: root/engine/items
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-04 19:43:28 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-04 20:10:39 -0400
commit306c85750e0686f9af104249ca3000e717aee0e2 (patch)
tree0b277bda2ba1a0f0d2ba37fb256396a77b09b6a8 /engine/items
parent5a546068a84d57454c7f95395250346ac14da81e (diff)
Identify some more unnamed labels
Diffstat (limited to 'engine/items')
-rw-r--r--engine/items/item_effects.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index ae2ebd187..bc185500e 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1377,17 +1377,16 @@ HealPowderEffect:
jp c, StatusHealer_ExitMenu
call UseStatusHealer
+ cp FALSE
+ jr nz, .not_used
- cp $0
- jr nz, .asm_efc9
ld c, HAPPINESS_BITTERPOWDER
farcall ChangeHappiness
-
call LooksBitterMessage
ld a, $0
-.asm_efc9
+.not_used
jp StatusHealer_Jumptable
StatusHealingEffect:
@@ -1401,7 +1400,7 @@ FullyHealStatus:
UseStatusHealer:
call IsMonFainted
- ld a, $1
+ ld a, TRUE
ret z
call GetItemHealingAction
ld a, MON_STATUS
@@ -1410,7 +1409,7 @@ UseStatusHealer:
and c
jr nz, .good
call IsItemUsedOnConfusedMon
- ld a, $1
+ ld a, TRUE
ret nc
ld b, PARTYMENUTEXT_HEAL_CONFUSION
.good
@@ -1422,7 +1421,7 @@ UseStatusHealer:
call Play_SFX_FULL_HEAL
call ItemActionTextWaitButton
call UseDisposableItem
- ld a, $0
+ ld a, FALSE
ret
IsItemUsedOnConfusedMon:
@@ -1512,15 +1511,16 @@ RevivalHerbEffect:
jp c, StatusHealer_ExitMenu
call RevivePokemon
- cp 0
- jr nz, .asm_f0c5
+ cp FALSE
+ jr nz, .not_used
ld c, HAPPINESS_REVIVALHERB
farcall ChangeHappiness
call LooksBitterMessage
- ld a, 0
-.asm_f0c5
+ ld a, $0
+
+.not_used
jp StatusHealer_Jumptable
ReviveEffect:
@@ -1533,7 +1533,7 @@ ReviveEffect:
RevivePokemon:
call IsMonFainted
- ld a, 1
+ ld a, TRUE
ret nz
ld a, [wBattleMode]
and a
@@ -1574,7 +1574,7 @@ RevivePokemon:
ld [wPartyMenuActionText], a
call ItemActionTextWaitButton
call UseDisposableItem
- ld a, 0
+ ld a, FALSE
ret
FullRestoreEffect: