From edebb637f4f390800246d1fc65931f6ae284c3e3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sun, 11 Oct 2015 18:17:26 -0400
Subject: wram label renaming for pika happiness

---
 engine/items/items.asm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'engine/items/items.asm')

diff --git a/engine/items/items.asm b/engine/items/items.asm
index 0798139f..749a2753 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -440,7 +440,7 @@ ItemUseBall: ; d3ad (3:53ad)
 	ld a, $1
 	ld [wd49c], a
 	ld a, $85
-	ld [wd471], a
+	ld [wPikachuMood], a
 	ld a,[wPartyCount]
 	cp PARTY_LENGTH		;is party full?
 	jr z,.sendToBox
@@ -685,7 +685,7 @@ ItemUseEvoStone: ; d7d0 (3:57d0)
 	ld a, $4
 	ld [wd49c], a
 	ld a, $82
-	ld [wd471], a
+	ld [wPikachuMood], a
 	jr .canceledItemUse
 .notPlayerPikachu
 	ld a,SFX_HEAL_AILMENT
@@ -799,7 +799,7 @@ ItemUseMedicine: ; d8ae (3:58ae)
 	jr nc, .asm_d906
 	push hl
 	push de
-	callabd_Func_f430a $2
+	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDITEM
 	pop de
 	pop hl
 .asm_d906
@@ -1383,7 +1383,7 @@ ItemUseMedicine: ; d8ae (3:58ae)
 	
 	xor a
 	ld [wForceEvolution],a
-	callabd_Func_f430a $1
+	callabd_ModifyPikachuHappiness PIKAHAPPY_LEVELUP
 	ld a, [wWhichPokemon]
 	push af
 	ld a, [wUsedItemOnWhichPokemon]
@@ -1538,7 +1538,7 @@ ItemUseXAccuracy: ; de3e (3:5e3e)
 	jp z,ItemUseNotTime
 	ld hl,W_PLAYERBATTSTATUS2
 	set UsingXAccuracy,[hl] ; X Accuracy bit
-	callabd_Func_f430a $3
+	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
 	jp PrintItemUseTextAndRemoveItem
 
 ; This function is bugged and never works. It always jumps to ItemUseNotTime.
@@ -1651,7 +1651,7 @@ ItemUseGuardSpec: ; df11 (3:5f11)
 	push af
 	ld a, [wPlayerMonNumber]
 	ld [wWhichPokemon], a
-	callabd_Func_f430a $3
+	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
 	pop af
 	ld [wWhichPokemon], a
 	
@@ -1676,7 +1676,7 @@ ItemUseDireHit: ; df42 (3:5f42)
 	push af
 	ld a, [wPlayerMonNumber]
 	ld [wWhichPokemon], a
-	callabd_Func_f430a $3
+	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
 	pop af
 	ld [wWhichPokemon], a
 	
@@ -1715,7 +1715,7 @@ ItemUseXStat: ; df69 (3:df69)
 	push af
 	ld a, [wPlayerMonNumber]
 	ld [wWhichPokemon], a
-	callabd_Func_f430a $3
+	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
 	pop af
 	ld [wWhichPokemon], a
 	
@@ -2012,7 +2012,7 @@ FishingInit: ; e182 (3:6182)
 	ld a, $2
 	ld [wd49c], a
 	ld a, $81
-	ld [wd471], a
+	ld [wPikachuMood], a
 	ld c,80
 	call DelayFrames
 	and a
@@ -2372,7 +2372,7 @@ ItemUseTMHM: ; e374 (3:6374)
 	push af
 	ld a,d
 	ld [wWhichPokemon],a
-	callabd_Func_f430a $5
+	callabd_ModifyPikachuHappiness PIKAHAPPY_USETMHM
 	callab Func_fce18
 	jr nc,.notTeachingThunderboltOrThunderToPikachu
 	ld a,[wcf91]
@@ -2384,7 +2384,7 @@ ItemUseTMHM: ; e374 (3:6374)
 	ld a, $5
 	ld [wd49c], a
 	ld a, $85
-	ld [wd471], a
+	ld [wPikachuMood], a
 .notTeachingThunderboltOrThunderToPikachu
 	pop af
 	ld [wWhichPokemon], a
-- 
cgit v1.3.1-sl0p


From 805b4fa7fd18deaec63442db975a381f11445b02 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sun, 11 Oct 2015 19:47:25 -0400
Subject: Fix build errors

---
 engine/bank3d/main.asm | 2 +-
 engine/items/items.asm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engine/items/items.asm')

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?
-- 
cgit v1.3.1-sl0p