summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/messages.asm42
-rw-r--r--include/charmap.inc225
-rwxr-xr-xtools/dump_string.py3
3 files changed, 167 insertions, 103 deletions
diff --git a/data/messages.asm b/data/messages.asm
index d881076..27a3efc 100644
--- a/data/messages.asm
+++ b/data/messages.asm
@@ -105,7 +105,7 @@ message_02_5fe2::
done
message_02_6004::
- text "GAME　SELECTがめんで"
+ text "ＧＡＭＥ　ＳＥＬＥＣＴがめんで"
line "みぎを　おしましょう"
done
@@ -229,19 +229,19 @@ message_02_644a::
message_02_645a::
text "もんだいを　といている"
line "さいちゅうに"
- line "STARTボタンを　おすと"
+ line "ＳＴＡＲＴボタンを　おすと"
line "メニューが　ひらきますが"
done
message_02_64b6::
text "サファリピクロスでは"
line "ポケモンピクロスの"
- line "『HINT』がないかわりに"
- line "『？START』があります"
+ line "『ＨＩＮＴ』がないかわりに"
+ line "『？ＳＴＡＲＴ』があります"
done
message_02_6518::
- text "『？START』をつかうと"
+ text "『？ＳＴＡＲＴ』をつかうと"
line "ためしにマスを"
line "けずることができます"
done
@@ -275,14 +275,14 @@ message_02_6612::
message_02_6654::
text "けずりおわったら"
line "メニューをだして"
- line "『？END』を"
+ line "『？ＥＮＤ』を"
line "えらびましょう"
done
message_02_6698::
text "けずったマスが"
line "あっているとおもったら"
- line "『OK』をえらびましょう"
+ line "『ＯＫ』をえらびましょう"
done
message_02_66da::
@@ -300,7 +300,7 @@ message_02_672c::
done
message_02_6780::
- text "GAMEOVERになるかも"
+ text "ＧＡＭＥＯＶＥＲになるかも"
line "しれないから"
line "ちゅういしましょう"
done
@@ -312,7 +312,7 @@ message_02_67be::
done
message_02_6802::
- text "『CANCEL』を"
+ text "『ＣＡＮＣＥＬ』を"
line "えらびましょう"
done
@@ -376,11 +376,11 @@ tutorial_message_08::
done
tutorial_message_09::
- text "たとえば　この『5』は　"
+ text "たとえば　この『５』は　"
done
tutorial_message_10::
- line "たてに　れんぞくして　5マス"
+ line "たてに　れんぞくして　５マス"
line "けずることを　あらわして"
line "おるんじゃ"
done
@@ -395,12 +395,12 @@ tutorial_message_12::
done
tutorial_message_13::
- text "たとえば　この『3』と『1』は"
+ text "たとえば　この『３』と『１』は"
done
tutorial_message_14::
- line "ひだりから3マスけずり　さらに　"
- line "はなれた　ところを1マスけずる"
+ line "ひだりから３マスけずり　さらに　"
+ line "はなれた　ところを１マスけずる"
line "ことを　あらわして　おるぞ！"
done
@@ -438,7 +438,7 @@ tutorial_message_20::
done
tutorial_message_21::
- text "タイミングよく　Aボタンを"
+ text "タイミングよく　Ａボタンを"
line "おすんじゃ！"
line "さいしょは　うえのカーソル"
done
@@ -469,11 +469,11 @@ tutorial_message_25::
done
tutorial_message_26::
- line "SELECTボタンをおすと"
+ line "ＳＥＬＥＣＴボタンをおすと"
done
tutorial_message_27::
- text "SELECTボタンを　おしている"
+ text "ＳＥＬＥＣＴボタンを　おしている"
line "あいだだけ　このように"
line "どんなもんだいを　といているか"
line "わかりやすくなるぞ！"
@@ -585,12 +585,12 @@ message_02_72da::
done
message_02_7310::
- text "STARTボタンを　おして"
+ text "ＳＴＡＲＴボタンを　おして"
line "メニューをだすんだ"
done
message_02_7340::
- text "そこで『BGM』を　えらんで"
+ text "そこで『ＢＧＭ』を　えらんで"
line "ポケモンの　エネルギーマークを"
done
@@ -755,11 +755,11 @@ message_02_77d6::
message_02_7806::
text "ふつうに８もんとけば"
- line "つぎのMAPにすすめるから"
+ line "つぎのＭＡＰにすすめるから"
done
message_02_7838::
- text "とりあえずは　さいごのMAPまで"
+ text "とりあえずは　さいごのＭＡＰまで"
line "すすんでから　あとで　ゆっくりと"
done
diff --git a/include/charmap.inc b/include/charmap.inc
index 98a623f..ee1cf1d 100644
--- a/include/charmap.inc
+++ b/include/charmap.inc
@@ -169,93 +169,156 @@ charmap "７", 167
charmap "８", 168
charmap "９", 169
charmap "ー", 170
-charmap "0", 160
-charmap "1", 161
-charmap "2", 162
-charmap "3", 163
-charmap "4", 164
-charmap "5", 165
-charmap "6", 166
-charmap "7", 167
-charmap "8", 168
-charmap "9", 169
-charmap "-", 170
-charmap "A", 171
-charmap "B", 172
-charmap "C", 173
-charmap "D", 174
-charmap "E", 175
-charmap "F", 176
-charmap "G", 177
-charmap "H", 178
-charmap "I", 179
-charmap "J", 180
-charmap "K", 181
-charmap "L", 182
-charmap "M", 183
-charmap "N", 184
-charmap "O", 185
-charmap "P", 186
-charmap "Q", 187
-charmap "R", 188
-charmap "S", 189
-charmap "T", 190
-charmap "U", 191
-charmap "V", 192
-charmap "W", 193
-charmap "X", 194
-charmap "Y", 195
-charmap "Z", 196
-charmap "a", 197
-charmap "b", 198
-charmap "c", 199
-charmap "d", 200
-charmap "e", 201
-charmap "f", 202
-charmap "g", 203
-charmap "h", 204
-charmap "i", 205
-charmap "j", 206
-charmap "k", 207
-charmap "l", 208
-charmap "m", 209
-charmap "n", 210
-charmap "o", 211
-charmap "p", 212
-charmap "q", 213
-charmap "r", 214
-charmap "s", 215
-charmap "t", 216
-charmap "u", 217
-charmap "v", 218
-charmap "w", 219
-charmap "x", 220
-charmap "y", 221
-charmap "z", 222
+charmap "Ａ", 171
+charmap "Ｂ", 172
+charmap "Ｃ", 173
+charmap "Ｄ", 174
+charmap "Ｅ", 175
+charmap "Ｆ", 176
+charmap "Ｇ", 177
+charmap "Ｈ", 178
+charmap "Ｉ", 179
+charmap "Ｊ", 180
+charmap "Ｋ", 181
+charmap "Ｌ", 182
+charmap "Ｍ", 183
+charmap "Ｎ", 184
+charmap "Ｏ", 185
+charmap "Ｐ", 186
+charmap "Ｑ", 187
+charmap "Ｒ", 188
+charmap "Ｓ", 189
+charmap "Ｔ", 190
+charmap "Ｕ", 191
+charmap "Ｖ", 192
+charmap "Ｗ", 193
+charmap "Ｘ", 194
+charmap "Ｙ", 195
+charmap "Ｚ", 196
+charmap "ａ", 197
+charmap "ｂ", 198
+charmap "ｃ", 199
+charmap "ｄ", 200
+charmap "ｅ", 201
+charmap "ｆ", 202
+charmap "ｇ", 203
+charmap "ｈ", 204
+charmap "ｉ", 205
+charmap "ｊ", 206
+charmap "ｋ", 207
+charmap "ｌ", 208
+charmap "ｍ", 209
+charmap "ｎ", 210
+charmap "ｏ", 211
+charmap "ｐ", 212
+charmap "ｑ", 213
+charmap "ｒ", 214
+charmap "ｓ", 215
+charmap "ｔ", 216
+charmap "ｕ", 217
+charmap "ｖ", 218
+charmap "ｗ", 219
+charmap "ｘ", 220
+charmap "ｙ", 221
+charmap "ｚ", 222
charmap "　", 223
-charmap " ", 223
charmap "、", 224
charmap "。", 225
charmap "『", 226
charmap "』", 227
-charmap "×", 228
-charmap "“", 229
-charmap "”", 230
+charmap "❌", 228
+charmap "“", 229
+charmap "”", 230
charmap "！", 231
charmap "？", 232
-charmap "!", 231
-charmap "?", 232
-charmap ":", 233
-charmap ";", 234
-charmap ",", 235
+charmap "：", 233
+charmap "；", 234
+charmap "，", 235
charmap "．", 236
-charmap ".", 236
-charmap "·", 237
-charmap "(", 238
-charmap ")", 239
-charmap "~", 240
-charmap "♂", 241
-charmap "♀", 242
+charmap "・", 237
+charmap "（", 238
+charmap "）", 239
+charmap "～", 240
+charmap "♂", 241
+charmap "♀", 242
-TX_LF EQU -2 ; Line feed
-TX_END EQU -1 ; End of message
+; ASCII alternatives to fullwidth characters
+charmap "0", 160
+charmap "1", 161
+charmap "2", 162
+charmap "3", 163
+charmap "4", 164
+charmap "5", 165
+charmap "6", 166
+charmap "7", 167
+charmap "8", 168
+charmap "9", 169
+charmap "-", 170
+charmap "A", 171
+charmap "B", 172
+charmap "C", 173
+charmap "D", 174
+charmap "E", 175
+charmap "F", 176
+charmap "G", 177
+charmap "H", 178
+charmap "I", 179
+charmap "J", 180
+charmap "K", 181
+charmap "L", 182
+charmap "M", 183
+charmap "N", 184
+charmap "O", 185
+charmap "P", 186
+charmap "Q", 187
+charmap "R", 188
+charmap "S", 189
+charmap "T", 190
+charmap "U", 191
+charmap "V", 192
+charmap "W", 193
+charmap "X", 194
+charmap "Y", 195
+charmap "Z", 196
+charmap "a", 197
+charmap "b", 198
+charmap "c", 199
+charmap "d", 200
+charmap "e", 201
+charmap "f", 202
+charmap "g", 203
+charmap "h", 204
+charmap "i", 205
+charmap "j", 206
+charmap "k", 207
+charmap "l", 208
+charmap "m", 209
+charmap "n", 210
+charmap "o", 211
+charmap "p", 212
+charmap "q", 213
+charmap "r", 214
+charmap "s", 215
+charmap "t", 216
+charmap "u", 217
+charmap "v", 218
+charmap "w", 219
+charmap "x", 220
+charmap "y", 221
+charmap "z", 222
+charmap " ", 223
+charmap "×", 228
+charmap "!", 231
+charmap "?", 232
+charmap ":", 233
+charmap ";", 234
+charmap ",", 235
+charmap "．", 236
+charmap ".", 236
+charmap "·", 237
+charmap "(", 238
+charmap ")", 239
+charmap "~", 240
+
+TX_LF EQU -2 ; Line feed
+TX_END EQU -1 ; End of message
diff --git a/tools/dump_string.py b/tools/dump_string.py
index 3a155b1..8578777 100755
--- a/tools/dump_string.py
+++ b/tools/dump_string.py
@@ -33,7 +33,8 @@ for line in open("include/charmap.inc"):
continue
char = char[1:-1]
- charmap[value] = char
+ if value not in charmap:
+ charmap[value] = char
for x in range(count):
bank = offset // 0x4000
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:28:07 +0000