diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
| commit | cd876292d126c339bfc31c717d5bec6fe1b63f80 (patch) | |
| tree | e7e3666bc80640d9b946f79c07e8d0858600598b /src/record_mixing.c | |
| parent | a08cbaee0a5f06f2e6d11ceb958e36430175f220 (diff) | |
| parent | fa5bfc16279fe6c8c38392612796448495da896f (diff) | |
Merge branch 'master' into pokenav_unk_2
Diffstat (limited to 'src/record_mixing.c')
| -rw-r--r-- | src/record_mixing.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/record_mixing.c b/src/record_mixing.c index 85b52e478..6cb145c80 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -82,21 +82,21 @@ union PlayerRecords // Static RAM declarations -static IWRAM_DATA bool8 gUnknown_03001130; -static IWRAM_DATA struct SecretBase *sSecretBasesSave; -static IWRAM_DATA TVShow *sTvShowsSave; -static IWRAM_DATA PokeNews *sPokeNewsSave; -static IWRAM_DATA OldMan *sOldManSave; -static IWRAM_DATA struct EasyChatPair *sEasyChatPairsSave; -static IWRAM_DATA struct RecordMixingDayCareMail *gUnknown_03001148; -static IWRAM_DATA void *sBattleTowerSave; -static IWRAM_DATA LilycoveLady *sLilycoveLadySave; -static IWRAM_DATA void *sApprenticesSave; -static IWRAM_DATA void *sBattleTowerSave_Duplicate; -static IWRAM_DATA u32 sRecordStructSize; -static IWRAM_DATA u8 gUnknown_03001160; -static IWRAM_DATA u32 filler_03001164; -static IWRAM_DATA struct PlayerHallRecords *gUnknown_03001168[3]; +static bool8 gUnknown_03001130; +static struct SecretBase *sSecretBasesSave; +static TVShow *sTvShowsSave; +static PokeNews *sPokeNewsSave; +static OldMan *sOldManSave; +static struct EasyChatPair *sEasyChatPairsSave; +static struct RecordMixingDayCareMail *gUnknown_03001148; +static void *sBattleTowerSave; +static LilycoveLady *sLilycoveLadySave; +static void *sApprenticesSave; +static void *sBattleTowerSave_Duplicate; +static u32 sRecordStructSize; +static u8 gUnknown_03001160; +static u32 filler_03001164; +static struct PlayerHallRecords *gUnknown_03001168[3]; static EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02039F9C = {0}; static EWRAM_DATA union PlayerRecords *sReceivedRecords = NULL; |