dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved several TODOs

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-15 13:24:47 +08:00
parent 51a779aa7b
commit f24eae3e90
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/battle.h
+1 -1
View File
@@ -60,7 +60,7 @@
#define BATTLE_TYPE_LEGENDARY 0x2000 #define BATTLE_TYPE_LEGENDARY 0x2000
#define BATTLE_TYPE_REGI 0x4000 #define BATTLE_TYPE_REGI 0x4000
#define BATTLE_TYPE_GHOST 0x8000 #define BATTLE_TYPE_GHOST 0x8000
#define BATTLE_TYPE_DOME 0x10000 #define BATTLE_TYPE_POKEDUDE 0x10000
#define BATTLE_TYPE_PALACE 0x20000 #define BATTLE_TYPE_PALACE 0x20000
#define BATTLE_TYPE_ARENA 0x40000 #define BATTLE_TYPE_ARENA 0x40000
#define BATTLE_TYPE_FACTORY 0x80000 #define BATTLE_TYPE_FACTORY 0x80000
include/pokemon.h
+10
View File
@@ -110,6 +110,16 @@
#define MON_FEMALE 0xFE #define MON_FEMALE 0xFE
#define MON_GENDERLESS 0xFF #define MON_GENDERLESS 0xFF
#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0
#define FRIENDSHIP_EVENT_VITAMIN 0x1
#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2
#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3
#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4
#define FRIENDSHIP_EVENT_WALKING 0x5
#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6
#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7
#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8
#define TYPE_NORMAL 0x00 #define TYPE_NORMAL 0x00
#define TYPE_FIGHTING 0x01 #define TYPE_FIGHTING 0x01
#define TYPE_FLYING 0x02 #define TYPE_FLYING 0x02
src/pokemon.c
+3 -13
View File
@@ -2386,8 +2386,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
spDefense = (110 * spDefense) / 100; spDefense = (110 * spDefense) / 100;
} }
// TODO: Use ARRAY_COUNT(sHoldEffectToType) for (i = 0; i < NELEMS(sHoldEffectToType); i++)
for (i = 0; i < 17; i++)
{ {
if (attackerHoldEffect == sHoldEffectToType[i][0] if (attackerHoldEffect == sHoldEffectToType[i][0]
&& type == sHoldEffectToType[i][1]) && type == sHoldEffectToType[i][1])
@@ -6260,9 +6259,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
return targetSpecies; return targetSpecies;
} }
// HoennPokedexNumToSpecies, but is it really Hoenn or Kanto its checking static u16 HoennPokedexNumToSpecies(u16 var)
// TODO: Figure this out
static u16 sub_80431B4(u16 var)
{ {
u16 species; u16 species;
@@ -6324,8 +6321,6 @@ u16 SpeciesToNationalPokedexNum(u16 species)
return sSpeciesToNationalPokedexNum[species - 1]; return sSpeciesToNationalPokedexNum[species - 1];
} }
// these 2 functions are probably kanto and not hoenn
// TODO: figure this out
static u16 SpeciesToHoennPokedexNum(u16 species) static u16 SpeciesToHoennPokedexNum(u16 species)
{ {
if (!species) if (!species)
@@ -6529,10 +6524,6 @@ static u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex)
#define TRAINER_CLASS_LEADER 0x57 #define TRAINER_CLASS_LEADER 0x57
#define TRAINER_CLASS_CHAMPION 0x5A #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) void AdjustFriendship(struct Pokemon *mon, u8 event)
{ {
u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0); u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0);
@@ -7110,8 +7101,7 @@ void sub_8044348(void)
void SetWildMonHeldItem(void) void SetWildMonHeldItem(void)
{ {
// TODO: Replace 0x00010000 with the right flag that isnt BATTLE_TYPE_DOME if (!(gBattleTypeFlags & (BATTLE_TYPE_POKEDUDE | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER)))
if (!(gBattleTypeFlags & (0x00010000 | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER)))
{ {
u16 rnd = Random() % 100; u16 rnd = Random() % 100;
u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, 0); u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, 0);
src/quest_log_battle.c
+1 -1
View File
@@ -26,7 +26,7 @@ void sub_812C334(s32 *, s32 *);
void sub_812BFDC(void) 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_TrainerBattleRecord * questLogTrainerBattleRecord = Alloc(sizeof(struct QuestLogStruct_TrainerBattleRecord));
struct QuestLogStruct_WildBattleRecord * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_WildBattleRecord)); struct QuestLogStruct_WildBattleRecord * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_WildBattleRecord));
src/unk_8159F40.c
+1 -1
View File
@@ -28,7 +28,7 @@ void sub_8159F40(void)
s32 opIdx = 0; s32 opIdx = 0;
const struct UnkStruct_84792D0 * data; const struct UnkStruct_84792D0 * data;
gBattleTypeFlags = BATTLE_TYPE_DOME; gBattleTypeFlags = BATTLE_TYPE_POKEDUDE;
ZeroPlayerPartyMons(); ZeroPlayerPartyMons();
ZeroEnemyPartyMons(); ZeroEnemyPartyMons();
data = gUnknown_84792D0[gSpecialVar_0x8004]; data = gUnknown_84792D0[gSpecialVar_0x8004];