From 023cfdbb051ea5184ebc7fa329db3ca43f1ca23e Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Thu, 12 Jun 2014 18:32:42 -0700
Subject: Consolidate monster structs in wram and sram.

The PartyMon struct is really the box struct with volatile variables like status added.

Some other labels have been reworked.
Move structs no longer have explicit labels since their location is arbitrary and usually shared.
---
 items/item_effects.asm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'items')

diff --git a/items/item_effects.asm b/items/item_effects.asm
index d294d198c..61ff2033e 100644
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -274,7 +274,7 @@ ParkBall: ; e8a2
 	ld a, b
 	ld [$ffb6], a
 
-	ld hl, EnemyMonHPHi
+	ld hl, EnemyMonHP
 	ld b, [hl]
 	inc hl
 	ld c, [hl]
@@ -449,9 +449,9 @@ ParkBall: ; e8a2
 .asm_ea1a
 	set 3, [hl]
 	ld hl, $c6f2
-	ld a, [EnemyMonAtkDefDV]
+	ld a, [EnemyMonDVs]
 	ld [hli], a
-	ld a, [EnemyMonSpdSpclDV]
+	ld a, [EnemyMonDVs + 1]
 	ld [hl], a
 
 .asm_ea27
@@ -579,7 +579,7 @@ ParkBall: ; e8a2
 	ld a, [PartyCount]
 	dec a
 	ld [CurPartyMon], a
-	ld hl, PartyMon1Nickname
+	ld hl, PartyMonNicknames
 	ld bc, PKMN_NAME_LENGTH
 	call AddNTimes
 
@@ -1316,11 +1316,11 @@ Functioneed9: ; eed9
 ; eeeb
 
 Table_eeeb: ; eeeb
-	db HP_UP,   PartyMon1HPExp   - PartyMon1StatExp
-	db PROTEIN, PartyMon1AtkExp  - PartyMon1StatExp
-	db IRON,    PartyMon1DefExp  - PartyMon1StatExp
-	db CARBOS,  PartyMon1SpdExp  - PartyMon1StatExp
-	db CALCIUM, PartyMon1SpclExp - PartyMon1StatExp
+	db HP_UP,   PartyMon1HPExp  - PartyMon1StatExp
+	db PROTEIN, PartyMon1AtkExp - PartyMon1StatExp
+	db IRON,    PartyMon1DefExp - PartyMon1StatExp
+	db CARBOS,  PartyMon1SpdExp - PartyMon1StatExp
+	db CALCIUM, PartyMon1SpcExp - PartyMon1StatExp
 ; eef5
 
 
@@ -1334,7 +1334,7 @@ Functioneef5: ; eef5
 	ld [CurPartyLevel], a
 	call GetBaseData
 	ld a, [CurPartyMon]
-	ld hl, PartyMon1Nickname
+	ld hl, PartyMonNicknames
 	call GetNick
 	ret
 ; 0xef14
-- 
cgit v1.2.3