Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SET8 and SET32 consistently (#5544)

Browse Source 
Co-authored-by: Rose <83477269+AreaZR@users.noreply.github.com>
This commit is contained in:
AZero13 2025-01-14 14:42:55 -05:00 committed by GitHub
parent e8dd8da5f7
commit 7eb96ec615
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pokemon.c
View File

@ -3074,20 +3074,14 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
SET8(substruct3->metLocation);
break;
case MON_DATA_MET_LEVEL:
{
u8 metLevel = *data;
substruct3->metLevel = metLevel;
SET8(substruct3->metLevel);
break;
}
case MON_DATA_MET_GAME:
SET8(substruct3->metGame);
break;
case MON_DATA_POKEBALL:
{
u8 pokeball = *data;
substruct0->pokeball = pokeball;
SET8(substruct0->pokeball);
break;
}
case MON_DATA_OT_GENDER:
SET8(substruct3->otGender);
break;
@ -3175,7 +3169,8 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
break;
case MON_DATA_IVS:
{
u32 ivs = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
u32 ivs;
SET32(ivs);
substruct3->hpIV = ivs & MAX_IV_MASK;
substruct3->attackIV = (ivs >> 5) & MAX_IV_MASK;
substruct3->defenseIV = (ivs >> 10) & MAX_IV_MASK;
@ -3212,12 +3207,8 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
SET8(substruct3->gigantamaxFactor);
break;
case MON_DATA_TERA_TYPE:
{
u32 teraType;
SET8(teraType);
substruct0->teraType = teraType;
SET8(substruct0->teraType);
break;
}
case MON_DATA_EVOLUTION_TRACKER:
{
union EvolutionTracker evoTracker;