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 /yellow/main.asm | |
| parent | engine/items/items.asm (diff) | |
| parent | Fix build errors (diff) | |
| download | pokeyellow-9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17.tar.gz pokeyellow-9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17.tar.xz pokeyellow-9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17.zip | |
Merge pull request #3 from PikalaxALT/master
ModifyPikachuHappiness
Diffstat (limited to 'yellow/main.asm')
| -rwxr-xr-x | yellow/main.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index fe0c0ccd..0797a2d0 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -628,11 +628,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 - calladb_Func_f430a $9 + calladb_ModifyPikachuHappiness PIKAHAPPY_PSNFNT .curMonNotPlayerPikachu pop de pop hl @@ -698,9 +698,9 @@ Func_c4c7: ; c4c7 (3:44c7) call Random and $1 jr z, .asm_c4de - calladb_Func_f430a $6 + calladb_ModifyPikachuHappiness $6 .asm_c4de - ld hl, wd471 + ld hl, wPikachuMood ld a, [hl] cp $80 jr z, .asm_c4ef |