summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-10-11 18:00:03 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-10-11 18:00:03 -0400
commit18fb5fc4682a196e80a774af4aa1f68ead8186b9 (patch)
tree2586be36d4160f1d868335e7f974d807a6cdbfac /main.asm
parent5c181f2d68525ec0ce58dc06accf12d528bcf046 (diff)
more annotations on ModifyPikachuHappiness
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/main.asm b/main.asm
index 8bea15ac..e02b5720 100755
--- a/main.asm
+++ b/main.asm
@@ -2537,11 +2537,11 @@ ApplyOutOfBattlePoisonDamage: ; c3de (3:43de)
ld a, $d0
ld [hSpriteIndexOrTextID], a
call DisplayTextID
- callab Func_fce18
+ callab IsThisPartymonOurPikachu
jr nc, .curMonNotPlayerPikachu
ld e, $3
callab Func_f0000
- callab_Func_f430a_ld_d $9
+ callab_ModifyPikachuHappiness_ld_d PIKAHAPPY_PSNFNT
.curMonNotPlayerPikachu
pop de
pop hl
@@ -2607,9 +2607,9 @@ Func_c4c7: ; c4c7 (3:44c7)
call Random
and $1
jr z, .asm_c4de
- callab_Func_f430a_ld_d $6
+ callab_ModifyPikachuHappiness_ld_d PIKAHAPPY_WALKING
.asm_c4de
- ld hl, wd471
+ ld hl, wPikachuMood
ld a, [hl]
cp $80
jr z, .asm_c4ef