diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon.c | 16 | ||||
| -rw-r--r-- | src/quest_log_battle.c | 2 | ||||
| -rw-r--r-- | src/unk_8159F40.c | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 31fa5fed4..f1ab79d65 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2386,8 +2386,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de spDefense = (110 * spDefense) / 100; } - // TODO: Use ARRAY_COUNT(sHoldEffectToType) - for (i = 0; i < 17; i++) + for (i = 0; i < NELEMS(sHoldEffectToType); i++) { if (attackerHoldEffect == sHoldEffectToType[i][0] && type == sHoldEffectToType[i][1]) @@ -6260,9 +6259,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) return targetSpecies; } -// HoennPokedexNumToSpecies, but is it really Hoenn or Kanto its checking -// TODO: Figure this out -static u16 sub_80431B4(u16 var) +static u16 HoennPokedexNumToSpecies(u16 var) { u16 species; @@ -6324,8 +6321,6 @@ u16 SpeciesToNationalPokedexNum(u16 species) return sSpeciesToNationalPokedexNum[species - 1]; } -// these 2 functions are probably kanto and not hoenn -// TODO: figure this out static u16 SpeciesToHoennPokedexNum(u16 species) { if (!species) @@ -6529,10 +6524,6 @@ static u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex) #define TRAINER_CLASS_LEADER 0x57 #define TRAINER_CLASS_CHAMPION 0x5A -// TODO: Move these too -#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3 -#define FRIENDSHIP_EVENT_WALKING 0x5 - void AdjustFriendship(struct Pokemon *mon, u8 event) { u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0); @@ -7110,8 +7101,7 @@ void sub_8044348(void) void SetWildMonHeldItem(void) { - // TODO: Replace 0x00010000 with the right flag that isnt BATTLE_TYPE_DOME - if (!(gBattleTypeFlags & (0x00010000 | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER))) + if (!(gBattleTypeFlags & (BATTLE_TYPE_POKEDUDE | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER))) { u16 rnd = Random() % 100; u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, 0); diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c index 4a63042bf..3dfc2eb57 100644 --- a/src/quest_log_battle.c +++ b/src/quest_log_battle.c @@ -26,7 +26,7 @@ void sub_812C334(s32 *, s32 *); void sub_812BFDC(void) { - if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_DOME)) && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT)) + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_POKEDUDE)) && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT)) { struct QuestLogStruct_TrainerBattleRecord * questLogTrainerBattleRecord = Alloc(sizeof(struct QuestLogStruct_TrainerBattleRecord)); struct QuestLogStruct_WildBattleRecord * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_WildBattleRecord)); diff --git a/src/unk_8159F40.c b/src/unk_8159F40.c index b0147d06a..ab27cea63 100644 --- a/src/unk_8159F40.c +++ b/src/unk_8159F40.c @@ -28,7 +28,7 @@ void sub_8159F40(void) s32 opIdx = 0; const struct UnkStruct_84792D0 * data; - gBattleTypeFlags = BATTLE_TYPE_DOME; + gBattleTypeFlags = BATTLE_TYPE_POKEDUDE; ZeroPlayerPartyMons(); ZeroEnemyPartyMons(); data = gUnknown_84792D0[gSpecialVar_0x8004]; |