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

6 files changed, 38 insertions, 20 deletions

diff --git a/asm/librfu.s b/asm/librfu.s
index 6995a9ac1..bdf816bd8 100644
--- a/asm/librfu.s
+++ b/asm/librfu.s
@@ -2769,11 +2769,11 @@ _081E0956:
 	thumb_func_start sub_81E095C
 sub_81E095C: @ 81E095C
 	push {lr}
-	ldr r2, _081E0964 @ =gUnknown_86FC068
+	ldr r2, _081E0964 @ =_Str_RFU_MBOOT
 	ldr r3, _081E0968 @ =0x30000F0
 	b _081E0976
 	.align 2, 0
-_081E0964: .4byte gUnknown_86FC068
+_081E0964: .4byte _Str_RFU_MBOOT
 _081E0968: .4byte 0x30000F0
 _081E096C:
 	ldrb r0, [r3]
@@ -5794,7 +5794,7 @@ _081E1FF0:
 	movs r2, 0
 	movs r0, 0x1
 	ands r0, r3
-	ldr r4, _081E2020 @ =gUnknown_86FC03C
+	ldr r4, _081E2020 @ =_Str_RfuHeader
 	cmp r0, 0
 	bne _081E2012
 	movs r1, 0x1
@@ -5818,7 +5818,7 @@ _081E2012:
 	adds r1, 0xF
 	b _081E202E
 	.align 2, 0
-_081E2020: .4byte gUnknown_86FC03C
+_081E2020: .4byte _Str_RfuHeader
 _081E2024:
 	cmp r0, 0
 	bne _081E2030
@@ -6832,7 +6832,7 @@ rfu_STC_NI_constructLLSF: @ 81E2790
 	ldr r0, [r2]
 	ldrb r0, [r0]
 	lsls r0, 4
-	ldr r1, _081E2810 @ =gUnknown_86FC03C
+	ldr r1, _081E2810 @ =_Str_RfuHeader
 	adds r0, r1
 	mov r8, r0
 	ldrh r1, [r4]
@@ -6883,7 +6883,7 @@ _081E27FA:
 	b _081E285C
 	.align 2, 0
 _081E280C: .4byte gUnknown_3007460
-_081E2810: .4byte gUnknown_86FC03C
+_081E2810: .4byte _Str_RfuHeader
 _081E2814: .4byte 0x00008022
 _081E2818:
 	ldr r0, _081E2844 @ =0x00008022
@@ -7083,7 +7083,7 @@ _081E297C:
 	ldr r2, [r0]
 	ldrb r0, [r2]
 	lsls r0, 4
-	ldr r1, _081E29F8 @ =gUnknown_86FC03C
+	ldr r1, _081E29F8 @ =_Str_RfuHeader
 	adds r5, r0, r1
 	ldrh r0, [r4]
 	movs r1, 0xF
@@ -7142,7 +7142,7 @@ _081E29CE:
 	b _081E2A0C
 	.align 2, 0
 _081E29F4: .4byte gUnknown_3007460
-_081E29F8: .4byte gUnknown_86FC03C
+_081E29F8: .4byte _Str_RfuHeader
 _081E29FC: .4byte gUnknown_3007468
 _081E2A00:
 	movs r0, 0x10
@@ -7469,7 +7469,7 @@ rfu_STC_analyzeLLSF: @ 81E2C40
 	movs r1, 0x1
 	ands r0, r1
 	lsls r0, 4
-	ldr r1, _081E2C78 @ =gUnknown_86FC03C
+	ldr r1, _081E2C78 @ =_Str_RfuHeader
 	adds r6, r0, r1
 	ldrb r0, [r6]
 	cmp r3, r0
@@ -7478,7 +7478,7 @@ rfu_STC_analyzeLLSF: @ 81E2C40
 	b _081E2E6E
 	.align 2, 0
 _081E2C74: .4byte gUnknown_3007460
-_081E2C78: .4byte gUnknown_86FC03C
+_081E2C78: .4byte _Str_RfuHeader
 _081E2C7C:
 	movs r5, 0
 	movs r4, 0
@@ -8877,12 +8877,12 @@ _081E3726:
 	cmp r0, 0x3
 	bhi _081E373C
 	lsls r0, 1
-	ldr r1, _081E3738 @ =gUnknown_86FC074
+	ldr r1, _081E3738 @ =_Str_Sio32ID
 	adds r0, r1
 	ldrh r0, [r0]
 	b _081E373E
 	.align 2, 0
-_081E3738: .4byte gUnknown_86FC074
+_081E3738: .4byte _Str_Sio32ID
 _081E373C:
 	ldr r0, _081E3794 @ =0x00008001
 _081E373E:
diff --git a/data/berry_fix.mb b/data/berry_fix.mb
new file mode 100644
index 000000000..0afff07f5
--- /dev/null
+++ b/data/berry_fix.mb
diff --git a/data/librfu_rodata.s b/data/librfu_rodata.s
index 867a1a17c..c6ca84f4b 100644
--- a/data/librfu_rodata.s
+++ b/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
diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s
index 0e4bcf384..bc417a8ba 100644
--- a/data/multiboot_berry_glitch_fix.s
+++ b/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::
diff --git a/data/multiboot_pokemon_colosseum.s b/data/multiboot_pokemon_colosseum.s
index 64df89692..bbc47a9e8 100644
--- a/data/multiboot_pokemon_colosseum.s
+++ b/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::
diff --git a/data/pokemon_colosseum.mb b/data/pokemon_colosseum.mb
new file mode 100644
index 000000000..2ff3f88bc
--- /dev/null
+++ b/data/pokemon_colosseum.mb