Address review by diego

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"
 

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

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::

get_diffs.py

@@ -1,24 +0,0 @@
-addrs =  sorted([0xdd7360,
-                 0xdd87c0,
-                 0xdd8ee0,
-                 0xdd8780,
-                 0xdd90e0,
-                 0xdd9718,
-                 0xdd9080,
-                 0xdd98b4,
-                 0xdd9e58,
-                 0xdd9874,
-                 0xdda02c,
-                 0xdda63c,
-                 0xdd9fec,
-                 0xdda840,
-                 0xddae40,
-                 0xdda800,
-                 0xddb020,
-                 0xddb2c4,
-                 0xddafe0,
-                 0xddb3e4])
-for i, addr in enumerate(addrs[:-1]):
-    print 'gUnknown_08{0:06X}:: @ 8{0:06X}'.format(addr)
-    print '\t.incbin "baserom.gba", 0x{:06x}, 0x{:x}'.format(addr, addrs[i + 1] - addr)
-    print ''

ld_script.txt

@@ -380,9 +380,9 @@ SECTIONS {
         data/battle_controller_recorded_player.o(.rodata);
         data/data_emerald.o(.rodata);
         data/battle_controller_player_partner.o(.rodata);
-        data/data_emerald2.o(.rodata);
+        data/data_emerald2pre1.o(.rodata);
         src/berry_fix_program.o(.rodata);
-        data/data_emerald2.o(.rodata.2);
+        data/data_emerald2.o(.rodata);
         data/fonts.o(.rodata);
         data/mystery_event_msg.o(.rodata);
         src/m4a_tables.o(.rodata);

src/berry_fix_program.c

@@ -130,8 +130,7 @@ static const u8 *const gUnknown_08618178[][3] = {
 };
 
 extern const u8 gUnknown_089A6550[0xC0];
-extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34];
+extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3b34];
-extern const u8 gMultiBootProgram_BerryGlitchFix_Start[];
 extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
 
 // .text