summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-12 17:47:56 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-12 17:47:56 -0400
commitfc49b05807390365c02833406fb76aa125a2d1d9 (patch)
tree5fb22acd53ed1a4881a0ae49b8d837099034149c
parent47f36847e110bdda2c408ea9f04e257ba02a2b94 (diff)
Link NdsMain
-rw-r--r--asm/main.s2
-rw-r--r--asm/rom.s3
2 files changed, 4 insertions, 1 deletions
diff --git a/asm/main.s b/asm/main.s
index 9bc71acb..32944833 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -84,7 +84,7 @@ _02000924: .4byte 0x07000000
_02000928: .4byte 0x02000B68
_0200092C: .4byte 0x027FFF9C
_02000930: .4byte 0x01FF8000
-_02000934: .4byte 0x02000C55 @ NdsMain
+_02000934: .4byte NdsMain+1
_02000938: .4byte 0xFFFF0000
arm_func_end Entry
diff --git a/asm/rom.s b/asm/rom.s
index 0025dec1..6013ba8a 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -1,5 +1,8 @@
/* rom.s TODO: Disassemble */
+.include "asm/macros.inc"
.section .text
+ thumb_func_start NdsMain
+NdsMain:
.incbin "baserom.nds", 0x4C54, 0x1A0