From a58467f3274eb02c84c72e04f3b50217356b28c3 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Wed, 15 Jul 2020 22:01:09 -0500
Subject: [PATCH] [nostalgia/core/gba] Fix timer addresses

---
 src/nostalgia/core/gba/addresses.hpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/nostalgia/core/gba/addresses.hpp b/src/nostalgia/core/gba/addresses.hpp
index 7bd64341..e2f5caf3 100644
--- a/src/nostalgia/core/gba/addresses.hpp
+++ b/src/nostalgia/core/gba/addresses.hpp
@@ -29,17 +29,17 @@ using interrupt_handler = void (*)(void);
 /////////////////////////////////////////////////////////////////
 // Timers
 
-#define REG_TIMER0CTL *reinterpret_cast<volatile uint16_t*>(0x04000100)
-#define REG_TIMER0    *reinterpret_cast<volatile uint16_t*>(0x04000102)
+#define REG_TIMER0    *reinterpret_cast<volatile uint16_t*>(0x04000100)
+#define REG_TIMER0CTL *reinterpret_cast<volatile uint16_t*>(0x04000102)
 
-#define REG_TIMER1CTL *reinterpret_cast<volatile uint16_t*>(0x04000104)
-#define REG_TIMER1    *reinterpret_cast<volatile uint16_t*>(0x04000106)
+#define REG_TIMER1    *reinterpret_cast<volatile uint16_t*>(0x04000104)
+#define REG_TIMER1CTL *reinterpret_cast<volatile uint16_t*>(0x04000106)
 
-#define REG_TIMER2CTL *reinterpret_cast<volatile uint16_t*>(0x04000108)
-#define REG_TIMER2    *reinterpret_cast<volatile uint16_t*>(0x0400010a)
+#define REG_TIMER2    *reinterpret_cast<volatile uint16_t*>(0x04000108)
+#define REG_TIMER2CTL *reinterpret_cast<volatile uint16_t*>(0x0400010a)
 
-#define REG_TIMER3CTL *reinterpret_cast<volatile uint16_t*>(0x0400010c)
-#define REG_TIMER3    *reinterpret_cast<volatile uint16_t*>(0x0400010e)
+#define REG_TIMER3    *reinterpret_cast<volatile uint16_t*>(0x0400010c)
+#define REG_TIMER3CTL *reinterpret_cast<volatile uint16_t*>(0x0400010e)
 
 /////////////////////////////////////////////////////////////////
 // background registers
@@ -82,3 +82,6 @@ typedef uint16_t BgMapTile[1024];
 #define MEM_OAM reinterpret_cast<uint64_t*>(0x07000000)
 
 #define MEM_ROM reinterpret_cast<char*>(0x08000000)
+
+#define MEM_SRAM reinterpret_cast<char*>(0x0e000000)
+#define MEM_SRAM_SIZE 65535