72 files changed, 584 insertions, 137 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/gfx/bgm/bulbasaur_1.png b/gfx/bgm/bulbasaur_1.png
new file mode 100644
index 0000000..e2c6ccd
--- /dev/null
+++ b/gfx/bgm/bulbasaur_1.png
diff --git a/gfx/bgm/bulbasaur_1_sgb.png b/gfx/bgm/bulbasaur_1_sgb.png
new file mode 100644
index 0000000..311b679
--- /dev/null
+++ b/gfx/bgm/bulbasaur_1_sgb.png
diff --git a/gfx/bgm/bulbasaur_2.png b/gfx/bgm/bulbasaur_2.png
new file mode 100644
index 0000000..a7dfae6
--- /dev/null
+++ b/gfx/bgm/bulbasaur_2.png
diff --git a/gfx/bgm/bulbasaur_2_sgb.png b/gfx/bgm/bulbasaur_2_sgb.png
new file mode 100644
index 0000000..232a43e
--- /dev/null
+++ b/gfx/bgm/bulbasaur_2_sgb.png
diff --git a/gfx/bgm/bulbasaur_3.png b/gfx/bgm/bulbasaur_3.png
new file mode 100644
index 0000000..bd5436f
--- /dev/null
+++ b/gfx/bgm/bulbasaur_3.png
diff --git a/gfx/bgm/bulbasaur_3_sgb.png b/gfx/bgm/bulbasaur_3_sgb.png
new file mode 100644
index 0000000..a394736
--- /dev/null
+++ b/gfx/bgm/bulbasaur_3_sgb.png
diff --git a/gfx/bgm/bulbasaur_4.png b/gfx/bgm/bulbasaur_4.png
new file mode 100644
index 0000000..ea0c76b
--- /dev/null
+++ b/gfx/bgm/bulbasaur_4.png
diff --git a/gfx/bgm/bulbasaur_4_sgb.png b/gfx/bgm/bulbasaur_4_sgb.png
new file mode 100644
index 0000000..3adab58
--- /dev/null
+++ b/gfx/bgm/bulbasaur_4_sgb.png
diff --git a/gfx/bgm/bulbasaur_blink.png b/gfx/bgm/bulbasaur_blink.png
new file mode 100644
index 0000000..2e40dbd
--- /dev/null
+++ b/gfx/bgm/bulbasaur_blink.png
diff --git a/gfx/bgm/charmander_1.png b/gfx/bgm/charmander_1.png
new file mode 100644
index 0000000..7e398b8
--- /dev/null
+++ b/gfx/bgm/charmander_1.png
diff --git a/gfx/bgm/charmander_1_sgb.png b/gfx/bgm/charmander_1_sgb.png
new file mode 100644
index 0000000..59291ae
--- /dev/null
+++ b/gfx/bgm/charmander_1_sgb.png
diff --git a/gfx/bgm/charmander_2.png b/gfx/bgm/charmander_2.png
new file mode 100644
index 0000000..452eff0
--- /dev/null
+++ b/gfx/bgm/charmander_2.png
diff --git a/gfx/bgm/charmander_2_sgb.png b/gfx/bgm/charmander_2_sgb.png
new file mode 100644
index 0000000..e8038f5
--- /dev/null
+++ b/gfx/bgm/charmander_2_sgb.png
diff --git a/gfx/bgm/charmander_3.png b/gfx/bgm/charmander_3.png
new file mode 100644
index 0000000..1134c60
--- /dev/null
+++ b/gfx/bgm/charmander_3.png
diff --git a/gfx/bgm/charmander_3_sgb.png b/gfx/bgm/charmander_3_sgb.png
new file mode 100644
index 0000000..5a9ecf2
--- /dev/null
+++ b/gfx/bgm/charmander_3_sgb.png
diff --git a/gfx/bgm/charmander_4.png b/gfx/bgm/charmander_4.png
new file mode 100644
index 0000000..1134089
--- /dev/null
+++ b/gfx/bgm/charmander_4.png
diff --git a/gfx/bgm/charmander_4_sgb.png b/gfx/bgm/charmander_4_sgb.png
new file mode 100644
index 0000000..6d7a3d2
--- /dev/null
+++ b/gfx/bgm/charmander_4_sgb.png
diff --git a/gfx/bgm/charmander_blink.png b/gfx/bgm/charmander_blink.png
new file mode 100644
index 0000000..b8725ed
--- /dev/null
+++ b/gfx/bgm/charmander_blink.png
diff --git a/gfx/bgm/clefairy_1.png b/gfx/bgm/clefairy_1.png
new file mode 100644
index 0000000..0d0f1f9
--- /dev/null
+++ b/gfx/bgm/clefairy_1.png
diff --git a/gfx/bgm/clefairy_1_sgb.png b/gfx/bgm/clefairy_1_sgb.png
new file mode 100644
index 0000000..b861c10
--- /dev/null
+++ b/gfx/bgm/clefairy_1_sgb.png
diff --git a/gfx/bgm/clefairy_2.png b/gfx/bgm/clefairy_2.png
new file mode 100644
index 0000000..eba9757
--- /dev/null
+++ b/gfx/bgm/clefairy_2.png
diff --git a/gfx/bgm/clefairy_2_sgb.png b/gfx/bgm/clefairy_2_sgb.png
new file mode 100644
index 0000000..6d2aba5
--- /dev/null
+++ b/gfx/bgm/clefairy_2_sgb.png
diff --git a/gfx/bgm/clefairy_3.png b/gfx/bgm/clefairy_3.png
new file mode 100644
index 0000000..6195467
--- /dev/null
+++ b/gfx/bgm/clefairy_3.png
diff --git a/gfx/bgm/clefairy_3_sgb.png b/gfx/bgm/clefairy_3_sgb.png
new file mode 100644
index 0000000..721e737
--- /dev/null
+++ b/gfx/bgm/clefairy_3_sgb.png
diff --git a/gfx/bgm/clefairy_4.png b/gfx/bgm/clefairy_4.png
new file mode 100644
index 0000000..f7e8318
--- /dev/null
+++ b/gfx/bgm/clefairy_4.png
diff --git a/gfx/bgm/clefairy_4_sgb.png b/gfx/bgm/clefairy_4_sgb.png
new file mode 100644
index 0000000..e024216
--- /dev/null
+++ b/gfx/bgm/clefairy_4_sgb.png
diff --git a/gfx/bgm/clefairy_blink.png b/gfx/bgm/clefairy_blink.png
new file mode 100644
index 0000000..25fc162
--- /dev/null
+++ b/gfx/bgm/clefairy_blink.png
diff --git a/gfx/bgm/jigglypuff_1.png b/gfx/bgm/jigglypuff_1.png
new file mode 100644
index 0000000..038f587
--- /dev/null
+++ b/gfx/bgm/jigglypuff_1.png
diff --git a/gfx/bgm/jigglypuff_1_sgb.png b/gfx/bgm/jigglypuff_1_sgb.png
new file mode 100644
index 0000000..ea9d1ed
--- /dev/null
+++ b/gfx/bgm/jigglypuff_1_sgb.png
diff --git a/gfx/bgm/jigglypuff_2.png b/gfx/bgm/jigglypuff_2.png
new file mode 100644
index 0000000..bcbc937
--- /dev/null
+++ b/gfx/bgm/jigglypuff_2.png
diff --git a/gfx/bgm/jigglypuff_2_sgb.png b/gfx/bgm/jigglypuff_2_sgb.png
new file mode 100644
index 0000000..906144d
--- /dev/null
+++ b/gfx/bgm/jigglypuff_2_sgb.png
diff --git a/gfx/bgm/jigglypuff_3.png b/gfx/bgm/jigglypuff_3.png
new file mode 100644
index 0000000..86bf1c6
--- /dev/null
+++ b/gfx/bgm/jigglypuff_3.png
diff --git a/gfx/bgm/jigglypuff_3_sgb.png b/gfx/bgm/jigglypuff_3_sgb.png
new file mode 100644
index 0000000..3f1c0db
--- /dev/null
+++ b/gfx/bgm/jigglypuff_3_sgb.png
diff --git a/gfx/bgm/jigglypuff_4.png b/gfx/bgm/jigglypuff_4.png
new file mode 100644
index 0000000..3ae5c7d
--- /dev/null
+++ b/gfx/bgm/jigglypuff_4.png
diff --git a/gfx/bgm/jigglypuff_4_sgb.png b/gfx/bgm/jigglypuff_4_sgb.png
new file mode 100644
index 0000000..9cff94b
--- /dev/null
+++ b/gfx/bgm/jigglypuff_4_sgb.png
diff --git a/gfx/bgm/jigglypuff_blink.png b/gfx/bgm/jigglypuff_blink.png
new file mode 100644
index 0000000..3a12c0a
--- /dev/null
+++ b/gfx/bgm/jigglypuff_blink.png
diff --git a/gfx/bgm/no_blink.png b/gfx/bgm/no_blink.png
new file mode 100644
index 0000000..07580d8
--- /dev/null
+++ b/gfx/bgm/no_blink.png
diff --git a/gfx/bgm/pikachu_1.png b/gfx/bgm/pikachu_1.png
new file mode 100644
index 0000000..52c8c34
--- /dev/null
+++ b/gfx/bgm/pikachu_1.png
diff --git a/gfx/bgm/pikachu_1_sgb.png b/gfx/bgm/pikachu_1_sgb.png
new file mode 100644
index 0000000..228b4b5
--- /dev/null
+++ b/gfx/bgm/pikachu_1_sgb.png
diff --git a/gfx/bgm/pikachu_2.png b/gfx/bgm/pikachu_2.png
new file mode 100644
index 0000000..d601ada
--- /dev/null
+++ b/gfx/bgm/pikachu_2.png
diff --git a/gfx/bgm/pikachu_2_sgb.png b/gfx/bgm/pikachu_2_sgb.png
new file mode 100644
index 0000000..35fe463
--- /dev/null
+++ b/gfx/bgm/pikachu_2_sgb.png
diff --git a/gfx/bgm/pikachu_3.png b/gfx/bgm/pikachu_3.png
new file mode 100644
index 0000000..1b693c6
--- /dev/null
+++ b/gfx/bgm/pikachu_3.png
diff --git a/gfx/bgm/pikachu_3_sgb.png b/gfx/bgm/pikachu_3_sgb.png
new file mode 100644
index 0000000..607a956
--- /dev/null
+++ b/gfx/bgm/pikachu_3_sgb.png
diff --git a/gfx/bgm/pikachu_4.png b/gfx/bgm/pikachu_4.png
new file mode 100644
index 0000000..7eac26d
--- /dev/null
+++ b/gfx/bgm/pikachu_4.png
diff --git a/gfx/bgm/pikachu_4_sgb.png b/gfx/bgm/pikachu_4_sgb.png
new file mode 100644
index 0000000..9e8ece2
--- /dev/null
+++ b/gfx/bgm/pikachu_4_sgb.png
diff --git a/gfx/bgm/pikachu_blink.png b/gfx/bgm/pikachu_blink.png
new file mode 100644
index 0000000..5023001
--- /dev/null
+++ b/gfx/bgm/pikachu_blink.png
diff --git a/gfx/bgm/squirtle_1.png b/gfx/bgm/squirtle_1.png
new file mode 100644
index 0000000..fc9ac26
--- /dev/null
+++ b/gfx/bgm/squirtle_1.png
diff --git a/gfx/bgm/squirtle_1_sgb.png b/gfx/bgm/squirtle_1_sgb.png
new file mode 100644
index 0000000..8ba78a2
--- /dev/null
+++ b/gfx/bgm/squirtle_1_sgb.png
diff --git a/gfx/bgm/squirtle_2.png b/gfx/bgm/squirtle_2.png
new file mode 100644
index 0000000..10482b5
--- /dev/null
+++ b/gfx/bgm/squirtle_2.png
diff --git a/gfx/bgm/squirtle_2_sgb.png b/gfx/bgm/squirtle_2_sgb.png
new file mode 100644
index 0000000..3a17571
--- /dev/null
+++ b/gfx/bgm/squirtle_2_sgb.png
diff --git a/gfx/bgm/squirtle_3.png b/gfx/bgm/squirtle_3.png
new file mode 100644
index 0000000..c174934
--- /dev/null
+++ b/gfx/bgm/squirtle_3.png
diff --git a/gfx/bgm/squirtle_3_sgb.png b/gfx/bgm/squirtle_3_sgb.png
new file mode 100644
index 0000000..05d4b4c
--- /dev/null
+++ b/gfx/bgm/squirtle_3_sgb.png
diff --git a/gfx/bgm/squirtle_4.png b/gfx/bgm/squirtle_4.png
new file mode 100644
index 0000000..8386aec
--- /dev/null
+++ b/gfx/bgm/squirtle_4.png
diff --git a/gfx/bgm/squirtle_4_sgb.png b/gfx/bgm/squirtle_4_sgb.png
new file mode 100644
index 0000000..9428d53
--- /dev/null
+++ b/gfx/bgm/squirtle_4_sgb.png
diff --git a/gfx/bgm/squirtle_blink.png b/gfx/bgm/squirtle_blink.png
new file mode 100644
index 0000000..1171fa0
--- /dev/null
+++ b/gfx/bgm/squirtle_blink.png
diff --git a/gfx/fonts/font_1.png b/gfx/fonts/font_1.png
new file mode 100644
index 0000000..65a3015
--- /dev/null
+++ b/gfx/fonts/font_1.png
diff --git a/gfx/fonts/font_2.png b/gfx/fonts/font_2.png
new file mode 100644
index 0000000..6a07992
--- /dev/null
+++ b/gfx/fonts/font_2.png
diff --git a/gfx/fonts/font_striped_dark.png b/gfx/fonts/font_striped_dark.png
new file mode 100644
index 0000000..bcaa710
--- /dev/null
+++ b/gfx/fonts/font_striped_dark.png
diff --git a/gfx/fonts/font_striped_light.png b/gfx/fonts/font_striped_light.png
new file mode 100644
index 0000000..2cff190
--- /dev/null
+++ b/gfx/fonts/font_striped_light.png
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/include/macros.inc b/include/macros.inc
index 86c3fb3..2f4d28d 100644
--- a/include/macros.inc
+++ b/include/macros.inc
@@ -23,6 +23,9 @@ farjp: macro
 endm
 
 
+tiles EQUS "* $10"
+
+
 lb: macro
     ld \1, ((\2) & $ff) << 8 | ((\3) & $ff)
 endm
diff --git a/include/text.inc b/include/text.inc
index bb76453..b293fd5 100644
--- a/include/text.inc
+++ b/include/text.inc
@@ -1,5 +1,7 @@
 INCLUDE "charmap.inc"
 
+; Outputs each character of each argument as a 16-bit word
+; (dw "string" does not do this: https://github.com/rednex/rgbds/issues/568)
 text: macro
 _arg = 1
     rept _NARG
@@ -7,7 +9,7 @@ _WS EQUS \1
 _len = STRLEN("{_WS}")
 _i = 1
         rept _len
-          dw STRSUB("{_WS}", _i, 1)
+            dw STRSUB("{_WS}", _i, 1)
 _i = _i + 1
         endr
         PURGE _WS
diff --git a/shim.sym b/shim.sym
index 1090e7d..57a56fd 100644
--- a/shim.sym
+++ b/shim.sym
@@ -37,6 +37,7 @@
 04:43ec function_04_43ec
 
 05:5f2f function_05_5f2f
+05:7089 function_05_7089
 
 06:4964 function_06_4964
 
@@ -58,6 +59,10 @@
 
 3c:4377 function_3c_4377
 
+6c:7eec compressed_tilemap_6c_7eec
+
+75:7d35 compressed_gfx_75_7d35
+
 7b:41e0 gfx_blank_char
 
 00:a03e s_a03e
@@ -87,6 +92,7 @@
 00:c318 w_farcall_target_high
 00:c31e w_bank_temp ; db
 
+00:c300 w_c300
 00:c301 w_c301
 00:c314 w_c314
 00:c316 w_c316
diff --git a/source/bank_00.asm b/source/bank_00.asm
index 9e967ae..21d3160 100644
--- a/source/bank_00.asm
+++ b/source/bank_00.asm
@@ -145,7 +145,7 @@ _start::
     ld a, [w_c358]
     push af
     ld hl, _RAM
-    ld bc, $1fff
+    ld bc, $2000 - 1
     call clear_mem
     pop af
     ld [w_c358], a
@@ -487,26 +487,26 @@ function_00_0458::
 SECTION "vwf_draw_char", ROM0[$0723]
 vwf_char_draw::
     ld a, [w_vwf_char_start_x]
-    and $07
+    and %00000111
     ld c, a
-    ld b, $00
+    ld b, 0
     ld hl, .pixel_masks_right
     add hl, bc
     ld a, [hl]
     ld [w_c363], a
     ld a, [w_vwf_char_end_x]
-    and $07
+    and %00000111
     ld c, a
-    ld b, $00
+    ld b, 0
     ld hl, .pixel_masks_left
     add hl, bc
     ld a, [hl]
     ld [w_c364], a
     ld a, [w_vwf_char_start_x]
-    and $f8
+    and %11111000
     ld c, a
     ld a, [w_vwf_char_end_x]
-    and $f8
+    and %11111000
     sub c
     srl a
     srl a
@@ -522,11 +522,11 @@ vwf_char_draw::
     inc a
     ld [w_c366], a
     ld a, [w_vwf_char_start_x]
-    and $07
+    and %00000111
     ld c, a
     add $38
     ld [w_c368], a
-    ld b, $00
+    ld b, 0
     ld hl, .pixel_masks_right
     add hl, bc
     ld a, [hl]
@@ -549,7 +549,7 @@ vwf_char_draw::
     ld a, [w_vwf_char_start_y]
     ld l, a
     ld a, [w_vwf_char_start_x]
-    and $f8
+    and %11111000
     ld h, a
 
 .jump_000_07a9
@@ -586,11 +586,11 @@ vwf_char_draw::
     ld b, h
     ld c, l
     ld a, l
-    and $f8
+    and %11111000
     srl a
     srl a
     ld e, a
-    ld d, $00
+    ld d, 0
     ld a, [w_cd6d]
     ld l, a
     ld a, [w_cd6e]
@@ -600,17 +600,17 @@ vwf_char_draw::
     ld h, [hl]
     ld l, a
     ld a, b
-    and $f8
+    and %11111000
     srl a
     srl a
     ld e, a
-    ld d, $00
+    ld d, 0
     add hl, de
     ld a, [hl+]
     ld h, [hl]
     ld l, a
     ld a, c
-    and $07
+    and %00000111
     sla a
     add l
     ld l, a
@@ -652,7 +652,7 @@ vwf_char_draw::
     add $0f
     ld c, a
     ld a, b
-    adc $00
+    adc 0
     ld b, a
     inc de
     pop hl
@@ -679,11 +679,11 @@ vwf_char_draw::
     ld b, h
     ld c, l
     ld a, l
-    and $f8
+    and %11111000
     srl a
     srl a
     ld e, a
-    ld d, $00
+    ld d, 0
     ld a, [w_cd6d]
     ld l, a
     ld a, [w_cd6e]
@@ -693,17 +693,17 @@ vwf_char_draw::
     ld h, [hl]
     ld l, a
     ld a, b
-    and $f8
+    and %11111000
     srl a
     srl a
     ld e, a
-    ld d, $00
+    ld d, 0
     add hl, de
     ld a, [hl+]
     ld h, [hl]
     ld l, a
     ld a, c
-    and $07
+    and %00000111
     sla a
     add l
     ld l, a
@@ -754,7 +754,7 @@ vwf_char_draw::
     add $0f
     ld c, a
     ld a, b
-    adc $00
+    adc 0
     ld b, a
     pop af
 
@@ -800,11 +800,11 @@ vwf_char_draw::
     ld b, h
     ld c, l
     ld a, l
-    and $f8
+    and %11111000
     srl a
     srl a
     ld e, a
-    ld d, $00
+    ld d, 0
     ld a, [w_cd6d]
     ld l, a
     ld a, [w_cd6e]
@@ -814,17 +814,17 @@ vwf_char_draw::
     ld h, [hl]
     ld l, a
     ld a, b
-    and $f8
+    and %11111000
     srl a
     srl a
     ld e, a
-    ld d, $00
+    ld d, 0
     add hl, de
     ld a, [hl+]
     ld h, [hl]
     ld l, a
     ld a, c
-    and $07
+    and %00000111
     sla a
     add l
     ld l, a
@@ -875,7 +875,7 @@ vwf_char_draw::
     add $0f
     ld c, a
     ld a, b
-    adc $00
+    adc 0
     ld b, a
     pop af
 
@@ -900,14 +900,14 @@ vwf_char_draw::
     inc bc
     inc bc
     ld a, c
-    and $0f
+    and %00001111
     jr nz, .jr_000_09bc
 
     ld a, c
     add $f0
     ld c, a
     ld a, b
-    adc $00
+    adc 0
     ld b, a
 
 .jr_000_09bc
@@ -1150,7 +1150,7 @@ function_00_0d91::
     ld [rROMB0], a
     ld a, l
 .skip_bankswitch
-    call $4000
+    call $4000 ; ???
     pop hl
     pop bc
     jr nc, .done
@@ -1209,12 +1209,12 @@ vram_copy::
 
 .wait_vblank
     ldh a, [rSTAT]
-    and $03
+    and STATF_LCD
     jr z, .wait_vblank
 
 .in_vblank
     ldh a, [rSTAT]
-    and $03
+    and STATF_LCD
     jr nz, .in_vblank
 
     ld a, [hl+]
@@ -1472,6 +1472,71 @@ text_draw_char:
     ld a, e
     ret
 
+SECTION "decompress", ROM0[$20cf]
+decompress::
+; Parameters:
+; hl - source
+; de - dest
+; bc - length (not the actual source or dest length)
+    ld [w_bank_temp], a
+    ld a, [w_bank_rom]
+    push af
+    ld a, [w_bank_temp]
+    ld [w_bank_rom], a
+    ld [rROMB0], a
+
+    xor a
+    ld [w_c300], a
+
+.main_loop
+    push bc
+    ld a, [hl+]
+    bit 7, a
+    jr nz, .alternating
+
+; uses the next a + 1 bytes of compressed data
+; to output a + 1 bytes of decompressed data
+    inc a
+    ld c, a
+    ld a, [w_c300]
+.seq_loop
+    xor [hl]
+    ld [de], a
+    inc hl
+    inc de
+    dec c
+    jr nz, .seq_loop
+    ld [w_c300], a
+    jr .next
+
+; uses the next one byte of compressed data
+; to output a - $7e bytes of decompressed data,
+; alternating between two different values
+.alternating
+    sub $7e
+    ld c, a
+    ld a, [w_c300]
+.alt_loop
+    xor [hl]
+    ld [de], a
+    inc de
+    dec c
+    jr nz, .alt_loop
+    ld [w_c300], a
+    inc hl
+
+.next
+    pop bc
+    dec bc
+    ld a, c
+    or b
+    jr nz, .main_loop
+
+    pop af
+    ld [w_bank_rom], a
+    ld [rROMB0], a
+    ret
+
 SECTION "function_00_24b7", ROM0[$24b7]
 function_00_24b7::
     xor a
diff --git a/source/bank_01.asm b/source/bank_01.asm
index e1371c5..80e88a7 100644
--- a/source/bank_01.asm
+++ b/source/bank_01.asm
@@ -30,3 +30,30 @@ level_name_textbox_clear:
     cp 11
     jp nz, .loop
     ret
+
+SECTION "function_01_6306", ROMX[$6306], BANK[$01]
+function_01_6306::
+    ld c, 16
+.loop
+    push bc
+    push hl
+    push de
+    push af
+    ld bc, 8 tiles
+    call vram_copy
+    farcall function_05_7089
+    pop af
+    pop de
+    pop hl
+    push hl
+    ld hl, 8 tiles
+    add hl, de
+    ld e, l
+    ld d, h
+    pop hl
+    ld bc, 8 tiles
+    add hl, bc
+    pop bc
+    dec c
+    jp nz, .loop
+    ret
diff --git a/source/bank_28.asm b/source/bank_28.asm
new file mode 100644
index 0000000..d798744
--- /dev/null
+++ b/source/bank_28.asm
@@ -0,0 +1,20 @@
+INCLUDE "hardware.inc"
+INCLUDE "macros.inc"
+
+SECTION "function_28_426a", ROMX[$426a], BANK[$28]
+
+function_28_426a::
+    ld a, $01
+    ld [w_d6b5], a
+    ld a, BANK(compressed_gfx_75_7d35)
+    ld hl, compressed_gfx_75_7d35
+    ld de, _VRAM8800
+    ld bc, 182
+    call decompress
+    ld a, BANK(compressed_tilemap_6c_7eec)
+    ld hl, compressed_tilemap_6c_7eec
+    ld de, _SCRN0
+    ld bc, 82
+    call decompress
+    call function_00_1085
+    ; TBC
diff --git a/source/bank_64.asm b/source/bank_64.asm
new file mode 100644
index 0000000..e29534f
--- /dev/null
+++ b/source/bank_64.asm
@@ -0,0 +1,14 @@
+SECTION "gfx_font_striped_dark", ROMX[$4d00], BANK[$64]
+gfx_font_striped_dark::
+INCBIN "gfx/fonts/font_striped_dark.bin"
+.end::
+
+SECTION "gfx_font_striped_light", ROMX[$6500], BANK[$64]
+gfx_font_striped_light::
+INCBIN "gfx/fonts/font_striped_light.bin"
+.end::
+
+SECTION "gfx_font_1", ROMX[$7000], BANK[$64]
+gfx_font_1::
+INCBIN "gfx/fonts/font_1.bin"
+.end::
diff --git a/source/bank_65.asm b/source/bank_65.asm
new file mode 100644
index 0000000..1aa9d0d
--- /dev/null
+++ b/source/bank_65.asm
@@ -0,0 +1,4 @@
+SECTION "gfx_font_2", ROMX[$7000], BANK[$65]
+gfx_font_2::
+INCBIN "gfx/fonts/font_2.bin"
+.end::
diff --git a/source/bank_66.asm b/source/bank_66.asm
new file mode 100644
index 0000000..f4b590d
--- /dev/null
+++ b/source/bank_66.asm
@@ -0,0 +1,121 @@
+SECTION "bank66", ROMX[$4000], BANK[$66]
+
+gfx_bgm_pikachu_1::
+INCBIN "gfx/bgm/pikachu_blink.bin"
+INCBIN "gfx/bgm/pikachu_1.bin"
+.end::
+
+gfx_bgm_pikachu_2::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/pikachu_2.bin"
+.end::
+
+gfx_bgm_pikachu_3::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/pikachu_3.bin"
+.end::
+
+gfx_bgm_pikachu_4::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/pikachu_4.bin"
+.end::
+
+gfx_bgm_bulbasaur_1::
+INCBIN "gfx/bgm/bulbasaur_blink.bin"
+INCBIN "gfx/bgm/bulbasaur_1.bin"
+.end::
+
+gfx_bgm_bulbasaur_2::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/bulbasaur_2.bin"
+.end::
+
+gfx_bgm_bulbasaur_3::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/bulbasaur_3.bin"
+.end::
+
+gfx_bgm_bulbasaur_4::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/bulbasaur_4.bin"
+.end::
+
+gfx_bgm_charmander_1::
+INCBIN "gfx/bgm/charmander_blink.bin"
+INCBIN "gfx/bgm/charmander_1.bin"
+.end::
+
+gfx_bgm_charmander_2::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/charmander_2.bin"
+.end::
+
+gfx_bgm_charmander_3::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/charmander_3.bin"
+.end::
+
+gfx_bgm_charmander_4::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/charmander_4.bin"
+.end::
+
+gfx_bgm_squirtle_1::
+INCBIN "gfx/bgm/squirtle_blink.bin"
+INCBIN "gfx/bgm/squirtle_1.bin"
+.end::
+
+gfx_bgm_squirtle_2::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/squirtle_2.bin"
+.end::
+
+gfx_bgm_squirtle_3::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/squirtle_3.bin"
+.end::
+
+gfx_bgm_squirtle_4::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/squirtle_4.bin"
+.end::
+
+gfx_bgm_clefairy_1::
+INCBIN "gfx/bgm/clefairy_blink.bin"
+INCBIN "gfx/bgm/clefairy_1.bin"
+.end::
+
+gfx_bgm_clefairy_2::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/clefairy_2.bin"
+.end::
+
+gfx_bgm_clefairy_3::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/clefairy_3.bin"
+.end::
+
+gfx_bgm_clefairy_4::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/clefairy_4.bin"
+.end::
+
+gfx_bgm_jigglypuff_1::
+INCBIN "gfx/bgm/jigglypuff_blink.bin"
+INCBIN "gfx/bgm/jigglypuff_1.bin"
+.end::
+
+gfx_bgm_jigglypuff_2::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/jigglypuff_2.bin"
+.end::
+
+gfx_bgm_jigglypuff_3::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/jigglypuff_3.bin"
+.end::
+
+gfx_bgm_jigglypuff_4::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/jigglypuff_4.bin"
+.end::
diff --git a/source/bank_68.asm b/source/bank_68.asm
new file mode 100644
index 0000000..b20508b
--- /dev/null
+++ b/source/bank_68.asm
@@ -0,0 +1,121 @@
+SECTION "bank68", ROMX[$4000], BANK[$68]
+
+gfx_bgm_pikachu_1_sgb::
+INCBIN "gfx/bgm/pikachu_blink.bin"
+INCBIN "gfx/bgm/pikachu_1_sgb.bin"
+.end::
+
+gfx_bgm_pikachu_2_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/pikachu_2_sgb.bin"
+.end::
+
+gfx_bgm_pikachu_3_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/pikachu_3_sgb.bin"
+.end::
+
+gfx_bgm_pikachu_4_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/pikachu_4_sgb.bin"
+.end::
+
+gfx_bgm_bulbasaur_1_sgb::
+INCBIN "gfx/bgm/bulbasaur_blink.bin"
+INCBIN "gfx/bgm/bulbasaur_1_sgb.bin"
+.end::
+
+gfx_bgm_bulbasaur_2_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/bulbasaur_2_sgb.bin"
+.end::
+
+gfx_bgm_bulbasaur_3_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/bulbasaur_3_sgb.bin"
+.end::
+
+gfx_bgm_bulbasaur_4_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/bulbasaur_4_sgb.bin"
+.end::
+
+gfx_bgm_charmander_1_sgb::
+INCBIN "gfx/bgm/charmander_blink.bin"
+INCBIN "gfx/bgm/charmander_1_sgb.bin"
+.end::
+
+gfx_bgm_charmander_2_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/charmander_2_sgb.bin"
+.end::
+
+gfx_bgm_charmander_3_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/charmander_3_sgb.bin"
+.end::
+
+gfx_bgm_charmander_4_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/charmander_4_sgb.bin"
+.end::
+
+gfx_bgm_squirtle_1_sgb::
+INCBIN "gfx/bgm/squirtle_blink.bin"
+INCBIN "gfx/bgm/squirtle_1_sgb.bin"
+.end::
+
+gfx_bgm_squirtle_2_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/squirtle_2_sgb.bin"
+.end::
+
+gfx_bgm_squirtle_3_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/squirtle_3_sgb.bin"
+.end::
+
+gfx_bgm_squirtle_4_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/squirtle_4_sgb.bin"
+.end::
+
+gfx_bgm_clefairy_1_sgb::
+INCBIN "gfx/bgm/clefairy_blink.bin"
+INCBIN "gfx/bgm/clefairy_1_sgb.bin"
+.end::
+
+gfx_bgm_clefairy_2_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/clefairy_2_sgb.bin"
+.end::
+
+gfx_bgm_clefairy_3_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/clefairy_3_sgb.bin"
+.end::
+
+gfx_bgm_clefairy_4_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/clefairy_4_sgb.bin"
+.end::
+
+gfx_bgm_jigglypuff_1_sgb::
+INCBIN "gfx/bgm/jigglypuff_blink.bin"
+INCBIN "gfx/bgm/jigglypuff_1_sgb.bin"
+.end::
+
+gfx_bgm_jigglypuff_2_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/jigglypuff_2_sgb.bin"
+.end::
+
+gfx_bgm_jigglypuff_3_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/jigglypuff_3_sgb.bin"
+.end::
+
+gfx_bgm_jigglypuff_4_sgb::
+INCBIN "gfx/bgm/no_blink.bin"
+INCBIN "gfx/bgm/jigglypuff_4_sgb.bin"
+.end::
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