diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-11 23:56:16 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-11 23:56:16 -0400 |
| commit | 9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17 (patch) | |
| tree | 4499dd3298b7b1526460f3c93aac035ec61d9d96 /main.asm | |
| parent | 66fbdbbf5aba6bd7ad8b388b01d8f1929ad4cd3e (diff) | |
| parent | 805b4fa7fd18deaec63442db975a381f11445b02 (diff) | |
Merge pull request #3 from PikalaxALT/master
ModifyPikachuHappiness
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |