From ad1e7f58f2912df805d9a768715497c9cc6a85c1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 12 Aug 2020 16:52:18 -0400
Subject: Merge two struct definitions

---
 arm9/src/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'arm9/src/main.c')

diff --git a/arm9/src/main.c b/arm9/src/main.c
index ac2d9ca9..bdb6078e 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 "options.h"
+#include "save_block_2.h"
 #include "sound.h"
 
 FS_EXTERN_OVERLAY(MODULE_52);
@@ -32,12 +32,12 @@ extern void FUN_02022294(void);
 extern void FUN_0201259C(void);
 extern void FUN_02002C14(void);
 extern void FUN_02002C50(int, int);
-extern struct UnkStruct_021C59C8 * FUN_0202254C(void);
-extern u32 FUN_02029EF8(struct UnkStruct_021C59C8 *);
+extern struct SaveBlock2 * FUN_0202254C(void);
+extern u32 FUN_02029EF8(struct SaveBlock2 *);
 extern void FUN_02020AFC(void);
 extern int FUN_020337E8(int);
 extern void FUN_02034188(int, int);
-extern int FUN_020227FC(struct UnkStruct_021C59C8 *);
+extern int FUN_020227FC(struct SaveBlock2 *);
 extern void FUN_02089D90(int);
 extern void FUN_0200A2AC(void);
 extern void FUN_02015E30(void);
-- 
cgit v1.2.3


From ddd20f2c76a34b4fc46503c8bf88d53a755453a8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 13 Aug 2020 08:58:40 -0400
Subject: Rename routines in player_data.s

---
 arm9/src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'arm9/src/main.c')

diff --git a/arm9/src/main.c b/arm9/src/main.c
index bdb6078e..3de65c45 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -74,7 +74,7 @@ THUMB_FUNC void NitroMain(void)
     FUN_02002C50(3, 3);
     gBacklightTop.unk18 = -1;
     gBacklightTop.unk20 = FUN_0202254C();
-    InitSoundData(FUN_02029EF8(gBacklightTop.unk20), LoadPlayerDataAddress(gBacklightTop.unk20));
+    InitSoundData(FUN_02029EF8(gBacklightTop.unk20), Sav2_PlayerData_GetOptionsAddr(gBacklightTop.unk20));
     FUN_02020AFC();
     if (FUN_020337E8(3) == 3)
         FUN_02034188(3, 0);
-- 
cgit v1.2.3