diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-12-28 21:34:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-28 21:34:16 -0600 |
| commit | 6512ebff67e163a5a6c0f5e19847e2a4dda19ad1 (patch) | |
| tree | 028f81d66b2cd990d163062280e558a080b30071 /include | |
| parent | 7a1956f51d3bbba5f49f97526b79efafa85792bb (diff) | |
| parent | f0ef6ae481ec2cc655f1606f074de38ef26276c4 (diff) | |
Merge pull request #90 from pret/pokemon_mail_data
Pokemon mail data and some decomp
Diffstat (limited to 'include')
| -rw-r--r-- | include/dungeon_entity.h | 6 | ||||
| -rw-r--r-- | include/dungeon_pokemon_attributes_1.h | 10 | ||||
| -rw-r--r-- | include/pokemon_mail.h | 15 |
3 files changed, 27 insertions, 4 deletions
diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index f4e836c..29fda0a 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -34,7 +34,7 @@ struct DungeonEntityData /* 0x9 */ u8 level; /* 0xA */ u8 partyIndex; // Leader is 0, partner is 1, etc. u8 fillB; - /* 0xC */ u16 IQ; + /* 0xC */ s16 IQ; /* 0xE */ s16 HP; /* 0x10 */ s16 maxHP; // Bosses have higher HP than normal for their level. This is the max HP they would normally have given their level. @@ -60,7 +60,7 @@ struct DungeonEntityData /* 0x30 */ s32 specialAttackMultiplier; /* 0x34 */ s32 defenseMultiplier; /* 0x38 */ s32 specialDefenseMultiplier; - u8 fill3C[0x3E - 0x3C]; + /* 0x3C */ s16 hiddenPowerPower; /* 0x3E */ u8 hiddenPowerType; u8 fill3F; /* 0x40 */ u8 joinLocation; // Uses the dungeon index in dungeon.h. @@ -151,7 +151,7 @@ struct DungeonEntityData u8 fillF3; /* 0xF4 */ bool8 grudgeStatus; /* 0xF5 */ bool8 exposedStatus; - u8 fillF7; + u8 fillF6; /* 0xF7 */ bool8 isBoss; u8 fillF8[0xFA - 0xF8]; /* 0xFA */ u8 terrifiedTurnsLeft; // Doubles as a bool for whether the Pokémon is terrified. diff --git a/include/dungeon_pokemon_attributes_1.h b/include/dungeon_pokemon_attributes_1.h index ccf68e5..cdfa989 100644 --- a/include/dungeon_pokemon_attributes_1.h +++ b/include/dungeon_pokemon_attributes_1.h @@ -8,6 +8,14 @@ bool8 CanSeeInvisible(struct DungeonEntity *pokemon); // 0x718AC bool8 HasTactic(struct DungeonEntity *pokemon, u8 tactic); // 0x718D8 -bool8 HasIQSkill(struct DungeonEntity* pokemon, u8 IQSkill); +bool8 HasIQSkill(struct DungeonEntity *pokemon, u8 IQSkill); + +void LoadIQSkills(struct DungeonEntity *pokemon); +bool8 CanSeeTeammate(struct DungeonEntity * pokemon); +u8 GetMoveType_2(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); + +// 0x71A44 +s32 CalculateMovePower(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); +bool8 ToolboxEnabled(struct DungeonEntityData *pokemon); #endif diff --git a/include/pokemon_mail.h b/include/pokemon_mail.h new file mode 100644 index 0000000..600db74 --- /dev/null +++ b/include/pokemon_mail.h @@ -0,0 +1,15 @@ +#ifndef POKEMON_MAIL_H +#define POKEMON_MAIL_H + +struct PokemonMail +{ + const char *headline; + const char *text; +}; + +#define NUM_POKEMON_MAIL 56 + +const char *GetPokemonMailHeadline(u8 index); +const char *GetPokemonMailText(u8 index); + +#endif // POKEMON_MAIL_H |