summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2019-04-09 18:23:34 -0400
committerscnorton <scnorton@biociphers.org>2019-04-09 18:23:34 -0400
commit789e598c920a4061828c9be27498228b0be568dc (patch)
tree61d6eaed8f893c6509dbf4ee05fcb6bb94de9de2 /data
parentfb423f957dc8944edf0b822a7aaa1949434ac65e (diff)
sub_812EEB0
Diffstat (limited to 'data')
-rw-r--r--data/data_83FECCC.s10
-rw-r--r--data/data_845FD54.s39
2 files changed, 45 insertions, 4 deletions
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index a96e9ff70..2075ac812 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -587,11 +587,17 @@ gUnknown_8415CE8:: @ 8415CE8
.incbin "baserom.gba", 0x415CE8, 0x44
gUnknown_8415D2C:: @ 8415D2C
- .incbin "baserom.gba", 0x415D2C, 0x1C
+ .string "CONTROLS$"
+ .align 2
+gUnknown_8415D38:: @ 8415D2C
+ .string "{KEYGFX_DPAD_UP_DOWN}えらぶ {KEYGFX_A_BUTTON}けってい$"
+
+ .align 2
gUnknown_8415D48:: @ 8415D48
- .incbin "baserom.gba", 0x415D48, 0x8
+ .string "{KEYGFX_A_BUTTON}NEXT$"
+ .align 2
gUnknown_8415D50:: @ 8415D50
.incbin "baserom.gba", 0x415D50, 0x10
diff --git a/data/data_845FD54.s b/data/data_845FD54.s
index fd9a62e1a..e395c79d9 100644
--- a/data/data_845FD54.s
+++ b/data/data_845FD54.s
@@ -1,3 +1,6 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
.section .rodata
.align 2
@@ -42,10 +45,42 @@ gUnknown_84623EC:: @ 84623EC
.incbin "baserom.gba", 0x4623EC, 0xA6C
gUnknown_8462E58:: @ 8462E58
- .incbin "baserom.gba", 0x462E58, 0x5C
+ .incbin "baserom.gba", 0x462E58, 0xC
+
+gUnknown_8462E64:: @ 8462E64
+ window_template 0x00, 0x00, 0x07, 0x1e, 0x04, 0x0f, 0x0001
+
+gUnknown_8462E6C:: @ 8462E6C
+ window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
+
+gUnknown_8462E74:: @ 8462E74
+ window_template 0x00, 0x06, 0x03, 0x18, 0x06, 0x0f, 0x0001
+
+gUnknown_8462E7C:: @ 8462E7C
+ window_template 0x00, 0x06, 0x0a, 0x18, 0x04, 0x0f, 0x0092
+
+gUnknown_8462E84:: @ 8462E84
+ window_template 0x00, 0x06, 0x0f, 0x18, 0x04, 0x0f, 0x00f3
+
+gUnknown_8462E8C:: @ 8462E8C
+ window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
+
+gUnknown_8462E94:: @ 8462E94
+ window_template 0x00, 0x06, 0x03, 0x18, 0x04, 0x0f, 0x0001
+
+gUnknown_8462E9C:: @ 8462E9C
+ window_template 0x00, 0x06, 0x08, 0x18, 0x04, 0x0f, 0x0062
+
+gUnknown_8462EA4:: @ 8462EA4
+ window_template 0x00, 0x06, 0x0d, 0x18, 0x06, 0x0f, 0x00c3
+
+gUnknown_8462EAC:: @ 8462EAC
+ window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
gUnknown_8462EB4:: @ 8462EB4
- .incbin "baserom.gba", 0x462EB4, 0xC
+ .4byte gUnknown_8462E64
+ .4byte gUnknown_8462E74
+ .4byte gUnknown_8462E94
gUnknown_8462EC0:: @ 8462EC0
.incbin "baserom.gba", 0x462EC0, 0x8