fix up constants for species according to datacrystal

1 files changed, 196 insertions, 215 deletions

diff --git a/include/constants/species.h b/include/constants/species.h
index 5a187ad..1822200 100644
--- a/include/constants/species.h
+++ b/include/constants/species.h
@@ -203,83 +203,81 @@
 #define SPECIES_SLOWKING 199
 #define SPECIES_MISDREAVUS 200
 #define SPECIES_UNOWN 201
-#define SPECIES_WOBBUFFET 202
-#define SPECIES_GIRAFARIG 203
-#define SPECIES_PINECO 204
-#define SPECIES_FORRETRESS 205
-#define SPECIES_DUNSPARCE 206
-#define SPECIES_GLIGAR 207
-#define SPECIES_STEELIX 208
-#define SPECIES_SNUBBULL 209
-#define SPECIES_GRANBULL 210
-#define SPECIES_QWILFISH 211
-#define SPECIES_SCIZOR 212
-#define SPECIES_SHUCKLE 213
-#define SPECIES_HERACROSS 214
-#define SPECIES_SNEASEL 215
-#define SPECIES_TEDDIURSA 216
-#define SPECIES_URSARING 217
-#define SPECIES_SLUGMA 218
-#define SPECIES_MAGCARGO 219
-#define SPECIES_SWINUB 220
-#define SPECIES_PILOSWINE 221
-#define SPECIES_CORSOLA 222
-#define SPECIES_REMORAID 223
-#define SPECIES_OCTILLERY 224
-#define SPECIES_DELIBIRD 225
-#define SPECIES_MANTINE 226
-#define SPECIES_SKARMORY 227
-#define SPECIES_HOUNDOUR 228
-#define SPECIES_HOUNDOOM 229
-#define SPECIES_KINGDRA 230
-#define SPECIES_PHANPY 231
-#define SPECIES_DONPHAN 232
-#define SPECIES_PORYGON2 233
-#define SPECIES_STANTLER 234
-#define SPECIES_SMEARGLE 235
-#define SPECIES_TYROGUE 236
-#define SPECIES_HITMONTOP 237
-#define SPECIES_SMOOCHUM 238
-#define SPECIES_ELEKID 239
-#define SPECIES_MAGBY 240
-#define SPECIES_MILTANK 241
-#define SPECIES_BLISSEY 242
-#define SPECIES_RAIKOU 243
-#define SPECIES_ENTEI 244
-#define SPECIES_SUICUNE 245
-#define SPECIES_LARVITAR 246
-#define SPECIES_PUPITAR 247
-#define SPECIES_TYRANITAR 248
-#define SPECIES_LUGIA 249
-#define SPECIES_HO_OH 250
-#define SPECIES_CELEBI 251
-
-#define SPECIES_OLD_UNOWN_B 252
-#define SPECIES_OLD_UNOWN_C 253
-#define SPECIES_OLD_UNOWN_D 254
-#define SPECIES_OLD_UNOWN_E 255
-#define SPECIES_OLD_UNOWN_F 256
-#define SPECIES_OLD_UNOWN_G 257
-#define SPECIES_OLD_UNOWN_H 258
-#define SPECIES_OLD_UNOWN_I 259
-#define SPECIES_OLD_UNOWN_J 260
-#define SPECIES_OLD_UNOWN_K 261
-#define SPECIES_OLD_UNOWN_L 262
-#define SPECIES_OLD_UNOWN_M 263
-#define SPECIES_OLD_UNOWN_N 264
-#define SPECIES_OLD_UNOWN_O 265
-#define SPECIES_OLD_UNOWN_P 266
-#define SPECIES_OLD_UNOWN_Q 267
-#define SPECIES_OLD_UNOWN_R 268
-#define SPECIES_OLD_UNOWN_S 269
-#define SPECIES_OLD_UNOWN_T 270
-#define SPECIES_OLD_UNOWN_U 271
-#define SPECIES_OLD_UNOWN_V 272
-#define SPECIES_OLD_UNOWN_W 273
-#define SPECIES_OLD_UNOWN_X 274
-#define SPECIES_OLD_UNOWN_Y 275
-#define SPECIES_OLD_UNOWN_Z 276
-
+#define SPECIES_UNOWN_B 202
+#define SPECIES_UNOWN_C 203
+#define SPECIES_UNOWN_D 204
+#define SPECIES_UNOWN_E 205
+#define SPECIES_UNOWN_F 206
+#define SPECIES_UNOWN_G 207
+#define SPECIES_UNOWN_H 208
+#define SPECIES_UNOWN_I 209
+#define SPECIES_UNOWN_J 210
+#define SPECIES_UNOWN_K 211
+#define SPECIES_UNOWN_L 212
+#define SPECIES_UNOWN_M 213
+#define SPECIES_UNOWN_N 214
+#define SPECIES_UNOWN_O 215
+#define SPECIES_UNOWN_P 216
+#define SPECIES_UNOWN_Q 217
+#define SPECIES_UNOWN_R 218
+#define SPECIES_UNOWN_S 219
+#define SPECIES_UNOWN_T 220
+#define SPECIES_UNOWN_U 221
+#define SPECIES_UNOWN_V 222
+#define SPECIES_UNOWN_W 223
+#define SPECIES_UNOWN_X 224
+#define SPECIES_UNOWN_Y 225
+#define SPECIES_UNOWN_Z 226
+#define SPECIES_WOBBUFFET 227
+#define SPECIES_GIRAFARIG 228
+#define SPECIES_PINECO 229
+#define SPECIES_FORRETRESS 230
+#define SPECIES_DUNSPARCE 231
+#define SPECIES_GLIGAR 232
+#define SPECIES_STEELIX 233
+#define SPECIES_SNUBBULL 234
+#define SPECIES_GRANBULL 235
+#define SPECIES_QWILFISH 236
+#define SPECIES_SCIZOR 237
+#define SPECIES_SHUCKLE 238
+#define SPECIES_HERACROSS 239
+#define SPECIES_SNEASEL 240
+#define SPECIES_TEDDIURSA 241
+#define SPECIES_URSARING 242
+#define SPECIES_SLUGMA 243
+#define SPECIES_MAGCARGO 244
+#define SPECIES_SWINUB 245
+#define SPECIES_PILOSWINE 246
+#define SPECIES_CORSOLA 247
+#define SPECIES_REMORAID 248
+#define SPECIES_OCTILLERY 249
+#define SPECIES_DELIBIRD 250
+#define SPECIES_MANTINE 251
+#define SPECIES_SKARMORY 252
+#define SPECIES_HOUNDOUR 253
+#define SPECIES_HOUNDOOM 254
+#define SPECIES_KINGDRA 255
+#define SPECIES_PHANPY 256
+#define SPECIES_DONPHAN 257
+#define SPECIES_PORYGON2 258
+#define SPECIES_STANTLER 259
+#define SPECIES_SMEARGLE 260
+#define SPECIES_TYROGUE 261
+#define SPECIES_HITMONTOP 262
+#define SPECIES_SMOOCHUM 263
+#define SPECIES_ELEKID 264
+#define SPECIES_MAGBY 265
+#define SPECIES_MILTANK 266
+#define SPECIES_BLISSEY 267
+#define SPECIES_RAIKOU 268
+#define SPECIES_ENTEI 269
+#define SPECIES_SUICUNE 270
+#define SPECIES_LARVITAR 271
+#define SPECIES_PUPITAR 272
+#define SPECIES_TYRANITAR 273
+#define SPECIES_LUGIA 274
+#define SPECIES_HO_OH 275
+#define SPECIES_CELEBI 276
 #define SPECIES_TREECKO 277
 #define SPECIES_GROVYLE 278
 #define SPECIES_SCEPTILE 279
@@ -304,145 +302,128 @@
 #define SPECIES_SEEDOT 298
 #define SPECIES_NUZLEAF 299
 #define SPECIES_SHIFTRY 300
-#define SPECIES_NINCADA 301
-#define SPECIES_NINJASK 302
-#define SPECIES_SHEDINJA 303
-#define SPECIES_TAILLOW 304
-#define SPECIES_SWELLOW 305
-#define SPECIES_SHROOMISH 306
-#define SPECIES_BRELOOM 307
-#define SPECIES_SPINDA 308
-#define SPECIES_WINGULL 309
-#define SPECIES_PELIPPER 310
-#define SPECIES_SURSKIT 311
-#define SPECIES_MASQUERAIN 312
-#define SPECIES_WAILMER 313
-#define SPECIES_WAILORD 314
-#define SPECIES_SKITTY 315
-#define SPECIES_DELCATTY 316
-#define SPECIES_KECLEON 317
-#define SPECIES_BALTOY 318
-#define SPECIES_CLAYDOL 319
-#define SPECIES_NOSEPASS 320
-#define SPECIES_TORKOAL 321
-#define SPECIES_SABLEYE 322
-#define SPECIES_BARBOACH 323
-#define SPECIES_WHISCASH 324
-#define SPECIES_LUVDISC 325
-#define SPECIES_CORPHISH 326
-#define SPECIES_CRAWDAUNT 327
-#define SPECIES_FEEBAS 328
-#define SPECIES_MILOTIC 329
-#define SPECIES_CARVANHA 330
-#define SPECIES_SHARPEDO 331
-#define SPECIES_TRAPINCH 332
-#define SPECIES_VIBRAVA 333
-#define SPECIES_FLYGON 334
-#define SPECIES_MAKUHITA 335
-#define SPECIES_HARIYAMA 336
-#define SPECIES_ELECTRIKE 337
-#define SPECIES_MANECTRIC 338
-#define SPECIES_NUMEL 339
-#define SPECIES_CAMERUPT 340
-#define SPECIES_SPHEAL 341
-#define SPECIES_SEALEO 342
-#define SPECIES_WALREIN 343
-#define SPECIES_CACNEA 344
-#define SPECIES_CACTURNE 345
-#define SPECIES_SNORUNT 346
-#define SPECIES_GLALIE 347
-#define SPECIES_LUNATONE 348
-#define SPECIES_SOLROCK 349
-#define SPECIES_AZURILL 350
-#define SPECIES_SPOINK 351
-#define SPECIES_GRUMPIG 352
-#define SPECIES_PLUSLE 353
-#define SPECIES_MINUN 354
-#define SPECIES_MAWILE 355
-#define SPECIES_MEDITITE 356
-#define SPECIES_MEDICHAM 357
+#define SPECIES_TAILLOW 301
+#define SPECIES_SWELLOW 302
+#define SPECIES_WINGULL 303
+#define SPECIES_PELIPPER 304
+#define SPECIES_RALTS 305
+#define SPECIES_KIRLIA 306
+#define SPECIES_GARDEVOIR 307
+#define SPECIES_SURSKIT 308
+#define SPECIES_MASQUERAIN 309
+#define SPECIES_SHROOMISH 310
+#define SPECIES_BRELOOM 311
+#define SPECIES_SLAKOTH 312
+#define SPECIES_VIGOROTH 313
+#define SPECIES_SLAKING 314
+#define SPECIES_NINCADA 315
+#define SPECIES_NINJASK 316
+#define SPECIES_SHEDINJA 317
+#define SPECIES_WHISMUR 318
+#define SPECIES_LOUDRED 319
+#define SPECIES_EXPLOUD 320
+#define SPECIES_MAKUHITA 321
+#define SPECIES_HARIYAMA 322
+#define SPECIES_AZURILL 323
+#define SPECIES_NOSEPASS 324
+#define SPECIES_SKITTY 325
+#define SPECIES_DELCATTY 326
+#define SPECIES_SABLEYE 327
+#define SPECIES_MAWILE 328
+#define SPECIES_ARON 329
+#define SPECIES_LAIRON 330
+#define SPECIES_AGGRON 331
+#define SPECIES_MEDITITE 332
+#define SPECIES_MEDICHAM 333
+#define SPECIES_ELECTRIKE 334
+#define SPECIES_MANECTRIC 335
+#define SPECIES_PLUSLE 336
+#define SPECIES_MINUN 337
+#define SPECIES_VOLBEAT 338
+#define SPECIES_ILLIMISE 339
+#define SPECIES_ROSELIA 340
+#define SPECIES_GULPIN 341
+#define SPECIES_SWALOT 342
+#define SPECIES_CARVANHA 343
+#define SPECIES_SHARPEDO 344
+#define SPECIES_WAILMER 345
+#define SPECIES_WAILORD 346
+#define SPECIES_NUMEL 347
+#define SPECIES_CAMERUPT 348
+#define SPECIES_TORKOAL 349
+#define SPECIES_SPOINK 350
+#define SPECIES_GRUMPIG 351
+#define SPECIES_SPINDA 352
+#define SPECIES_TRAPINCH 353
+#define SPECIES_VIBRAVA 354
+#define SPECIES_FLYGON 355
+#define SPECIES_CACNEA 356
+#define SPECIES_CACTURNE 357
 #define SPECIES_SWABLU 358
 #define SPECIES_ALTARIA 359
-#define SPECIES_WYNAUT 360
-#define SPECIES_DUSKULL 361
-#define SPECIES_DUSCLOPS 362
-#define SPECIES_ROSELIA 363
-#define SPECIES_SLAKOTH 364
-#define SPECIES_VIGOROTH 365
-#define SPECIES_SLAKING 366
-#define SPECIES_GULPIN 367
-#define SPECIES_SWALOT 368
-#define SPECIES_TROPIUS 369
-#define SPECIES_WHISMUR 370
-#define SPECIES_LOUDRED 371
-#define SPECIES_EXPLOUD 372
-#define SPECIES_CLAMPERL 373
-#define SPECIES_HUNTAIL 374
-#define SPECIES_GOREBYSS 375
-#define SPECIES_ABSOL 376
-#define SPECIES_SHUPPET 377
-#define SPECIES_BANETTE 378
-#define SPECIES_SEVIPER 379
-#define SPECIES_ZANGOOSE 380
-#define SPECIES_RELICANTH 381
-#define SPECIES_ARON 382
-#define SPECIES_LAIRON 383
-#define SPECIES_AGGRON 384
-#define SPECIES_CASTFORM 385
-#define SPECIES_VOLBEAT 386
-#define SPECIES_ILLUMISE 387
-#define SPECIES_LILEEP 388
-#define SPECIES_CRADILY 389
-#define SPECIES_ANORITH 390
-#define SPECIES_ARMALDO 391
-#define SPECIES_RALTS 392
-#define SPECIES_KIRLIA 393
-#define SPECIES_GARDEVOIR 394
-#define SPECIES_BAGON 395
-#define SPECIES_SHELGON 396
-#define SPECIES_SALAMENCE 397
-#define SPECIES_BELDUM 398
-#define SPECIES_METANG 399
-#define SPECIES_METAGROSS 400
-#define SPECIES_REGIROCK 401
-#define SPECIES_REGICE 402
-#define SPECIES_REGISTEEL 403
-#define SPECIES_KYOGRE 404
-#define SPECIES_GROUDON 405
-#define SPECIES_RAYQUAZA 406
-#define SPECIES_LATIAS 407
-#define SPECIES_LATIOS 408
-#define SPECIES_JIRACHI 409
-#define SPECIES_DEOXYS 410
-#define SPECIES_CHIMECHO 411
-#define SPECIES_EGG 412
-
-#define SPECIES_UNOWN_B 413
-#define SPECIES_UNOWN_C 414
-#define SPECIES_UNOWN_D 415
-#define SPECIES_UNOWN_E 416
-#define SPECIES_UNOWN_F 417
-#define SPECIES_UNOWN_G 418
-#define SPECIES_UNOWN_H 419
-#define SPECIES_UNOWN_I 420
-#define SPECIES_UNOWN_J 421
-#define SPECIES_UNOWN_K 422
-#define SPECIES_UNOWN_L 423
-#define SPECIES_UNOWN_M 424
-#define SPECIES_UNOWN_N 425
-#define SPECIES_UNOWN_O 426
-#define SPECIES_UNOWN_P 427
-#define SPECIES_UNOWN_Q 428
-#define SPECIES_UNOWN_R 429
-#define SPECIES_UNOWN_S 430
-#define SPECIES_UNOWN_T 431
-#define SPECIES_UNOWN_U 432
-#define SPECIES_UNOWN_V 433
-#define SPECIES_UNOWN_W 434
-#define SPECIES_UNOWN_X 435
-#define SPECIES_UNOWN_Y 436
-#define SPECIES_UNOWN_Z 437
-#define SPECIES_UNOWN_EMARK 438
-#define SPECIES_UNOWN_QMARK 439
+#define SPECIES_ZANGOOSE 360
+#define SPECIES_SEVIPER 361
+#define SPECIES_LUNATONE 362
+#define SPECIES_SOLROCK 363
+#define SPECIES_BARBOACH 364
+#define SPECIES_WHISCASH 365
+#define SPECIES_CORPHISH 366
+#define SPECIES_CRAWDAUNT 367
+#define SPECIES_BALTOY 368
+#define SPECIES_CLAYDOL 369
+#define SPECIES_LILEEP 370
+#define SPECIES_CRADILY 371
+#define SPECIES_ANORITH 372
+#define SPECIES_ARMALDO 373
+#define SPECIES_FEEBAS 374
+#define SPECIES_MILOTIC 375
+#define SPECIES_CASTFORM 376
+#define SPECIES_CASTFORM_SNOWY 377
+#define SPECIES_CASTFORM_SUNNY 378
+#define SPECIES_CASTFORM_RAINY 379
+#define SPECIES_KECLEON 380
+#define SPECIES_SHUPPET 381
+#define SPECIES_BANETTE 382
+#define SPECIES_DUSKULL 383
+#define SPECIES_DUSCLOPS 384
+#define SPECIES_TROPIUS 385
+#define SPECIES_CHIMECHO 386
+#define SPECIES_ABSOL 387
+#define SPECIES_WYNAUT 388
+#define SPECIES_SNORUNT 389
+#define SPECIES_GLALIE 390
+#define SPECIES_SPHEAL 391
+#define SPECIES_SEALEO 392
+#define SPECIES_WALREIN 393
+#define SPECIES_CLAMPERL 394
+#define SPECIES_HUNTAIL 395
+#define SPECIES_GOREBYSS 396
+#define SPECIES_RELICANTH 397
+#define SPECIES_LUVDISC 398
+#define SPECIES_BAGON 399
+#define SPECIES_SHELGON 400
+#define SPECIES_SALAMENCE 401
+#define SPECIES_BELDUM 402
+#define SPECIES_METANG 403
+#define SPECIES_METAGROSS 404
+#define SPECIES_REGIROCK 405
+#define SPECIES_REGICE 406
+#define SPECIES_REGISTEEL 407
+#define SPECIES_LATIAS 408
+#define SPECIES_LATIOS 409
+#define SPECIES_KYOGRE 410
+#define SPECIES_GROUDON 411
+#define SPECIES_RAYQUAZA 412
+#define SPECIES_JIRACHI 413
+#define SPECIES_DEOXYS_NORMAL 414
+#define SPECIES_UNOWN_EMARK 415
+#define SPECIES_UNOWN_QMARK 416
+#define SPECIES_DEOXYS_ATTACK 417
+#define SPECIES_DEOXYS_DEFENSE 418
+#define SPECIES_DEOXYS_SPEED 419
+#define SPECIES_MUNCHLAX 420
+#define SPECIES_DECOY 421
+#define SPECIES_STATUE 422
+#define SPECIES_RAYQUAZA_CUTSCENE 423
 
 #endif  // GUARD_CONSTANTS_SPECIES_H