From 5f4fcbfba2742a04bd0dff37b8d0d5a90e56e3c3 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Mon, 8 Apr 2013 02:15:08 -0400
Subject: [PATCH] minor wram fixes

---
 battle/effect_commands.asm |  4 ++--
 constants.asm              |  1 +
 wram.asm                   | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index dcc3a3d2a..391758073 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -1976,7 +1976,7 @@ Function0x349f4: ; 349f4
 
 
 Function0x34a2a: ; 34a2a
-	ld hl, OTPartyMon1Species2
+	ld hl, OTPartyMon1
 	ld a, [OTPartyCount]
 	ld b, a
 	ld c, $20
@@ -3914,8 +3914,8 @@ Function0x355bd: ; 355bd
 	and a
 	ld hl, PartyMon1Species
 	jr z, .asm_355cc
+	ld hl, OTPartyMon1Species
 
-	ld hl, OTPartyMon1Species2
 .asm_355cc
 	ld a, [DefaultFlypoint]
 	add hl, bc
diff --git a/constants.asm b/constants.asm
index 395c41b65..5f620f34b 100644
--- a/constants.asm
+++ b/constants.asm
@@ -3357,6 +3357,7 @@ SPECIAL_MONCHECK 			EQU $0097
 
 ; predefs
 PREDEF_FILLPP EQU $05
+PREDEF_ADDPARTYMON EQU $06
 PREDEF_FILLSTATS EQU $0C
 PREDEF_FILLMOVES EQU $1B
 PREDEF_GETUNOWNLETTER EQU $2D
diff --git a/wram.asm b/wram.asm
index a31ec0cae..9ee4b00ba 100644
--- a/wram.asm
+++ b/wram.asm
@@ -634,7 +634,7 @@ PlayerEvaLevel: ; c6d2
 	ds 1
 ; c6d3
 	ds 1
-PlayerStatLevelsEnd
+PlayerStatLevelsEnd:
 
 EnemyStatLevels: ; c6d4
 ; 07 neutral
@@ -746,7 +746,7 @@ LastEnemyMove: ; c71c
 SECTION "overworldmap",BSS[$c800]
 OverworldMap: ; c800
 	ds 1300
-OverworldMapEnd
+OverworldMapEnd:
 	
 	ds 12
 
@@ -1102,7 +1102,7 @@ OTPartySpecies: ; d281
 	     ; or the routine will keep going
 
 OTPartyMon1:
-OTPartyMon1Species2: ; d288
+OTPartyMon1Species: ; d288
 	ds 1
 OTPartyMon1Item: ; d289
 	ds 1
@@ -1239,6 +1239,7 @@ PlayerID: ; d47b
 	ds 2
 PlayerName: ; d47d
 	ds 11
+PlayerNameEnd: ; d478
 
 	ds 46
 	
@@ -1430,9 +1431,8 @@ PartyCount: ; dcd7
 	ds 1 ; number of Pokémon in party
 PartySpecies: ; dcd8
 	ds 6 ; species of each Pokémon in party
-; dcde
-	ds 1 ; any empty slots including the 7th must be FF
-	     ; or the routine will keep going
+PartyEnd: ; dcde
+	ds 1 ; legacy functions don't check PartyCount
 		 
 PartyMons:
 PartyMon1:
@@ -1479,7 +1479,7 @@ PartyMon1PokerusStatus: ; dcfb
 	ds 1
 PartyMon1CaughtData: ; dcfc
 PartyMon1CaughtTime: ; dcfc
-PartyMon1CaughtLevel ; dcfc
+PartyMon1CaughtLevel: ; dcfc
 	ds 1
 PartyMon1CaughtGender: ; dcfd
 PartyMon1CaughtLocation: ; dcfd