summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data.s45
-rw-r--r--data/main_menu/unk_8234648.pal19
-rw-r--r--data/main_menu/unk_8234668.pal19
-rw-r--r--data/specials.inc4
-rw-r--r--data/strings.s6
5 files changed, 43 insertions, 50 deletions
diff --git a/data/data.s b/data/data.s
index 1757ea056..0883c65d7 100644
--- a/data/data.s
+++ b/data/data.s
@@ -6,51 +6,6 @@
.section .rodata
- .align 2, 0
-gUnknown_8234614::
- .string "$"
-
-gUnknown_8234615::
- .string "\n$"
-
- .align 2, 0
-gUnknown_8234618:: @ 8234618
- .byte 0x00, 0x03, 0x01, 0x18, 0x02, 0x0f
- .2byte 0x0001
-
-gUnknown_8234620:: @ 8234620
- .byte 0x00, 0x03, 0x01, 0x18, 0x0a, 0x0f
- .2byte 0x0001
- .byte 0x00, 0x03, 0x0d, 0x18, 0x02, 0x0f
- .2byte 0x00f1
- .byte 0x00, 0x03, 0x11, 0x18, 0x02, 0x0f
- .2byte 0x0121
-
-gUnknown_8234638:: @ 8234638
- .byte 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f
- .2byte 0x0001
- .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
- .2byte 0x0000
-
-gUnknown_8234648:: @ 8234648
- .incbin "baserom.gba", 0x234648, 0x20
-
-gUnknown_8234668:: @ 8234668
- .incbin "baserom.gba", 0x234668, 0x20
-
-gUnknown_8234688:: @ 8234688
- .incbin "baserom.gba", 0x234688, 0x3
-
-gUnknown_823468B:: @ 823468B
- .incbin "baserom.gba", 0x23468B, 0x3
-
- .align 2
-gUnknown_8234690:: @ 8234690
- .incbin "baserom.gba", 0x234690, 0x4
-
-gUnknown_8234694:: @ 8234694
- .incbin "baserom.gba", 0x234694, 0x4
-
.align 2
gUnknown_8234698:: @ 8234698
.incbin "baserom.gba", 0x234698, 0x20
diff --git a/data/main_menu/unk_8234648.pal b/data/main_menu/unk_8234648.pal
new file mode 100644
index 000000000..7aca54c52
--- /dev/null
+++ b/data/main_menu/unk_8234648.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 148 255
+255 255 255
+49 57 82
+90 98 115
+8 8 16
+148 156 172
+205 222 238
+180 180 189
+189 205 222
+32 32 49
+123 131 139
+49 82 123
+41 123 197
+57 139 213
+90 164 230
+139 197 246
diff --git a/data/main_menu/unk_8234668.pal b/data/main_menu/unk_8234668.pal
new file mode 100644
index 000000000..022f0051f
--- /dev/null
+++ b/data/main_menu/unk_8234668.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+98 98 98
+213 213 205
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/specials.inc b/data/specials.inc
index 5e9a3aeae..6111e4836 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -417,8 +417,8 @@ gSpecials:: @ 815FD60
def_special sub_814B504
def_special sub_80CC8CC
def_special sub_80CC948
- def_special sub_812B478
- def_special sub_812B484
+ def_special HelpSystem_Disable
+ def_special HelpSystem_Enable
def_special sub_810B82C
def_special CheckHasAtLeastOneBerry
def_special sub_815F094
diff --git a/data/strings.s b/data/strings.s
index eccd54800..e43a37050 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3049,13 +3049,13 @@ gText_Colon:: @ 0x841B6E1
gText_Pokedex:: @ 841B6E3
.string "POKéDEX$"
-gUnknown_841B6EB:: @ 841B6EB
+gTextJPDummy_Hiki:: @ 841B6EB
.string "$"
-gUnknown_841B6EC:: @ 841B6EC
+gText_Badges:: @ 841B6EC
.string "BADGES$"
-gUnknown_841B6F3:: @ 841B6F3
+gTextJPDummy_Ko:: @ 841B6F3
.string "$"
gUnknown_841B6F4:: @ 0x841B6F4