diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/data.s | 36 | ||||
-rw-r--r-- | data/main_menu/unk_8234648.pal | 19 | ||||
-rw-r--r-- | data/main_menu/unk_8234668.pal | 19 | ||||
-rw-r--r-- | data/specials.inc | 4 | ||||
-rw-r--r-- | data/strings.s | 38 |
5 files changed, 60 insertions, 56 deletions
diff --git a/data/data.s b/data/data.s index d0bd198e1..0883c65d7 100644 --- a/data/data.s +++ b/data/data.s @@ -6,41 +6,7 @@ .section .rodata - .align 2, 0 -gUnknown_8234614:: - .string "$" - -gUnknown_8234615:: - .string "\n$" - - .align 2, 0 -gUnknown_8234618:: @ 8234618 - .incbin "baserom.gba", 0x234618, 0x8 - -gUnknown_8234620:: @ 8234620 - .incbin "baserom.gba", 0x234620, 0x18 - -gUnknown_8234638:: @ 8234638 - .incbin "baserom.gba", 0x234638, 0x10 - -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, 0x5 - -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 be47054b5..e43a37050 100644 --- a/data/strings.s +++ b/data/strings.s @@ -48,25 +48,25 @@ gText_EggNickname:: @ 8415A62 gText_Pokemon:: @ 8415A66 .string "POKéMON$" -gUnknown_8415A6E:: @ 8415A6E +gText_NewGame:: @ 8415A6E .string "NEW GAME$" -gUnknown_8415A77:: @ 8415A77 +gText_Continue:: @ 8415A77 .string "CONTINUE$" -gUnknown_8415A80:: @ 0x8415A80 +gTextJP_Options:: @ 0x8415A80 .string "せっていを かえる$" -gUnknown_8415A8A:: @ 0x8415A8A +gUnusedText_MysteryGift:: @ 0x8415A8A .string "MYSTERY GIFT$" -gUnknown_8415A97:: @ 8415A97 +gText_MysteryGift:: @ 8415A97 .string "MYSTERY GIFT$" -gUnknown_8415AA4:: @ 8415AA4 +gText_WirelessAdapterIsNotConnected:: @ 8415AA4 .string "The Wireless Adapter is not\nconnected.$" -gUnknown_8415ACB:: @ 8415ACB +gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached:: @ 8415ACB .string "MYSTERY GIFT can't be used while\nthe Wireless Adapter is attached.$" gUnknown_8415B0E:: @ 0x8415B0E @@ -81,16 +81,16 @@ gUnknown_8415B44:: @ 0x8415B44 gUnknown_8415BAA:: @ 0x8415BAA .string "レポ-トの こうしんは\nしっぱいしました!\pバックアップカ-トリッジを\nこうかんしてください!\pくわしくは\nにんてんどう サ-ビスセンタ- まで\lおといあわせ ください$" -gUnknown_8415BFF:: @ 8415BFF +gText_SaveFileCorruptedPrevWillBeLoaded:: @ 8415BFF .string "The save file is corrupted.\pThe previous save file will be\nloaded.$" -gUnknown_8415C42:: @ 8415C42 +gText_SaveFileHasBeenDeleted:: @ 8415C42 .string "The save file has been\ndeleted...$" -gUnknown_8415C64:: @ 8415C64 +gText_1MSubCircuitBoardNotInstalled:: @ 8415C64 .string "The 1M sub-circuit board is\nnot installed.$" -gUnknown_8415C8F:: @ 0x8415C8F +gTextJP_InternalBatteryHasRunDry:: @ 0x8415C8F .string "でんちぎれの ために\nとけいが うごかなくなりました\pとけいに かんけいする できごとは おきませんが\nゲ-ムを つづけて あそぶことは できます$" gUnknown_8415CD9:: @ 0x8415CD9 @@ -3037,25 +3037,25 @@ gUnknown_841B69E:: @ 841B69E gUnknown_841B6B9:: @ 841B6B9 .string "Clearing data‥\nPlease wait.$" -gUnknown_841B6D5:: @ 841B6D5 +gText_Player:: @ 841B6D5 .string "PLAYER$" -gUnknown_841B6DC:: @ 841B6DC +gText_Time:: @ 841B6DC .string "TIME$" -gUnknown_841B6E1:: @ 0x841B6E1 +gText_Colon:: @ 0x841B6E1 .string ":$" -gUnknown_841B6E3:: @ 841B6E3 +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 @@ -4199,7 +4199,7 @@ gText_WonderCardThrownAway:: @ 841ED7B gText_WonderNewsThrownAway:: @ 841ED9C .string "The WONDER NEWS was thrown away.$" -gText_MysteryGift:: @ 841EDBD +gText_MysteryGift2:: @ 841EDBD .string "MYSTERY GIFT$" gText_PickOKCancel:: @ 841EDCA |