diff options
| -rw-r--r-- | arm9/src/main.c | 2 | ||||
| -rw-r--r-- | include/player_data.h | 2 | ||||
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | include/save_block_2.h | 1 | ||||
| -rw-r--r-- | include/sound.h | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c index 050aa5f0..3f967380 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -6,7 +6,7 @@ #include "PAD_pad.h" #include "main.h" #include "poke_overlay.h" -#include "save_block_2.h" +#include "player_data.h" #include "sound.h" FS_EXTERN_OVERLAY(MODULE_52); diff --git a/include/player_data.h b/include/player_data.h index 28133f43..bd9cd3b9 100644 --- a/include/player_data.h +++ b/include/player_data.h @@ -12,7 +12,7 @@ struct PlayerData /* 0x10 */ u32 playerId; /* 0x14 */ u32 money; /* 0x18 */ u8 gender; - /* 0x19 */ u8 language; + /* 0x19 */ u8 country; /* 0x1A */ u8 badges; /* 0x1B */ u8 avatar; /* 0x1C */ u8 field_1C; diff --git a/include/pokemon.h b/include/pokemon.h index d3be0c34..1ef26f85 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -9,7 +9,7 @@ #include "seals.h" #include "constants/pokemon.h" #include "string16.h" -#include "save_block_2.h" +#include "player_data.h" struct BaseStats { /* 0x00 */ u8 hp; diff --git a/include/save_block_2.h b/include/save_block_2.h index 5257b11d..304469c7 100644 --- a/include/save_block_2.h +++ b/include/save_block_2.h @@ -2,7 +2,6 @@ #define POKEDIAMOND_SAVE_BLOCK_2_H #include "MATH_crc.h" -#include "player_data.h" struct SavArrayHeader { diff --git a/include/sound.h b/include/sound.h index 9cec824d..9b50542f 100644 --- a/include/sound.h +++ b/include/sound.h @@ -3,7 +3,7 @@ #include "FS_file.h" #include "sdat.h" -#include "save_block_2.h" +#include "player_data.h" struct SoundData { |