Merge.

hg-commit-id: 048127125cc4

1 files changed, 208 insertions, 0 deletions

diff --git a/constants.asm b/constants.asm
index 02598ed8..6442f918 100644
--- a/constants.asm
+++ b/constants.asm
@@ -157,6 +157,214 @@ W_PLAYERNAME EQU $D158 ; 11 characters, including null
 
 W_NUMINPARTY EQU $D163
 
+W_PARTYMON1 EQU $D164
+W_PARTYMON2 EQU $D165
+W_PARTYMON3 EQU $D166
+W_PARTYMON4 EQU $D167
+W_PARTYMON5 EQU $D168
+W_PARTYMON6 EQU $D169
+W_PARTYMONEND EQU $D16A
+
+W_PARTYMON1DATA EQU $D16B
+W_PARTYMON1_NUM EQU $D16B
+W_PARTYMON1_HP EQU $D16C
+W_PARTYMON1_BOXLEVEL EQU $D16E
+W_PARTYMON1_STATUS EQU $D16F
+W_PARTYMON1_TYPE1 EQU $D170
+W_PARTYMON1_TYPE2 EQU $D171
+W_PARTYMON1_CRATE EQU $D172
+W_PARTYMON1_MOVE1 EQU $D173
+W_PARTYMON1_MOVE2 EQU $D174
+W_PARTYMON1_MOVE3 EQU $D175
+W_PARTYMON1_MOVE4 EQU $D176
+W_PARTYMON1_OTID EQU $D177
+W_PARTYMON1_EXP EQU $D179
+W_PARTYMON1_EVHP EQU $D17C
+W_PARTYMON1_EVATTACK EQU $D17E
+W_PARTYMON1_EVDEFENSE EQU $D180
+W_PARTYMON1_EVSPEED EQU $D182
+W_PARTYMON1_EVSECIAL EQU $D184
+W_PARTYMON1_IV EQU $D186
+W_PARTYMON1_MOVE1PP EQU $D188
+W_PARTYMON1_MOVE2PP EQU $D189
+W_PARTYMON1_MOVE3PP EQU $D18A
+W_PARTYMON1_MOVE4PP EQU $D18B
+W_PARTYMON1_LEVEL EQU $D18C
+W_PARTYMON1_MAXHP EQU $D18D
+W_PARTYMON1_ATACK EQU $D18F
+W_PARTYMON1_DEFENSE EQU $D191
+W_PARTYMON1_SPEED EQU $D193
+W_PARTYMON1_SPECIAL EQU $D195
+
+W_PARTYMON2DATA EQU $D197
+W_PARTYMON2_NUM EQU $D197
+W_PARTYMON2_HP EQU $D198
+W_PARTYMON2_BOXLEVEL EQU $D19A
+W_PARTYMON2_STATUS EQU $D19B
+W_PARTYMON2_TYPE1 EQU $D19C
+W_PARTYMON2_TYPE2 EQU $D19D
+W_PARTYMON2_CRATE EQU $D19E
+W_PARTYMON2_MOVE1 EQU $D19F
+W_PARTYMON2_MOVE2 EQU $D1A0
+W_PARTYMON2_MOVE3 EQU $D1A1
+W_PARTYMON2_MOVE4 EQU $D1A2
+W_PARTYMON2_OTID EQU $D1A3
+W_PARTYMON2_EXP EQU $D1A5
+W_PARTYMON2_EVHP EQU $D1A8
+W_PARTYMON2_EVATTACK EQU $D1AA
+W_PARTYMON2_EVDEFENSE EQU $D1AC
+W_PARTYMON2_EVSPEED EQU $D1AE
+W_PARTYMON2_EVSECIAL EQU $D1B0
+W_PARTYMON2_IV EQU $D1B2
+W_PARTYMON2_MOVE1PP EQU $D1B4
+W_PARTYMON2_MOVE2PP EQU $D1B5
+W_PARTYMON2_MOVE3PP EQU $D1B6
+W_PARTYMON2_MOVE4PP EQU $D1B7
+W_PARTYMON2_LEVEL EQU $D1B8
+W_PARTYMON2_MAXHP EQU $D1B9
+W_PARTYMON2_ATACK EQU $D1BB
+W_PARTYMON2_DEFENSE EQU $D1BD
+W_PARTYMON2_SPEED EQU $D1BF
+W_PARTYMON2_SPECIAL EQU $D1C1
+
+W_PARTYMON3DATA EQU $D1C3
+W_PARTYMON3_NUM EQU $D1C3
+W_PARTYMON3_HP EQU $D1C4
+W_PARTYMON3_BOXLEVEL EQU $D1C6
+W_PARTYMON3_STATUS EQU $D1C7
+W_PARTYMON3_TYPE1 EQU $D1C8
+W_PARTYMON3_TYPE2 EQU $D1C9
+W_PARTYMON3_CRATE EQU $D1CA
+W_PARTYMON3_MOVE1 EQU $D1CB
+W_PARTYMON3_MOVE2 EQU $D1CC
+W_PARTYMON3_MOVE3 EQU $D1CD
+W_PARTYMON3_MOVE4 EQU $D1CE
+W_PARTYMON3_OTID EQU $D1CF
+W_PARTYMON3_EXP EQU $D1D1
+W_PARTYMON3_EVHP EQU $D1D4
+W_PARTYMON3_EVATTACK EQU $D1D6
+W_PARTYMON3_EVDEFENSE EQU $D1D8
+W_PARTYMON3_EVSPEED EQU $D1DA
+W_PARTYMON3_EVSECIAL EQU $D1DC
+W_PARTYMON3_IV EQU $D1DE
+W_PARTYMON3_MOVE1PP EQU $D1E0
+W_PARTYMON3_MOVE2PP EQU $D1E1
+W_PARTYMON3_MOVE3PP EQU $D1E2
+W_PARTYMON3_MOVE4PP EQU $D1E3
+W_PARTYMON3_LEVEL EQU $D1E4
+W_PARTYMON3_MAXHP EQU $D1E5
+W_PARTYMON3_ATACK EQU $D1E7
+W_PARTYMON3_DEFENSE EQU $D1E9
+W_PARTYMON3_SPEED EQU $D1EB
+W_PARTYMON3_SPECIAL EQU $D1ED
+
+W_PARTYMON4DATA EQU $D1EF
+W_PARTYMON4_NUM EQU $D1EF
+W_PARTYMON4_HP EQU $D1F0
+W_PARTYMON4_BOXLEVEL EQU $D1F2
+W_PARTYMON4_STATUS EQU $D1F3
+W_PARTYMON4_TYPE1 EQU $D1F4
+W_PARTYMON4_TYPE2 EQU $D1F5
+W_PARTYMON4_CRATE EQU $D1F6
+W_PARTYMON4_MOVE1 EQU $D1F7
+W_PARTYMON4_MOVE2 EQU $D1F8
+W_PARTYMON4_MOVE3 EQU $D1F9
+W_PARTYMON4_MOVE4 EQU $D1FA
+W_PARTYMON4_OTID EQU $D1FB
+W_PARTYMON4_EXP EQU $D1FD
+W_PARTYMON4_EVHP EQU $D200
+W_PARTYMON4_EVATTACK EQU $D202
+W_PARTYMON4_EVDEFENSE EQU $D204
+W_PARTYMON4_EVSPEED EQU $D206
+W_PARTYMON4_EVSECIAL EQU $D208
+W_PARTYMON4_IV EQU $D20A
+W_PARTYMON4_MOVE1PP EQU $D20C
+W_PARTYMON4_MOVE2PP EQU $D20D
+W_PARTYMON4_MOVE3PP EQU $D20E
+W_PARTYMON4_MOVE4PP EQU $D20F
+W_PARTYMON4_LEVEL EQU $D210
+W_PARTYMON4_MAXHP EQU $D211
+W_PARTYMON4_ATACK EQU $D213
+W_PARTYMON4_DEFENSE EQU $D215
+W_PARTYMON4_SPEED EQU $D217
+W_PARTYMON4_SPECIAL EQU $D219
+
+W_PARTYMON5DATA EQU $D21B
+W_PARTYMON5_NUM EQU $D21B
+W_PARTYMON5_HP EQU $D21C
+W_PARTYMON5_BOXLEVEL EQU $D21E
+W_PARTYMON5_STATUS EQU $D21F
+W_PARTYMON5_TYPE1 EQU $D220
+W_PARTYMON5_TYPE2 EQU $D221
+W_PARTYMON5_CRATE EQU $D222
+W_PARTYMON5_MOVE1 EQU $D223
+W_PARTYMON5_MOVE2 EQU $D224
+W_PARTYMON5_MOVE3 EQU $D225
+W_PARTYMON5_MOVE4 EQU $D226
+W_PARTYMON5_OTID EQU $D227
+W_PARTYMON5_EXP EQU $D229
+W_PARTYMON5_EVHP EQU $D22C
+W_PARTYMON5_EVATTACK EQU $D22E
+W_PARTYMON5_EVDEFENSE EQU $D230
+W_PARTYMON5_EVSPEED EQU $D232
+W_PARTYMON5_EVSECIAL EQU $D234
+W_PARTYMON5_IV EQU $D236
+W_PARTYMON5_MOVE1PP EQU $D238
+W_PARTYMON5_MOVE2PP EQU $D239
+W_PARTYMON5_MOVE3PP EQU $D23A
+W_PARTYMON5_MOVE4PP EQU $D23B
+W_PARTYMON5_LEVEL EQU $D23C
+W_PARTYMON5_MAXHP EQU $D23D
+W_PARTYMON5_ATACK EQU $D23F
+W_PARTYMON5_DEFENSE EQU $D241
+W_PARTYMON5_SPEED EQU $D243
+W_PARTYMON5_SPECIAL EQU $D245
+
+W_PARTYMON6DATA EQU $D247
+W_PARTYMON6_NUM EQU $D247
+W_PARTYMON6_HP EQU $D248
+W_PARTYMON6_BOXLEVEL EQU $D24A
+W_PARTYMON6_STATUS EQU $D24B
+W_PARTYMON6_TYPE1 EQU $D24C
+W_PARTYMON6_TYPE2 EQU $D24D
+W_PARTYMON6_CRATE EQU $D24E
+W_PARTYMON6_MOVE1 EQU $D24F
+W_PARTYMON6_MOVE2 EQU $D250
+W_PARTYMON6_MOVE3 EQU $D251
+W_PARTYMON6_MOVE4 EQU $D252
+W_PARTYMON6_OTID EQU $D253
+W_PARTYMON6_EXP EQU $D255
+W_PARTYMON6_EVHP EQU $D258
+W_PARTYMON6_EVATTACK EQU $D25A
+W_PARTYMON6_EVDEFENSE EQU $D25C
+W_PARTYMON6_EVSPEED EQU $D25E
+W_PARTYMON6_EVSECIAL EQU $D260
+W_PARTYMON6_IV EQU $D262
+W_PARTYMON6_MOVE1PP EQU $D264
+W_PARTYMON6_MOVE2PP EQU $D265
+W_PARTYMON6_MOVE3PP EQU $D266
+W_PARTYMON6_MOVE4PP EQU $D267
+W_PARTYMON6_LEVEL EQU $D268
+W_PARTYMON6_MAXHP EQU $D269
+W_PARTYMON6_ATACK EQU $D26B
+W_PARTYMON6_DEFENSE EQU $D26D
+W_PARTYMON6_SPEED EQU $D26F
+W_PARTYMON6_SPECIAL EQU $D271
+
+W_PARTYMON1OT EQU $D273
+W_PARTYMON2OT EQU $D27E
+W_PARTYMON3OT EQU $D289
+W_PARTYMON4OT EQU $D294
+W_PARTYMON5OT EQU $D29F
+W_PARTYMON6OT EQU $D2AA
+
+W_PARTYMON1NAME EQU $D2B5
+W_PARTYMON2NAME EQU $D2C0
+W_PARTYMON3NAME EQU $D2CB
+W_PARTYMON4NAME EQU $D2D6
+W_PARTYMON5NAME EQU $D2E1
+W_PARTYMON6NAME EQU $D2EC
+
 W_NUMBAGITEMS EQU $D31D
 W_BAGITEM01 EQU $D31E