summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/asm.inc.h10
-rw-r--r--include/load_save.h17
-rw-r--r--include/rom4.h2
-rw-r--r--src/fieldmap.c18
-rw-r--r--src/load_save.c13
-rw-r--r--src/main.c13
-rw-r--r--src/rom4.c31
-rw-r--r--src/save.c1
-rw-r--r--src/start_menu.c17
9 files changed, 67 insertions, 55 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 5e55acd40..80fe5fa00 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -34,15 +34,6 @@ u8 daycare_relationship_score_from_savegame(void);
// asm/rom_804373C.o
void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s4);
-// asm/load_save.o
-void CheckForFlashMemory(void);
-int sub_80479F8();
-void sub_8047A04();
-void SetSecretBase2Field_9_AndHideBG(void);
-void ClearSecretBase2Field_9_2(void);
-void SaveSerializedGame(void);
-void LoadSerializedGame(void);
-
// asm/berry_blender.o
void sub_80516C4(u8, u16);
@@ -499,3 +490,4 @@ u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size);
u32 ProgramFlashSectorAndVerify();
u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, u8 *src, u32 n);
+u16 IdentifyFlash(void);
diff --git a/include/load_save.h b/include/load_save.h
new file mode 100644
index 000000000..5ca52a2fc
--- /dev/null
+++ b/include/load_save.h
@@ -0,0 +1,17 @@
+#ifndef GUARD_LOAD_SAVE_H
+#define GUARD_LOAD_SAVE_H
+
+void CheckForFlashMemory(void);
+bool32 GetSecretBase2Field_9(void);
+void ClearSecretBase2Field_9(void);
+void SetSecretBase2Field_9(void);
+void SetSecretBase2Field_9_AndHideBG(void);
+void ClearSecretBase2Field_9_2(void);
+void SavePlayerParty(void);
+void LoadPlayerParty(void);
+void SaveSerializedGame(void);
+void LoadSerializedGame(void);
+void LoadPlayerData(void);
+void SavePlayerData(void);
+
+#endif // GUARD_LOAD_SAVE_H
diff --git a/include/rom4.h b/include/rom4.h
index b12bbf4bc..036f43c36 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -59,7 +59,7 @@ void sub_8053720(s16, s16);
// sub_8053778
// unref_sub_8053790
// sub_80537CC
-// gpu_sync_bg_hide
+void gpu_sync_bg_hide();
// sub_8053818
// sub_8053850
// sub_80538B0
diff --git a/src/fieldmap.c b/src/fieldmap.c
index cd9baa217..0470d33ff 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -156,8 +156,8 @@ void sub_8056134(int x, int y, struct MapHeader *mapHeader, int x2, int y2, int
void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
int x, y;
- int x2, y2;
- int width, height;
+ int x2;
+ int width;
int cWidth;
if (connectedMapHeader) {
@@ -190,9 +190,9 @@ void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
}
void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
- int x, y;
+ int x;
int x2, y2;
- int width, height;
+ int width;
int cWidth, cHeight;
if (connectedMapHeader) {
@@ -229,9 +229,9 @@ void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
- int x, y;
+ int y;
int x2, y2;
- int width, height;
+ int height;
int cWidth, cHeight;
if (connectedMapHeader) {
cWidth = connectedMapHeader->mapData->width;
@@ -265,9 +265,9 @@ void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connected
void fillEastConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
int x, y;
- int x2, y2;
- int width, height;
- int cWidth, cHeight;
+ int y2;
+ int height;
+ int cHeight;
if (connectedMapHeader) {
cHeight = connectedMapHeader->mapData->height;
x = mapHeader->mapData->width + 7;
diff --git a/src/load_save.c b/src/load_save.c
index 6f12718f0..0d4f1238d 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,7 +1,9 @@
#include "global.h"
+#include "load_save.h"
+#include "asm.h"
#include "main.h"
-#include "rom4.h"
#include "pokemon.h"
+#include "rom4.h"
extern u8 gPlayerPartyCount;
extern u32 gUnknown_3004820;
@@ -18,9 +20,6 @@ struct LoadedSaveData
extern struct LoadedSaveData gLoadedSaveData[];
-extern u16 IdentifyFlash(void);
-extern void gpu_sync_bg_hide();
-
void CheckForFlashMemory(void)
{
if(!IdentifyFlash())
@@ -32,7 +31,7 @@ void CheckForFlashMemory(void)
gUnknown_3004820 = 0;
}
-u8 GetSecretBase2Field_9(void)
+bool32 GetSecretBase2Field_9(void)
{
return gSaveBlock2.specialSaveWarp;
}
@@ -78,7 +77,7 @@ void LoadPlayerParty(void)
gPlayerParty[i] = gSaveBlock1.playerParty[i];
}
-void SaveMapObjects(void)
+static void SaveMapObjects(void)
{
int i;
@@ -86,7 +85,7 @@ void SaveMapObjects(void)
gSaveBlock1.mapObjects[i] = gMapObjects[i];
}
-void LoadMapObjects(void)
+static void LoadMapObjects(void)
{
int i;
diff --git a/src/main.c b/src/main.c
index ad131547b..c443de69b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,17 +1,18 @@
#include "global.h"
#include "main.h"
#include "asm.h"
-#include "play_time.h"
-#include "m4a.h"
-#include "gba/m4a_internal.h"
#include "gba/flash_internal.h"
-#include "siirtc.h"
-#include "rtc.h"
+#include "gba/m4a_internal.h"
+#include "intro.h"
#include "link.h"
+#include "load_save.h"
+#include "m4a.h"
+#include "play_time.h"
#include "rng.h"
#include "rom4.h"
+#include "rtc.h"
+#include "siirtc.h"
#include "sound.h"
-#include "intro.h"
extern struct SoundInfo gSoundInfo;
extern u32 gUnknown_3004820;
diff --git a/src/rom4.c b/src/rom4.c
index 19f59001b..b81007fd5 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -4,30 +4,31 @@
#include "asm_fieldmap.h"
#include "battle_setup.h"
#include "berry.h"
+#include "field_camera.h"
+#include "field_effect.h"
#include "field_map_obj.h"
+#include "field_message_box.h"
#include "field_player_avatar.h"
+#include "flag.h"
+#include "heal_location.h"
+#include "link.h"
+#include "load_save.h"
+#include "main.h"
#include "menu.h"
-#include "weather.h"
-#include "task.h"
-#include "tileset_anim.h"
-#include "start_menu.h"
-#include "play_time.h"
-#include "truck_scene.h"
#include "new_game.h"
-#include "heal_location.h"
-#include "field_message_box.h"
+#include "palette.h"
+#include "play_time.h"
+#include "rng.h"
#include "safari_zone.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
-#include "rng.h"
-#include "main.h"
-#include "palette.h"
-#include "link.h"
-#include "flag.h"
+#include "start_menu.h"
+#include "task.h"
+#include "tileset_anim.h"
+#include "truck_scene.h"
#include "var.h"
-#include "field_camera.h"
-#include "field_effect.h"
+#include "weather.h"
#include "wild_encounter.h"
#ifdef SAPPHIRE
diff --git a/src/save.c b/src/save.c
index 88f19f15c..1f527bbc0 100644
--- a/src/save.c
+++ b/src/save.c
@@ -2,6 +2,7 @@
#include "save.h"
#include "asm.h"
#include "gba/gba.h"
+#include "load_save.h"
#include "rom4.h"
#include "gba/flash_internal.h"
diff --git a/src/start_menu.c b/src/start_menu.c
index 69f561144..f02665ad1 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1,10 +1,19 @@
#include "global.h"
#include "start_menu.h"
#include "asm.h"
+#include "field_player_avatar.h"
+#include "flag.h"
+#include "load_save.h"
#include "main.h"
+#include "map_obj_lock.h"
#include "menu.h"
+#include "option_menu.h"
#include "palette.h"
#include "pokedex.h"
+#include "rom4.h"
+#include "safari_zone.h"
+#include "save.h"
+#include "save_menu_util.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
@@ -12,15 +21,7 @@
#include "string_util.h"
#include "task.h"
#include "trainer_card.h"
-#include "flag.h"
-#include "rom4.h"
-#include "safari_zone.h"
-#include "field_player_avatar.h"
#include "weather.h"
-#include "save.h"
-#include "option_menu.h"
-#include "map_obj_lock.h"
-#include "save_menu_util.h"
//Menu actions
enum {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 16:10:41 +0000