ref: 5f4fcbfba2742a04bd0dff37b8d0d5a90e56e3c3
parent: 1888e8ad6b05bbf2655665856f71c41b64822fb4
author: yenatch <[email protected]>
date: Sun Apr 7 22:15:08 EDT 2013
minor wram fixes
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -1976,7 +1976,7 @@
Function0x34a2a: ; 34a2a
- ld hl, OTPartyMon1Species2
+ ld hl, OTPartyMon1
ld a, [OTPartyCount]
ld b, a
ld c, $20
@@ -3914,8 +3914,8 @@
and a
ld hl, PartyMon1Species
jr z, .asm_355cc
+ ld hl, OTPartyMon1Species
- ld hl, OTPartyMon1Species2
.asm_355cc
ld a, [DefaultFlypoint]
add hl, bc
--- a/constants.asm
+++ b/constants.asm
@@ -3357,6 +3357,7 @@
; predefs
PREDEF_FILLPP EQU $05
+PREDEF_ADDPARTYMON EQU $06
PREDEF_FILLSTATS EQU $0C
PREDEF_FILLMOVES EQU $1B
PREDEF_GETUNOWNLETTER EQU $2D
--- a/wram.asm
+++ b/wram.asm
@@ -634,7 +634,7 @@
ds 1
; c6d3
ds 1
-PlayerStatLevelsEnd
+PlayerStatLevelsEnd:
EnemyStatLevels: ; c6d4
; 07 neutral
@@ -746,7 +746,7 @@
SECTION "overworldmap",BSS[$c800]
OverworldMap: ; c800
ds 1300
-OverworldMapEnd
+OverworldMapEnd:
ds 12
@@ -1102,7 +1102,7 @@
; or the routine will keep going
OTPartyMon1:
-OTPartyMon1Species2: ; d288
+OTPartyMon1Species: ; d288
ds 1
OTPartyMon1Item: ; d289
ds 1
@@ -1239,6 +1239,7 @@
ds 2
PlayerName: ; d47d
ds 11
+PlayerNameEnd: ; d478
ds 46
@@ -1430,9 +1431,8 @@
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 @@
ds 1
PartyMon1CaughtData: ; dcfc
PartyMon1CaughtTime: ; dcfc
-PartyMon1CaughtLevel ; dcfc
+PartyMon1CaughtLevel: ; dcfc
ds 1
PartyMon1CaughtGender: ; dcfd
PartyMon1CaughtLocation: ; dcfd