define variables in agb_flash.c

3 files changed, 13 insertions, 21 deletions

diff --git a/iwram_syms.txt b/iwram_syms.txt
index fa48f9cf1..109e02501 100644
--- a/iwram_syms.txt
+++ b/iwram_syms.txt
@@ -15,14 +15,3 @@ word_3004858 = 0x3004858;
 gTasks = 0x3004B20;
 
 gMPlayMemAccArea = 0x3007440;
-
-gFlashTimeoutFlag = 0x3007490;
-PollFlashStatus = 0x3007494;
-WaitForFlashWrite = 0x3007498;
-ProgramFlashSector = 0x300749C;
-gFlash = 0x30074A0;
-ProgramFlashByte = 0x30074A4;
-gFlashNumRemainingBytes = 0x30074A8;
-EraseFlashChip = 0x30074AC;
-EraseFlashSector = 0x30074B0;
-gFlashMaxTime = 0x30074B4;
diff --git a/ld_script.txt b/ld_script.txt
index aea25d62b..394c572b8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -48,6 +48,9 @@ SECTIONS {
 
         . = 0x5FD0;
         src/m4a_2.o(iwram_data);
+
+        . = 0x7490;
+        src/agb_flash.o(iwram_data);
     }
 
     . = 0x8000000;
diff --git a/src/agb_flash.c b/src/agb_flash.c
index e3ac96623..2164da194 100644
--- a/src/agb_flash.c
+++ b/src/agb_flash.c
@@ -6,16 +6,16 @@ static u16 sTimerCount;
 static vu16 *sTimerReg;
 static u16 sSavedIme;
 
-extern u8 gFlashTimeoutFlag;
-extern u8 (*PollFlashStatus)(u8 *);
-extern u16 (*WaitForFlashWrite)(u8 phase, u8 *addr, u8 lastData);
-extern u16 (*ProgramFlashSector)(u16 sectorNum, u8 *src);
-extern const struct FlashType *gFlash;
-extern u16 (*ProgramFlashByte)(u16 sectorNum, u32 offset, u8 data);
-extern u16 gFlashNumRemainingBytes;
-extern u16 (*EraseFlashChip)();
-extern u16 (*EraseFlashSector)(u16 sectorNum);
-extern const u16 *gFlashMaxTime;
+COMM_2(u8 gFlashTimeoutFlag)
+COMM_2(u8 (*PollFlashStatus)(u8 *))
+COMM_2(u16 (*WaitForFlashWrite)(u8 phase, u8 *addr, u8 lastData))
+COMM_2(u16 (*ProgramFlashSector)(u16 sectorNum, u8 *src))
+COMM_2(const struct FlashType *gFlash)
+COMM_2(u16 (*ProgramFlashByte)(u16 sectorNum, u32 offset, u8 data))
+COMM_2(u16 gFlashNumRemainingBytes)
+COMM_2(u16 (*EraseFlashChip)())
+COMM_2(u16 (*EraseFlashSector)(u16 sectorNum))
+COMM_2(const u16 *gFlashMaxTime)
 
 void SetReadFlash1(u16 *dest);