summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/contest_opponents.inc973
-rw-r--r--include/contest.h18
-rw-r--r--src/data/contest_opponents.h8
3 files changed, 414 insertions, 585 deletions
diff --git a/data/contest_opponents.inc b/data/contest_opponents.inc
index 9246bac21..81510ac18 100644
--- a/data/contest_opponents.inc
+++ b/data/contest_opponents.inc
@@ -1,11 +1,24 @@
+ .macro aiPool rank:req, cool:req, beauty:req, cute:req, smart:req, tough:req
+ .byte ((\tough) << 6) | ((\smart) << 5) | ((\cute) << 4) | ((\beauty) << 3) | ((\cool) << 2) | \rank
+ .byte 0 @ padding
+ .endm
+
+ .macro gfxId id
+ .byte \id
+ .2byte 0 @ padding
+ .endm
+
+ .macro unk2C
+ .4byte 0, 0, 0
+ .endm
+
@todo: cleanup
.2byte SPECIES_POOCHYENA
.string "POOCHY$ "
.string "JIMMY$ "
- .byte 7
- .2byte 0
+ gfxId 7
.4byte 0xc000fff
- .2byte 68
+ aiPool 0, 1, 0, 0, 0, 1
.2byte 46
.2byte 44
.2byte 36
@@ -16,18 +29,16 @@
.byte 3
.byte 4
.byte 50
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_ILLUMISE
.string "MUSILLE$ "
.string "EDITH$ "
- .byte 8
- .2byte 0
+ gfxId 8
.4byte 0x82000fff
- .2byte 16
+ aiPool 0, 0, 0, 1, 0, 0
.2byte 156
.2byte 263
.2byte 33
@@ -38,18 +49,16 @@
.byte 1
.byte 2
.byte 60
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_DUSTOX
.string "DUSTER$ "
.string "EVAN$ "
- .byte 11
- .2byte 0
+ gfxId 11
.4byte 0x21000fff
- .2byte 8
+ aiPool 0, 0, 1, 0, 0, 0
.2byte 318
.2byte 236
.2byte 113
@@ -60,18 +69,16 @@
.byte 12
.byte 4
.byte 70
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SEEDOT
.string "DOTS$ "
.string "KELSEY$ "
- .byte 16
- .2byte 0
+ gfxId 16
.4byte 0x20800fff
- .2byte 96
+ aiPool 0, 0, 0, 0, 1, 1
.2byte 117
.2byte 235
.2byte 331
@@ -82,18 +89,16 @@
.byte 2
.byte 7
.byte 80
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_TAILLOW
.string "TATAY$ "
.string "MADISON$"
- .byte 18
- .2byte 0
+ gfxId 18
.4byte 0x80400fff
- .2byte 4
+ aiPool 0, 1, 0, 0, 0, 0
.2byte 17
.2byte 97
.2byte 332
@@ -104,18 +109,16 @@
.byte 5
.byte 4
.byte 90
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_NINCADA
.string "NINDA$ "
.string "RAYMOND$"
- .byte 44
- .2byte 0
+ gfxId 44
.4byte 0x10200fff
- .2byte 32
+ aiPool 0, 0, 0, 0, 1, 0
.2byte 141
.2byte 206
.2byte 154
@@ -126,18 +129,16 @@
.byte 7
.byte 8
.byte 100
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SHROOMISH
.string "SMISH$ "
.string "GRANT$ "
- .byte 35
- .2byte 0
+ gfxId 35
.4byte 0x20100fff
- .2byte 32
+ aiPool 0, 0, 0, 0, 1, 0
.2byte 78
.2byte 73
.2byte 72
@@ -148,18 +149,16 @@
.byte 2
.byte 2
.byte 50
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SPHEAL
.string "SLEAL$ "
.string "PAIGE$ "
- .byte 26
- .2byte 0
+ gfxId 26
.4byte 0x8080fff
- .2byte 24
+ aiPool 0, 0, 1, 1, 0, 0
.2byte 62
.2byte 55
.2byte 45
@@ -170,18 +169,16 @@
.byte 10
.byte 10
.byte 60
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SLAKOTH
.string "SLOKTH$ "
.string "ALEC$ "
- .byte 31
- .2byte 0
+ gfxId 31
.4byte 0x40040fff
- .2byte 88
+ aiPool 0, 0, 1, 1, 0, 1
.2byte 70
.2byte 68
.2byte 281
@@ -192,18 +189,16 @@
.byte 5
.byte 18
.byte 70
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_WHISMUR
.string "WHIRIS$ "
.string "SYDNEY$ "
- .byte 47
- .2byte 0
+ gfxId 47
.4byte 0x80020fff
- .2byte 36
+ aiPool 0, 1, 0, 0, 1, 0
.2byte 310
.2byte 103
.2byte 253
@@ -214,18 +209,16 @@
.byte 2
.byte 7
.byte 80
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MAKUHITA
.string "MAHITA$ "
.string "MORRIS$ "
- .byte 38
- .2byte 0
+ gfxId 38
.4byte 0x8010fff
- .2byte 68
+ aiPool 0, 1, 0, 0, 0, 1
.2byte 69
.2byte 233
.2byte 33
@@ -236,18 +229,16 @@
.byte 8
.byte 1
.byte 90
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_ARON
.string "RONAR$ "
.string "MARIAH$ "
- .byte 10
- .2byte 0
+ gfxId 10
.4byte 0x8008fff
- .2byte 68
+ aiPool 0, 1, 0, 0, 0, 1
.2byte 232
.2byte 334
.2byte 29
@@ -258,18 +249,16 @@
.byte 10
.byte 2
.byte 100
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_CROBAT
.string "BATRO$ "
.string "RUSSELL$"
- .byte 33
- .2byte 0
+ gfxId 33
.4byte 0x90004fff
- .2byte 56
+ aiPool 0, 0, 1, 1, 1, 0
.2byte 114
.2byte 212
.2byte 109
@@ -280,18 +269,16 @@
.byte 2
.byte 10
.byte 50
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_GULPIN
.string "GULIN$ "
.string "MELANIE$"
- .byte 6
- .2byte 0
+ gfxId 6
.4byte 0x40002fff
- .2byte 16
+ aiPool 0, 0, 0, 1, 0, 0
.2byte 124
.2byte 133
.2byte 92
@@ -302,18 +289,16 @@
.byte 10
.byte 5
.byte 60
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MANECTRIC
.string "RIKELEC$ "
.string "CHANCE$ "
- .byte 15
- .2byte 0
+ gfxId 15
.4byte 0x80001fff
- .2byte 12
+ aiPool 0, 1, 1, 0, 0, 0
.2byte 209
.2byte 86
.2byte 87
@@ -324,18 +309,16 @@
.byte 1
.byte 1
.byte 70
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_BULBASAUR
.string "BULBY$ "
.string "AGATHA$ "
- .byte 20
- .2byte 0
+ gfxId 20
.4byte 0xc000fff
- .2byte 48
+ aiPool 0, 0, 0, 1, 1, 0
.2byte 45
.2byte 73
.2byte 33
@@ -346,18 +329,16 @@
.byte 10
.byte 4
.byte 50
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_BUTTERFREE
.string "FUTTERBE$ "
.string "BEAU$ "
- .byte 40
- .2byte 0
+ gfxId 40
.4byte 0x82000fff
- .2byte 40
+ aiPool 0, 0, 1, 0, 1, 0
.2byte 48
.2byte 18
.2byte 318
@@ -368,18 +349,16 @@
.byte 10
.byte 4
.byte 60
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_PIDGEOTTO
.string "PIDEOT$ "
.string "KAY$ "
- .byte 34
- .2byte 0
+ gfxId 34
.4byte 0x21000fff
- .2byte 12
+ aiPool 0, 1, 1, 0, 0, 0
.2byte 119
.2byte 98
.2byte 332
@@ -390,18 +369,16 @@
.byte 2
.byte 3
.byte 70
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_DIGLETT
.string "DIGLE$ "
.string "CALE$ "
- .byte 55
- .2byte 0
+ gfxId 55
.4byte 0x20800fff
- .2byte 96
+ aiPool 0, 0, 0, 0, 1, 1
.2byte 91
.2byte 89
.2byte 90
@@ -412,18 +389,16 @@
.byte 5
.byte 10
.byte 80
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_POLIWAG
.string "WAGIL$ "
.string "CAITLIN$"
- .byte 53
- .2byte 0
+ gfxId 53
.4byte 0x80400fff
- .2byte 72
+ aiPool 0, 0, 1, 0, 0, 1
.2byte 56
.2byte 240
.2byte 34
@@ -434,18 +409,16 @@
.byte 3
.byte 10
.byte 90
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_TOTODILE
.string "TOTDIL$ "
.string "COLBY$ "
- .byte 5
- .2byte 0
+ gfxId 5
.4byte 0x10200fff
- .2byte 12
+ aiPool 0, 1, 1, 0, 0, 0
.2byte 99
.2byte 103
.2byte 57
@@ -456,18 +429,16 @@
.byte 1
.byte 5
.byte 100
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_LEDYBA
.string "BALEDY$ "
.string "KYLIE$ "
- .byte 45
- .2byte 0
+ gfxId 45
.4byte 0x20100fff
- .2byte 20
+ aiPool 0, 1, 0, 1, 0, 0
.2byte 226
.2byte 97
.2byte 129
@@ -478,18 +449,16 @@
.byte 6
.byte 2
.byte 90
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_DELIBIRD
.string "BIRDLY$ "
.string "LIAM$ "
- .byte 66
- .2byte 0
+ gfxId 66
.4byte 0x8080fff
- .2byte 112
+ aiPool 0, 0, 0, 1, 1, 1
.2byte 217
.2byte 263
.2byte 264
@@ -500,18 +469,16 @@
.byte 5
.byte 3
.byte 80
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_LARVITAR
.string "TARVITAR$ "
.string "MILO$ "
- .byte 39
- .2byte 0
+ gfxId 39
.4byte 0x40040fff
- .2byte 64
+ aiPool 0, 0, 0, 0, 0, 1
.2byte 37
.2byte 259
.2byte 242
@@ -522,18 +489,16 @@
.byte 8
.byte 10
.byte 70
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_ROSELIA
.string "RELIA$ "
.string "KARINA$ "
- .byte 32
- .2byte 0
+ gfxId 32
.4byte 0x24000fff
- .2byte 41
+ aiPool 1, 0, 1, 0, 1, 0
.2byte 80
.2byte 345
.2byte 320
@@ -544,18 +509,16 @@
.byte 10
.byte 20
.byte 100
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_DODRIO
.string "DUODO$ "
.string "BOBBY$ "
- .byte 51
- .2byte 0
+ gfxId 51
.4byte 0x82000fff
- .2byte 125
+ aiPool 1, 1, 1, 1, 1, 1
.2byte 64
.2byte 31
.2byte 216
@@ -566,18 +529,16 @@
.byte 85
.byte 35
.byte 110
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_TRAPINCH
.string "PINCHIN$ "
.string "CLAIRE$ "
- .byte 8
- .2byte 0
+ gfxId 8
.4byte 0x81000fff
- .2byte 113
+ aiPool 1, 0, 0, 1, 1, 1
.2byte 44
.2byte 28
.2byte 91
@@ -588,18 +549,16 @@
.byte 10
.byte 25
.byte 120
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_CACNEA
.string "NACAC$ "
.string "WILLIE$ "
- .byte 11
- .2byte 0
+ gfxId 11
.4byte 0x80800fff
- .2byte 37
+ aiPool 1, 1, 0, 0, 1, 0
.2byte 191
.2byte 43
.2byte 40
@@ -610,18 +569,16 @@
.byte 65
.byte 25
.byte 130
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SANDSLASH
.string "SHRAND$ "
.string "CASSIDY$"
- .byte 18
- .2byte 0
+ gfxId 18
.4byte 0x10400fff
- .2byte 69
+ aiPool 1, 1, 0, 0, 0, 1
.2byte 163
.2byte 111
.2byte 129
@@ -632,18 +589,16 @@
.byte 10
.byte 100
.byte 140
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_BALTOY
.string "TOYBAL$ "
.string "MORGAN$ "
- .byte 44
- .2byte 0
+ gfxId 44
.4byte 0x8200fff
- .2byte 41
+ aiPool 1, 0, 1, 0, 1, 0
.2byte 120
.2byte 317
.2byte 60
@@ -654,18 +609,16 @@
.byte 35
.byte 35
.byte 150
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MEDICHAM
.string "CHAMCHAM$ "
.string "SUMMER$ "
- .byte 26
- .2byte 0
+ gfxId 26
.4byte 0x10100fff
- .2byte 77
+ aiPool 1, 1, 1, 0, 0, 1
.2byte 179
.2byte 9
.2byte 7
@@ -676,18 +629,16 @@
.byte 40
.byte 40
.byte 100
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SPINDA
.string "SPININ$ "
.string "MILES$ "
- .byte 31
- .2byte 0
+ gfxId 31
.4byte 0x80080fff
- .2byte 49
+ aiPool 1, 0, 0, 1, 1, 0
.2byte 298
.2byte 244
.2byte 95
@@ -698,18 +649,16 @@
.byte 10
.byte 25
.byte 110
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SWABLU
.string "SWABY$ "
.string "AUDREY$ "
- .byte 47
- .2byte 0
+ gfxId 47
.4byte 0xa0040fff
- .2byte 41
+ aiPool 1, 0, 1, 0, 1, 0
.2byte 119
.2byte 195
.2byte 219
@@ -720,18 +669,16 @@
.byte 30
.byte 25
.byte 120
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SPOINK
.string "POINKER$ "
.string "AVERY$ "
- .byte 38
- .2byte 0
+ gfxId 38
.4byte 0x80020fff
- .2byte 49
+ aiPool 1, 0, 0, 1, 1, 0
.2byte 150
.2byte 109
.2byte 173
@@ -742,18 +689,16 @@
.byte 40
.byte 30
.byte 130
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_KECLEON
.string "KECON$ "
.string "ARIANA$ "
- .byte 10
- .2byte 0
+ gfxId 10
.4byte 0x80010fff
- .2byte 97
+ aiPool 1, 0, 0, 0, 1, 1
.2byte 168
.2byte 103
.2byte 246
@@ -764,18 +709,16 @@
.byte 75
.byte 35
.byte 140
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_GOLDEEN
.string "GOLDEN$ "
.string "ASHTON$ "
- .byte 33
- .2byte 0
+ gfxId 33
.4byte 0x80008fff
- .2byte 13
+ aiPool 1, 1, 1, 0, 0, 0
.2byte 30
.2byte 31
.2byte 32
@@ -786,18 +729,16 @@
.byte 30
.byte 25
.byte 150
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_BARBOACH
.string "BOBOACH$ "
.string "SANDRA$ "
- .byte 6
- .2byte 0
+ gfxId 6
.4byte 0x80004fff
- .2byte 113
+ aiPool 1, 0, 0, 1, 1, 1
.2byte 300
.2byte 346
.2byte 89
@@ -808,18 +749,16 @@
.byte 25
.byte 15
.byte 100
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SKARMORY
.string "CORPY$ "
.string "CARSON$ "
- .byte 35
- .2byte 0
+ gfxId 35
.4byte 0x8002fff
- .2byte 77
+ aiPool 1, 1, 1, 0, 0, 1
.2byte 129
.2byte 104
.2byte 97
@@ -830,18 +769,16 @@
.byte 60
.byte 20
.byte 110
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_LOTAD
.string "TADO$ "
.string "KATRINA$"
- .byte 16
- .2byte 0
+ gfxId 16
.4byte 0x8001fff
- .2byte 57
+ aiPool 1, 0, 1, 1, 1, 0
.2byte 310
.2byte 45
.2byte 240
@@ -852,18 +789,16 @@
.byte 15
.byte 75
.byte 120
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SLOWBRO
.string "BROWLO$ "
.string "LUKE$ "
- .byte 17
- .2byte 0
+ gfxId 17
.4byte 0xc000fff
- .2byte 49
+ aiPool 1, 0, 0, 1, 1, 0
.2byte 281
.2byte 50
.2byte 45
@@ -874,18 +809,16 @@
.byte 30
.byte 20
.byte 100
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_FARFETCHD
.string "FETCHIN$ "
.string "RAUL$ "
- .byte 66
- .2byte 0
+ gfxId 66
.4byte 0x82000fff
- .2byte 21
+ aiPool 1, 1, 0, 1, 0, 0
.2byte 263
.2byte 210
.2byte 19
@@ -896,18 +829,16 @@
.byte 20
.byte 20
.byte 110
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SEEL
.string "SEELEY$ "
.string "JADA$ "
- .byte 20
- .2byte 0
+ gfxId 20
.4byte 0x21000fff
- .2byte 25
+ aiPool 1, 0, 1, 1, 0, 0
.2byte 213
.2byte 58
.2byte 219
@@ -918,18 +849,16 @@
.byte 20
.byte 20
.byte 120
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_DROWZEE
.string "DROWZIN$ "
.string "ZEEK$ "
- .byte 37
- .2byte 0
+ gfxId 37
.4byte 0x20800fff
- .2byte 121
+ aiPool 1, 0, 1, 1, 1, 1
.2byte 50
.2byte 248
.2byte 237
@@ -940,18 +869,16 @@
.byte 30
.byte 45
.byte 130
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_HITMONCHAN
.string "HITEMON$ "
.string "DIEGO$ "
- .byte 21
- .2byte 0
+ gfxId 21
.4byte 0x80400fff
- .2byte 69
+ aiPool 1, 1, 0, 0, 0, 1
.2byte 327
.2byte 197
.2byte 279
@@ -962,18 +889,16 @@
.byte 20
.byte 45
.byte 140
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_BLISSEY
.string "BLISS$ "
.string "ALIYAH$ "
- .byte 85
- .2byte 0
+ gfxId 85
.4byte 0x10200fff
- .2byte 89
+ aiPool 1, 0, 1, 1, 0, 1
.2byte 47
.2byte 135
.2byte 121
@@ -984,18 +909,16 @@
.byte 20
.byte 20
.byte 150
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_ELEKID
.string "KIDLEK$ "
.string "NATALIA$"
- .byte 18
- .2byte 0
+ gfxId 18
.4byte 0x20100fff
- .2byte 21
+ aiPool 1, 1, 0, 1, 0, 0
.2byte 351
.2byte 98
.2byte 103
@@ -1006,18 +929,16 @@
.byte 25
.byte 25
.byte 140
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SNUBBULL
.string "SNUBBINS$ "
.string "DEVIN$ "
- .byte 48
- .2byte 0
+ gfxId 48
.4byte 0x8080fff
- .2byte 81
+ aiPool 1, 0, 0, 1, 0, 1
.2byte 184
.2byte 269
.2byte 39
@@ -1028,18 +949,16 @@
.byte 20
.byte 20
.byte 130
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MISDREAVUS
.string "DREAVIS$ "
.string "TYLOR$ "
- .byte 40
- .2byte 0
+ gfxId 40
.4byte 0x40040fff
- .2byte 41
+ aiPool 1, 0, 1, 0, 1, 0
.2byte 195
.2byte 212
.2byte 109
@@ -1050,18 +969,16 @@
.byte 45
.byte 20
.byte 120
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_LAIRON
.string "LAIRN$ "
.string "RONNIE$ "
- .byte 55
- .2byte 0
+ gfxId 55
.4byte 0x84000fff
- .2byte 98
+ aiPool 2, 0, 0, 0, 1, 1
.2byte 319
.2byte 232
.2byte 106
@@ -1072,18 +989,16 @@
.byte 100
.byte 90
.byte 200
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SHIFTRY
.string "SHIFTY$ "
.string "CLAUDIA$"
- .byte 8
- .2byte 0
+ gfxId 8
.4byte 0x82000fff
- .2byte 14
+ aiPool 2, 1, 1, 0, 0, 0
.2byte 74
.2byte 13
.2byte 153
@@ -1094,18 +1009,16 @@
.byte 35
.byte 70
.byte 210
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_NINJASK
.string "NINAS$ "
.string "ELIAS$ "
- .byte 11
- .2byte 0
+ gfxId 11
.4byte 0x81000fff
- .2byte 114
+ aiPool 2, 0, 0, 1, 1, 1
.2byte 103
.2byte 154
.2byte 28
@@ -1116,18 +1029,16 @@
.byte 70
.byte 70
.byte 220
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SWELLOW
.string "WELOW$ "
.string "JADE$ "
- .byte 18
- .2byte 0
+ gfxId 18
.4byte 0x80800fff
- .2byte 14
+ aiPool 2, 1, 1, 0, 0, 0
.2byte 97
.2byte 332
.2byte 17
@@ -1138,18 +1049,16 @@
.byte 75
.byte 40
.byte 230
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MIGHTYENA
.string "YENA$ "
.string "FRANCIS$"
- .byte 44
- .2byte 0
+ gfxId 44
.4byte 0x80400fff
- .2byte 98
+ aiPool 2, 0, 0, 0, 1, 1
.2byte 269
.2byte 168
.2byte 316
@@ -1160,18 +1069,16 @@
.byte 70
.byte 70
.byte 240
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_BEAUTIFLY
.string "TIFLY$ "
.string "ALISHA$ "
- .byte 26
- .2byte 0
+ gfxId 26
.4byte 0x80200fff
- .2byte 42
+ aiPool 2, 0, 1, 0, 1, 0
.2byte 234
.2byte 318
.2byte 78
@@ -1182,18 +1089,16 @@
.byte 80
.byte 100
.byte 250
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SEAKING
.string "KINGSEA$ "
.string "SAUL$ "
- .byte 31
- .2byte 0
+ gfxId 31
.4byte 0x80100fff
- .2byte 118
+ aiPool 2, 1, 0, 1, 1, 1
.2byte 175
.2byte 48
.2byte 30
@@ -1204,18 +1109,16 @@
.byte 70
.byte 90
.byte 200
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_CASTFORM
.string "CASTER$ "
.string "FELICIA$"
- .byte 47
- .2byte 0
+ gfxId 47
.4byte 0x80080fff
- .2byte 126
+ aiPool 2, 1, 1, 1, 1, 1
.2byte 241
.2byte 311
.2byte 201
@@ -1226,18 +1129,16 @@
.byte 50
.byte 65
.byte 210
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MACHOKE
.string "CHOKEM$ "
.string "EMILIO$ "
- .byte 38
- .2byte 0
+ gfxId 38
.4byte 0x80040fff
- .2byte 70
+ aiPool 2, 1, 0, 0, 0, 1
.2byte 69
.2byte 116
.2byte 2
@@ -1248,18 +1149,16 @@
.byte 60
.byte 50
.byte 220
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_LOMBRE
.string "LOMBE$ "
.string "KARLA$ "
- .byte 10
- .2byte 0
+ gfxId 10
.4byte 0x80020fff
- .2byte 58
+ aiPool 2, 0, 1, 1, 1, 0
.2byte 213
.2byte 148
.2byte 253
@@ -1270,18 +1169,16 @@
.byte 45
.byte 70
.byte 230
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SEVIPER
.string "VIPES$ "
.string "DARRYL$ "
- .byte 33
- .2byte 0
+ gfxId 33
.4byte 0x80010fff
- .2byte 98
+ aiPool 2, 0, 0, 0, 1, 1
.2byte 305
.2byte 137
.2byte 35
@@ -1292,18 +1189,16 @@
.byte 40
.byte 100
.byte 240
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_WAILMER
.string "MERAIL$ "
.string "SELENA$ "
- .byte 22
- .2byte 0
+ gfxId 22
.4byte 0x80008fff
- .2byte 26
+ aiPool 2, 0, 1, 1, 0, 0
.2byte 352
.2byte 156
.2byte 323
@@ -1314,18 +1209,16 @@
.byte 50
.byte 30
.byte 250
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MAGIKARP
.string "KARPAG$ "
.string "NOEL$ "
- .byte 35
- .2byte 0
+ gfxId 35
.4byte 0x80004fff
- .2byte 82
+ aiPool 2, 0, 0, 1, 0, 1
.2byte 33
.2byte 150
.2byte 175
@@ -1336,18 +1229,16 @@
.byte 50
.byte 160
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_LUNATONE
.string "LUNONE$ "
.string "LACEY$ "
- .byte 16
- .2byte 0
+ gfxId 16
.4byte 0x80002fff
- .2byte 42
+ aiPool 2, 0, 1, 0, 1, 0
.2byte 153
.2byte 248
.2byte 94
@@ -1358,18 +1249,16 @@
.byte 70
.byte 50
.byte 210
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_ABSOL
.string "ABSO$ "
.string "CORBIN$ "
- .byte 39
- .2byte 0
+ gfxId 39
.4byte 0x80001fff
- .2byte 14
+ aiPool 2, 1, 1, 0, 0, 0
.2byte 195
.2byte 258
.2byte 63
@@ -1380,18 +1269,16 @@
.byte 35
.byte 35
.byte 220
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_EXEGGUTOR
.string "EGGSOR$ "
.string "GRACIE$ "
- .byte 32
- .2byte 0
+ gfxId 32
.4byte 0xc000fff
- .2byte 98
+ aiPool 2, 0, 0, 0, 1, 1
.2byte 23
.2byte 95
.2byte 121
@@ -1402,18 +1289,16 @@
.byte 100
.byte 80
.byte 200
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_CUBONE
.string "CUBIN$ "
.string "COLTIN$ "
- .byte 65
- .2byte 0
+ gfxId 65
.4byte 0x82000fff
- .2byte 82
+ aiPool 2, 0, 0, 1, 0, 1
.2byte 125
.2byte 155
.2byte 198
@@ -1424,18 +1309,16 @@
.byte 35
.byte 100
.byte 210
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_HITMONLEE
.string "HITMON$ "
.string "ELLIE$ "
- .byte 22
- .2byte 0
+ gfxId 22
.4byte 0x21000fff
- .2byte 70
+ aiPool 2, 1, 0, 0, 0, 1
.2byte 179
.2byte 279
.2byte 116
@@ -1446,18 +1329,16 @@
.byte 50
.byte 100
.byte 220
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SQUIRTLE
.string "SURTLE$ "
.string "MARCUS$ "
- .byte 49
- .2byte 0
+ gfxId 49
.4byte 0x20800fff
- .2byte 82
+ aiPool 2, 0, 0, 1, 0, 1
.2byte 39
.2byte 145
.2byte 264
@@ -1468,18 +1349,16 @@
.byte 40
.byte 95
.byte 230
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_KANGASKHAN
.string "KHANKAN$ "
.string "KIARA$ "
- .byte 14
- .2byte 0
+ gfxId 14
.4byte 0x80400fff
- .2byte 70
+ aiPool 2, 1, 0, 0, 0, 1
.2byte 5
.2byte 99
.2byte 264
@@ -1490,18 +1369,16 @@
.byte 50
.byte 100
.byte 240
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_PINECO
.string "PINOC$ "
.string "BRYCE$ "
- .byte 36
- .2byte 0
+ gfxId 36
.4byte 0x10200fff
- .2byte 42
+ aiPool 2, 0, 1, 0, 1, 0
.2byte 153
.2byte 191
.2byte 113
@@ -1512,18 +1389,16 @@
.byte 80
.byte 80
.byte 250
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_DUNSPARCE
.string "DILTOT$ "
.string "JAMIE$ "
- .byte 34
- .2byte 0
+ gfxId 34
.4byte 0x20100fff
- .2byte 82
+ aiPool 2, 0, 0, 1, 0, 1
.2byte 180
.2byte 281
.2byte 111
@@ -1534,18 +1409,16 @@
.byte 40
.byte 110
.byte 240
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_HOUNDOOM
.string "DOOMOND$ "
.string "JORGE$ "
- .byte 48
- .2byte 0
+ gfxId 48
.4byte 0x8080fff
- .2byte 14
+ aiPool 2, 1, 1, 0, 0, 0
.2byte 46
.2byte 53
.2byte 185
@@ -1556,18 +1429,16 @@
.byte 25
.byte 80
.byte 230
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MILTANK
.string "MILKAN$ "
.string "DEVON$ "
- .byte 25
- .2byte 0
+ gfxId 25
.4byte 0x40040fff
- .2byte 26
+ aiPool 2, 0, 1, 1, 0, 0
.2byte 208
.2byte 215
.2byte 111
@@ -1578,18 +1449,16 @@
.byte 35
.byte 40
.byte 220
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_GYARADOS
.string "RADOS$ "
.string "JUSTINA$"
- .byte 32
- .2byte 0
+ gfxId 32
.4byte 0x84000fff
- .2byte 79
+ aiPool 3, 1, 1, 0, 0, 1
.2byte 63
.2byte 56
.2byte 240
@@ -1600,18 +1469,16 @@
.byte 40
.byte 160
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_LOUDRED
.string "LOUDERD$ "
.string "RALPH$ "
- .byte 21
- .2byte 0
+ gfxId 21
.4byte 0x82000fff
- .2byte 71
+ aiPool 3, 1, 0, 0, 0, 1
.2byte 304
.2byte 23
.2byte 46
@@ -1622,18 +1489,16 @@
.byte 150
.byte 160
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SKITTY
.string "SITTY$ "
.string "ROSA$ "
- .byte 8
- .2byte 0
+ gfxId 8
.4byte 0x81000fff
- .2byte 59
+ aiPool 3, 0, 1, 1, 1, 0
.2byte 213
.2byte 274
.2byte 185
@@ -1644,18 +1509,16 @@
.byte 185
.byte 60
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SLAKING
.string "SLING$ "
.string "KEATON$ "
- .byte 11
- .2byte 0
+ gfxId 11
.4byte 0x80800fff
- .2byte 115
+ aiPool 3, 0, 0, 1, 1, 1
.2byte 343
.2byte 68
.2byte 227
@@ -1666,18 +1529,16 @@
.byte 110
.byte 150
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_ALTARIA
.string "TARIA$ "
.string "MAYRA$ "
- .byte 18
- .2byte 0
+ gfxId 18
.4byte 0x80400fff
- .2byte 15
+ aiPool 3, 1, 1, 0, 0, 0
.2byte 349
.2byte 63
.2byte 195
@@ -1688,18 +1549,16 @@
.byte 30
.byte 90
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_KIRLIA
.string "LIRKI$ "
.string "LAMAR$ "
- .byte 15
- .2byte 0
+ gfxId 15
.4byte 0x80200fff
- .2byte 39
+ aiPool 3, 1, 0, 0, 1, 0
.2byte 351
.2byte 247
.2byte 285
@@ -1710,18 +1569,16 @@
.byte 230
.byte 80
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_BELLOSSOM
.string "BLOSSOM$ "
.string "AUBREY$ "
- .byte 26
- .2byte 0
+ gfxId 26
.4byte 0x80100fff
- .2byte 59
+ aiPool 3, 0, 1, 1, 1, 0
.2byte 80
.2byte 230
.2byte 78
@@ -1732,18 +1589,16 @@
.byte 130
.byte 40
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SABLEYE
.string "EYESAB$ "
.string "NIGEL$ "
- .byte 31
- .2byte 0
+ gfxId 31
.4byte 0x80080fff
- .2byte 115
+ aiPool 3, 0, 0, 1, 1, 1
.2byte 212
.2byte 185
.2byte 282
@@ -1754,18 +1609,16 @@
.byte 150
.byte 160
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_NATU
.string "UTAN$ "
.string "CAMILLE$"
- .byte 47
- .2byte 0
+ gfxId 47
.4byte 0x80040fff
- .2byte 115
+ aiPool 3, 0, 0, 1, 1, 1
.2byte 101
.2byte 248
.2byte 109
@@ -1776,18 +1629,16 @@
.byte 130
.byte 170
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SHARPEDO
.string "PEDOS$ "
.string "DEON$ "
- .byte 38
- .2byte 0
+ gfxId 38
.4byte 0x80020fff
- .2byte 87
+ aiPool 3, 1, 0, 1, 0, 1
.2byte 97
.2byte 207
.2byte 269
@@ -1798,18 +1649,16 @@
.byte 75
.byte 100
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_LUVDISC
.string "LUVIS$ "
.string "JANELLE$"
- .byte 10
- .2byte 0
+ gfxId 10
.4byte 0x80010fff
- .2byte 83
+ aiPool 3, 0, 0, 1, 0, 1
.2byte 186
.2byte 213
.2byte 36
@@ -1820,18 +1669,16 @@
.byte 40
.byte 190
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_HERACROSS
.string "HEROSS$ "
.string "HEATH$ "
- .byte 33
- .2byte 0
+ gfxId 33
.4byte 0x80008fff
- .2byte 71
+ aiPool 3, 1, 0, 0, 0, 1
.2byte 70
.2byte 203
.2byte 179
@@ -1842,18 +1689,16 @@
.byte 240
.byte 140
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_ELECTRODE
.string "RODLECT$ "
.string "SASHA$ "
- .byte 6
- .2byte 0
+ gfxId 6
.4byte 0x80004fff
- .2byte 15
+ aiPool 3, 1, 1, 0, 0, 0
.2byte 153
.2byte 113
.2byte 129
@@ -1864,18 +1709,16 @@
.byte 35
.byte 50
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_PICHU
.string "CHUPY$ "
.string "FRANKIE$"
- .byte 35
- .2byte 0
+ gfxId 35
.4byte 0x80002fff
- .2byte 59
+ aiPool 3, 0, 1, 1, 1, 0
.2byte 186
.2byte 213
.2byte 156
@@ -1886,18 +1729,16 @@
.byte 115
.byte 120
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_WOBBUFFET
.string "WOBET$ "
.string "HELEN$ "
- .byte 16
- .2byte 0
+ gfxId 16
.4byte 0x80001fff
- .2byte 111
+ aiPool 3, 1, 1, 0, 1, 1
.2byte 68
.2byte 243
.2byte 219
@@ -1908,18 +1749,16 @@
.byte 220
.byte 210
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_GENGAR
.string "GAREN$ "
.string "CAMILE$ "
- .byte 40
- .2byte 0
+ gfxId 40
.4byte 0xc000fff
- .2byte 71
+ aiPool 3, 1, 0, 0, 0, 1
.2byte 194
.2byte 109
.2byte 122
@@ -1930,18 +1769,16 @@
.byte 80
.byte 180
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_PORYGON
.string "GONPOR$ "
.string "MARTIN$ "
- .byte 46
- .2byte 0
+ gfxId 46
.4byte 0x82000fff
- .2byte 127
+ aiPool 3, 1, 1, 1, 1, 1
.2byte 176
.2byte 160
.2byte 216
@@ -1952,18 +1789,16 @@
.byte 130
.byte 130
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_DRAGONITE
.string "DRITE$ "
.string "SERGIO$ "
- .byte 7
- .2byte 0
+ gfxId 7
.4byte 0x21000fff
- .2byte 71
+ aiPool 3, 1, 0, 0, 0, 1
.2byte 200
.2byte 21
.2byte 239
@@ -1974,18 +1809,16 @@
.byte 120
.byte 150
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_MEOWTH
.string "MEOWY$ "
.string "KAILEY$ "
- .byte 6
- .2byte 0
+ gfxId 6
.4byte 0x20800fff
- .2byte 51
+ aiPool 3, 0, 0, 1, 1, 0
.2byte 45
.2byte 269
.2byte 6
@@ -1996,18 +1829,16 @@
.byte 170
.byte 80
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_JYNX
.string "NYX$ "
.string "PERLA$ "
- .byte 45
- .2byte 0
+ gfxId 45
.4byte 0x80400fff
- .2byte 43
+ aiPool 3, 0, 1, 0, 1, 0
.2byte 195
.2byte 212
.2byte 142
@@ -2018,18 +1849,16 @@
.byte 150
.byte 120
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_TOGEPI
.string "GEPITO$ "
.string "CLARA$ "
- .byte 20
- .2byte 0
+ gfxId 20
.4byte 0x10200fff
- .2byte 19
+ aiPool 3, 0, 0, 1, 0, 0
.2byte 45
.2byte 281
.2byte 227
@@ -2040,18 +1869,16 @@
.byte 120
.byte 80
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_ESPEON
.string "SPEON$ "
.string "JAKOB$ "
- .byte 37
- .2byte 0
+ gfxId 37
.4byte 0x20100fff
- .2byte 15
+ aiPool 3, 1, 1, 0, 0, 0
.2byte 129
.2byte 98
.2byte 234
@@ -2062,18 +1889,16 @@
.byte 80
.byte 150
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_SLOWKING
.string "SLOWGO$ "
.string "TREY$ "
- .byte 49
- .2byte 0
+ gfxId 49
.4byte 0x8080fff
- .2byte 83
+ aiPool 3, 0, 0, 1, 0, 1
.2byte 263
.2byte 174
.2byte 281
@@ -2084,18 +1909,16 @@
.byte 110
.byte 170
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
+
.2byte SPECIES_URSARING
.string "URSING$ "
.string "LANE$ "
- .byte 44
- .2byte 0
+ gfxId 44
.4byte 0x40040fff
- .2byte 71
+ aiPool 3, 1, 0, 0, 0, 1
.2byte 37
.2byte 332
.2byte 313
@@ -2106,9 +1929,7 @@
.byte 80
.byte 190
.byte 255
- .4byte 0x0
- .4byte 0x0
- .4byte 0x0
+ unk2C
.4byte 0x0
.4byte 0xffff
diff --git a/include/contest.h b/include/contest.h
index 4fbec9d22..a803c6d4c 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -208,15 +208,17 @@ struct ContestPokemon
{
/*0x00*/ u16 species;
/*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
- /*0x0D*/ u8 trainerName[8];
+ /*0x0D*/ u8 trainerName[PLAYER_NAME_LENGTH + 1];
/*0x15*/ u8 trainerGfxId;
+ // Temp note: 2 bytes of padding
/*0x18*/ u32 flags;
- /*0x1C*/ u8 whichRank:2;
- u8 aiPool_Cool:1;
- u8 aiPool_Beauty:1;
- u8 aiPool_Cute:1;
- u8 aiPool_Smart:1;
- u8 aiPool_Tough:1;
+ /*0x1C*/ u8 whichRank:2; // 0x1 0x2
+ u8 aiPool_Cool:1; // 0x4
+ u8 aiPool_Beauty:1; // 0x8
+ u8 aiPool_Cute:1; // 0x10
+ u8 aiPool_Smart:1; // 0x20
+ u8 aiPool_Tough:1; // 0x40
+ // Temp note: 1 byte of padding
/*0x1E*/ u16 moves[4]; // moves
/*0x26*/ u8 cool; // cool
/*0x27*/ u8 beauty; // beauty
@@ -227,7 +229,7 @@ struct ContestPokemon
/*0x2C*/ u8 unk2C[12];
/*0x38*/ u32 personality; // personality
/*0x3C*/ u32 otId; // otId
-}; // wow
+};
struct Shared18000
{
diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h
index 580d7916e..07d41d824 100644
--- a/src/data/contest_opponents.h
+++ b/src/data/contest_opponents.h
@@ -77,4 +77,10 @@ const struct ContestWinner gUnknown_08587FA4[] =
.trainerName = _("OMAR"),
.contestRank = CONTEST_RANK_MASTER
}
-}; \ No newline at end of file
+};
+/*
+const struct ContestPokemon gContestOpponents[] =
+{
+
+};*/
+extern const struct ContestPokemon gContestOpponents[96]; \ No newline at end of file