summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-06 20:41:59 -0700
committerYamaArashi <shadow962@live.com>2015-10-06 20:41:59 -0700
commit025bb6a8b936df404605e45e06c92b43ef0810e9 (patch)
treef44fb3c4e9aa88acf1829117071962aa9103f4eb
parent65228e6fb8ee96d6ea2d10075c7e09c6e3fc4860 (diff)
add interrupt table and other data
-rw-r--r--asm/data2.s37
-rw-r--r--asm/gpu_bg.s4
2 files changed, 38 insertions, 3 deletions
diff --git a/asm/data2.s b/asm/data2.s
index c2f651adb..6fc00e9a7 100644
--- a/asm/data2.s
+++ b/asm/data2.s
@@ -1,2 +1,37 @@
@ the second big chunk of data
- .incbin "base_emerald.gba", 0x2e952e
+
+ .align 2, 0
+
+gUnknown_82E9530:
+ .byte 3
+
+gUnknown_82E9531:
+ .byte 2
+
+ .align 2, 0
+
+@ compile time
+ .asciz "2005 02 21 11:10"
+
+ .align 2, 0
+
+gRomInterruptTable: @ 82E9548
+ .4byte irq_vcount+1
+ .4byte irq_serial+1
+ .4byte irq_timer3+1
+ .4byte irq_hblank+1
+ .4byte irq_vblank+1
+ .4byte irq_other+1
+ .4byte irq_other+1
+ .4byte irq_other+1
+ .4byte irq_other+1
+ .4byte irq_other+1
+ .4byte irq_other+1
+ .4byte irq_other+1
+ .4byte irq_other+1
+ .4byte irq_other+1
+
+gBgConfigZeroValue: @ 82E9580
+ .4byte 0
+
+ .incbin "base_emerald.gba", 0x2e9584
diff --git a/asm/gpu_bg.s b/asm/gpu_bg.s
index b59d3368c..e304bb9ef 100644
--- a/asm/gpu_bg.s
+++ b/asm/gpu_bg.s
@@ -46,7 +46,7 @@ gpu_get_bg_mode: @ 8001324
gpu_reset_bg_configs: @ 8001334
push {lr}
ldr r2, =0x030008e0
- ldr r0, =0x082e9580
+ ldr r0, =gBgConfigZeroValue
ldr r0, [r0]
adds r1, r2, 0
adds r1, 0xC
@@ -74,7 +74,7 @@ sub_8001354: @ 8001354
ldr r1, =0x030008e0
lsls r0, r4, 2
adds r0, r1
- ldr r1, =0x082e9580
+ ldr r1, =gBgConfigZeroValue
ldr r1, [r1]
str r1, [r0]
_08001372: