From ae7f94a0a28a84624ea5c49a9a7444d477359693 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 30 Jun 2023 17:05:18 -0400 Subject: [PATCH 1/2] MON_DATA_SPECIES2 -> MON_DATA_SPECIES_OR_EGG --- include/constants/pokemon.h | 4 ++-- src/battle/battle_command.c | 14 +++++++------- src/party.c | 2 +- src/pokemon.c | 12 ++++++------ src/pokemon_icon_idx.c | 2 +- src/pokemon_mood.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index c73071881..3e060c3d4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -268,7 +268,7 @@ #define MON_DATA_HOENN_WORLD_RIBBON 109 #define MON_DATA_FATEFUL_ENCOUNTER 110 #define MON_DATA_GENDER 111 -#define MON_DATA_FORM 112 +#define MON_DATA_FORM 112 #define MON_DATA_RESERVED_113 113 // HGSS #define MON_DATA_RESERVED_114 114 // Plat #define MON_DATA_HGSS_EGG_MET_LOCATION 115 @@ -330,7 +330,7 @@ #define MON_DATA_SEAL_COORDS 171 #define MON_DATA_SPECIES_EXISTS 172 #define MON_DATA_SANITY_IS_EGG 173 -#define MON_DATA_SPECIES2 174 +#define MON_DATA_SPECIES_OR_EGG 174 // If the Pokémon is in an Egg, return SPECIES_EGG. #define MON_DATA_IVS_WORD 175 #define MON_DATA_UNK_176 176 #define MON_DATA_TYPE_1 177 diff --git a/src/battle/battle_command.c b/src/battle/battle_command.c index b65f5bd3a..22a96bab1 100644 --- a/src/battle/battle_command.c +++ b/src/battle/battle_command.c @@ -3736,7 +3736,7 @@ BOOL BtlCmd_BeatUpDamageCalc(BattleSystem *bsys, BATTLECONTEXT *ctx) { while (TRUE) { mon = BattleSystem_GetPartyMon(bsys, ctx->battlerIdAttacker, ctx->beatUpCount); if (ctx->beatUpCount == ctx->selectedMonIndex[ctx->battlerIdAttacker] || - (GetMonData(mon, MON_DATA_HP, 0) && GetMonData(mon, MON_DATA_SPECIES2, 0) && GetMonData(mon, MON_DATA_SPECIES2, 0) != 0x1ee && GetMonData(mon, MON_DATA_STATUS, 0) == 0)) { + (GetMonData(mon, MON_DATA_HP, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0x1ee && GetMonData(mon, MON_DATA_STATUS, 0) == 0)) { break; } ctx->beatUpCount++; @@ -3772,7 +3772,7 @@ BOOL BtlCmd_BeatUpDamageCalc(BattleSystem *bsys, BATTLECONTEXT *ctx) { while (TRUE) { mon = BattleSystem_GetPartyMon(bsys, ctx->battlerIdAttacker, ctx->beatUpCount); if (ctx->beatUpCount == ctx->selectedMonIndex[ctx->battlerIdAttacker] || - (GetMonData(mon, MON_DATA_HP, 0) && GetMonData(mon, MON_DATA_SPECIES2, 0) && GetMonData(mon, MON_DATA_SPECIES2, 0) != 0x1ee && GetMonData(mon, MON_DATA_STATUS, 0) == 0)) { + (GetMonData(mon, MON_DATA_HP, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0x1ee && GetMonData(mon, MON_DATA_STATUS, 0) == 0)) { break; } ctx->beatUpCount++; @@ -3879,7 +3879,7 @@ BOOL BtlCmd_TryAssist(BattleSystem *bsys, BATTLECONTEXT *ctx) { for (i = 0; i < monCnt; i++) { if (i != ctx->selectedMonIndex[ctx->battlerIdAttacker]) { mon = BattleSystem_GetPartyMon(bsys, ctx->battlerIdAttacker, i); - if (GetMonData(mon, MON_DATA_SPECIES2, 0) && GetMonData(mon, MON_DATA_SPECIES2, 0) != SPECIES_EGG) { + if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { for (j = 0; j < MAX_MON_MOVES; j++) { move = GetMonData(mon, MON_DATA_MOVE1 + j, 0); if (CheckMoveCallsOtherMove(move) == FALSE && CheckLegalMetronomeMove(bsys, ctx, ctx->battlerIdAttacker, move) == TRUE) { @@ -4862,7 +4862,7 @@ BOOL BtlCmd_Pickup(BattleSystem *bsys, BATTLECONTEXT *ctx) { for (i = 0; i < BattleSystem_GetPartySize(bsys, 0); i++) { mon = BattleSystem_GetPartyMon(bsys, 0, i); - species = GetMonData(mon, MON_DATA_SPECIES2, 0); + species = GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0); item = GetMonData(mon, MON_DATA_HELD_ITEM, 0); ability = GetMonData(mon, MON_DATA_ABILITY, 0); if (ability == ABILITY_PICKUP && species && species != SPECIES_EGG && !item && !(BattleSystem_Random(bsys)%10)) { @@ -5497,7 +5497,7 @@ BOOL BtlCmd_CheckWhiteout(BattleSystem *bsys, BATTLECONTEXT *ctx) { for (i = 0; i < GetPartyCount(party1); i++) { mon = GetPartyMonByIndex(party1, i); - if (GetMonData(mon, MON_DATA_SPECIES2, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES2, 0) != SPECIES_EGG) { + if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { partyHp += GetMonData(mon, MON_DATA_HP, 0); } } @@ -5506,7 +5506,7 @@ BOOL BtlCmd_CheckWhiteout(BattleSystem *bsys, BATTLECONTEXT *ctx) { } else for (i = 0; i < GetPartyCount(party2); i++) { mon = GetPartyMonByIndex(party2, i); - if (GetMonData(mon, MON_DATA_SPECIES2, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES2, 0) != SPECIES_EGG) { + if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { partyHp += GetMonData(mon, MON_DATA_HP, 0); } } @@ -5521,7 +5521,7 @@ BOOL BtlCmd_CheckWhiteout(BattleSystem *bsys, BATTLECONTEXT *ctx) { for (i = 0; i < GetPartyCount(party); i++) { mon = GetPartyMonByIndex(party, i); - if (GetMonData(mon, MON_DATA_SPECIES2, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES2, 0) != SPECIES_EGG) { + if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { partyHp += GetMonData(mon, MON_DATA_HP, 0); } } diff --git a/src/party.c b/src/party.c index 02db18ee3..33737b38f 100644 --- a/src/party.c +++ b/src/party.c @@ -127,7 +127,7 @@ BOOL PartyHasMon(PARTY *party, u16 species) { int i; for (i = 0; i < party->core.curCount; i++) { - if (species == GetMonData(&party->core.mons[i], MON_DATA_SPECIES2, NULL)) { + if (species == GetMonData(&party->core.mons[i], MON_DATA_SPECIES_OR_EGG, NULL)) { break; } } diff --git a/src/pokemon.c b/src/pokemon.c index 847eb8f9a..3a456fbc0 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -514,7 +514,7 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxMon, int attr, void * dest) { ret = blockB->isEgg; } break; - case MON_DATA_SPECIES2: + case MON_DATA_SPECIES_OR_EGG: ret = blockA->species; if (ret != SPECIES_NONE && (blockB->isEgg || boxMon->checksum_fail)) { ret = SPECIES_EGG; @@ -1698,7 +1698,7 @@ static void AddBoxMonDataInternal(BoxPokemon *boxMon, int attr, int value) { case MON_DATA_SEAL_COORDS: case MON_DATA_SPECIES_EXISTS: case MON_DATA_SANITY_IS_EGG: - case MON_DATA_SPECIES2: + case MON_DATA_SPECIES_OR_EGG: case MON_DATA_IVS_WORD: case MON_DATA_UNK_176: case MON_DATA_TYPE_1: @@ -2041,7 +2041,7 @@ void MonApplyFriendshipMod(Pokemon *mon, u8 kind, u16 location) { if (kind == FRIENDSHIP_EVENT_WALKING && (LCRandom() & 1)) return; - species = (u16)GetMonData(mon, MON_DATA_SPECIES2, NULL); + species = (u16)GetMonData(mon, MON_DATA_SPECIES_OR_EGG, NULL); if (species == SPECIES_NONE || species == SPECIES_EGG) return; @@ -2157,7 +2157,7 @@ void sub_02070130(struct SomeDrawPokemonStruct *a0, BoxPokemon *boxMon, u8 which void GetBoxmonSpriteCharAndPlttNarcIds(struct SomeDrawPokemonStruct *spC, BoxPokemon *boxMon, u8 whichFacing, BOOL sp14) { BOOL decry = AcquireBoxMonLock(boxMon); - u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES2, NULL); + u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES_OR_EGG, NULL); u8 gender = GetBoxMonGender(boxMon); u8 shiny = BoxMonIsShiny(boxMon); u32 pid = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); @@ -2474,7 +2474,7 @@ u8 sub_02070848(BoxPokemon *boxMon, u8 whichFacing) { } u8 sub_02070854(BoxPokemon *boxMon, u8 whichFacing, BOOL a2) { - u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES2, NULL); + u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES_OR_EGG, NULL); u8 gender = GetBoxMonGender(boxMon); u32 pid = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL); u8 form; @@ -3772,7 +3772,7 @@ BOOL GetBoxMonTMHMCompat(BoxPokemon *boxMon, u8 tmhm) { u16 species; u32 form; - species = GetBoxMonData(boxMon, MON_DATA_SPECIES2, NULL); + species = GetBoxMonData(boxMon, MON_DATA_SPECIES_OR_EGG, NULL); form = GetBoxMonData(boxMon, MON_DATA_FORM, NULL); return GetTMHMCompatBySpeciesAndForm(species, form, tmhm); } diff --git a/src/pokemon_icon_idx.c b/src/pokemon_icon_idx.c index 59cc48fb6..dd65807d3 100644 --- a/src/pokemon_icon_idx.c +++ b/src/pokemon_icon_idx.c @@ -79,7 +79,7 @@ u32 GetBattleMonIconNaixEx(u32 species, BOOL isEgg, u32 form) { } static u16 BoxMonGetForm(BoxPokemon *boxMon) { - switch (GetBoxMonData(boxMon, MON_DATA_SPECIES2, NULL)) { + switch (GetBoxMonData(boxMon, MON_DATA_SPECIES_OR_EGG, NULL)) { case SPECIES_UNOWN: return GetBoxMonUnownLetter(boxMon); case SPECIES_DEOXYS: diff --git a/src/pokemon_mood.c b/src/pokemon_mood.c index 42377d256..12f468bae 100644 --- a/src/pokemon_mood.c +++ b/src/pokemon_mood.c @@ -96,7 +96,7 @@ void ApplyMonMoodModifier(Pokemon *mon, int modifierId) { u16 species; s32 adjustedMood; - species = GetMonData(mon, MON_DATA_SPECIES2, NULL); + species = GetMonData(mon, MON_DATA_SPECIES_OR_EGG, NULL); if (species != 0 && species != SPECIES_EGG) { mood = GetMonData(mon, MON_DATA_MOOD, NULL); From d166cf11f9854b6cbc7534ea4d44822d5fc4a65f Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 30 Jun 2023 17:51:36 -0400 Subject: [PATCH 2/2] Uses of SPECIES_NONE, STATUS_NONE, MOVE_NONE and ITEM_NONE --- src/battle/battle_command.c | 45 +++++++++++++++++++++++--------- src/battle/overlay_12_0224E4FC.c | 6 ++++- src/field/scrcmd_pokemon_misc.c | 4 +-- src/pokemon_mood.c | 2 +- src/unk_02097F6C.c | 2 +- 5 files changed, 42 insertions(+), 17 deletions(-) diff --git a/src/battle/battle_command.c b/src/battle/battle_command.c index 22a96bab1..257342ca3 100644 --- a/src/battle/battle_command.c +++ b/src/battle/battle_command.c @@ -3165,7 +3165,9 @@ BOOL BtlCmd_TryWhirlwind(BattleSystem *bsys, BATTLECONTEXT *ctx) { for (monIndex = index0; monIndex < indexEnd; monIndex++) { mon = GetPartyMonByIndex(party, monIndex); - if (GetMonData(mon, MON_DATA_SPECIES, 0) && !GetMonData(mon, MON_DATA_IS_EGG, 0) && GetMonData(mon, MON_DATA_HP, 0)) { + if (GetMonData(mon, MON_DATA_SPECIES, 0) != SPECIES_NONE + && !GetMonData(mon, MON_DATA_IS_EGG, 0) + && GetMonData(mon, MON_DATA_HP, 0) != 0) { cnt++; } } @@ -3179,7 +3181,9 @@ BOOL BtlCmd_TryWhirlwind(BattleSystem *bsys, BATTLECONTEXT *ctx) { monIndex += index0; } while (monIndex == monIndexA || monIndex == monIndexB); mon = GetPartyMonByIndex(party, monIndex); - } while (!GetMonData(mon, MON_DATA_SPECIES, 0) || GetMonData(mon, MON_DATA_IS_EGG, 0) == 1 || !GetMonData(mon, MON_DATA_HP, 0)); + } while (GetMonData(mon, MON_DATA_SPECIES, 0) == SPECIES_NONE + || GetMonData(mon, MON_DATA_IS_EGG, 0) == TRUE + || GetMonData(mon, MON_DATA_HP, 0) == 0); ctx->unk_21A0[ctx->battlerIdTarget] = monIndex; } else { BattleScriptIncrementPointer(ctx, adrs); @@ -3735,8 +3739,11 @@ BOOL BtlCmd_BeatUpDamageCalc(BattleSystem *bsys, BATTLECONTEXT *ctx) { while (TRUE) { mon = BattleSystem_GetPartyMon(bsys, ctx->battlerIdAttacker, ctx->beatUpCount); - if (ctx->beatUpCount == ctx->selectedMonIndex[ctx->battlerIdAttacker] || - (GetMonData(mon, MON_DATA_HP, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0x1ee && GetMonData(mon, MON_DATA_STATUS, 0) == 0)) { + if (ctx->beatUpCount == ctx->selectedMonIndex[ctx->battlerIdAttacker] + || (GetMonData(mon, MON_DATA_HP, 0) != 0 + && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_NONE + && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG + && GetMonData(mon, MON_DATA_STATUS, 0) == STATUS_NONE)) { break; } ctx->beatUpCount++; @@ -3771,8 +3778,11 @@ BOOL BtlCmd_BeatUpDamageCalc(BattleSystem *bsys, BATTLECONTEXT *ctx) { if (ctx->beatUpCount < monCnt) { while (TRUE) { mon = BattleSystem_GetPartyMon(bsys, ctx->battlerIdAttacker, ctx->beatUpCount); - if (ctx->beatUpCount == ctx->selectedMonIndex[ctx->battlerIdAttacker] || - (GetMonData(mon, MON_DATA_HP, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0x1ee && GetMonData(mon, MON_DATA_STATUS, 0) == 0)) { + if (ctx->beatUpCount == ctx->selectedMonIndex[ctx->battlerIdAttacker] + || (GetMonData(mon, MON_DATA_HP, 0) != 0 + && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_NONE + && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG + && GetMonData(mon, MON_DATA_STATUS, 0) == STATUS_NONE)) { break; } ctx->beatUpCount++; @@ -3879,7 +3889,8 @@ BOOL BtlCmd_TryAssist(BattleSystem *bsys, BATTLECONTEXT *ctx) { for (i = 0; i < monCnt; i++) { if (i != ctx->selectedMonIndex[ctx->battlerIdAttacker]) { mon = BattleSystem_GetPartyMon(bsys, ctx->battlerIdAttacker, i); - if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { + if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_NONE + && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { for (j = 0; j < MAX_MON_MOVES; j++) { move = GetMonData(mon, MON_DATA_MOVE1 + j, 0); if (CheckMoveCallsOtherMove(move) == FALSE && CheckLegalMetronomeMove(bsys, ctx, ctx->battlerIdAttacker, move) == TRUE) { @@ -4865,7 +4876,11 @@ BOOL BtlCmd_Pickup(BattleSystem *bsys, BATTLECONTEXT *ctx) { species = GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0); item = GetMonData(mon, MON_DATA_HELD_ITEM, 0); ability = GetMonData(mon, MON_DATA_ABILITY, 0); - if (ability == ABILITY_PICKUP && species && species != SPECIES_EGG && !item && !(BattleSystem_Random(bsys)%10)) { + if (ability == ABILITY_PICKUP + && species != SPECIES_NONE + && species != SPECIES_EGG + && item == ITEM_NONE + && !(BattleSystem_Random(bsys) % 10)) { rnd = BattleSystem_Random(bsys) % 100; lvl = (GetMonData(mon, MON_DATA_LEVEL, 0) - 1) / 10; if (lvl >= 10) { @@ -4881,7 +4896,10 @@ BOOL BtlCmd_Pickup(BattleSystem *bsys, BATTLECONTEXT *ctx) { } } } - if (ability == ABILITY_HONEY_GATHER && species && species != SPECIES_EGG && !item) { + if (ability == ABILITY_HONEY_GATHER + && species != SPECIES_NONE + && species != SPECIES_EGG + && item == ITEM_NONE) { j = 0; k = 10; lvl = GetMonData(mon, MON_DATA_LEVEL, 0); @@ -5497,7 +5515,8 @@ BOOL BtlCmd_CheckWhiteout(BattleSystem *bsys, BATTLECONTEXT *ctx) { for (i = 0; i < GetPartyCount(party1); i++) { mon = GetPartyMonByIndex(party1, i); - if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { + if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_NONE + && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { partyHp += GetMonData(mon, MON_DATA_HP, 0); } } @@ -5506,7 +5525,8 @@ BOOL BtlCmd_CheckWhiteout(BattleSystem *bsys, BATTLECONTEXT *ctx) { } else for (i = 0; i < GetPartyCount(party2); i++) { mon = GetPartyMonByIndex(party2, i); - if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { + if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_NONE + && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { partyHp += GetMonData(mon, MON_DATA_HP, 0); } } @@ -5521,7 +5541,8 @@ BOOL BtlCmd_CheckWhiteout(BattleSystem *bsys, BATTLECONTEXT *ctx) { for (i = 0; i < GetPartyCount(party); i++) { mon = GetPartyMonByIndex(party, i); - if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != 0 && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { + if (GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_NONE + && GetMonData(mon, MON_DATA_SPECIES_OR_EGG, 0) != SPECIES_EGG) { partyHp += GetMonData(mon, MON_DATA_HP, 0); } } diff --git a/src/battle/overlay_12_0224E4FC.c b/src/battle/overlay_12_0224E4FC.c index 6c66241cc..ea443b703 100644 --- a/src/battle/overlay_12_0224E4FC.c +++ b/src/battle/overlay_12_0224E4FC.c @@ -2985,7 +2985,11 @@ BOOL CanSwitchMon(BattleSystem *bsys, BATTLECONTEXT *ctx, int battlerId) { for (i = start; i < partySize; i++) { mon = GetPartyMonByIndex(party, i); - if (GetMonData(mon, MON_DATA_SPECIES, NULL) && !GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, MON_DATA_HP, NULL) && monIndex1 != i && monIndex2 != i) { + if (GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_NONE + && !GetMonData(mon, MON_DATA_IS_EGG, NULL) + && GetMonData(mon, MON_DATA_HP, NULL) != 0 + && monIndex1 != i + && monIndex2 != i) { cnt++; } } diff --git a/src/field/scrcmd_pokemon_misc.c b/src/field/scrcmd_pokemon_misc.c index 556226f29..a3910dfd7 100644 --- a/src/field/scrcmd_pokemon_misc.c +++ b/src/field/scrcmd_pokemon_misc.c @@ -936,7 +936,7 @@ BOOL ScrCmd_CreatePokeathlonFriendshipRoomStatues(ScriptContext *ctx) { species = unkPtr->friendshipRoomStatues[i].species; - if (species != 0 && species <= SPECIES_ARCEUS) { + if (species != SPECIES_NONE && species <= SPECIES_ARCEUS) { ov01_02201F98(fsys->mapObjectMan, (u8) i, species, unkPtr->friendshipRoomStatues[i].form, unkPtr->friendshipRoomStatues[i].gender, sFriendshipRoomStatuesPositions[i][0], sFriendshipRoomStatuesPositions[i][1], fsys->location->mapId); } } @@ -1028,7 +1028,7 @@ BOOL ScrCmd_GiveTogepiEgg(ScriptContext *ctx) { SetEggStats(mon, SPECIES_TOGEPI, 1, profile, 3, sub_02017FE4(MAPSECTYPE_GIFT, 0xd)); for (i = 0; i < MAX_MON_MOVES; i++) { - if (!GetMonData(mon, MON_DATA_MOVE1 + i, 0)) { + if (GetMonData(mon, MON_DATA_MOVE1 + i, 0) == MOVE_NONE) { break; } } diff --git a/src/pokemon_mood.c b/src/pokemon_mood.c index 12f468bae..ee20c7002 100644 --- a/src/pokemon_mood.c +++ b/src/pokemon_mood.c @@ -98,7 +98,7 @@ void ApplyMonMoodModifier(Pokemon *mon, int modifierId) { species = GetMonData(mon, MON_DATA_SPECIES_OR_EGG, NULL); - if (species != 0 && species != SPECIES_EGG) { + if (species != SPECIES_NONE && species != SPECIES_EGG) { mood = GetMonData(mon, MON_DATA_MOOD, NULL); adjustedMood = mood + sMoodModifiers[modifierId]; diff --git a/src/unk_02097F6C.c b/src/unk_02097F6C.c index f433351ab..5c023f834 100644 --- a/src/unk_02097F6C.c +++ b/src/unk_02097F6C.c @@ -60,6 +60,6 @@ void GetSwarmInfoFromRand(u32 rand, u16 *mapno, u16 *species) { *species = encData.swarmSpecies[0]; break; } - GF_ASSERT(*species != 0); + GF_ASSERT(*species != SPECIES_NONE); *mapno = (*swarmMap)[0]; }