diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 19:35:47 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 19:35:47 -0400 |
| commit | 692b76fd27bf0b74a3fe871864c5d77387c05618 (patch) | |
| tree | e3e3e42e5f152d82489a40bdd60cfdba92412b2c | |
| parent | ad1e7f58f2912df805d9a768715497c9cc6a85c1 (diff) | |
Resolve warnings
| -rw-r--r-- | include/pokemon.h | 3 | ||||
| -rw-r--r-- | include/save_block_2.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index cf5d3377..1ab3c401 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -9,6 +9,7 @@ #include "seals.h" #include "constants/pokemon.h" #include "string16.h" +#include "save_block_2.h" struct BaseStats { /* 0x00 */ u8 hp; @@ -198,8 +199,6 @@ struct PlayerParty struct Pokemon mons[PARTY_SIZE]; }; -#include "save_block_2.h" - void ZeroMonData(struct Pokemon * pokemon); void ZeroBoxMonData(struct BoxPokemon * boxmon); u32 SizeOfStructPokemon(void); diff --git a/include/save_block_2.h b/include/save_block_2.h index bb2fb2df..e969bde7 100644 --- a/include/save_block_2.h +++ b/include/save_block_2.h @@ -1,7 +1,6 @@ #ifndef POKEDIAMOND_SAVE_BLOCK_2_H #define POKEDIAMOND_SAVE_BLOCK_2_H -#include "pokemon.h" #include "MATH_crc.h" struct Options { @@ -32,6 +31,8 @@ struct PlayerData /* 0x1C */ u8 field_1C; /* 0x1D */ u8 field_1D_0:1; u8 field_1D_1:1; + u8 field_1D_pad:6; + /* 0x1E */ u8 padding_1E[2]; }; struct PlayerDataSav |