This commit is contained in:
Eduardo Quezada
2025-02-27 20:34:00 -03:00
parent 5415822f1d
commit 3210249f11
2 changed files with 151 additions and 151 deletions

View File

@@ -598,12 +598,12 @@ static void ov97_022341EC(u32 param0, NNSG2dCharacterData **param1, void *param2
#define NUM_UNOWN_FORMS 28
#define GET_UNOWN_LETTER_FROM_PERSONALITY(personality) (( \
(((personality) & 0x03000000) >> 18) \
| (((personality) & 0x00030000) >> 12) \
| (((personality) & 0x00000300) >> 6) \
| (((personality) & 0x00000003) >> 0) \
) % NUM_UNOWN_FORMS)
#define GET_UNOWN_LETTER_FROM_PERSONALITY(personality) (( \
(((personality) & 0x03000000) >> 18) \
| (((personality) & 0x00030000) >> 12) \
| (((personality) & 0x00000300) >> 6) \
| (((personality) & 0x00000003) >> 0)) \
% NUM_UNOWN_FORMS)
static u8 GetSpeciesGBAForm(int speciesNDS, u32 personality, int gbaVersion)
{

View File

@@ -20,150 +20,150 @@ typedef struct {
} GBAToDSSpeciesStruct;
GBAToDSSpeciesStruct sGBAToDSSpecies[] = {
{ GBA_SPECIES_TREECKO, SPECIES_TREECKO },
{ GBA_SPECIES_GROVYLE, SPECIES_GROVYLE },
{ GBA_SPECIES_SCEPTILE, SPECIES_SCEPTILE },
{ GBA_SPECIES_TORCHIC, SPECIES_TORCHIC },
{ GBA_SPECIES_COMBUSKEN, SPECIES_COMBUSKEN },
{ GBA_SPECIES_BLAZIKEN, SPECIES_BLAZIKEN },
{ GBA_SPECIES_MUDKIP, SPECIES_MUDKIP },
{ GBA_SPECIES_MARSHTOMP, SPECIES_MARSHTOMP },
{ GBA_SPECIES_SWAMPERT, SPECIES_SWAMPERT },
{ GBA_SPECIES_POOCHYENA, SPECIES_POOCHYENA },
{ GBA_SPECIES_MIGHTYENA, SPECIES_MIGHTYENA },
{ GBA_SPECIES_ZIGZAGOON, SPECIES_ZIGZAGOON },
{ GBA_SPECIES_LINOONE, SPECIES_LINOONE },
{ GBA_SPECIES_WURMPLE, SPECIES_WURMPLE },
{ GBA_SPECIES_SILCOON, SPECIES_SILCOON },
{ GBA_SPECIES_BEAUTIFLY, SPECIES_BEAUTIFLY },
{ GBA_SPECIES_CASCOON, SPECIES_CASCOON },
{ GBA_SPECIES_DUSTOX, SPECIES_DUSTOX },
{ GBA_SPECIES_LOTAD, SPECIES_LOTAD },
{ GBA_SPECIES_LOMBRE, SPECIES_LOMBRE },
{ GBA_SPECIES_LUDICOLO, SPECIES_LUDICOLO },
{ GBA_SPECIES_SEEDOT, SPECIES_SEEDOT },
{ GBA_SPECIES_NUZLEAF, SPECIES_NUZLEAF },
{ GBA_SPECIES_SHIFTRY, SPECIES_SHIFTRY },
{ GBA_SPECIES_NINCADA, SPECIES_NINCADA },
{ GBA_SPECIES_NINJASK, SPECIES_NINJASK },
{ GBA_SPECIES_SHEDINJA, SPECIES_SHEDINJA },
{ GBA_SPECIES_TAILLOW, SPECIES_TAILLOW },
{ GBA_SPECIES_SWELLOW, SPECIES_SWELLOW },
{ GBA_SPECIES_SHROOMISH, SPECIES_SHROOMISH },
{ GBA_SPECIES_BRELOOM, SPECIES_BRELOOM },
{ GBA_SPECIES_SPINDA, SPECIES_SPINDA },
{ GBA_SPECIES_WINGULL, SPECIES_WINGULL },
{ GBA_SPECIES_PELIPPER, SPECIES_PELIPPER },
{ GBA_SPECIES_SURSKIT, SPECIES_SURSKIT },
{ GBA_SPECIES_MASQUERAIN, SPECIES_MASQUERAIN },
{ GBA_SPECIES_WAILMER, SPECIES_WAILMER },
{ GBA_SPECIES_WAILORD, SPECIES_WAILORD },
{ GBA_SPECIES_SKITTY, SPECIES_SKITTY },
{ GBA_SPECIES_DELCATTY, SPECIES_DELCATTY },
{ GBA_SPECIES_KECLEON, SPECIES_KECLEON },
{ GBA_SPECIES_BALTOY, SPECIES_BALTOY },
{ GBA_SPECIES_CLAYDOL, SPECIES_CLAYDOL },
{ GBA_SPECIES_NOSEPASS, SPECIES_NOSEPASS },
{ GBA_SPECIES_TORKOAL, SPECIES_TORKOAL },
{ GBA_SPECIES_SABLEYE, SPECIES_SABLEYE },
{ GBA_SPECIES_BARBOACH, SPECIES_BARBOACH },
{ GBA_SPECIES_WHISCASH, SPECIES_WHISCASH },
{ GBA_SPECIES_LUVDISC, SPECIES_LUVDISC },
{ GBA_SPECIES_CORPHISH, SPECIES_CORPHISH },
{ GBA_SPECIES_CRAWDAUNT, SPECIES_CRAWDAUNT },
{ GBA_SPECIES_FEEBAS, SPECIES_FEEBAS },
{ GBA_SPECIES_MILOTIC, SPECIES_MILOTIC },
{ GBA_SPECIES_CARVANHA, SPECIES_CARVANHA },
{ GBA_SPECIES_SHARPEDO, SPECIES_SHARPEDO },
{ GBA_SPECIES_TRAPINCH, SPECIES_TRAPINCH },
{ GBA_SPECIES_VIBRAVA, SPECIES_VIBRAVA },
{ GBA_SPECIES_FLYGON, SPECIES_FLYGON },
{ GBA_SPECIES_MAKUHITA, SPECIES_MAKUHITA },
{ GBA_SPECIES_HARIYAMA, SPECIES_HARIYAMA },
{ GBA_SPECIES_ELECTRIKE, SPECIES_ELECTRIKE },
{ GBA_SPECIES_MANECTRIC, SPECIES_MANECTRIC },
{ GBA_SPECIES_NUMEL, SPECIES_NUMEL },
{ GBA_SPECIES_CAMERUPT, SPECIES_CAMERUPT },
{ GBA_SPECIES_SPHEAL, SPECIES_SPHEAL },
{ GBA_SPECIES_SEALEO, SPECIES_SEALEO },
{ GBA_SPECIES_WALREIN, SPECIES_WALREIN },
{ GBA_SPECIES_CACNEA, SPECIES_CACNEA },
{ GBA_SPECIES_CACTURNE, SPECIES_CACTURNE },
{ GBA_SPECIES_SNORUNT, SPECIES_SNORUNT },
{ GBA_SPECIES_GLALIE, SPECIES_GLALIE },
{ GBA_SPECIES_LUNATONE, SPECIES_LUNATONE },
{ GBA_SPECIES_SOLROCK, SPECIES_SOLROCK },
{ GBA_SPECIES_AZURILL, SPECIES_AZURILL },
{ GBA_SPECIES_SPOINK, SPECIES_SPOINK },
{ GBA_SPECIES_GRUMPIG, SPECIES_GRUMPIG },
{ GBA_SPECIES_PLUSLE, SPECIES_PLUSLE },
{ GBA_SPECIES_MINUN, SPECIES_MINUN },
{ GBA_SPECIES_MAWILE, SPECIES_MAWILE },
{ GBA_SPECIES_MEDITITE, SPECIES_MEDITITE },
{ GBA_SPECIES_MEDICHAM, SPECIES_MEDICHAM },
{ GBA_SPECIES_SWABLU, SPECIES_SWABLU },
{ GBA_SPECIES_ALTARIA, SPECIES_ALTARIA },
{ GBA_SPECIES_WYNAUT, SPECIES_WYNAUT },
{ GBA_SPECIES_DUSKULL, SPECIES_DUSKULL },
{ GBA_SPECIES_DUSCLOPS, SPECIES_DUSCLOPS },
{ GBA_SPECIES_ROSELIA, SPECIES_ROSELIA },
{ GBA_SPECIES_SLAKOTH, SPECIES_SLAKOTH },
{ GBA_SPECIES_VIGOROTH, SPECIES_VIGOROTH },
{ GBA_SPECIES_SLAKING, SPECIES_SLAKING },
{ GBA_SPECIES_GULPIN, SPECIES_GULPIN },
{ GBA_SPECIES_SWALOT, SPECIES_SWALOT },
{ GBA_SPECIES_TROPIUS, SPECIES_TROPIUS },
{ GBA_SPECIES_WHISMUR, SPECIES_WHISMUR },
{ GBA_SPECIES_LOUDRED, SPECIES_LOUDRED },
{ GBA_SPECIES_EXPLOUD, SPECIES_EXPLOUD },
{ GBA_SPECIES_CLAMPERL, SPECIES_CLAMPERL },
{ GBA_SPECIES_HUNTAIL, SPECIES_HUNTAIL },
{ GBA_SPECIES_GOREBYSS, SPECIES_GOREBYSS },
{ GBA_SPECIES_ABSOL, SPECIES_ABSOL },
{ GBA_SPECIES_SHUPPET, SPECIES_SHUPPET },
{ GBA_SPECIES_BANETTE, SPECIES_BANETTE },
{ GBA_SPECIES_SEVIPER, SPECIES_SEVIPER },
{ GBA_SPECIES_ZANGOOSE, SPECIES_ZANGOOSE },
{ GBA_SPECIES_RELICANTH, SPECIES_RELICANTH },
{ GBA_SPECIES_ARON, SPECIES_ARON },
{ GBA_SPECIES_LAIRON, SPECIES_LAIRON },
{ GBA_SPECIES_AGGRON, SPECIES_AGGRON },
{ GBA_SPECIES_CASTFORM, SPECIES_CASTFORM },
{ GBA_SPECIES_VOLBEAT, SPECIES_VOLBEAT },
{ GBA_SPECIES_ILLUMISE, SPECIES_ILLUMISE },
{ GBA_SPECIES_LILEEP, SPECIES_LILEEP },
{ GBA_SPECIES_CRADILY, SPECIES_CRADILY },
{ GBA_SPECIES_ANORITH, SPECIES_ANORITH },
{ GBA_SPECIES_ARMALDO, SPECIES_ARMALDO },
{ GBA_SPECIES_RALTS, SPECIES_RALTS },
{ GBA_SPECIES_KIRLIA, SPECIES_KIRLIA },
{ GBA_SPECIES_GARDEVOIR, SPECIES_GARDEVOIR },
{ GBA_SPECIES_BAGON, SPECIES_BAGON },
{ GBA_SPECIES_SHELGON, SPECIES_SHELGON },
{ GBA_SPECIES_SALAMENCE, SPECIES_SALAMENCE },
{ GBA_SPECIES_BELDUM, SPECIES_BELDUM },
{ GBA_SPECIES_METANG, SPECIES_METANG },
{ GBA_SPECIES_METAGROSS, SPECIES_METAGROSS },
{ GBA_SPECIES_REGIROCK, SPECIES_REGIROCK },
{ GBA_SPECIES_REGICE, SPECIES_REGICE },
{ GBA_SPECIES_REGISTEEL, SPECIES_REGISTEEL },
{ GBA_SPECIES_KYOGRE, SPECIES_KYOGRE },
{ GBA_SPECIES_GROUDON, SPECIES_GROUDON },
{ GBA_SPECIES_RAYQUAZA, SPECIES_RAYQUAZA },
{ GBA_SPECIES_LATIAS, SPECIES_LATIAS },
{ GBA_SPECIES_LATIOS, SPECIES_LATIOS },
{ GBA_SPECIES_JIRACHI, SPECIES_JIRACHI },
{ GBA_SPECIES_DEOXYS, SPECIES_DEOXYS },
{ GBA_SPECIES_CHIMECHO, SPECIES_CHIMECHO },
{ GBA_SPECIES_EGG, 0x19C },
{ 0x19D, 0x19D },
{ 0x19E, 0x19E },
{ 0x19F, 0x19F },
{ 0x1A0, 0x1A0 },
{ 0x1A1, 0x1A1 },
{ 0x1A2, 0x1A2 },
{ 0x1A3, 0x1A3 },
{ 0x1A4, 0x1A4 }
{ GBA_SPECIES_TREECKO, SPECIES_TREECKO },
{ GBA_SPECIES_GROVYLE, SPECIES_GROVYLE },
{ GBA_SPECIES_SCEPTILE, SPECIES_SCEPTILE },
{ GBA_SPECIES_TORCHIC, SPECIES_TORCHIC },
{ GBA_SPECIES_COMBUSKEN, SPECIES_COMBUSKEN },
{ GBA_SPECIES_BLAZIKEN, SPECIES_BLAZIKEN },
{ GBA_SPECIES_MUDKIP, SPECIES_MUDKIP },
{ GBA_SPECIES_MARSHTOMP, SPECIES_MARSHTOMP },
{ GBA_SPECIES_SWAMPERT, SPECIES_SWAMPERT },
{ GBA_SPECIES_POOCHYENA, SPECIES_POOCHYENA },
{ GBA_SPECIES_MIGHTYENA, SPECIES_MIGHTYENA },
{ GBA_SPECIES_ZIGZAGOON, SPECIES_ZIGZAGOON },
{ GBA_SPECIES_LINOONE, SPECIES_LINOONE },
{ GBA_SPECIES_WURMPLE, SPECIES_WURMPLE },
{ GBA_SPECIES_SILCOON, SPECIES_SILCOON },
{ GBA_SPECIES_BEAUTIFLY, SPECIES_BEAUTIFLY },
{ GBA_SPECIES_CASCOON, SPECIES_CASCOON },
{ GBA_SPECIES_DUSTOX, SPECIES_DUSTOX },
{ GBA_SPECIES_LOTAD, SPECIES_LOTAD },
{ GBA_SPECIES_LOMBRE, SPECIES_LOMBRE },
{ GBA_SPECIES_LUDICOLO, SPECIES_LUDICOLO },
{ GBA_SPECIES_SEEDOT, SPECIES_SEEDOT },
{ GBA_SPECIES_NUZLEAF, SPECIES_NUZLEAF },
{ GBA_SPECIES_SHIFTRY, SPECIES_SHIFTRY },
{ GBA_SPECIES_NINCADA, SPECIES_NINCADA },
{ GBA_SPECIES_NINJASK, SPECIES_NINJASK },
{ GBA_SPECIES_SHEDINJA, SPECIES_SHEDINJA },
{ GBA_SPECIES_TAILLOW, SPECIES_TAILLOW },
{ GBA_SPECIES_SWELLOW, SPECIES_SWELLOW },
{ GBA_SPECIES_SHROOMISH, SPECIES_SHROOMISH },
{ GBA_SPECIES_BRELOOM, SPECIES_BRELOOM },
{ GBA_SPECIES_SPINDA, SPECIES_SPINDA },
{ GBA_SPECIES_WINGULL, SPECIES_WINGULL },
{ GBA_SPECIES_PELIPPER, SPECIES_PELIPPER },
{ GBA_SPECIES_SURSKIT, SPECIES_SURSKIT },
{ GBA_SPECIES_MASQUERAIN, SPECIES_MASQUERAIN },
{ GBA_SPECIES_WAILMER, SPECIES_WAILMER },
{ GBA_SPECIES_WAILORD, SPECIES_WAILORD },
{ GBA_SPECIES_SKITTY, SPECIES_SKITTY },
{ GBA_SPECIES_DELCATTY, SPECIES_DELCATTY },
{ GBA_SPECIES_KECLEON, SPECIES_KECLEON },
{ GBA_SPECIES_BALTOY, SPECIES_BALTOY },
{ GBA_SPECIES_CLAYDOL, SPECIES_CLAYDOL },
{ GBA_SPECIES_NOSEPASS, SPECIES_NOSEPASS },
{ GBA_SPECIES_TORKOAL, SPECIES_TORKOAL },
{ GBA_SPECIES_SABLEYE, SPECIES_SABLEYE },
{ GBA_SPECIES_BARBOACH, SPECIES_BARBOACH },
{ GBA_SPECIES_WHISCASH, SPECIES_WHISCASH },
{ GBA_SPECIES_LUVDISC, SPECIES_LUVDISC },
{ GBA_SPECIES_CORPHISH, SPECIES_CORPHISH },
{ GBA_SPECIES_CRAWDAUNT, SPECIES_CRAWDAUNT },
{ GBA_SPECIES_FEEBAS, SPECIES_FEEBAS },
{ GBA_SPECIES_MILOTIC, SPECIES_MILOTIC },
{ GBA_SPECIES_CARVANHA, SPECIES_CARVANHA },
{ GBA_SPECIES_SHARPEDO, SPECIES_SHARPEDO },
{ GBA_SPECIES_TRAPINCH, SPECIES_TRAPINCH },
{ GBA_SPECIES_VIBRAVA, SPECIES_VIBRAVA },
{ GBA_SPECIES_FLYGON, SPECIES_FLYGON },
{ GBA_SPECIES_MAKUHITA, SPECIES_MAKUHITA },
{ GBA_SPECIES_HARIYAMA, SPECIES_HARIYAMA },
{ GBA_SPECIES_ELECTRIKE, SPECIES_ELECTRIKE },
{ GBA_SPECIES_MANECTRIC, SPECIES_MANECTRIC },
{ GBA_SPECIES_NUMEL, SPECIES_NUMEL },
{ GBA_SPECIES_CAMERUPT, SPECIES_CAMERUPT },
{ GBA_SPECIES_SPHEAL, SPECIES_SPHEAL },
{ GBA_SPECIES_SEALEO, SPECIES_SEALEO },
{ GBA_SPECIES_WALREIN, SPECIES_WALREIN },
{ GBA_SPECIES_CACNEA, SPECIES_CACNEA },
{ GBA_SPECIES_CACTURNE, SPECIES_CACTURNE },
{ GBA_SPECIES_SNORUNT, SPECIES_SNORUNT },
{ GBA_SPECIES_GLALIE, SPECIES_GLALIE },
{ GBA_SPECIES_LUNATONE, SPECIES_LUNATONE },
{ GBA_SPECIES_SOLROCK, SPECIES_SOLROCK },
{ GBA_SPECIES_AZURILL, SPECIES_AZURILL },
{ GBA_SPECIES_SPOINK, SPECIES_SPOINK },
{ GBA_SPECIES_GRUMPIG, SPECIES_GRUMPIG },
{ GBA_SPECIES_PLUSLE, SPECIES_PLUSLE },
{ GBA_SPECIES_MINUN, SPECIES_MINUN },
{ GBA_SPECIES_MAWILE, SPECIES_MAWILE },
{ GBA_SPECIES_MEDITITE, SPECIES_MEDITITE },
{ GBA_SPECIES_MEDICHAM, SPECIES_MEDICHAM },
{ GBA_SPECIES_SWABLU, SPECIES_SWABLU },
{ GBA_SPECIES_ALTARIA, SPECIES_ALTARIA },
{ GBA_SPECIES_WYNAUT, SPECIES_WYNAUT },
{ GBA_SPECIES_DUSKULL, SPECIES_DUSKULL },
{ GBA_SPECIES_DUSCLOPS, SPECIES_DUSCLOPS },
{ GBA_SPECIES_ROSELIA, SPECIES_ROSELIA },
{ GBA_SPECIES_SLAKOTH, SPECIES_SLAKOTH },
{ GBA_SPECIES_VIGOROTH, SPECIES_VIGOROTH },
{ GBA_SPECIES_SLAKING, SPECIES_SLAKING },
{ GBA_SPECIES_GULPIN, SPECIES_GULPIN },
{ GBA_SPECIES_SWALOT, SPECIES_SWALOT },
{ GBA_SPECIES_TROPIUS, SPECIES_TROPIUS },
{ GBA_SPECIES_WHISMUR, SPECIES_WHISMUR },
{ GBA_SPECIES_LOUDRED, SPECIES_LOUDRED },
{ GBA_SPECIES_EXPLOUD, SPECIES_EXPLOUD },
{ GBA_SPECIES_CLAMPERL, SPECIES_CLAMPERL },
{ GBA_SPECIES_HUNTAIL, SPECIES_HUNTAIL },
{ GBA_SPECIES_GOREBYSS, SPECIES_GOREBYSS },
{ GBA_SPECIES_ABSOL, SPECIES_ABSOL },
{ GBA_SPECIES_SHUPPET, SPECIES_SHUPPET },
{ GBA_SPECIES_BANETTE, SPECIES_BANETTE },
{ GBA_SPECIES_SEVIPER, SPECIES_SEVIPER },
{ GBA_SPECIES_ZANGOOSE, SPECIES_ZANGOOSE },
{ GBA_SPECIES_RELICANTH, SPECIES_RELICANTH },
{ GBA_SPECIES_ARON, SPECIES_ARON },
{ GBA_SPECIES_LAIRON, SPECIES_LAIRON },
{ GBA_SPECIES_AGGRON, SPECIES_AGGRON },
{ GBA_SPECIES_CASTFORM, SPECIES_CASTFORM },
{ GBA_SPECIES_VOLBEAT, SPECIES_VOLBEAT },
{ GBA_SPECIES_ILLUMISE, SPECIES_ILLUMISE },
{ GBA_SPECIES_LILEEP, SPECIES_LILEEP },
{ GBA_SPECIES_CRADILY, SPECIES_CRADILY },
{ GBA_SPECIES_ANORITH, SPECIES_ANORITH },
{ GBA_SPECIES_ARMALDO, SPECIES_ARMALDO },
{ GBA_SPECIES_RALTS, SPECIES_RALTS },
{ GBA_SPECIES_KIRLIA, SPECIES_KIRLIA },
{ GBA_SPECIES_GARDEVOIR, SPECIES_GARDEVOIR },
{ GBA_SPECIES_BAGON, SPECIES_BAGON },
{ GBA_SPECIES_SHELGON, SPECIES_SHELGON },
{ GBA_SPECIES_SALAMENCE, SPECIES_SALAMENCE },
{ GBA_SPECIES_BELDUM, SPECIES_BELDUM },
{ GBA_SPECIES_METANG, SPECIES_METANG },
{ GBA_SPECIES_METAGROSS, SPECIES_METAGROSS },
{ GBA_SPECIES_REGIROCK, SPECIES_REGIROCK },
{ GBA_SPECIES_REGICE, SPECIES_REGICE },
{ GBA_SPECIES_REGISTEEL, SPECIES_REGISTEEL },
{ GBA_SPECIES_KYOGRE, SPECIES_KYOGRE },
{ GBA_SPECIES_GROUDON, SPECIES_GROUDON },
{ GBA_SPECIES_RAYQUAZA, SPECIES_RAYQUAZA },
{ GBA_SPECIES_LATIAS, SPECIES_LATIAS },
{ GBA_SPECIES_LATIOS, SPECIES_LATIOS },
{ GBA_SPECIES_JIRACHI, SPECIES_JIRACHI },
{ GBA_SPECIES_DEOXYS, SPECIES_DEOXYS },
{ GBA_SPECIES_CHIMECHO, SPECIES_CHIMECHO },
{ GBA_SPECIES_EGG, 0x19C },
{ 0x19D, 0x19D },
{ 0x19E, 0x19E },
{ 0x19F, 0x19F },
{ 0x1A0, 0x1A0 },
{ 0x1A1, 0x1A1 },
{ 0x1A2, 0x1A2 },
{ 0x1A3, 0x1A3 },
{ 0x1A4, 0x1A4 }
};
typedef struct {
@@ -1560,7 +1560,7 @@ void BoxMonGBAToBoxMon(BoxPokemonGBA *param0, BoxPokemon *param1)
if (BoxPokemon_GetValue(param1, MON_DATA_SPECIES, NULL) == SPECIES_UNOWN) {
v1 = GetGBABoxMonData(param0, GBA_MON_DATA_PERSONALITY, NULL);
v1 = GETUNOWN (((v1 & 0x3000000) >> 18) | ((v1 & 0x30000) >> 12) | ((v1 & 0x300) >> 6) | (v1 & 0x3)) % 28;
v1 = (((v1 & 0x3000000) >> 18) | ((v1 & 0x30000) >> 12) | ((v1 & 0x300) >> 6) | (v1 & 0x3)) % 28;
BoxPokemon_SetValue(param1, MON_DATA_FORM, (u8 *)&v1);
}