From eff223c19043b19aa120e80556d1b230dbbde71d Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 28 Feb 2023 11:19:14 -0300 Subject: [PATCH] Added GBA species consts --- include/constants/gba/species.h | 141 ++++++++++++++++++++++++++++++++ src/overlay097/ov97_02236380.c | 5 +- 2 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 include/constants/gba/species.h diff --git a/include/constants/gba/species.h b/include/constants/gba/species.h new file mode 100644 index 0000000000..53207db7b8 --- /dev/null +++ b/include/constants/gba/species.h @@ -0,0 +1,141 @@ +#ifndef POKEPLATINUM_CONSTANTS_GBA_SPECIES_H +#define POKEPLATINUM_CONSTANTS_GBA_SPECIES_H + +#define GBA_SPECIES_TREECKO 277 +#define GBA_SPECIES_GROVYLE 278 +#define GBA_SPECIES_SCEPTILE 279 +#define GBA_SPECIES_TORCHIC 280 +#define GBA_SPECIES_COMBUSKEN 281 +#define GBA_SPECIES_BLAZIKEN 282 +#define GBA_SPECIES_MUDKIP 283 +#define GBA_SPECIES_MARSHTOMP 284 +#define GBA_SPECIES_SWAMPERT 285 +#define GBA_SPECIES_POOCHYENA 286 +#define GBA_SPECIES_MIGHTYENA 287 +#define GBA_SPECIES_ZIGZAGOON 288 +#define GBA_SPECIES_LINOONE 289 +#define GBA_SPECIES_WURMPLE 290 +#define GBA_SPECIES_SILCOON 291 +#define GBA_SPECIES_BEAUTIFLY 292 +#define GBA_SPECIES_CASCOON 293 +#define GBA_SPECIES_DUSTOX 294 +#define GBA_SPECIES_LOTAD 295 +#define GBA_SPECIES_LOMBRE 296 +#define GBA_SPECIES_LUDICOLO 297 +#define GBA_SPECIES_SEEDOT 298 +#define GBA_SPECIES_NUZLEAF 299 +#define GBA_SPECIES_SHIFTRY 300 +#define GBA_SPECIES_NINCADA 301 +#define GBA_SPECIES_NINJASK 302 +#define GBA_SPECIES_SHEDINJA 303 +#define GBA_SPECIES_TAILLOW 304 +#define GBA_SPECIES_SWELLOW 305 +#define GBA_SPECIES_SHROOMISH 306 +#define GBA_SPECIES_BRELOOM 307 +#define GBA_SPECIES_SPINDA 308 +#define GBA_SPECIES_WINGULL 309 +#define GBA_SPECIES_PELIPPER 310 +#define GBA_SPECIES_SURSKIT 311 +#define GBA_SPECIES_MASQUERAIN 312 +#define GBA_SPECIES_WAILMER 313 +#define GBA_SPECIES_WAILORD 314 +#define GBA_SPECIES_SKITTY 315 +#define GBA_SPECIES_DELCATTY 316 +#define GBA_SPECIES_KECLEON 317 +#define GBA_SPECIES_BALTOY 318 +#define GBA_SPECIES_CLAYDOL 319 +#define GBA_SPECIES_NOSEPASS 320 +#define GBA_SPECIES_TORKOAL 321 +#define GBA_SPECIES_SABLEYE 322 +#define GBA_SPECIES_BARBOACH 323 +#define GBA_SPECIES_WHISCASH 324 +#define GBA_SPECIES_LUVDISC 325 +#define GBA_SPECIES_CORPHISH 326 +#define GBA_SPECIES_CRAWDAUNT 327 +#define GBA_SPECIES_FEEBAS 328 +#define GBA_SPECIES_MILOTIC 329 +#define GBA_SPECIES_CARVANHA 330 +#define GBA_SPECIES_SHARPEDO 331 +#define GBA_SPECIES_TRAPINCH 332 +#define GBA_SPECIES_VIBRAVA 333 +#define GBA_SPECIES_FLYGON 334 +#define GBA_SPECIES_MAKUHITA 335 +#define GBA_SPECIES_HARIYAMA 336 +#define GBA_SPECIES_ELECTRIKE 337 +#define GBA_SPECIES_MANECTRIC 338 +#define GBA_SPECIES_NUMEL 339 +#define GBA_SPECIES_CAMERUPT 340 +#define GBA_SPECIES_SPHEAL 341 +#define GBA_SPECIES_SEALEO 342 +#define GBA_SPECIES_WALREIN 343 +#define GBA_SPECIES_CACNEA 344 +#define GBA_SPECIES_CACTURNE 345 +#define GBA_SPECIES_SNORUNT 346 +#define GBA_SPECIES_GLALIE 347 +#define GBA_SPECIES_LUNATONE 348 +#define GBA_SPECIES_SOLROCK 349 +#define GBA_SPECIES_AZURILL 350 +#define GBA_SPECIES_SPOINK 351 +#define GBA_SPECIES_GRUMPIG 352 +#define GBA_SPECIES_PLUSLE 353 +#define GBA_SPECIES_MINUN 354 +#define GBA_SPECIES_MAWILE 355 +#define GBA_SPECIES_MEDITITE 356 +#define GBA_SPECIES_MEDICHAM 357 +#define GBA_SPECIES_SWABLU 358 +#define GBA_SPECIES_ALTARIA 359 +#define GBA_SPECIES_WYNAUT 360 +#define GBA_SPECIES_DUSKULL 361 +#define GBA_SPECIES_DUSCLOPS 362 +#define GBA_SPECIES_ROSELIA 363 +#define GBA_SPECIES_SLAKOTH 364 +#define GBA_SPECIES_VIGOROTH 365 +#define GBA_SPECIES_SLAKING 366 +#define GBA_SPECIES_GULPIN 367 +#define GBA_SPECIES_SWALOT 368 +#define GBA_SPECIES_TROPIUS 369 +#define GBA_SPECIES_WHISMUR 370 +#define GBA_SPECIES_LOUDRED 371 +#define GBA_SPECIES_EXPLOUD 372 +#define GBA_SPECIES_CLAMPERL 373 +#define GBA_SPECIES_HUNTAIL 374 +#define GBA_SPECIES_GOREBYSS 375 +#define GBA_SPECIES_ABSOL 376 +#define GBA_SPECIES_SHUPPET 377 +#define GBA_SPECIES_BANETTE 378 +#define GBA_SPECIES_SEVIPER 379 +#define GBA_SPECIES_ZANGOOSE 380 +#define GBA_SPECIES_RELICANTH 381 +#define GBA_SPECIES_ARON 382 +#define GBA_SPECIES_LAIRON 383 +#define GBA_SPECIES_AGGRON 384 +#define GBA_SPECIES_CASTFORM 385 +#define GBA_SPECIES_VOLBEAT 386 +#define GBA_SPECIES_ILLUMISE 387 +#define GBA_SPECIES_LILEEP 388 +#define GBA_SPECIES_CRADILY 389 +#define GBA_SPECIES_ANORITH 390 +#define GBA_SPECIES_ARMALDO 391 +#define GBA_SPECIES_RALTS 392 +#define GBA_SPECIES_KIRLIA 393 +#define GBA_SPECIES_GARDEVOIR 394 +#define GBA_SPECIES_BAGON 395 +#define GBA_SPECIES_SHELGON 396 +#define GBA_SPECIES_SALAMENCE 397 +#define GBA_SPECIES_BELDUM 398 +#define GBA_SPECIES_METANG 399 +#define GBA_SPECIES_METAGROSS 400 +#define GBA_SPECIES_REGIROCK 401 +#define GBA_SPECIES_REGICE 402 +#define GBA_SPECIES_REGISTEEL 403 +#define GBA_SPECIES_KYOGRE 404 +#define GBA_SPECIES_GROUDON 405 +#define GBA_SPECIES_RAYQUAZA 406 +#define GBA_SPECIES_LATIAS 407 +#define GBA_SPECIES_LATIOS 408 +#define GBA_SPECIES_JIRACHI 409 +#define GBA_SPECIES_DEOXYS 410 +#define GBA_SPECIES_CHIMECHO 411 +#define GBA_SPECIES_EGG 412 + +#endif // POKEPLATINUM_CONSTANTS_GBA_SPECIES_H diff --git a/src/overlay097/ov97_02236380.c b/src/overlay097/ov97_02236380.c index 185f8956ea..9b39b0e12d 100644 --- a/src/overlay097/ov97_02236380.c +++ b/src/overlay097/ov97_02236380.c @@ -13,6 +13,7 @@ #include "constants/species.h" #include "constants/gba/pokemon.h" +#include "constants/gba/species.h" typedef struct { u16 unk_00; @@ -1031,7 +1032,7 @@ u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) break; case GBA_MON_DATA_SPECIES: if (boxMonGBA->isBadEgg) - retVal = 412; + retVal = GBA_SPECIES_EGG; else retVal = substruct0->species; break; @@ -1201,7 +1202,7 @@ u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) break; if ((substruct3->isEgg) || (boxMonGBA->isBadEgg)) - retVal = 412; + retVal = GBA_SPECIES_EGG; break; case GBA_MON_DATA_IVS: