Name unknown ctrl codes; split data_83F5738

5 files changed, 70 insertions, 61 deletions

diff --git a/charmap.txt b/charmap.txt
index a191b9b7b..294749a77 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -404,20 +404,20 @@ SHADOW = FC 03 @ same as fc 01
 COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
 PALETTE = FC 05 @ used in credits
 SIZE = FC 06 @ note that anything other than "SMALL" is invalid
-UNKNOWN_7 = FC 07
+RESET_SIZE = FC 07
 PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them
 PAUSE_UNTIL_PRESS = FC 09
-UNKNOWN_A = FC 0A
+WAIT_SE = FC 0A
 PLAY_BGM = FC 0B
 ESCAPE = FC 0C
-SHIFT_TEXT = FC 0D
-UNKNOWN_E = FC 0E
-UNKNOWN_F = FC 0F
+SHIFT_TEXT = FC 0D @ shift rightward by 1-byte arg
+SHIFT_DOWN = FC 0E @ shift downward by 1-byte arg
+FILL_WINDOW = FC 0F
 PLAY_SE = FC 10
 CLEAR = FC 11
 SKIP = FC 12
 CLEAR_TO = FC 13
-UNKNOWN_14 = FC 14
+SPACING = FC 14
 JPN = FC 15
 ENG = FC 16
 PAUSE_MUSIC = FC 17
diff --git a/data/data_83F5738.s b/data/data_83F5738.s
index b7b09e748..61dd4518a 100644
--- a/data/data_83F5738.s
+++ b/data/data_83F5738.s
@@ -3,58 +3,7 @@
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 	.section .rodata
-
-	.align 2
-gUnknown_83F5738:: @ 83F5738
-	.incbin "baserom.gba", 0x3F5738, 0xCC
-
-gUnknown_83F5804:: @ 83F5804
-	.incbin "baserom.gba", 0x3F5804, 0x20
-
-gUnknown_83F5824:: @ 83F5824
-	.incbin "baserom.gba", 0x3F5824, 0x20
-
-gUnknown_83F5844:: @ 83F5844
-	.incbin "baserom.gba", 0x3F5844, 0x10
-
-gUnknown_83F5854:: @ 83F5854
-	.incbin "baserom.gba", 0x3F5854, 0x10
-
-gUnknown_83F5864:: @ 83F5864
-	.incbin "baserom.gba", 0x3F5864, 0x1E0
-
-gUnknown_83F5A44:: @ 83F5A44
-	.incbin "baserom.gba", 0x3F5A44, 0xB4
-
-	.section .rodata.83F6C90
-gUnknown_83F6C90:: @ 83F6C90
-	.incbin "baserom.gba", 0x3F6C90, 0x20
-
-gUnknown_83F6CB0:: @ 83F6CB0
-	.incbin "baserom.gba", 0x3F6CB0, 0x6F8
-
-gUnknown_83F73A8:: @ 83F73A8
-	.incbin "baserom.gba", 0x3F73A8, 0x4E4
-
-gUnknown_83F788C:: @ 83F788C
-	.incbin "baserom.gba", 0x3F788C, 0x4D4
-
-gUnknown_83F7D60:: @ 83F7D60
-	.incbin "baserom.gba", 0x3F7D60, 0x6A0
-
-gUnknown_83F8400:: @ 83F8400
-	.incbin "baserom.gba", 0x3F8400, 0x40
-
-gUnknown_83F8440:: @ 83F8440
-	.incbin "baserom.gba", 0x3F8440, 0x2D
-
-gUnknown_83F846D:: @ 83F846D
-	.incbin "baserom.gba", 0x3F846D, 0x10
-
-gUnknown_83F847D:: @ 83F847D
-	.incbin "baserom.gba", 0x3F847D, 0x323
-
-	.section .rodata.83FB218
+	.align 2, 0
 
 gUnknown_83FB218:: @ 83FB218
 	.incbin "baserom.gba", 0x3FB218, 0x99C
diff --git a/data/evolution_scene.s b/data/evolution_scene.s
new file mode 100644
index 000000000..0bba4c18c
--- /dev/null
+++ b/data/evolution_scene.s
@@ -0,0 +1,33 @@
+#include "constants/species.h"
+#include "constants/items.h"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+	.section .rodata
+	.align 2
+
+gUnknown_83F6C90:: @ 83F6C90
+	.incbin "baserom.gba", 0x3F6C90, 0x20
+
+gUnknown_83F6CB0:: @ 83F6CB0
+	.incbin "baserom.gba", 0x3F6CB0, 0x6F8
+
+gUnknown_83F73A8:: @ 83F73A8
+	.incbin "baserom.gba", 0x3F73A8, 0x4E4
+
+gUnknown_83F788C:: @ 83F788C
+	.incbin "baserom.gba", 0x3F788C, 0x4D4
+
+gUnknown_83F7D60:: @ 83F7D60
+	.incbin "baserom.gba", 0x3F7D60, 0x6A0
+
+gUnknown_83F8400:: @ 83F8400
+	.incbin "baserom.gba", 0x3F8400, 0x40
+
+gUnknown_83F8440:: @ 83F8440
+	.incbin "baserom.gba", 0x3F8440, 0x2D
+
+gUnknown_83F846D:: @ 83F846D
+	.incbin "baserom.gba", 0x3F846D, 0x10
+
+gUnknown_83F847D:: @ 83F847D
+	.incbin "baserom.gba", 0x3F847D, 0x323
diff --git a/data/fldeff_flash.s b/data/fldeff_flash.s
new file mode 100644
index 000000000..113cf42d1
--- /dev/null
+++ b/data/fldeff_flash.s
@@ -0,0 +1,27 @@
+#include "constants/species.h"
+#include "constants/items.h"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+	.section .rodata
+	.align 2
+
+gUnknown_83F5738:: @ 83F5738
+	.incbin "baserom.gba", 0x3F5738, 0xCC
+
+gUnknown_83F5804:: @ 83F5804
+	.incbin "baserom.gba", 0x3F5804, 0x20
+
+gUnknown_83F5824:: @ 83F5824
+	.incbin "baserom.gba", 0x3F5824, 0x20
+
+gUnknown_83F5844:: @ 83F5844
+	.incbin "baserom.gba", 0x3F5844, 0x10
+
+gUnknown_83F5854:: @ 83F5854
+	.incbin "baserom.gba", 0x3F5854, 0x10
+
+gUnknown_83F5864:: @ 83F5864
+	.incbin "baserom.gba", 0x3F5864, 0x1E0
+
+gUnknown_83F5A44:: @ 83F5A44
+	.incbin "baserom.gba", 0x3F5A44, 0xB4
diff --git a/ld_script.txt b/ld_script.txt
index ef4de7176..6292835cb 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -466,13 +466,13 @@ SECTIONS {
         src/heal_location.o(.rodata);
         data/region_map.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);
-        data/data_83F5738.o(.rodata);
+        data/fldeff_flash.o(.rodata);
         src/field_specials.o(.rodata);
         src/battle_records.o(.rodata);
-        data/data_83F5738.o(.rodata.83F6C90);
+        data/evolution_scene.o(.rodata);
         src/battle_transition.o(.rodata);
         src/battle_controller_link_partner.o(.rodata);
-        data/data_83F5738.o(.rodata.83FB218);
+        data/data_83F5738.o(.rodata);
         src/save.o(.rodata);
         data/data_83FECCC.o(.rodata);
         src/battle_controller_safari.o(.rodata);