From 67ac6db95e537a68ebdc474f75e9ba6c0550c09d Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 1 Nov 2016 17:34:01 -0500
Subject: [PATCH] Finish port of agb_flash

---
 asm/save.s                | 18 +++++++++---------
 asm/save_failed_screen.s  |  2 +-
 common_syms/agb_flash.txt | 10 ++++++++++
 data/sound_data.s         |  2 +-
 sym_bss.txt               | 14 +++-----------
 sym_common.txt            | 30 +-----------------------------
 6 files changed, 25 insertions(+), 51 deletions(-)
 create mode 100644 common_syms/agb_flash.txt

diff --git a/asm/save.s b/asm/save.s
index 0ed93c6144..9330cc552f 100644
--- a/asm/save.s
+++ b/asm/save.s
@@ -9,7 +9,7 @@
 calls_flash_erase_block: @ 8152650
 	push {r4,r5,lr}
 	movs r4, 0
-	ldr r5, =gUnknown_03007860
+	ldr r5, =EraseFlashSector
 _08152656:
 	ldr r1, [r5]
 	adds r0, r4, 0
@@ -572,7 +572,7 @@ _08152B22:
 	ldr r2, =0x00000ff6
 	adds r1, r2
 	strh r0, [r1]
-	ldr r0, =gUnknown_03007860
+	ldr r0, =EraseFlashSector
 	ldr r1, [r0]
 	adds r0, r5, 0
 	bl _call_via_r1
@@ -580,7 +580,7 @@ _08152B22:
 	movs r4, 0
 	ldr r7, =0x00000ff7
 	mov r9, r7
-	ldr r7, =gUnknown_03007854
+	ldr r7, =ProgramFlashByte
 	b _08152B82
 	.pool
 _08152B7C:
@@ -612,7 +612,7 @@ _08152BA0:
 _08152BB0:
 	movs r6, 0x1
 	movs r4, 0
-	ldr r1, =gUnknown_03007854
+	ldr r1, =ProgramFlashByte
 	mov r9, r1
 	ldr r7, =0x00000ff9
 	b _08152BCA
@@ -690,7 +690,7 @@ sav12_xor_get: @ 8152C20
 	adds r0, r4, r0
 	lsls r0, 16
 	lsrs r4, r0, 16
-	ldr r0, =gUnknown_03007854
+	ldr r0, =ProgramFlashByte
 	ldr r1, =0x00000ff8
 	ldr r3, [r0]
 	adds r0, r4, 0
@@ -751,7 +751,7 @@ sub_8152CAC: @ 8152CAC
 	adds r0, r4, r0
 	lsls r0, 16
 	lsrs r4, r0, 16
-	ldr r3, =gUnknown_03007854
+	ldr r3, =ProgramFlashByte
 	ldr r1, =0x00000ff8
 	ldr r0, =gUnknown_03006204
 	ldr r0, [r0]
@@ -815,7 +815,7 @@ sub_8152D44: @ 8152D44
 	adds r0, r4, r0
 	lsls r0, 16
 	lsrs r4, r0, 16
-	ldr r0, =gUnknown_03007854
+	ldr r0, =ProgramFlashByte
 	ldr r1, =0x00000ff8
 	ldr r3, [r0]
 	adds r0, r4, 0
@@ -1390,7 +1390,7 @@ _0815322C:
 	.4byte _08153244
 _08153244:
 	movs r4, 0x1C
-	ldr r5, =gUnknown_03007860
+	ldr r5, =EraseFlashSector
 _08153248:
 	ldr r1, [r5]
 	adds r0, r4, 0
@@ -1460,7 +1460,7 @@ _081532DE:
 	.pool
 _081532F8:
 	movs r4, 0x1C
-	ldr r5, =gUnknown_03007860
+	ldr r5, =EraseFlashSector
 _081532FC:
 	ldr r1, [r5]
 	adds r0, r4, 0
diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s
index 75a8532930..c4a6a9c467 100644
--- a/asm/save_failed_screen.s
+++ b/asm/save_failed_screen.s
@@ -633,7 +633,7 @@ sub_8179554: @ 8179554
 	movs r0, 0
 	ldr r1, =0x00000fff
 	mov r8, r1
-	ldr r7, =gUnknown_03007854
+	ldr r7, =ProgramFlashByte
 _08179566:
 	movs r4, 0
 	adds r5, r0, 0x1
diff --git a/common_syms/agb_flash.txt b/common_syms/agb_flash.txt
new file mode 100644
index 0000000000..cb421ec80d
--- /dev/null
+++ b/common_syms/agb_flash.txt
@@ -0,0 +1,10 @@
+gFlashTimeoutFlag
+PollFlashStatus
+WaitForFlashWrite
+ProgramFlashSector
+gFlash
+ProgramFlashByte
+gFlashNumRemainingBytes
+EraseFlashChip
+EraseFlashSector
+gFlashMaxTime
diff --git a/data/sound_data.s b/data/sound_data.s
index 1de5125ed7..b90c6f4492 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -31,4 +31,4 @@ gUnknown_086B49C0:: @ 86B49C0
 	.incbin "baserom.gba", 0x6b49c0, 0x30
 
 gUnknown_086B49F0:: @ 86B49F0
-	.incbin "baserom.gba", 0x6b49f0, 0x2ee6e0
+	.incbin "baserom.gba", 0x6b49f0, 0x2ee660
diff --git a/sym_bss.txt b/sym_bss.txt
index 99c33b5861..a7e70dbe36 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -511,20 +511,12 @@ gUnknown_030012FC: @ 30012FC
 gUnknown_03001300: @ 3001300
 	.space 0x770
 
-gUnknown_03001A70: @ 3001A70
+  .include "src/agb_flash.o"
+
 	.space 0x2
 
-gUnknown_03001A72: @ 3001A72
-	.space 0x2
-
-gUnknown_03001A74: @ 3001A74
-	.space 0x4
-
-gUnknown_03001A78: @ 3001A78
-	.space 0x6
-
 gUnknown_03001A7E: @ 3001A7E
-	.space 0x02
+	.space 0x2
 
 	.include "tools/agbcc/lib/libgcc.a:dp-bit.o"
 	.include "tools/agbcc/lib/libgcc.a:fp-bit.o"
diff --git a/sym_common.txt b/sym_common.txt
index d9a227e4fb..d7d605314b 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -548,35 +548,7 @@ gUnknown_030077F0: @ 30077F0
 gUnknown_03007800: @ 3007800
 	.space 0x40
 
-gUnknown_03007840: @ 3007840
-	.space 0x4
-
-gUnknown_03007844: @ 3007844
-	.space 0x4
-
-gUnknown_03007848: @ 3007848
-	.space 0x4
-
-gUnknown_0300784C: @ 300784C
-	.space 0x4
-
-gUnknown_03007850: @ 3007850
-	.space 0x4
-
-gUnknown_03007854: @ 3007854
-	.space 0x4
-
-gUnknown_03007858: @ 3007858
-	.space 0x4
-
-gUnknown_0300785C: @ 300785C
-	.space 0x4
-
-gUnknown_03007860: @ 3007860
-	.space 0x4
-
-gUnknown_03007864: @ 3007864
-	.space 0x4
+  .include "agb_flash.o"
 
 gUnknown_03007868: @ 3007868
 	.space 0x8