diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 4 | ||||
| -rw-r--r-- | data/strings.s | 24 |
2 files changed, 15 insertions, 13 deletions
diff --git a/data/data.s b/data/data.s index da50d9086..1757ea056 100644 --- a/data/data.s +++ b/data/data.s @@ -42,14 +42,16 @@ gUnknown_8234688:: @ 8234688 .incbin "baserom.gba", 0x234688, 0x3 gUnknown_823468B:: @ 823468B - .incbin "baserom.gba", 0x23468B, 0x5 + .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/strings.s b/data/strings.s index 7af3a57bc..eccd54800 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 @@ -3037,16 +3037,16 @@ 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 @@ -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 |