Leahnaya/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2026-10-01 22:02:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build errors

Browse Source
This commit is contained in:
PikalaxALT
2015-10-11 19:47:25 -04:00
parent edebb637f4
commit 805b4fa7fd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/bank3d/main.asm
View File

@@ -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

6
engine/items/items.asm
View File

@@ -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?