summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-21 17:45:04 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-21 17:45:04 -0400
commit0d3a934236114e5a58d324f335a031da06a01849 (patch)
treeb59a85719c448aa0de2bbe80fb7a425154f6ee24
parent44a55d6948781ca07dfff49cedce280173d553c8 (diff)
Define text/data boundary
-rw-r--r--asm/rom2.s5
-rw-r--r--asm/rom2_2.s2
-rw-r--r--pokediamond.lcf4
3 files changed, 8 insertions, 3 deletions
diff --git a/asm/rom2.s b/asm/rom2.s
index 46e54560..5cca06fe 100644
--- a/asm/rom2.s
+++ b/asm/rom2.s
@@ -126,4 +126,7 @@ FUN_020EC5CC:
.global FUN_020EC694
FUN_020EC694:
-.incbin "baserom.nds", 0xF0694, 0x474
+.incbin "baserom.nds", 0xF0694, 0x7C
+
+ .section .data
+.incbin "baserom.nds", 0xF0710, 0x3F8
diff --git a/asm/rom2_2.s b/asm/rom2_2.s
index ce26e3bf..b1f43c5c 100644
--- a/asm/rom2_2.s
+++ b/asm/rom2_2.s
@@ -3,7 +3,7 @@
/* rom2.s TODO: Disassemble */
-.section .text
+.section .data
.incbin "baserom.nds", 0xF0B50, 0x6A0C
diff --git a/pokediamond.lcf b/pokediamond.lcf
index a8dbd9ca..b0b3e2fb 100644
--- a/pokediamond.lcf
+++ b/pokediamond.lcf
@@ -390,8 +390,10 @@ SECTIONS {
rom1.5.o (.text)
FUN_020C9C0C.o (.text)
rom2.o (.text)
+ /* rodata */
+ rom2.o (.data)
string_util.o (.data)
- rom2_2.o (.text)
+ rom2_2.o (.data)
} > arm9
.arm9overlay : AT (0x10B800) {