Merge branch 'master' into demo-jp

2 files changed, 156 insertions, 154 deletions

diff --git a/data/data_08127280.s b/data/data_08127280.s
index f8d5fc0d..5733d217 100644
--- a/data/data_08127280.s
+++ b/data/data_08127280.s
@@ -733,157 +733,3 @@ gUnk_08128B48:: @ 08128B48
 
 gUnk_08128B50:: @ 08128B50
 	.incbin "baserom.gba", 0x128B50, 0x0000014
-
-gUnk_08128B64:: @ 08128B64
-	.incbin "baserom.gba", 0x128B64, 0x0000090
-
-gUnk_08128BF4:: @ 08128BF4
-	.incbin "baserom.gba", 0x128BF4, 0x0000004
-
-gUnk_08128BF8:: @ 08128BF8
-	.4byte sub_080A5594
-	.4byte sub_080A56A0
-
-gUnk_08128C00:: @ 08128C00
-	.incbin "baserom.gba", 0x128C00, 0x0000004
-
-gUnk_08128C04:: @ 08128C04
-	.incbin "baserom.gba", 0x128C04, 0x0000010
-
-gUnk_08128C14:: @ 08128C14
-	.incbin "baserom.gba", 0x128C14, 0x0000080
-
-gUnk_08128C94:: @ 08128C94
-	.incbin "baserom.gba", 0x128C94, 0x0000080
-
-gUnk_08128D14:: @ 08128D14
-	.4byte sub_080A59AC
-	.4byte sub_080A59C8
-	.4byte sub_080A5A54
-	.4byte sub_080A5A90
-
-gUnk_08128D24:: @ 08128D24
-	.4byte sub_080A5AF4
-	.4byte sub_080A5B34
-	.4byte sub_080A5BB8
-
-gUnk_08128D30:: @ 08128D30
-	.4byte sub_080A5C44
-	.4byte sub_080A5C9C
-
-gUnk_08128D38:: @ 08128D38
-	.incbin "baserom.gba", 0x128D38, 0x0000004
-
-gUnk_08128D3C:: @ 08128D3C
-	.incbin "baserom.gba", 0x128D3C, 0x0000007
-
-gUnk_08128D43:: @ 08128D43
-	.incbin "baserom.gba", 0x128D43, 0x000000E
-
-gUnk_08128D51:: @ 08128D51
-	.incbin "baserom.gba", 0x128D51, 0x0000007
-
-gUnk_08128D58:: @ 08128D58
-	.4byte sub_080A6024
-	.4byte sub_080A6044
-
-gUnk_08128D60:: @ 08128D60
-	.incbin "baserom.gba", 0x128D60, 0x0000010
-
-gUnk_08128D70:: @ 08128D70
-	.incbin "baserom.gba", 0x128D70, 0x0000040
-
-gUnk_08128DB0:: @ 08128DB0
-	.4byte sub_080A6108
-	.4byte sub_080A612C
-
-gUnk_08128DB8:: @ 08128DB8
-	.incbin "baserom.gba", 0x128DB8, 0x0000004
-
-gUnk_08128DBC:: @ 08128DBC
-	.incbin "baserom.gba", 0x128DBC, 0x0000010
-
-gUnk_08128DCC:: @ 08128DCC
-	.4byte sub_080A6290
-	.4byte sub_080A62E0
-
-gUnk_08128DD4:: @ 08128DD4
-	.incbin "baserom.gba", 0x128DD4, 0x0000004
-
-gUnk_08128DD8:: @ 08128DD8
-	.incbin "baserom.gba", 0x128DD8, 0x0000010
-
-gUnk_08128DE8:: @ 08128DE8
-	.incbin "baserom.gba", 0x128DE8, 0x0000088
-
-gUnk_08128E70:: @ 08128E70
-	.4byte sub_080A6534
-	.4byte sub_080A65AC
-
-gUnk_08128E78:: @ 08128E78
-	.4byte sub_080A6650
-	.4byte sub_080A667C
-
-gUnk_08128E80:: @ 08128E80
-	.incbin "baserom.gba", 0x128E80, 0x0000004
-
-gUnk_08128E84:: @ 08128E84
-	.incbin "baserom.gba", 0x128E84, 0x0000010
-
-gUnk_08128E94:: @ 08128E94
-	.incbin "baserom.gba", 0x128E94, 0x0000088
-
-gUnk_08128F1C:: @ 08128F1C
-	.4byte sub_080A6B04
-	.4byte sub_080A6C1C
-
-gUnk_08128F24:: @ 08128F24
-	.4byte sub_080A6CA8
-	.4byte sub_080A6CD8
-	.4byte sub_080A6DD0
-	.4byte sub_080A6DF8
-	.4byte sub_080A6E44
-
-gUnk_08128F38:: @ 08128F38
-	.incbin "baserom.gba", 0x128F38, 0x0000014
-
-gUnk_08128F4C:: @ 08128F4C
-	.incbin "baserom.gba", 0x128F4C, 0x000000C
-
-gUnk_08128F58:: @ 08128F58
-	.incbin "baserom.gba", 0x128F58, 0x0000050
-
-gUnk_08128FA8:: @ 08128FA8
-	.incbin "baserom.gba", 0x128FA8, 0x0000018
-
-gUnk_08128FC0:: @ 08128FC0
-	.incbin "baserom.gba", 0x128FC0, 0x0000018
-
-gUnk_08128FD8:: @ 08128FD8
-	.incbin "baserom.gba", 0x128FD8, 0x0000018
-
-gUnk_08128FF0:: @ 08128FF0
-	.incbin "baserom.gba", 0x128FF0, 0x0000014
-
-gUnk_08129004:: @ 08129004
-	.incbin "baserom.gba", 0x129004, 0x0000018
-
-gUnk_0812901C:: @ 0812901C
-	.4byte sub_080A7250
-	.4byte sub_080A7328
-	.4byte sub_080A7528
-	.4byte sub_080A73A8
-	.4byte sub_080A74C8
-
-gUnk_08129030:: @ 08129030
-	.4byte sub_080A71DC
-	.4byte sub_080A4EA0
-	.4byte sub_080A71DC
-	.4byte sub_080A64FC
-	.4byte DrawKinstoneMenu
-	.4byte sub_08051E68
-	.4byte sub_0804AB54
-	.4byte sub_080A45A4
-	.4byte sub_08054870
-	.4byte sub_080A6C74
-	.4byte sub_080A6AB8
diff --git a/data/data_08128BF4.s b/data/data_08128BF4.s
new file mode 100644
index 00000000..42050d2e
--- /dev/null
+++ b/data/data_08128BF4.s
@@ -0,0 +1,156 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gUnk_08128BF4:: @ 08128BF4
+	.incbin "baserom.gba", 0x128BF4, 0x0000004
+
+gUnk_08128BF8:: @ 08128BF8
+	.4byte sub_080A5594
+	.4byte sub_080A56A0
+
+gUnk_08128C00:: @ 08128C00
+	.incbin "baserom.gba", 0x128C00, 0x0000004
+
+gUnk_08128C04:: @ 08128C04
+	.incbin "baserom.gba", 0x128C04, 0x0000010
+
+gUnk_08128C14:: @ 08128C14
+	.incbin "baserom.gba", 0x128C14, 0x0000080
+
+gUnk_08128C94:: @ 08128C94
+	.incbin "baserom.gba", 0x128C94, 0x0000080
+
+gUnk_08128D14:: @ 08128D14
+	.4byte sub_080A59AC
+	.4byte sub_080A59C8
+	.4byte sub_080A5A54
+	.4byte sub_080A5A90
+
+gUnk_08128D24:: @ 08128D24
+	.4byte sub_080A5AF4
+	.4byte sub_080A5B34
+	.4byte sub_080A5BB8
+
+gUnk_08128D30:: @ 08128D30
+	.4byte sub_080A5C44
+	.4byte sub_080A5C9C
+
+gUnk_08128D38:: @ 08128D38
+	.incbin "baserom.gba", 0x128D38, 0x0000004
+
+gUnk_08128D3C:: @ 08128D3C
+	.incbin "baserom.gba", 0x128D3C, 0x0000007
+
+gUnk_08128D43:: @ 08128D43
+	.incbin "baserom.gba", 0x128D43, 0x000000E
+
+gUnk_08128D51:: @ 08128D51
+	.incbin "baserom.gba", 0x128D51, 0x0000007
+
+gUnk_08128D58:: @ 08128D58
+	.4byte sub_080A6024
+	.4byte sub_080A6044
+
+gUnk_08128D60:: @ 08128D60
+	.incbin "baserom.gba", 0x128D60, 0x0000010
+
+gUnk_08128D70:: @ 08128D70
+	.incbin "baserom.gba", 0x128D70, 0x0000040
+
+gUnk_08128DB0:: @ 08128DB0
+	.4byte sub_080A6108
+	.4byte sub_080A612C
+
+gUnk_08128DB8:: @ 08128DB8
+	.incbin "baserom.gba", 0x128DB8, 0x0000004
+
+gUnk_08128DBC:: @ 08128DBC
+	.incbin "baserom.gba", 0x128DBC, 0x0000010
+
+gUnk_08128DCC:: @ 08128DCC
+	.4byte sub_080A6290
+	.4byte sub_080A62E0
+
+gUnk_08128DD4:: @ 08128DD4
+	.incbin "baserom.gba", 0x128DD4, 0x0000004
+
+gUnk_08128DD8:: @ 08128DD8
+	.incbin "baserom.gba", 0x128DD8, 0x0000010
+
+gUnk_08128DE8:: @ 08128DE8
+	.incbin "baserom.gba", 0x128DE8, 0x0000088
+
+gUnk_08128E70:: @ 08128E70
+	.4byte sub_080A6534
+	.4byte sub_080A65AC
+
+gUnk_08128E78:: @ 08128E78
+	.4byte sub_080A6650
+	.4byte sub_080A667C
+
+gUnk_08128E80:: @ 08128E80
+	.incbin "baserom.gba", 0x128E80, 0x0000004
+
+gUnk_08128E84:: @ 08128E84
+	.incbin "baserom.gba", 0x128E84, 0x0000010
+
+gUnk_08128E94:: @ 08128E94
+	.incbin "baserom.gba", 0x128E94, 0x0000088
+
+gUnk_08128F1C:: @ 08128F1C
+	.4byte sub_080A6B04
+	.4byte sub_080A6C1C
+
+gUnk_08128F24:: @ 08128F24
+	.4byte sub_080A6CA8
+	.4byte sub_080A6CD8
+	.4byte sub_080A6DD0
+	.4byte sub_080A6DF8
+	.4byte sub_080A6E44
+
+gUnk_08128F38:: @ 08128F38
+	.incbin "baserom.gba", 0x128F38, 0x0000014
+
+gUnk_08128F4C:: @ 08128F4C
+	.incbin "baserom.gba", 0x128F4C, 0x000000C
+
+gUnk_08128F58:: @ 08128F58
+	.incbin "baserom.gba", 0x128F58, 0x0000050
+
+gUnk_08128FA8:: @ 08128FA8
+	.incbin "baserom.gba", 0x128FA8, 0x0000018
+
+gUnk_08128FC0:: @ 08128FC0
+	.incbin "baserom.gba", 0x128FC0, 0x0000018
+
+gUnk_08128FD8:: @ 08128FD8
+	.incbin "baserom.gba", 0x128FD8, 0x0000018
+
+gUnk_08128FF0:: @ 08128FF0
+	.incbin "baserom.gba", 0x128FF0, 0x0000014
+
+gUnk_08129004:: @ 08129004
+	.incbin "baserom.gba", 0x129004, 0x0000018
+
+gUnk_0812901C:: @ 0812901C
+	.4byte sub_080A7250
+	.4byte sub_080A7328
+	.4byte sub_080A7528
+	.4byte sub_080A73A8
+	.4byte sub_080A74C8
+
+gUnk_08129030:: @ 08129030
+	.4byte sub_080A71DC
+	.4byte sub_080A4EA0
+	.4byte sub_080A71DC
+	.4byte sub_080A64FC
+	.4byte DrawKinstoneMenu
+	.4byte sub_08051E68
+	.4byte sub_0804AB54
+	.4byte sub_080A45A4
+	.4byte sub_08054870
+	.4byte sub_080A6C74
+	.4byte sub_080A6AB8