Merge pull request #239 from shricubed/savestate

Documented SaveState struct and relevant functions

include/save_player.h

@@ -0,0 +1,23 @@
+#ifndef POKEPLATINUM_SAVE_PLAYER_H
+#define POKEPLATINUM_SAVE_PLAYER_H
+
+#include "play_time.h"
+#include "trainer_info.h"
+#include "game_options.h"
+#include "savedata.h"
+
+typedef struct PlayerSave {
+    Options options;
+    TrainerInfo info;
+    u16 coins; 
+    PlayTime playTime;
+} PlayerSave;
+
+int Player_SaveSize(void);
+void Player_Init(PlayerSave * player);
+TrainerInfo * SaveData_GetTrainerInfo(SaveData * saveData);
+Options * SaveData_Options(SaveData * saveData);
+u16 * SaveData_GetCoins(SaveData * saveData);
+PlayTime * SaveData_GetPlayTime(SaveData * saveData);
+
+#endif // POKEPLATINUM_SAVE_PLAYER_H

include/struct_decls/struct_02025E0C_decl.h

@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_02025E0C_DECL_H
-#define POKEPLATINUM_STRUCT_02025E0C_DECL_H
-
-typedef struct UnkStruct_02025E0C_t UnkStruct_02025E0C;
-
-#endif // POKEPLATINUM_STRUCT_02025E0C_DECL_H

include/unk_02025E08.h

@@ -1,17 +0,0 @@
-#ifndef POKEPLATINUM_UNK_02025E08_H
-#define POKEPLATINUM_UNK_02025E08_H
-
-#include "struct_decls/struct_02025E0C_decl.h"
-#include "play_time.h"
-#include "trainer_info.h"
-#include "game_options.h"
-#include "savedata.h"
-
-int Player_SaveSize(void);
-void Player_Init(UnkStruct_02025E0C * param0);
-TrainerInfo * SaveData_GetTrainerInfo(SaveData * param0);
-Options * SaveData_Options(SaveData * param0);
-u16 * sub_02025E50(SaveData * param0);
-PlayTime * SaveData_GetPlayTime(SaveData * param0);
-
-#endif // POKEPLATINUM_UNK_02025E08_H

platinum.us/main.lsf

@@ -104,7 +104,7 @@ Static main
 	Object main.nef.p/src_savedata_save_table.c.o
 	Object main.nef.p/src_savedata.c.o
 	Object main.nef.p/src_unk_02025CB0.c.o
-	Object main.nef.p/src_unk_02025E08.c.o
+	Object main.nef.p/src_save_player.c.o
 	Object main.nef.p/src_trainer_info.c.o
 	Object main.nef.p/src_unk_0202602C.c.o
 	Object main.nef.p/src_unk_02026150.c.o

src/communication_information.c

@@ -12,7 +12,7 @@
 
 #include "heap.h"
 #include "constants/heap.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202602C.h"
 #include "unk_0202854C.h"

src/field_map_change.c

@@ -32,7 +32,7 @@
 #include "unk_02018340.h"
 #include "strbuf.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "savedata_misc.h"
 #include "unk_02027F50.h"

src/field_menu.c

@@ -54,7 +54,7 @@
 #include "unk_020218BC.h"
 #include "strbuf.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "unk_02028124.h"

src/game_options.c

@@ -4,7 +4,7 @@
 #include "core_sys.h"
 #include "savedata.h"
 #include "heap.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "core_sys.h"
 

src/main.c

@@ -27,7 +27,7 @@
 #include "unk_02022844.h"
 #include "unk_0202419C.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202CC64.h"
 #include "communication_system.h"
 #include "unk_020366A0.h"

src/meson.build

@@ -96,7 +96,7 @@ pokeplatinum_c = files(
     'savedata/save_table.c',
     'savedata.c',
     'unk_02025CB0.c',
-    'unk_02025E08.c',
+    'save_player.c',
     'trainer_info.c',
     'unk_0202602C.c',
     'unk_02026150.c',

src/overlay005/encounter_effect_core.c

@@ -39,7 +39,7 @@
 #include "unk_020218BC.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "overlay005/encounter_effect.h"
 #include "overlay005/field_motion_blur.h"

src/overlay005/field_control.c

@@ -17,7 +17,7 @@
 #include "overlay005/struct_ov5_021D219C.h"
 
 #include "unk_02005474.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_020261E4.h"
 #include "game_records.h"

src/overlay005/ov5_021DC018.c

@@ -30,7 +30,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "coins.h"
 #include "unk_0202D05C.h"
@@ -908,7 +908,7 @@ void ov5_021DD098 (FieldSystem * fieldSystem, Window * param1)
     v1 = StringTemplate_Default(4);
     v2 = Strbuf_Init(16, 4);
     v3 = MessageLoader_GetNewStrbuf(v0, 197);
-    v4 = Coins_GetValue(sub_02025E50(fieldSystem->saveData));
+    v4 = Coins_GetValue(SaveData_GetCoins(fieldSystem->saveData));
 
     StringTemplate_SetNumber(v1, 0, v4, 5, 1, 1);
     StringTemplate_Format(v1, v2, v3);

src/overlay005/ov5_021DD42C.c

@@ -16,7 +16,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "script_manager.h"
 #include "unk_0205D8CC.h"

src/overlay005/ov5_021E1D20.c

@@ -23,7 +23,7 @@
 #include "unk_0201D670.h"
 #include "strbuf.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "play_time.h"

src/overlay005/ov5_021E622C.c

@@ -21,7 +21,7 @@
 #include "heap.h"
 #include "unk_0201D15C.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_020261E4.h"
 #include "unk_0202CC64.h"

src/overlay005/ov5_021EA874.c

@@ -28,7 +28,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_0202ACE0.h"

src/overlay005/ov5_021EFB0C.c

@@ -14,7 +14,7 @@
 
 #include "narc.h"
 #include "heap.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202D7A8.h"
 #include "unk_02039C80.h"

src/overlay005/ov5_021F08CC.c

@@ -26,7 +26,7 @@
 #include "sys_task_manager.h"
 #include "unk_0201D15C.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_records.h"
 #include "unk_020508D4.h"
 #include "unk_02050A74.h"

src/overlay006/ov6_02240C9C.c

@@ -27,7 +27,7 @@
 #include "rtc.h"
 #include "heap.h"
 #include "unk_0201D15C.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "unk_0202D7A8.h"

src/overlay006/ov6_02246184.c

@@ -11,7 +11,7 @@
 #include "message.h"
 #include "heap.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202F180.h"
 #include "map_header.h"

src/overlay006/ov6_02246444.c

@@ -13,7 +13,7 @@
 #include "unk_020021B0.h"
 #include "heap.h"
 #include "savedata/save_table.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202E2CC.h"
 #include "overlay006/ov6_02246444.h"

src/overlay006/ov6_02246A30.c

@@ -9,7 +9,7 @@
 #include "field/field_system.h"
 
 #include "unk_0201D15C.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "vars_flags.h"

src/overlay006/ov6_02247A0C.c

@@ -20,7 +20,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202F108.h"
 #include "field_system.h"
 #include "unk_020508D4.h"

src/overlay007/communication_club.c

@@ -30,7 +30,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "communication_information.h"
 #include "unk_02033200.h"

src/overlay007/ov7_0224B4E8.c

@@ -28,7 +28,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202602C.h"
 #include "unk_02026150.h"
 #include "unk_020508D4.h"

src/overlay007/ov7_0224BE9C.c

@@ -42,7 +42,7 @@
 #include "unk_0201D670.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_020298BC.h"
 #include "unk_0205D8CC.h"

src/overlay007/ov7_0224CD28.c

@@ -39,7 +39,7 @@
 #include "camera.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_0202854C.h"

src/overlay008/ov8_02249960.c

@@ -37,7 +37,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "camera.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "savedata_misc.h"
 #include "unk_02027F50.h"

src/overlay019/ov19_021D0D80.c

@@ -51,7 +51,7 @@
 #include "unk_02023FCC.h"
 #include "savedata/save_table.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202CC64.h"
 #include "unk_0202D778.h"

src/overlay023/ov23_0223E140.c

@@ -54,7 +54,7 @@
 #include "unk_0201F834.h"
 #include "gx_layers.h"
 #include "unk_020218BC.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "unk_0202854C.h"

src/overlay023/ov23_02241F74.c

@@ -27,7 +27,7 @@
 #include "unk_0200DA60.h"
 #include "heap.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202854C.h"
 #include "unk_02030EE0.h"

src/overlay023/ov23_0224F294.c

@@ -42,7 +42,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202854C.h"
 #include "communication_system.h"

src/overlay023/ov23_0225128C.c

@@ -32,7 +32,7 @@
 #include "unk_02018340.h"
 #include "camera.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202854C.h"
 #include "communication_information.h"
 #include "unk_02033200.h"

src/overlay025/poketch_system.c

@@ -20,7 +20,7 @@
 #include "sys_task.h"
 #include "heap.h"
 #include "unk_0201E3D8.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "field_system.h"
 #include "trainer_info.h"
 #include "unk_020508D4.h"

src/overlay056/ov56_022561C0.c

@@ -47,7 +47,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_02027F84.h"
 #include "unk_02033200.h"

src/overlay057/ov57_021D0D80.c

@@ -23,7 +23,7 @@
 #include "heap.h"
 #include "unk_0201D15C.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "savedata_misc.h"
 #include "game_options.h"

src/overlay057/ov57_021D0F30.c

@@ -5,7 +5,7 @@
 #include "savedata.h"
 
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0203D178.h"
 #include "vars_flags.h"

src/overlay059/ov59_021D2B44.c

@@ -12,7 +12,7 @@
 #include "heap.h"
 #include "savedata/save_table.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "communication_information.h"
 #include "overlay059/ov59_021D2B44.h"

src/overlay061/ov61_0222B008.c

@@ -28,7 +28,7 @@
 #include "string_template.h"
 #include "heap.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202F1D4.h"
 #include "unk_020366A0.h"
 #include "overlay004/ov4_021D0D80.h"

src/overlay061/ov61_0222BF44.c

@@ -44,7 +44,7 @@
 #include "gx_layers.h"
 #include "strbuf.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202ACE0.h"
 #include "unk_020366A0.h"

src/overlay062/ov62_0223CAEC.c

@@ -32,7 +32,7 @@
 #include "gx_layers.h"
 #include "strbuf.h"
 #include "unk_02023FCC.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "play_time.h"
 #include "game_records.h"
 #include "unk_02030A80.h"

src/overlay062/ov62_02241204.c

@@ -45,7 +45,7 @@
 #include "gx_layers.h"
 #include "strbuf.h"
 #include "unk_02023FCC.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202631C.h"
 #include "unk_0202F1D4.h"
 #include "unk_02030A80.h"

src/overlay064/ov64_0222DCE0.c

@@ -75,7 +75,7 @@
 #include "unk_020218BC.h"
 #include "unk_0202309C.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_0202ACE0.h"

src/overlay065/ov65_0222DCE0.c

@@ -79,7 +79,7 @@
 #include "strbuf.h"
 #include "unk_02023FCC.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "game_options.h"

src/overlay065/ov65_0223648C.c

@@ -59,7 +59,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "journal.h"

src/overlay066/ov66_0222DDF0.c

@@ -54,7 +54,7 @@
 #include "strbuf.h"
 #include "savedata.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "journal.h"

src/overlay067/ov67_0225C700.c

@@ -40,7 +40,7 @@
 #include "unk_0201D670.h"
 #include "gx_layers.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "game_records.h"
 #include "unk_020366A0.h"

src/overlay068/ov68_0225C700.c

@@ -57,7 +57,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_02030EA4.h"

src/overlay069/ov69_0225C700.c

@@ -65,7 +65,7 @@
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202C858.h"
 #include "unk_020393C8.h"

src/overlay070/ov70_0225D9A4.c

@@ -80,7 +80,7 @@
 #include "unk_02023FCC.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_020366A0.h"

src/overlay072/ov72_0223D7A0.c

@@ -56,7 +56,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202C7FC.h"
 #include "game_records.h"

src/overlay073/ov73_021D0D80.c

@@ -51,7 +51,7 @@
 #include "unk_0201D670.h"
 #include "gx_layers.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "savedata_misc.h"
 #include "game_options.h"

src/overlay081/ov81_021D0D80.c

@@ -27,7 +27,7 @@
 #include "unk_02018340.h"
 #include "gx_layers.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "journal.h"
 #include "unk_020393C8.h"

src/overlay084/ov84_0223B5A0.c

@@ -48,7 +48,7 @@
 #include "unk_0201E3D8.h"
 #include "gx_layers.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_0202D7A8.h"

src/overlay090/ov90_021D0D80.c

@@ -48,7 +48,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202D05C.h"
 #include "unk_0203061C.h"
 #include "unk_0208C098.h"

src/overlay092/ov92_021D0D80.c

@@ -46,7 +46,7 @@
 #include "camera.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202C858.h"
 #include "unk_020996D0.h"

src/overlay097/ov97_0222AE60.c

@@ -49,7 +49,7 @@
 #include "savedata/save_table.h"
 #include "savedata.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "unk_0202DAB4.h"

src/overlay097/ov97_0222C174.c

@@ -44,7 +44,7 @@
 #include "unk_020218BC.h"
 #include "strbuf.h"
 #include "savedata/save_table.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "game_options.h"

src/overlay097/ov97_0222D30C.c

@@ -58,7 +58,7 @@
 #include "unk_020218BC.h"
 #include "strbuf.h"
 #include "savedata/save_table.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202DAB4.h"
 #include "unk_02033200.h"

src/overlay097/ov97_02230410.c

@@ -50,7 +50,7 @@
 #include "strbuf.h"
 #include "savedata/save_table.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_0202DAB4.h"

src/overlay097/ov97_02233B18.c

@@ -62,7 +62,7 @@
 #include "strbuf.h"
 #include "savedata/save_table.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202EEC0.h"
 #include "pokemon.h"

src/overlay098/ov98_02246C20.c

@@ -19,7 +19,7 @@
 #include "heap.h"
 #include "error_handling.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_02030CE8.h"
 #include "unk_02033200.h"
 #include "unk_02038FFC.h"

src/overlay098/ov98_022471C8.c

@@ -51,7 +51,7 @@
 #include "strbuf.h"
 #include "savedata.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202ACE0.h"
 #include "unk_02030CE8.h"

src/overlay102/ov102_021D0D80.c

@@ -29,7 +29,7 @@
 #include "unk_0201D670.h"
 #include "gx_layers.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "overlay102/ov102_021D0D80.h"
 
 typedef struct {

src/overlay104/ov104_0222DCE0.c

@@ -26,7 +26,7 @@
 #include "unk_0201D15C.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202C858.h"
 #include "communication_information.h"

src/overlay104/ov104_0222ECE8.c

@@ -13,7 +13,7 @@
 #include "overlay104/struct_ov104_0223BFFC.h"
 
 #include "heap.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_020302D0.h"
 #include "unk_02030494.h"
 #include "unk_0203061C.h"

src/overlay104/ov104_0222FBE4.c

@@ -73,7 +73,7 @@
 #include "strbuf.h"
 #include "savedata/save_table.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202ACE0.h"
 #include "game_records.h"

src/overlay104/ov104_02231F74.c

@@ -57,7 +57,7 @@
 #include "unk_0201F834.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"

src/overlay104/ov104_022361B4.c

@@ -30,7 +30,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_records.h"
 #include "unk_020302D0.h"
 #include "unk_0203061C.h"

src/overlay104/ov104_02237378.c

@@ -27,7 +27,7 @@
 #include "heap.h"
 #include "gx_layers.h"
 #include "unk_020218BC.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_02030494.h"
 #include "communication_information.h"

src/overlay104/ov104_02239C58.c

@@ -13,7 +13,7 @@
 #include "struct_defs/struct_0209BBA4.h"
 
 #include "heap.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_02028124.h"
 #include "unk_0202D778.h"
 #include "party.h"

src/overlay104/ov104_0223B6F4.c

@@ -18,7 +18,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0203061C.h"
 #include "communication_information.h"

src/overlay104/ov104_0223BCBC.c

@@ -13,7 +13,7 @@
 #include "message.h"
 #include "strbuf.h"
 #include "unk_0201D15C.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "communication_information.h"
 #include "communication_system.h"

src/overlay104/ov104_0223C2D4.c

@@ -47,7 +47,7 @@
 #include "gx_layers.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_020393C8.h"
 #include "unk_0209B6F8.h"

src/overlay105/ov105_02241AE0.c

@@ -54,7 +54,7 @@
 #include "unk_020218BC.h"
 #include "strbuf.h"
 #include "unk_02024220.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "communication_information.h"

src/overlay106/ov106_02241AE0.c

@@ -49,7 +49,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_02030108.h"

src/overlay107/ov107_02241AE0.c

@@ -57,7 +57,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_020302D0.h"

src/overlay107/ov107_02245EB0.c

@@ -57,7 +57,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_020302D0.h"

src/overlay108/ov108_02241AE0.c

@@ -51,7 +51,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_02030494.h"
 #include "unk_0203061C.h"
 #include "communication_system.h"

src/overlay110/ov110_021D0D80.c

@@ -34,7 +34,7 @@
 #include "unk_0201D670.h"
 #include "gx_layers.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202D05C.h"
 #include "unk_0202FF4C.h"
 #include "unk_020302D0.h"

src/overlay111/ov111_021D0D80.c

@@ -48,7 +48,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "overlay111/ov111_021D0D80.h"
 #include "overlay111/ov111_021D2F80.h"

src/overlay113/ov113_0225C700.c

@@ -76,7 +76,7 @@
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_020393C8.h"
 #include "pokemon.h"

src/overlay114/ov114_0225C700.c

@@ -59,7 +59,7 @@
 #include "gx_layers.h"
 #include "unk_020218BC.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "game_options.h"
 #include "unk_0202ACE0.h"
 #include "communication_information.h"

src/roaming_pokemon.c

@@ -11,7 +11,7 @@
 #include "struct_defs/struct_0206C638.h"
 
 #include "heap.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202D7A8.h"
 #include "roaming_pokemon.h"

src/save_player.c

@@ -0,0 +1,51 @@
+#include <nitro.h>
+#include <string.h>
+
+#include "savedata.h"
+
+#include "savedata.h"
+#include "save_player.h"
+#include "trainer_info.h"
+#include "game_options.h"
+#include "coins.h"
+#include "play_time.h"
+
+
+int Player_SaveSize (void)
+{
+    return sizeof(PlayerSave);
+}
+
+void Player_Init (PlayerSave * player)
+{
+    MI_CpuClearFast(player, sizeof(PlayerSave));
+
+    Options_Init(&player->options);
+    TrainerInfo_Init(&player->info);
+    Coins_Init(&player->coins);
+    PlayTime_Init(&player->playTime);
+}
+
+TrainerInfo * SaveData_GetTrainerInfo (SaveData * saveData)
+{
+    PlayerSave * state = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PLAYER);
+    return &state->info;
+}
+
+Options * SaveData_Options (SaveData * saveData)
+{
+    PlayerSave * state = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PLAYER);
+    return &state->options;
+}
+
+u16 * SaveData_GetCoins (SaveData * saveData)
+{
+    PlayerSave * state = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PLAYER);
+    return &state->coins;
+}
+
+PlayTime *SaveData_GetPlayTime(SaveData *saveData)
+{
+    PlayerSave *state = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PLAYER);
+    return &state->playTime;
+}

src/savedata/save_table.c

@@ -6,7 +6,7 @@
 #include "unk_02014D38.h"
 #include "savedata.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202602C.h"
 #include "unk_020261E4.h"
 #include "unk_0202631C.h"

src/scrcmd.c

@@ -82,7 +82,7 @@
 #include "savedata/save_table.h"
 #include "savedata.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_020261E4.h"
 #include "unk_0202631C.h"

src/string_template.c

@@ -35,7 +35,7 @@
 
 #include "unk_02014D38.h"
 #include "unk_02017038.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_0202B37C.h"
 #include "unk_020797C8.h"
 #include "unk_020996D0.h"

src/unk_02025CB0.c

@@ -9,7 +9,7 @@
 #include "unk_02025CB0.h"
 
 typedef struct UnkStruct_02025CCC_t {
-    s64 unk_00;
+    s64 unk_00;  
     u8 unk_08[6];
     u8 unk_0E;
     u8 unk_0F;

src/unk_02025E08.c

@@ -1,64 +0,0 @@
-#include <nitro.h>
-#include <string.h>
-
-#include "struct_decls/struct_02025E0C_decl.h"
-#include "savedata.h"
-
-#include "savedata.h"
-#include "unk_02025E08.h"
-#include "trainer_info.h"
-#include "game_options.h"
-#include "coins.h"
-#include "play_time.h"
-
-struct UnkStruct_02025E0C_t {
-    Options unk_00;
-    TrainerInfo unk_04;
-    u16 unk_24;
-    PlayTime playTime;
-};
-
-int Player_SaveSize (void)
-{
-    return sizeof(UnkStruct_02025E0C);
-}
-
-void Player_Init (UnkStruct_02025E0C * param0)
-{
-    MI_CpuClearFast(param0, sizeof(UnkStruct_02025E0C));
-
-    Options_Init(&param0->unk_00);
-    TrainerInfo_Init(&param0->unk_04);
-    Coins_Init(&param0->unk_24);
-    PlayTime_Init(&param0->playTime);
-}
-
-TrainerInfo * SaveData_GetTrainerInfo (SaveData * param0)
-{
-    UnkStruct_02025E0C * v0;
-
-    v0 = SaveData_SaveTable(param0, 1);
-    return &v0->unk_04;
-}
-
-Options * SaveData_Options (SaveData * param0)
-{
-    UnkStruct_02025E0C * v0;
-
-    v0 = SaveData_SaveTable(param0, 1);
-    return &v0->unk_00;
-}
-
-u16 * sub_02025E50 (SaveData * param0)
-{
-    UnkStruct_02025E0C * v0;
-
-    v0 = SaveData_SaveTable(param0, 1);
-    return &v0->unk_24;
-}
-
-PlayTime *SaveData_GetPlayTime(SaveData *savedata)
-{
-    UnkStruct_02025E0C *v0 = SaveData_SaveTable(savedata, 1);
-    return &v0->playTime;
-}

src/unk_02028124.c

@@ -13,7 +13,7 @@
 #include "unk_02014A84.h"
 #include "heap.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_02028124.h"
 #include "pokemon.h"

src/unk_0202E840.c

@@ -17,7 +17,7 @@
 #include "heap.h"
 #include "strbuf.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202B37C.h"
 #include "game_records.h"

src/unk_0202F1D4.c

@@ -24,7 +24,7 @@
 #include "unk_0201D15C.h"
 #include "savedata/save_table.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_02026150.h"
 #include "unk_0202631C.h"

src/unk_02030A80.c

@@ -18,7 +18,7 @@
 #include "strbuf.h"
 #include "savedata.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "savedata_misc.h"
 #include "unk_0202C858.h"

src/unk_02030CE8.c

@@ -11,7 +11,7 @@
 #include "unk_020021B0.h"
 #include "unk_0201D15C.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202C858.h"
 #include "unk_02030CE8.h"

src/unk_020366A0.c

@@ -15,7 +15,7 @@
 #include "unk_02017728.h"
 #include "heap.h"
 #include "savedata.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "unk_02030EE0.h"
 #include "unk_0203266C.h"
 #include "unk_02032798.h"

src/unk_0203D1B8.c

@@ -70,7 +70,7 @@
 #include "savedata/save_table.h"
 #include "savedata.h"
 #include "unk_02025CB0.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "savedata_misc.h"
@@ -1587,11 +1587,11 @@ static BOOL sub_0203E35C (TaskManager * param0)
         break;
     case 1:
         if (sub_020509B4(fieldSystem) == 0) {
-            u16 * v5 = sub_02025E50(fieldSystem->saveData);
+            u16 * v5 = SaveData_GetCoins(fieldSystem->saveData);
             s64 v6 = GetTimestamp();
 
             sub_0206DD38(fieldSystem, Coins_GetValue(v5), v2->unk_00, TimeElapsed(v2->unk_04, v6) / 60);
-            Coins_SetValue(sub_02025E50(fieldSystem->saveData), v2->unk_00);
+            Coins_SetValue(SaveData_GetCoins(fieldSystem->saveData), v2->unk_00);
 
             v4 = sub_0206B394(v1);
 
@@ -1615,7 +1615,7 @@ void sub_0203E414 (TaskManager * param0, int param1)
     UnkStruct_0203E35C * v2 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203E35C));
 
     v2->unk_0C.unk_00 = &v2->unk_00;
-    v2->unk_00 = Coins_GetValue(sub_02025E50(fieldSystem->saveData));
+    v2->unk_00 = Coins_GetValue(SaveData_GetCoins(fieldSystem->saveData));
     v2->unk_04 = GetTimestamp();
     v2->unk_0C.records = SaveData_GetGameRecordsPtr(fieldSystem->saveData);
     v2->unk_0C.unk_0C = 0;

src/unk_02046AD4.c

@@ -5,7 +5,7 @@
 
 #include "field_script_context.h"
 
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0203D1B8.h"
 #include "unk_02046AD4.h"

src/unk_02046C7C.c

@@ -12,7 +12,7 @@
 
 #include "string_template.h"
 #include "strbuf.h"
-#include "unk_02025E08.h"
+#include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "unk_020298BC.h"