Start Blue/Sky based clean-up

This commit is contained in:
DizzyEggg
2025-10-31 10:53:14 +01:00
parent e0d35f54b0
commit 40ed4086e7
17 changed files with 204 additions and 220 deletions

View File

@@ -21,13 +21,6 @@
#define NUM_SPEED_COUNTERS 5
#define NUM_PREV_POS 4
#define STAT_STAGE_ATK 0
#define STAT_STAGE_SP_ATK 1
#define STAT_STAGE_DEF 0
#define STAT_STAGE_SP_DEF 1
#define STAT_STAGE_ACCURACY 0
#define STAT_STAGE_EVASION 1
// size: 0x8
typedef struct ActionParameter
{
@@ -237,12 +230,10 @@ typedef struct EntityInfo
/* 0x8C */ IqSkillFlags IQSkillMenuFlags; // IQ skills selected in the IQ skills menu.
/* 0x90 */ IqSkillFlags IQSkillFlags;
/* 0x94 */ u8 tactic;
u8 fill95[0x98 - 0x95];
/* 0x98 */ u32 dungeonSpriteId;
/* 0x9C */ u32 unk9C;
/* 0xA0 */ s32 unkA0;
/* 0xA4 */ u8 monsterBehavior;
u8 fillA5[0xA8 - 0xA5];
// Statuses are split into groups based on which ones can't overlap.
// See status.h for which statuses are in each group.
/* 0xA8 */ SleepClassStatus sleepClassStatus;
@@ -299,7 +290,6 @@ typedef struct EntityInfo
/* 0x14A */ u8 unk14A;
/* 0x14B */ u8 unk14B;
/* 0x14C */ u8 unk14C;
/* 0x14D */ u8 unk14D;
/* 0x14E */ u16 visualFlags;
/* 0x150 */ u16 previousVisualFlags;
/* 0x152 */ u8 unk152;

View File

@@ -452,11 +452,9 @@ typedef struct Dungeon
u8 unk1356C;
u8 fill1356D[0x13570 - 0x1356D];
/* 0x13570 */ u8 unk13570;
u8 fill13571[0x13574 - 0x13571];
/* 0x13574 */ DungeonPos trapPos;
/* 0x13578 */ u8 trapID;
/* 0x13579 */ u8 unk13579;
u8 fill1357A[0x1357C - 0x1357A];
/* 0x1357C */ Entity *teamPokemon[MAX_TEAM_MEMBERS];
/* 0x1358C */ Entity *wildPokemon[DUNGEON_MAX_WILD_POKEMON];
/* 0x135CC */ Entity *activePokemon[DUNGEON_MAX_POKEMON]; // Contains both team and wild Pokémon

View File

@@ -0,0 +1,15 @@
#ifndef GUARD_STR_STAT_INDEX_X
#define GUARD_STR_STAT_INDEX_X
#define STAT_INDEX_PHYSICAL 0 // Atk, Def
#define STAT_INDEX_SPECIAL 1 // Sp Atk, Sp Def
#define STAT_INDEX_ACCURACY STAT_INDEX_PHYSICAL
#define STAT_INDEX_EVASION STAT_INDEX_SPECIAL
// Needed to match in Blue/Sky. I wonder what was the reason for making it a struct as opposed to a simple int...
struct StatIndex
{
int id;
};
#endif // GUARD_STR_STAT_INDEX_X