Merge branch 'mevent' of github.com:pikalaxalt/pokefirered into mevent

data/librfu_rodata.s

@@ -1,10 +1,28 @@
 	.section .rodata
 
-gUnknown_86FC03C:: @ 86FC03C
-	.incbin "baserom.gba", 0x6FC03C, 0x2C
+	.set VERSION_MAJOR, 1
+	.set VERSION_MINOR, 0
+	.set VERSION_REVISION, 24
 
-gUnknown_86FC068:: @ 86FC068
-	.incbin "baserom.gba", 0x6FC068, 0xC
+	.align 2
+_Str_RfuHeader::
+	.byte 2, 14, 0, 10, 9, 5, 7, 2
+	.byte 0, 15, 1, 3, 3, 0, 31, 0
+	.byte 3, 22, 18, 14, 13, 9, 11, 3
+	.byte 15, 15, 1, 3, 3, 0, 0x7f, 0
+
+	.ascii "RFU_V"
+	.byte VERSION_MAJOR + 0x30
+	.byte VERSION_MINOR + 0x30
+	.byte (VERSION_REVISION / 10) + 0x30
+	.byte (VERSION_REVISION % 10) + 0x30
+	.byte 0
+
+	.align 2
+_Str_RFU_MBOOT::
+	.asciz "RFU-MBOOT"
+
+	.align 2
+_Str_Sio32ID::
+	.asciz "NINTENDOSio32ID_030820"
 
-gUnknown_86FC074:: @ 86FC074
-	.incbin "baserom.gba", 0x6FC074, 0x18

data/multiboot_berry_glitch_fix.s

@@ -1,5 +1,5 @@
 	.section .rodata
 
 gMultiBootProgram_BerryGlitchFix_Start:: @ 86FFC6C
-	.incbin "baserom.gba", 0x6FFC6C, 0x3BF4
+	.incbin "data/berry_fix.mb"
 gMultiBootProgram_BerryGlitchFix_End::

data/multiboot_pokemon_colosseum.s

@@ -1,5 +1,5 @@
 	.section .rodata
 
 gMultiBootProgram_PokemonColosseum_Start:: @ 8703860
-	.incbin "baserom.gba", 0x703860, 0x28000
+	.incbin "data/pokemon_colosseum.mb"
 gMultiBootProgram_PokemonColosseum_End::