From ecd34a351b12bd9aa00d471396f4b5fed58a888e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 25 Oct 2022 16:28:18 -0300 Subject: [PATCH] Ordered Gen 1-3 mon to vanilla order --- include/constants/species.h | 430 ++++++++++++++++++------------------ 1 file changed, 215 insertions(+), 215 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index cda546b1af..0c5655bf7c 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -206,223 +206,223 @@ #define SPECIES_MISDREAVUS 200 #define SPECIES_UNOWN SPECIES_UNOWN_A #define SPECIES_UNOWN_A 201 -#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_UNOWN_EMARK 227 -#define SPECIES_UNOWN_QMARK 228 -#define SPECIES_WOBBUFFET 229 -#define SPECIES_GIRAFARIG 230 -#define SPECIES_PINECO 231 -#define SPECIES_FORRETRESS 232 -#define SPECIES_DUNSPARCE 233 -#define SPECIES_GLIGAR 234 -#define SPECIES_STEELIX 235 -#define SPECIES_SNUBBULL 236 -#define SPECIES_GRANBULL 237 -#define SPECIES_QWILFISH 238 -#define SPECIES_SCIZOR 239 -#define SPECIES_SHUCKLE 240 -#define SPECIES_HERACROSS 241 -#define SPECIES_SNEASEL 242 -#define SPECIES_TEDDIURSA 243 -#define SPECIES_URSARING 244 -#define SPECIES_SLUGMA 245 -#define SPECIES_MAGCARGO 246 -#define SPECIES_SWINUB 247 -#define SPECIES_PILOSWINE 248 -#define SPECIES_CORSOLA 249 -#define SPECIES_REMORAID 250 -#define SPECIES_OCTILLERY 251 -#define SPECIES_DELIBIRD 252 -#define SPECIES_MANTINE 253 -#define SPECIES_SKARMORY 254 -#define SPECIES_HOUNDOUR 255 -#define SPECIES_HOUNDOOM 256 -#define SPECIES_KINGDRA 257 -#define SPECIES_PHANPY 258 -#define SPECIES_DONPHAN 259 -#define SPECIES_PORYGON2 260 -#define SPECIES_STANTLER 261 -#define SPECIES_SMEARGLE 262 -#define SPECIES_TYROGUE 263 -#define SPECIES_HITMONTOP 264 -#define SPECIES_SMOOCHUM 265 -#define SPECIES_ELEKID 266 -#define SPECIES_MAGBY 267 -#define SPECIES_MILTANK 268 -#define SPECIES_BLISSEY 269 -#define SPECIES_RAIKOU 270 -#define SPECIES_ENTEI 271 -#define SPECIES_SUICUNE 272 -#define SPECIES_LARVITAR 273 -#define SPECIES_PUPITAR 274 -#define SPECIES_TYRANITAR 275 -#define SPECIES_LUGIA 276 -#define SPECIES_HO_OH 277 -#define SPECIES_CELEBI 278 -#define SPECIES_TREECKO 279 -#define SPECIES_GROVYLE 280 -#define SPECIES_SCEPTILE 281 -#define SPECIES_TORCHIC 282 -#define SPECIES_COMBUSKEN 283 -#define SPECIES_BLAZIKEN 284 -#define SPECIES_MUDKIP 285 -#define SPECIES_MARSHTOMP 286 -#define SPECIES_SWAMPERT 287 -#define SPECIES_POOCHYENA 288 -#define SPECIES_MIGHTYENA 289 -#define SPECIES_ZIGZAGOON 290 -#define SPECIES_LINOONE 291 -#define SPECIES_WURMPLE 292 -#define SPECIES_SILCOON 293 -#define SPECIES_BEAUTIFLY 294 -#define SPECIES_CASCOON 295 -#define SPECIES_DUSTOX 296 -#define SPECIES_LOTAD 297 -#define SPECIES_LOMBRE 298 -#define SPECIES_LUDICOLO 299 -#define SPECIES_SEEDOT 300 -#define SPECIES_NUZLEAF 301 -#define SPECIES_SHIFTRY 302 -#define SPECIES_TAILLOW 303 -#define SPECIES_SWELLOW 304 -#define SPECIES_WINGULL 305 -#define SPECIES_PELIPPER 306 -#define SPECIES_RALTS 307 -#define SPECIES_KIRLIA 308 -#define SPECIES_GARDEVOIR 309 -#define SPECIES_SURSKIT 310 -#define SPECIES_MASQUERAIN 311 -#define SPECIES_SHROOMISH 312 -#define SPECIES_BRELOOM 313 -#define SPECIES_SLAKOTH 314 -#define SPECIES_VIGOROTH 315 -#define SPECIES_SLAKING 316 -#define SPECIES_NINCADA 317 -#define SPECIES_NINJASK 318 -#define SPECIES_SHEDINJA 319 -#define SPECIES_WHISMUR 320 -#define SPECIES_LOUDRED 321 -#define SPECIES_EXPLOUD 322 -#define SPECIES_MAKUHITA 323 -#define SPECIES_HARIYAMA 324 -#define SPECIES_AZURILL 325 -#define SPECIES_NOSEPASS 326 -#define SPECIES_SKITTY 327 -#define SPECIES_DELCATTY 328 -#define SPECIES_SABLEYE 329 -#define SPECIES_MAWILE 330 -#define SPECIES_ARON 331 -#define SPECIES_LAIRON 332 -#define SPECIES_AGGRON 333 -#define SPECIES_MEDITITE 334 -#define SPECIES_MEDICHAM 335 -#define SPECIES_ELECTRIKE 336 -#define SPECIES_MANECTRIC 337 -#define SPECIES_PLUSLE 338 -#define SPECIES_MINUN 339 -#define SPECIES_VOLBEAT 340 -#define SPECIES_ILLUMISE 341 -#define SPECIES_ROSELIA 342 -#define SPECIES_GULPIN 343 -#define SPECIES_SWALOT 344 -#define SPECIES_CARVANHA 345 -#define SPECIES_SHARPEDO 346 -#define SPECIES_WAILMER 347 -#define SPECIES_WAILORD 348 -#define SPECIES_NUMEL 349 -#define SPECIES_CAMERUPT 350 -#define SPECIES_TORKOAL 351 -#define SPECIES_SPOINK 352 -#define SPECIES_GRUMPIG 353 -#define SPECIES_SPINDA 354 -#define SPECIES_TRAPINCH 355 -#define SPECIES_VIBRAVA 356 -#define SPECIES_FLYGON 357 -#define SPECIES_CACNEA 358 -#define SPECIES_CACTURNE 359 -#define SPECIES_SWABLU 360 -#define SPECIES_ALTARIA 361 -#define SPECIES_ZANGOOSE 362 -#define SPECIES_SEVIPER 363 -#define SPECIES_LUNATONE 364 -#define SPECIES_SOLROCK 365 -#define SPECIES_BARBOACH 366 -#define SPECIES_WHISCASH 367 -#define SPECIES_CORPHISH 368 -#define SPECIES_CRAWDAUNT 369 -#define SPECIES_BALTOY 370 -#define SPECIES_CLAYDOL 371 -#define SPECIES_LILEEP 372 -#define SPECIES_CRADILY 373 -#define SPECIES_ANORITH 374 -#define SPECIES_ARMALDO 375 -#define SPECIES_FEEBAS 376 -#define SPECIES_MILOTIC 377 +#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_UNOWN_B 252 +#define SPECIES_UNOWN_C 253 +#define SPECIES_UNOWN_D 254 +#define SPECIES_UNOWN_E 255 +#define SPECIES_UNOWN_F 256 +#define SPECIES_UNOWN_G 257 +#define SPECIES_UNOWN_H 258 +#define SPECIES_UNOWN_I 259 +#define SPECIES_UNOWN_J 260 +#define SPECIES_UNOWN_K 261 +#define SPECIES_UNOWN_L 262 +#define SPECIES_UNOWN_M 263 +#define SPECIES_UNOWN_N 264 +#define SPECIES_UNOWN_O 265 +#define SPECIES_UNOWN_P 266 +#define SPECIES_UNOWN_Q 267 +#define SPECIES_UNOWN_R 268 +#define SPECIES_UNOWN_S 269 +#define SPECIES_UNOWN_T 270 +#define SPECIES_UNOWN_U 271 +#define SPECIES_UNOWN_V 272 +#define SPECIES_UNOWN_W 273 +#define SPECIES_UNOWN_X 274 +#define SPECIES_UNOWN_Y 275 +#define SPECIES_UNOWN_Z 276 +#define SPECIES_TREECKO 277 +#define SPECIES_GROVYLE 278 +#define SPECIES_SCEPTILE 279 +#define SPECIES_TORCHIC 280 +#define SPECIES_COMBUSKEN 281 +#define SPECIES_BLAZIKEN 282 +#define SPECIES_MUDKIP 283 +#define SPECIES_MARSHTOMP 284 +#define SPECIES_SWAMPERT 285 +#define SPECIES_POOCHYENA 286 +#define SPECIES_MIGHTYENA 287 +#define SPECIES_ZIGZAGOON 288 +#define SPECIES_LINOONE 289 +#define SPECIES_WURMPLE 290 +#define SPECIES_SILCOON 291 +#define SPECIES_BEAUTIFLY 292 +#define SPECIES_CASCOON 293 +#define SPECIES_DUSTOX 294 +#define SPECIES_LOTAD 295 +#define SPECIES_LOMBRE 296 +#define SPECIES_LUDICOLO 297 +#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_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 SPECIES_CASTFORM_NORMAL -#define SPECIES_CASTFORM_NORMAL 378 -#define SPECIES_CASTFORM_SUNNY 379 -#define SPECIES_CASTFORM_RAINY 380 -#define SPECIES_CASTFORM_SNOWY 381 -#define SPECIES_KECLEON 382 -#define SPECIES_SHUPPET 383 -#define SPECIES_BANETTE 384 -#define SPECIES_DUSKULL 385 -#define SPECIES_DUSCLOPS 386 -#define SPECIES_TROPIUS 387 -#define SPECIES_CHIMECHO 388 -#define SPECIES_ABSOL 389 -#define SPECIES_WYNAUT 390 -#define SPECIES_SNORUNT 391 -#define SPECIES_GLALIE 392 -#define SPECIES_SPHEAL 393 -#define SPECIES_SEALEO 394 -#define SPECIES_WALREIN 395 -#define SPECIES_CLAMPERL 396 -#define SPECIES_HUNTAIL 397 -#define SPECIES_GOREBYSS 398 -#define SPECIES_RELICANTH 399 -#define SPECIES_LUVDISC 400 -#define SPECIES_BAGON 401 -#define SPECIES_SHELGON 402 -#define SPECIES_SALAMENCE 403 -#define SPECIES_BELDUM 404 -#define SPECIES_METANG 405 -#define SPECIES_METAGROSS 406 -#define SPECIES_REGIROCK 407 -#define SPECIES_REGICE 408 -#define SPECIES_REGISTEEL 409 -#define SPECIES_LATIAS 410 -#define SPECIES_LATIOS 411 -#define SPECIES_KYOGRE 412 -#define SPECIES_GROUDON 413 -#define SPECIES_RAYQUAZA 414 -#define SPECIES_JIRACHI 415 +#define SPECIES_CASTFORM_NORMAL 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 SPECIES_DEOXYS_NORMAL -#define SPECIES_DEOXYS_NORMAL 416 +#define SPECIES_DEOXYS_NORMAL 410 +#define SPECIES_CHIMECHO 411 +#define SPECIES_UNOWN_EMARK 412 +#define SPECIES_UNOWN_QMARK 413 +#define SPECIES_CASTFORM_SUNNY 414 +#define SPECIES_CASTFORM_RAINY 415 +#define SPECIES_CASTFORM_SNOWY 416 #define SPECIES_DEOXYS_ATTACK 417 #define SPECIES_DEOXYS_DEFENSE 418 #define SPECIES_DEOXYS_SPEED 419