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 /home.asm | |
| parent | 66fbdbbf5aba6bd7ad8b388b01d8f1929ad4cd3e (diff) | |
| parent | 805b4fa7fd18deaec63442db975a381f11445b02 (diff) | |
Merge pull request #3 from PikalaxALT/master
ModifyPikachuHappiness
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -475,7 +475,7 @@ HandlePartyMenuInput:: ; 1226 (0:1226) jr nz,.asm_1258 ld a,[wCurrentMenuItem] ld [wWhichPokemon],a - callab Func_fce18 ; 3f:4e18 + callab IsThisPartymonOurPikachu ; 3f:4e18 jr nc,.asm_1258 call Func_154a jr nz,.asm_128f @@ -2958,7 +2958,7 @@ IsItemInBag:: ; 3422 (0:3422) IsSurfingPikachuInParty:: ; 342a (0:342a) ; set bit 6 of wd472 if true -; also calls Func_3467, which is a bankswitch to Func_fcdb8 +; also calls Func_3467, which is a bankswitch to IsPikachuInOurParty ld a,[wd472] and $3f ld [wd472],a @@ -3001,7 +3001,7 @@ IsSurfingPikachuInParty:: ; 342a (0:342a) Func_3467:: ; 3467 (0:3467) push hl push bc - callab Func_fcdb8 + callab IsPikachuInOurParty pop bc pop hl ret nc |