diff options
| -rw-r--r-- | engine/bank3d/main.asm | 2 | ||||
| -rwxr-xr-x | engine/items/items.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm index c130a54d..3855d096 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d/main.asm @@ -57,7 +57,7 @@ ModifyPikachuHappiness:: ; f430a (3d:430a) ld a, d cp PIKAHAPPY_GYMLEADER jr z, .checkanywhereinparty - cp PIKAHAPPY_6 + cp PIKAHAPPY_WALKING jr z, .checkanywhereinparty push de callab IsThisPartymonOurPikachu diff --git a/engine/items/items.asm b/engine/items/items.asm index 749a2753..25c50b4f 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -673,7 +673,7 @@ ItemUseEvoStone: ; d7d0 (3:57d0) ld [wcf91],a call Func_d85d jr nc, .noEffect - callab Func_fce18 + callab IsThisPartymonOurPikachu jr nc, .notPlayerPikachu ld e, $1b callab Func_f0000 @@ -2372,8 +2372,8 @@ ItemUseTMHM: ; e374 (3:6374) push af ld a,d ld [wWhichPokemon],a - callabd_ModifyPikachuHappiness PIKAHAPPY_USETMHM - callab Func_fce18 + callabd_ModifyPikachuHappiness PIKAHAPPY_USEDTMHM + callab IsThisPartymonOurPikachu jr nc,.notTeachingThunderboltOrThunderToPikachu ld a,[wcf91] cp a,TM_24 ; are we teaching thunderbolt to the player pikachu? |