summaryrefslogtreecommitdiff
path: root/asm/main.s
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-12 17:44:30 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-12 17:44:30 -0400
commit4a7f4cf494b45f74f74edde0a9574989aabd8175 (patch)
tree6b040feffc2c4b86885fbe638fa9dfdd92e8c8ce /asm/main.s
parent7580227574d4995ec8763326c3dfefa9a486b8f5 (diff)
parent09d4bbd57a8d810e2765f77ac7431848ca4328b2 (diff)
Merge branch 'master' into main
Diffstat (limited to 'asm/main.s')
-rw-r--r--asm/main.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/main.s b/asm/main.s
index dbfbcbcc..9bc71acb 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -2,8 +2,8 @@
.text
- arm_func_start Entry_ARM9
-Entry_ARM9: @ 0x02000800
+ arm_func_start Entry
+Entry: @ 0x02000800
mov ip, #0x4000000
str ip, [ip, #0x208]
_02000808:
@@ -86,7 +86,7 @@ _0200092C: .4byte 0x027FFF9C
_02000930: .4byte 0x01FF8000
_02000934: .4byte 0x02000C55 @ NdsMain
_02000938: .4byte 0xFFFF0000
- arm_func_end Entry_ARM9
+ arm_func_end Entry
arm_func_start sub_200093C
sub_200093C: