From 4099235b1f26e313aeb94847c1b197d1dc4d4776 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 1 Jan 2017 20:26:55 -0800 Subject: mail data in save block 1 --- src/load_save.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 0d4f1238d..a35c20023 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -15,7 +15,7 @@ struct LoadedSaveData struct ItemSlot pokeBalls[16]; struct ItemSlot TMsHMs[64]; struct ItemSlot berries[46]; - struct SaveBlock1_2B4C_Struct unknownSaveData[16]; + struct MailStruct mail[16]; }; extern struct LoadedSaveData gLoadedSaveData[]; @@ -129,9 +129,9 @@ void LoadPlayerData(void) for(i = 0; i < 46; i++) gLoadedSaveData->berries[i] = gSaveBlock1.bagPocket_Berries[i]; - // load misc data. + // load mail for(i = 0; i < 16; i++) - gLoadedSaveData->unknownSaveData[i] = gSaveBlock1.unkSave[i]; + gLoadedSaveData->mail[i] = gSaveBlock1.mail[i]; } void SavePlayerData(void) @@ -158,7 +158,7 @@ void SavePlayerData(void) for(i = 0; i < 46; i++) gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData->berries[i]; - // save misc data. + // save mail for(i = 0; i < 16; i++) - gSaveBlock1.unkSave[i] = gLoadedSaveData->unknownSaveData[i]; + gSaveBlock1.mail[i] = gLoadedSaveData->mail[i]; } -- cgit v1.2.3 From 370c7f78539698902907f262721fe60e606c774d Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 4 Jan 2017 17:31:44 -0500 Subject: more labels (#159) * labels for tv.c and tv.s * match function prologue a little bit better * whoops * label and document lottery_corner.c * gSoftResetDisabled * add labels for main_menu.c * labels for metatile_behavior.c --- src/load_save.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index a35c20023..5babb843e 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -105,7 +105,7 @@ void LoadSerializedGame(void) LoadMapObjects(); } -void LoadPlayerData(void) +void LoadPlayerBag(void) { int i; @@ -129,12 +129,12 @@ void LoadPlayerData(void) for(i = 0; i < 46; i++) gLoadedSaveData->berries[i] = gSaveBlock1.bagPocket_Berries[i]; - // load mail + // load mail. for(i = 0; i < 16; i++) gLoadedSaveData->mail[i] = gSaveBlock1.mail[i]; } -void SavePlayerData(void) +void SavePlayerBag(void) { int i; @@ -158,7 +158,7 @@ void SavePlayerData(void) for(i = 0; i < 46; i++) gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData->berries[i]; - // save mail + // save mail. for(i = 0; i < 16; i++) gSaveBlock1.mail[i] = gLoadedSaveData->mail[i]; } -- cgit v1.2.3 From 801877553db80267a62c0c3c0b2805b6716d1ef9 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:38:44 +0100 Subject: Remove trailing whitespace --- src/load_save.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 5babb843e..56d9b2b4d 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -80,7 +80,7 @@ void LoadPlayerParty(void) static void SaveMapObjects(void) { int i; - + for(i = 0; i < 16; i++) gSaveBlock1.mapObjects[i] = gMapObjects[i]; } @@ -88,7 +88,7 @@ static void SaveMapObjects(void) static void LoadMapObjects(void) { int i; - + for(i = 0; i < 16; i++) gMapObjects[i] = gSaveBlock1.mapObjects[i]; } -- cgit v1.2.3 From bcaab977727ded65c9eeaef9dbef9e9441d26fb7 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 21 Jan 2017 16:48:06 -0800 Subject: formatting --- src/load_save.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 56d9b2b4d..77554eb38 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -22,7 +22,7 @@ extern struct LoadedSaveData gLoadedSaveData[]; void CheckForFlashMemory(void) { - if(!IdentifyFlash()) + if (!IdentifyFlash()) { gUnknown_3004820 = 1; InitFlashTimer(); @@ -81,7 +81,7 @@ static void SaveMapObjects(void) { int i; - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gSaveBlock1.mapObjects[i] = gMapObjects[i]; } @@ -89,7 +89,7 @@ static void LoadMapObjects(void) { int i; - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gMapObjects[i] = gSaveBlock1.mapObjects[i]; } @@ -110,27 +110,27 @@ void LoadPlayerBag(void) int i; // load player items. - for(i = 0; i < 20; i++) + for (i = 0; i < 20; i++) gLoadedSaveData->items[i] = gSaveBlock1.bagPocket_Items[i]; // load player key items. - for(i = 0; i < 20; i++) + for (i = 0; i < 20; i++) gLoadedSaveData->keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i]; // load player pokeballs. - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gLoadedSaveData->pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i]; // load player TMs and HMs. - for(i = 0; i < 64; i++) + for (i = 0; i < 64; i++) gLoadedSaveData->TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i]; // load player berries. - for(i = 0; i < 46; i++) + for (i = 0; i < 46; i++) gLoadedSaveData->berries[i] = gSaveBlock1.bagPocket_Berries[i]; // load mail. - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gLoadedSaveData->mail[i] = gSaveBlock1.mail[i]; } @@ -139,26 +139,26 @@ void SavePlayerBag(void) int i; // save player items. - for(i = 0; i < 20; i++) + for (i = 0; i < 20; i++) gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData->items[i]; // save player key items. - for(i = 0; i < 20; i++) + for (i = 0; i < 20; i++) gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData->keyItems[i]; // save player pokeballs. - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData->pokeBalls[i]; // save player TMs and HMs. - for(i = 0; i < 64; i++) + for (i = 0; i < 64; i++) gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData->TMsHMs[i]; // save player berries. - for(i = 0; i < 46; i++) + for (i = 0; i < 46; i++) gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData->berries[i]; // save mail. - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) gSaveBlock1.mail[i] = gLoadedSaveData->mail[i]; } -- cgit v1.2.3 From 0d2125cebb22334265b79d7d9295552507d2c78b Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 19 Feb 2017 11:54:15 -0800 Subject: gFlashMemoryPresent variable --- src/load_save.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 77554eb38..2e554c083 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -6,7 +6,7 @@ #include "rom4.h" extern u8 gPlayerPartyCount; -extern u32 gUnknown_3004820; +extern bool32 gFlashMemoryPresent; struct LoadedSaveData { @@ -24,11 +24,11 @@ void CheckForFlashMemory(void) { if (!IdentifyFlash()) { - gUnknown_3004820 = 1; + gFlashMemoryPresent = TRUE; InitFlashTimer(); } else - gUnknown_3004820 = 0; + gFlashMemoryPresent = FALSE; } bool32 GetSecretBase2Field_9(void) -- cgit v1.2.3 From 83134f6dda6832e3fb4551a9fd220f054627fe79 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 19 Feb 2017 12:16:08 -0800 Subject: define gFlashMemoryPresent in load_save.c --- src/load_save.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 2e554c083..0642c4cb3 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -6,7 +6,8 @@ #include "rom4.h" extern u8 gPlayerPartyCount; -extern bool32 gFlashMemoryPresent; + +bool32 gFlashMemoryPresent; struct LoadedSaveData { -- cgit v1.2.3 From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Mar 2017 04:00:15 +0100 Subject: reorganize and add new headers for many files --- src/load_save.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 0642c4cb3..0add1b0e3 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -1,4 +1,5 @@ #include "global.h" +#include "gba/flash_internal.h" #include "load_save.h" #include "asm.h" #include "main.h" -- cgit v1.2.3 From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- src/load_save.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index 0add1b0e3..0630f060c 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -1,7 +1,6 @@ #include "global.h" #include "gba/flash_internal.h" #include "load_save.h" -#include "asm.h" #include "main.h" #include "pokemon.h" #include "rom4.h" -- cgit v1.2.3