summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data_emerald2.s33
-rw-r--r--data/data_emerald2pre1.s35
-rw-r--r--data/multiboot_berry_glitch_fix.s1
3 files changed, 35 insertions, 34 deletions
diff --git a/data/data_emerald2.s b/data/data_emerald2.s
index ce7e2a6e3..e363e7365 100644
--- a/data/data_emerald2.s
+++ b/data/data_emerald2.s
@@ -2,39 +2,6 @@
.include "constants/constants.inc"
.section .rodata
-
-
-gUnknown_08617274:: @ 8617274
- .incbin "baserom.gba", 0x617274, 0x920
-
-gUnknown_08617B94:: @ 8617B94
- .incbin "baserom.gba", 0x617b94, 0xb0
-
-gUnknown_08617C44:: @ 8617C44
- .incbin "baserom.gba", 0x617c44, 0x120
-
-gUnknown_08617D64:: @ 8617D64
- .incbin "baserom.gba", 0x617d64, 0x30
-
-gUnknown_08617D94:: @ 8617D94
- .incbin "baserom.gba", 0x617d94, 0x10
-
-gUnknown_08617DA4:: @ 8617DA4
- .incbin "baserom.gba", 0x617da4, 0x5c
-
-gUnknown_08617E00:: @ 8617E00
- .incbin "baserom.gba", 0x617e00, 0x18
-
-gUnknown_08617E18:: @ 8617E18
- .incbin "baserom.gba", 0x617e18, 0x1c
-
-gUnknown_08617E34:: @ 8617E34
- .incbin "baserom.gba", 0x617e34, 0x2c
-
-gUnknown_08617E60:: @ 8617E60
- .incbin "baserom.gba", 0x617e60, 0x18
-
- .section .rodata.2
@ 86181C1
.include "data/text/move_descriptions.inc"
diff --git a/data/data_emerald2pre1.s b/data/data_emerald2pre1.s
new file mode 100644
index 000000000..f6238dd06
--- /dev/null
+++ b/data/data_emerald2pre1.s
@@ -0,0 +1,35 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
+ .section .rodata
+
+
+gUnknown_08617274:: @ 8617274
+ .incbin "baserom.gba", 0x617274, 0x920
+
+gUnknown_08617B94:: @ 8617B94
+ .incbin "baserom.gba", 0x617b94, 0xb0
+
+gUnknown_08617C44:: @ 8617C44
+ .incbin "baserom.gba", 0x617c44, 0x120
+
+gUnknown_08617D64:: @ 8617D64
+ .incbin "baserom.gba", 0x617d64, 0x30
+
+gUnknown_08617D94:: @ 8617D94
+ .incbin "baserom.gba", 0x617d94, 0x10
+
+gUnknown_08617DA4:: @ 8617DA4
+ .incbin "baserom.gba", 0x617da4, 0x5c
+
+gUnknown_08617E00:: @ 8617E00
+ .incbin "baserom.gba", 0x617e00, 0x18
+
+gUnknown_08617E18:: @ 8617E18
+ .incbin "baserom.gba", 0x617e18, 0x1c
+
+gUnknown_08617E34:: @ 8617E34
+ .incbin "baserom.gba", 0x617e34, 0x2c
+
+gUnknown_08617E60:: @ 8617E60
+ .incbin "baserom.gba", 0x617e60, 0x18
diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s
index e6a26c619..bc97eb553 100644
--- a/data/multiboot_berry_glitch_fix.s
+++ b/data/multiboot_berry_glitch_fix.s
@@ -3,7 +3,6 @@
gUnknown_089A6550:: @ 89A6550
.incbin "baserom.gba", 0x9a6550, 0xc0
-gMultiBootProgram_BerryGlitchFix_Script:: @ 89A6610
gMultiBootProgram_BerryGlitchFix_Start:: @ 89A6610
.incbin "baserom.gba", 0x9a6610, 0x3b34
gMultiBootProgram_BerryGlitchFix_End::