Identify some more unnamed labels

This commit is contained in:
Rangi
2020-10-04 19:43:28 -04:00
parent 5a546068a8
commit 306c85750e
23 changed files with 66 additions and 66 deletions

View File

@@ -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: