Add support for german translation

First extract the german dialogue: python restool.py --extract-dialogue -r german.sfc Then extract resources / build the assert file: python restool.py --extract-from-rom --languages=de
2025-12-19 18:05:55 -05:00 · 2023-03-08 16:48:21 +01:00
parent 366da3c3d2
commit 9dde4a7a07
26 changed files with 1315 additions and 993 deletions
--- a/assets.h
+++ b/assets.h
@@ -6,6 +6,8 @@ enum {
 };
 extern const uint8 *g_asset_ptrs[kNumberOfAssets];
 extern uint32 g_asset_sizes[kNumberOfAssets];
+extern MemBlk FindInAssetArray(int asset, int idx);
+
 #define kSoundBank_intro ((uint8*)g_asset_ptrs[0])
 #define kSoundBank_intro_SIZE (g_asset_sizes[0])
 #define kSoundBank_indoor ((uint8*)g_asset_ptrs[1])
@@ -134,76 +136,69 @@ extern uint32 g_asset_sizes[kNumberOfAssets];
 #define kMap32ToMap16_2_SIZE (g_asset_sizes[62])
 #define kMap32ToMap16_3 ((uint8*)g_asset_ptrs[63])
 #define kMap32ToMap16_3_SIZE (g_asset_sizes[63])
-#define kDialogueOffs ((uint16*)g_asset_ptrs[64])
-#define kDialogueOffs_SIZE (g_asset_sizes[64])
-#define kDialogueText ((uint8*)g_asset_ptrs[65])
-#define kDialogueText_SIZE (g_asset_sizes[65])
-#define kSprGfx ((uint8*)g_asset_ptrs[66])
-#define kSprGfx_SIZE (g_asset_sizes[66])
-#define kBgGfx ((uint8*)g_asset_ptrs[67])
-#define kBgGfx_SIZE (g_asset_sizes[67])
-#define kOverworldMapGfx ((uint8*)g_asset_ptrs[68])
-#define kOverworldMapGfx_SIZE (g_asset_sizes[68])
-#define kLightOverworldTilemap ((uint8*)g_asset_ptrs[69])
-#define kLightOverworldTilemap_SIZE (g_asset_sizes[69])
-#define kDarkOverworldTilemap ((uint8*)g_asset_ptrs[70])
-#define kDarkOverworldTilemap_SIZE (g_asset_sizes[70])
-#define kPredefinedTileData ((uint16*)g_asset_ptrs[71])
-#define kPredefinedTileData_SIZE (g_asset_sizes[71])
-#define kFontData ((uint16*)g_asset_ptrs[72])
-#define kFontData_SIZE (g_asset_sizes[72])
-#define kMap16ToMap8 ((uint16*)g_asset_ptrs[73])
-#define kMap16ToMap8_SIZE (g_asset_sizes[73])
-#define kGeneratedWishPondItem ((uint8*)g_asset_ptrs[74])
-#define kGeneratedWishPondItem_SIZE (g_asset_sizes[74])
-#define kGeneratedBombosArr ((uint8*)g_asset_ptrs[75])
-#define kGeneratedBombosArr_SIZE (g_asset_sizes[75])
-#define kGeneratedEndSequence15 ((uint8*)g_asset_ptrs[76])
-#define kGeneratedEndSequence15_SIZE (g_asset_sizes[76])
-#define kEnding_Credits_Text ((uint8*)g_asset_ptrs[77])
-#define kEnding_Credits_Text_SIZE (g_asset_sizes[77])
-#define kEnding_Credits_Offs ((uint16*)g_asset_ptrs[78])
-#define kEnding_Credits_Offs_SIZE (g_asset_sizes[78])
-#define kEnding_MapData ((uint16*)g_asset_ptrs[79])
-#define kEnding_MapData_SIZE (g_asset_sizes[79])
-#define kEnding0_Offs ((uint16*)g_asset_ptrs[80])
-#define kEnding0_Offs_SIZE (g_asset_sizes[80])
-#define kEnding0_Data ((uint8*)g_asset_ptrs[81])
-#define kEnding0_Data_SIZE (g_asset_sizes[81])
-#define kPalette_DungBgMain ((uint16*)g_asset_ptrs[82])
-#define kPalette_DungBgMain_SIZE (g_asset_sizes[82])
-#define kPalette_MainSpr ((uint16*)g_asset_ptrs[83])
-#define kPalette_MainSpr_SIZE (g_asset_sizes[83])
-#define kPalette_ArmorAndGloves ((uint16*)g_asset_ptrs[84])
-#define kPalette_ArmorAndGloves_SIZE (g_asset_sizes[84])
-#define kPalette_Sword ((uint16*)g_asset_ptrs[85])
-#define kPalette_Sword_SIZE (g_asset_sizes[85])
-#define kPalette_Shield ((uint16*)g_asset_ptrs[86])
-#define kPalette_Shield_SIZE (g_asset_sizes[86])
-#define kPalette_SpriteAux3 ((uint16*)g_asset_ptrs[87])
-#define kPalette_SpriteAux3_SIZE (g_asset_sizes[87])
-#define kPalette_MiscSprite_Indoors ((uint16*)g_asset_ptrs[88])
-#define kPalette_MiscSprite_Indoors_SIZE (g_asset_sizes[88])
-#define kPalette_SpriteAux1 ((uint16*)g_asset_ptrs[89])
-#define kPalette_SpriteAux1_SIZE (g_asset_sizes[89])
-#define kPalette_OverworldBgMain ((uint16*)g_asset_ptrs[90])
-#define kPalette_OverworldBgMain_SIZE (g_asset_sizes[90])
-#define kPalette_OverworldBgAux12 ((uint16*)g_asset_ptrs[91])
-#define kPalette_OverworldBgAux12_SIZE (g_asset_sizes[91])
-#define kPalette_OverworldBgAux3 ((uint16*)g_asset_ptrs[92])
-#define kPalette_OverworldBgAux3_SIZE (g_asset_sizes[92])
-#define kPalette_PalaceMapBg ((uint16*)g_asset_ptrs[93])
-#define kPalette_PalaceMapBg_SIZE (g_asset_sizes[93])
-#define kPalette_PalaceMapSpr ((uint16*)g_asset_ptrs[94])
-#define kPalette_PalaceMapSpr_SIZE (g_asset_sizes[94])
-#define kHudPalData ((uint16*)g_asset_ptrs[95])
-#define kHudPalData_SIZE (g_asset_sizes[95])
-#define kOverworldMapPaletteData ((uint16*)g_asset_ptrs[96])
-#define kOverworldMapPaletteData_SIZE (g_asset_sizes[96])
-#define kDungMap_FloorLayout ((uint8*)g_asset_ptrs[97])
-#define kDungMap_FloorLayout_SIZE (g_asset_sizes[97])
-#define kDungMap_Tiles ((uint8*)g_asset_ptrs[98])
-#define kDungMap_Tiles_SIZE (g_asset_sizes[98])
+#define kSprGfx(idx) FindInAssetArray(64, idx)
+#define kBgGfx(idx) FindInAssetArray(65, idx)
+#define kOverworldMapGfx ((uint8*)g_asset_ptrs[66])
+#define kOverworldMapGfx_SIZE (g_asset_sizes[66])
+#define kLightOverworldTilemap ((uint8*)g_asset_ptrs[67])
+#define kLightOverworldTilemap_SIZE (g_asset_sizes[67])
+#define kDarkOverworldTilemap ((uint8*)g_asset_ptrs[68])
+#define kDarkOverworldTilemap_SIZE (g_asset_sizes[68])
+#define kPredefinedTileData ((uint16*)g_asset_ptrs[69])
+#define kPredefinedTileData_SIZE (g_asset_sizes[69])
+#define kMap16ToMap8 ((uint16*)g_asset_ptrs[70])
+#define kMap16ToMap8_SIZE (g_asset_sizes[70])
+#define kGeneratedWishPondItem ((uint8*)g_asset_ptrs[71])
+#define kGeneratedWishPondItem_SIZE (g_asset_sizes[71])
+#define kGeneratedBombosArr ((uint8*)g_asset_ptrs[72])
+#define kGeneratedBombosArr_SIZE (g_asset_sizes[72])
+#define kGeneratedEndSequence15 ((uint8*)g_asset_ptrs[73])
+#define kGeneratedEndSequence15_SIZE (g_asset_sizes[73])
+#define kEnding_Credits_Text ((uint8*)g_asset_ptrs[74])
+#define kEnding_Credits_Text_SIZE (g_asset_sizes[74])
+#define kEnding_Credits_Offs ((uint16*)g_asset_ptrs[75])
+#define kEnding_Credits_Offs_SIZE (g_asset_sizes[75])
+#define kEnding_MapData ((uint16*)g_asset_ptrs[76])
+#define kEnding_MapData_SIZE (g_asset_sizes[76])
+#define kEnding0_Offs ((uint16*)g_asset_ptrs[77])
+#define kEnding0_Offs_SIZE (g_asset_sizes[77])
+#define kEnding0_Data ((uint8*)g_asset_ptrs[78])
+#define kEnding0_Data_SIZE (g_asset_sizes[78])
+#define kPalette_DungBgMain ((uint16*)g_asset_ptrs[79])
+#define kPalette_DungBgMain_SIZE (g_asset_sizes[79])
+#define kPalette_MainSpr ((uint16*)g_asset_ptrs[80])
+#define kPalette_MainSpr_SIZE (g_asset_sizes[80])
+#define kPalette_ArmorAndGloves ((uint16*)g_asset_ptrs[81])
+#define kPalette_ArmorAndGloves_SIZE (g_asset_sizes[81])
+#define kPalette_Sword ((uint16*)g_asset_ptrs[82])
+#define kPalette_Sword_SIZE (g_asset_sizes[82])
+#define kPalette_Shield ((uint16*)g_asset_ptrs[83])
+#define kPalette_Shield_SIZE (g_asset_sizes[83])
+#define kPalette_SpriteAux3 ((uint16*)g_asset_ptrs[84])
+#define kPalette_SpriteAux3_SIZE (g_asset_sizes[84])
+#define kPalette_MiscSprite_Indoors ((uint16*)g_asset_ptrs[85])
+#define kPalette_MiscSprite_Indoors_SIZE (g_asset_sizes[85])
+#define kPalette_SpriteAux1 ((uint16*)g_asset_ptrs[86])
+#define kPalette_SpriteAux1_SIZE (g_asset_sizes[86])
+#define kPalette_OverworldBgMain ((uint16*)g_asset_ptrs[87])
+#define kPalette_OverworldBgMain_SIZE (g_asset_sizes[87])
+#define kPalette_OverworldBgAux12 ((uint16*)g_asset_ptrs[88])
+#define kPalette_OverworldBgAux12_SIZE (g_asset_sizes[88])
+#define kPalette_OverworldBgAux3 ((uint16*)g_asset_ptrs[89])
+#define kPalette_OverworldBgAux3_SIZE (g_asset_sizes[89])
+#define kPalette_PalaceMapBg ((uint16*)g_asset_ptrs[90])
+#define kPalette_PalaceMapBg_SIZE (g_asset_sizes[90])
+#define kPalette_PalaceMapSpr ((uint16*)g_asset_ptrs[91])
+#define kPalette_PalaceMapSpr_SIZE (g_asset_sizes[91])
+#define kHudPalData ((uint16*)g_asset_ptrs[92])
+#define kHudPalData_SIZE (g_asset_sizes[92])
+#define kOverworldMapPaletteData ((uint16*)g_asset_ptrs[93])
+#define kOverworldMapPaletteData_SIZE (g_asset_sizes[93])
+#define kDialogue(idx) FindInAssetArray(94, idx)
+#define kDialogueFont(idx) FindInAssetArray(95, idx)
+#define kDialogueMap(idx) FindInAssetArray(96, idx)
+#define kDungMap_FloorLayout(idx) FindInAssetArray(97, idx)
+#define kDungMap_Tiles(idx) FindInAssetArray(98, idx)
 #define kBgTilemap_0 ((uint8*)g_asset_ptrs[99])
 #define kBgTilemap_0_SIZE (g_asset_sizes[99])
 #define kBgTilemap_1 ((uint8*)g_asset_ptrs[100])
@@ -216,10 +211,8 @@ extern uint32 g_asset_sizes[kNumberOfAssets];
 #define kBgTilemap_4_SIZE (g_asset_sizes[103])
 #define kBgTilemap_5 ((uint8*)g_asset_ptrs[104])
 #define kBgTilemap_5_SIZE (g_asset_sizes[104])
-#define kOverworld_Hibytes_Comp ((uint8*)g_asset_ptrs[105])
-#define kOverworld_Hibytes_Comp_SIZE (g_asset_sizes[105])
-#define kOverworld_Lobytes_Comp ((uint8*)g_asset_ptrs[106])
-#define kOverworld_Lobytes_Comp_SIZE (g_asset_sizes[106])
+#define kOverworld_Hibytes_Comp(idx) FindInAssetArray(105, idx)
+#define kOverworld_Lobytes_Comp(idx) FindInAssetArray(106, idx)
 #define kOverworldMapIsSmall ((uint8*)g_asset_ptrs[107])
 #define kOverworldMapIsSmall_SIZE (g_asset_sizes[107])
 #define kOverworldAuxTileThemeIndexes ((uint8*)g_asset_ptrs[108])
@@ -336,4 +329,4 @@ extern uint32 g_asset_sizes[kNumberOfAssets];
 #define kMap8DataToTileAttr_SIZE (g_asset_sizes[163])
 #define kSomeTileAttr ((uint8*)g_asset_ptrs[164])
 #define kSomeTileAttr_SIZE (g_asset_sizes[164])
-#define kAssets_Sig 90, 101, 108, 100, 97, 51, 95, 118, 48, 32, 32, 32, 32, 32, 10, 0, 140, 60, 238, 107, 183, 109, 113, 156, 115, 98, 147, 236, 79, 160, 95, 71, 26, 185, 82, 158, 43, 82, 22, 60, 62, 92, 250, 152, 23, 230, 97, 235
+#define kAssets_Sig 90, 101, 108, 100, 97, 51, 95, 118, 48, 32, 32, 32, 32, 32, 10, 0, 27, 174, 233, 45, 74, 174, 252, 50, 49, 27, 153, 197, 27, 43, 216, 197, 132, 101, 173, 169, 36, 108, 15, 155, 176, 169, 57, 131, 174, 101, 51, 207
--- a/config.c
+++ b/config.c
@@ -442,6 +442,9 @@ static bool HandleIniConfig(int section, const char *key, char *value) {
      return ParseBool(value, &g_config.display_perf_title);
    } else if (StringEqualsNoCase(key, "DisableFrameDelay")) {
      return ParseBool(value, &g_config.disable_frame_delay);
+    } else if (StringEqualsNoCase(key, "Language")) {
+      g_config.language = value;
+      return true;
    }
  } else if (section == 4) {
    if (StringEqualsNoCase(key, "ItemSwitchLR")) {
--- a/config.h
+++ b/config.h
@@ -73,6 +73,7 @@ typedef struct Config {
  char *memory_buffer;
  const char *shader;
  const char *msu_path;
+  const char *language;
 } Config;

 enum {
--- a/load_gfx.c
+++ b/load_gfx.c
@@ -325,7 +325,7 @@ static const int8 kGraphicsLoadSp6[20] = {
 static const uint8 kMirrorWarp_LoadNext_NmiLoad[15] = {0, 14, 15, 16, 17, 0, 0, 0, 0, 0, 0, 18, 19, 20, 0};

 static const uint8 *GetCompSpritePtr(int i) {
-  return kSprGfx + *(uint32 *)(kSprGfx + i * 4);
+  return kSprGfx(i).ptr;
 }

 void ApplyPaletteFilter_bounce() {
@@ -932,7 +932,7 @@ void Graphics_LoadChrHalfSlot() {  // 80e3fa
 }

 void TransferFontToVRAM() {  // 80e556
-  memcpy(&g_zenv.vram[0x7000], kFontData, 0x800 * sizeof(uint16));
+  memcpy(&g_zenv.vram[0x7000], FindIndexInMemblk(kDialogueFont(0), 0).ptr, 0x800 * sizeof(uint16));
 }

 void Do3To4High(uint16 *vram_ptr, const uint8 *decomp_addr) {  // 80e5af
@@ -991,17 +991,17 @@ void LoadCommonSprites() {  // 80e6b7
 int Decomp_spr(uint8 *dst, int gfx) {  // 80e772
  if (gfx < 12)
    gfx = 12; // ensure it wont decode bad sheets.
+  MemBlk blk = kSprGfx(gfx);
  const uint8 *sprite_data = GetCompSpritePtr(gfx);
  // If the size is not 0x600 then it's compressed
-  if (gfx >= 103 || (((uint32 *)kSprGfx)[gfx + 1] - ((uint32 *)kSprGfx)[gfx]) != 0x600)
-    return Decompress(dst, sprite_data);
-  memcpy(dst, sprite_data, 0x600);
+  if (gfx >= 103 || blk.size != 0x600)
+    return Decompress(dst, blk.ptr);
+  memcpy(dst, blk.ptr, 0x600);
  return 0x600;
 }

 int Decomp_bg(uint8 *dst, int gfx) {  // 80e78f
-  const uint8 *p = kBgGfx + *(uint32 *)(kBgGfx + gfx * 4);
-  return Decompress(dst, p);
+  return Decompress(dst, kBgGfx(gfx).ptr);
 }

 int Decompress(uint8 *dst, const uint8 *src) {  // 80e79e
--- a/main.c
+++ b/main.c
@@ -304,6 +304,7 @@ int main(int argc, char** argv) {
                       g_config.extend_y * kPpuRenderFlags_Height240 |
                       g_config.no_sprite_limits * kPpuRenderFlags_NoSpriteLimits;
  ZeldaEnableMsu(g_config.enable_msu);
+  ZeldaSetLanguage(g_config.language);

  if (g_config.fullscreen == 1)
    g_win_flags ^= SDL_WINDOW_FULLSCREEN_DESKTOP;
@@ -865,3 +866,7 @@ static void SwitchDirectory() {
      pos--;
  }
 }
+
+MemBlk FindInAssetArray(int asset, int idx) {
+  return FindIndexInMemblk((MemBlk) { g_asset_ptrs[asset], g_asset_sizes[asset] }, idx);
+}
--- a/messaging.c
+++ b/messaging.c
@@ -101,108 +101,6 @@ static PlayerHandlerFunc *const kDungMapSubmodules[] = {
 };
 static const uint16 kText_Positions[2] = {0x6125, 0x6244};
 static const uint16 kSrmOffsets[4] = {0, 0x500, 0xa00, 0xf00};
-static const uint8 kTextDictionary[] = {
-  0x59, 0x59, 0x59, 0x59,
-  0x59, 0x59, 0x59,
-  0x59, 0x59,
-  0x51, 0x2c, 0x59,
-  0x1a, 0x27, 0x1d, 0x59,
-  0x1a, 0x2b, 0x1e, 0x59,
-  0x1a, 0x25, 0x25, 0x59,
-  0x1a, 0x22, 0x27,
-  0x1a, 0x27, 0x1d,
-  0x1a, 0x2d, 0x59,
-  0x1a, 0x2c, 0x2d,
-  0x1a, 0x27,
-  0x1a, 0x2d,
-  0x1b, 0x25, 0x1e,
-  0x1b, 0x1a,
-  0x1b, 0x1e,
-  0x1b, 0x28,
-  0x1c, 0x1a, 0x27, 0x59,
-  0x1c, 0x21, 0x1e,
-  0x1c, 0x28, 0x26,
-  0x1c, 0x24,
-  0x1d, 0x1e, 0x2c,
-  0x1d, 0x22,
-  0x1d, 0x28,
-  0x1e, 0x27, 0x59,
-  0x1e, 0x2b, 0x59,
-  0x1e, 0x1a, 0x2b,
-  0x1e, 0x27, 0x2d,
-  0x1e, 0x1d, 0x59,
-  0x1e, 0x27,
-  0x1e, 0x2b,
-  0x1e, 0x2f,
-  0x1f, 0x28, 0x2b,
-  0x1f, 0x2b, 0x28,
-  0x20, 0x22, 0x2f, 0x1e, 0x59,
-  0x20, 0x1e, 0x2d,
-  0x20, 0x28,
-  0x21, 0x1a, 0x2f, 0x1e,
-  0x21, 0x1a, 0x2c,
-  0x21, 0x1e, 0x2b,
-  0x21, 0x22,
-  0x21, 0x1a,
-  0x22, 0x20, 0x21, 0x2d, 0x59,
-  0x22, 0x27, 0x20, 0x59,
-  0x22, 0x27,
-  0x22, 0x2c,
-  0x22, 0x2d,
-  0x23, 0x2e, 0x2c, 0x2d,
-  0x24, 0x27, 0x28, 0x30,
-  0x25, 0x32, 0x59,
-  0x25, 0x1a,
-  0x25, 0x28,
-  0x26, 0x1a, 0x27,
-  0x26, 0x1a,
-  0x26, 0x1e,
-  0x26, 0x2e,
-  0x27, 0x51, 0x2d, 0x59,
-  0x27, 0x28, 0x27,
-  0x27, 0x28, 0x2d,
-  0x28, 0x29, 0x1e, 0x27,
-  0x28, 0x2e, 0x27, 0x1d,
-  0x28, 0x2e, 0x2d, 0x59,
-  0x28, 0x1f,
-  0x28, 0x27,
-  0x28, 0x2b,
-  0x29, 0x1e, 0x2b,
-  0x29, 0x25, 0x1e,
-  0x29, 0x28, 0x30,
-  0x29, 0x2b, 0x28,
-  0x2b, 0x1e, 0x59,
-  0x2b, 0x1e,
-  0x2c, 0x28, 0x26, 0x1e,
-  0x2c, 0x1e,
-  0x2c, 0x21,
-  0x2c, 0x28,
-  0x2c, 0x2d,
-  0x2d, 0x1e, 0x2b, 0x59,
-  0x2d, 0x21, 0x22, 0x27,
-  0x2d, 0x1e, 0x2b,
-  0x2d, 0x21, 0x1a,
-  0x2d, 0x21, 0x1e,
-  0x2d, 0x21, 0x22,
-  0x2d, 0x28,
-  0x2d, 0x2b,
-  0x2e, 0x29,
-  0x2f, 0x1e, 0x2b,
-  0x30, 0x22, 0x2d, 0x21,
-  0x30, 0x1a,
-  0x30, 0x1e,
-  0x30, 0x21,
-  0x30, 0x22,
-  0x32, 0x28, 0x2e,
-  0x7, 0x1e, 0x2b,
-  0x13, 0x21, 0x1a,
-  0x13, 0x21, 0x1e,
-  0x13, 0x21, 0x22,
-  0x18, 0x28, 0x2e,
-};
-static const uint16 kTextDictionary_Idx[] = {
-  0, 4, 7, 9, 12, 16, 20, 24, 27, 30, 33, 36, 38, 40, 43, 45, 47, 49, 53, 56, 59, 61, 64, 66, 68, 71, 74, 77, 80, 83, 85, 87, 89, 92, 95, 100, 103, 105, 109, 112, 115, 117, 119, 124, 128, 130, 132, 134, 138, 142, 145, 147, 149, 152, 154, 156, 158, 162, 165, 168, 172, 176, 180, 182, 184, 186, 189, 192, 195, 198, 201, 203, 207, 209, 211, 213, 215, 219, 223, 226, 229, 232, 235, 237, 239, 241, 244, 248, 250, 252, 254, 256, 259, 262, 265, 268, 271, 274
-};
 static const int8 kText_InitializationData[32] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0x39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1c, 4, 0, 0, 0, 0, 0};
 static const uint16 kText_BorderTiles[9] = {0x28f3, 0x28f4, 0x68f3, 0x28c8, 0x387f, 0x68c8, 0xa8f3, 0xa8f4, 0xe8f3};
 static const uint8 kText_CommandLengths[25] = {
@@ -212,16 +110,7 @@ static const uint8 kText_CommandLengths[25] = {
 static const uint8 kVWF_RenderCharacter_setMasks[8] = {0x80, 0x40, 0x20, 0x10, 8, 4, 2, 1};
 static const uint16 kVWF_RenderCharacter_renderPos[3] = {0, 0x2a0, 0x540};
 static const uint16 kVWF_RenderCharacter_linePositions[3] = {0, 0x40, 0x80};
-static const uint8 kVWF_RenderCharacter_widths[99] = {
-  6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 7, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6,
-  6, 6, 3, 5, 6, 3, 7, 6, 6, 6, 6, 5, 6, 6, 6, 7, 7, 7, 7, 6, 6, 4, 6, 6, 6, 6, 6, 6, 6, 6, 3, 7,
-  6, 4, 4, 6, 8, 6, 6, 6, 6, 6, 8, 8, 8, 7, 7, 7, 7, 4, 8, 8, 8, 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8,
-  8, 8, 4,
-};
 static const uint16 kVWF_RowPositions[3] = {0, 2, 4};
-static const uint16 kVWF_LinePositions[3] = {0, 40, 80};
-static const uint16 kVWF_Command7B[4] = {0x24b8, 0x24ba, 0x24bc, 0x24be};
-static const uint16 kVWF_Command7C[8] = {0x24b8, 0x24ba, 0x24bc, 0x24be, 0x24b8, 0x24ba, 0x24bc, 0x24be};
 static const uint16 kText_WaitDurations[16] = {31, 63, 94, 125, 156, 188, 219, 250, 281, 313, 344, 375, 406, 438, 469, 500};
 static PlayerHandlerFunc *const kText_Render[] = {
  &RenderText_Draw_Border,
@@ -336,11 +225,11 @@ static PlayerHandlerFunc *const kModule_Death[16] = {
 static const uint8 kLocationMenuStartPos[3] = {0, 1, 6};
 static void RunInterface();
 const uint8 *GetDungmapFloorLayout() {
-  return kDungMap_FloorLayout + *(uint32 *)(kDungMap_FloorLayout + (cur_palace_index_x2 >> 1) * 4);
+  return kDungMap_FloorLayout(cur_palace_index_x2 >> 1).ptr;
 }

 uint8 GetOtherDungmapInfo(int count) {
-  const uint8 *p = kDungMap_Tiles + *(uint32 *)(kDungMap_Tiles + (cur_palace_index_x2 >> 1) * 4);
+  const uint8 *p = kDungMap_Tiles(cur_palace_index_x2 >> 1).ptr;
  return p[count];
 }

@@ -351,10 +240,6 @@ void DungMap_4() {
    overworld_map_state--;
 }

-const uint8 *GetCurrentTextPtr() {
-  return kDialogueText + kDialogueOffs[dialogue_message_index];
-}
-
 void Module_Messaging_6() {
  assert(0);
 }
@@ -2259,8 +2144,7 @@ void Text_Initialize_initModuleStateLoop() {  // 8ec493
  RenderText_SetDefaultWindowPosition();
  text_tilemap_cur = 0x3980;
  Text_LoadCharacterBuffer();
-  RenderText_Draw_EmptyBuffer();
-  dialogue_msg_dst_offs = 0;
+  memset(messaging_buf, 0, 0x7e0);
  nmi_subroutine_index = 2;
  nmi_disable_core_updates = 2;
 }
@@ -2272,56 +2156,157 @@ void Text_InitVwfState() {  // 8ec4c9
  vwf_line_ptr = 0;
 }

+enum {
+  kTextCommandStart_US = 0x67,
+  kTextDictBase = 0x88,
+
+  kTextCmd_NextPic = 0,
+  kTextCmd_Choose = 1,
+  kTextCmd_Item = 2,
+  kTextCmd_Name = 3,
+  kTextCmd_Window = 4,  // Only used with 2
+  kTextCmd_Number = 5,
+  kTextCmd_Position = 6,
+  kTextCmd_ScrollSpd = 7,
+  kTextCmd_Selchg = 8,
+  kTextCmd_Choose3 = 10,
+  kTextCmd_Choose2 = 11,
+  kTextCmd_Scroll = 12,
+  kTextCmd_1 = 13,
+  kTextCmd_2 = 14,
+  kTextCmd_3 = 15,
+  kTextCmd_Color = 16,
+  kTextCmd_Wait = 17,
+  kTextCmd_Sound = 18,
+  kTextCmd_Speed = 19,
+  kTextCmd_Mark = 20,     // Unused
+  kTextCmd_Mark2 = 21,    // Unused
+  kTextCmd_Clear = 22,    // Unused
+  kTextCmd_Waitkey = 23,
+  kTextCmd_EndMessage = 24,
+
+  kTextCmd_IsLetter = 25, // Pseudo cmd
+};
+
+enum {
+  kTextCmd_EU_Scroll = 0x80,  // frequency 875
+  kTextCmd_EU_Waitkey = 0x81, // frequency 362
+  kTextCmd_EU_1 = 0x82,       // frequency 25
+  kTextCmd_EU_2 = 0x83,       // frequency 496
+  kTextCmd_EU_3 = 0x84,       // frequency 347
+  kTextCmd_EU_Name = 0x85,    // frequency 64
+  kTextCmd_EU_Rest = 0x87,    
+};
+
+#define TEXTCMD_MULTIBYTE(a) ((a) & 1)
+#define TEXTCMD_CMD(a) (((a) >> 1) & 0x1f)
+#define TEXTCMD_PARAM(a) ((a) >> 6)
+#define TEXTCMD_MK(c, x, m) ((c) << 6 | (x) << 1 | (m))
+
+uint32 Text_DecodeCmd(uint8 a, const uint8 *src) {
+  if ((g_zenv.dialogue_flags & 1) == 0) {
+    // US encoding
+    if (a < kTextCommandStart_US)
+      return TEXTCMD_MK(a, kTextCmd_IsLetter, 0);
+    if (a >= 0x80)
+      return TEXTCMD_MK(26, kTextCmd_IsLetter, 0); // could happen when loading snapshots
+    assert(a < 0x80);
+    static const uint8 kText_CommandLengths_US[] = { 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
+    if (kText_CommandLengths_US[a - kTextCommandStart_US])
+      return TEXTCMD_MK(*src, a - kTextCommandStart_US, 1);
+    else
+      return TEXTCMD_MK(0, a - kTextCommandStart_US, 0);
+  } else {
+    // EU encoding
+    if (a < 0x7f)
+      return TEXTCMD_MK(a, kTextCmd_IsLetter, 0);
+    static const uint8 kSoundLut[1] = {45};
+    static const uint8 kReturns_Simple[] = {
+      TEXTCMD_MK(0, kTextCmd_EndMessage, 0),
+      TEXTCMD_MK(0, kTextCmd_Scroll, 0),
+      TEXTCMD_MK(0, kTextCmd_Waitkey, 0),
+      TEXTCMD_MK(0, kTextCmd_1, 0),
+      TEXTCMD_MK(0, kTextCmd_2, 0),
+      TEXTCMD_MK(0, kTextCmd_3, 0),
+      TEXTCMD_MK(0, kTextCmd_Name, 0),
+      TEXTCMD_MK(0, kTextCmd_Name, 0), // Unused
+    };
+    if (a < kTextCmd_EU_Rest)
+      return kReturns_Simple[a - 0x7f];
+    a = *src;
+    switch (a >> 4) {
+    case 0: return TEXTCMD_MK(a & 0xF, kTextCmd_Wait, 1);
+    case 1: return TEXTCMD_MK(a & 0xF, kTextCmd_Color, 1);
+    case 2: return TEXTCMD_MK(a & 0xF, kTextCmd_Number, 1);
+    case 3: return TEXTCMD_MK(a & 0xF, kTextCmd_Speed, 1);
+    case 4: return TEXTCMD_MK(kSoundLut[a & 0xF], kTextCmd_Sound, 1);
+    case 8: {
+      static const uint8 kReturns_Ext[] = {
+        TEXTCMD_MK(0, kTextCmd_Choose, 1),
+        TEXTCMD_MK(0, kTextCmd_Choose2, 1),
+        TEXTCMD_MK(0, kTextCmd_Choose3, 1),
+        TEXTCMD_MK(0, kTextCmd_Selchg, 1),
+        TEXTCMD_MK(0, kTextCmd_Item, 1),
+        TEXTCMD_MK(0, kTextCmd_NextPic, 1),
+        TEXTCMD_MK(2, kTextCmd_Window, 1),
+        TEXTCMD_MK(0, kTextCmd_Position, 1),
+        TEXTCMD_MK(1, kTextCmd_Position, 1),
+      };
+      return kReturns_Ext[a - 0x80];
+    }
+    default:
+      assert(0);
+      return TEXTCMD_MK(26, kTextCmd_IsLetter, 0);
+    }
+  }
+}
+
+// Perform initial parsing of the string, expanding words, processing some commands, etc.
 void Text_LoadCharacterBuffer() {  // 8ec4e2
-  const uint8 *src = GetCurrentTextPtr(), *src_org = src;
+  MemBlk dictionary = FindIndexInMemblk(g_zenv.dialogue_blk, 0);
+  MemBlk dialogue = FindIndexInMemblk(g_zenv.dialogue_blk, 1);
+  MemBlk text_str = FindIndexInMemblk(dialogue, dialogue_message_index);
+  const uint8 *src = text_str.ptr, *src_end = src + text_str.size, *src_org = src;
  uint8 *dst = messaging_text_buffer;
-  dst[0] = dst[1] = 0x7f;
-  dialogue_msg_dst_offs = 0;
-  dialogue_msg_src_offs = 0;
-  for (;;) {
+  while (src < src_end) {
    uint8 c = *src++;
-    if (!(c & 0x80)) {
-      switch (c) {
-      case 0x67 + 3: dst = Text_WritePlayerName(dst); break;
-      case 0x67 + 4:  // RenderText_ExtendedCommand_SetWindowType
-        text_render_state = *src++;
+    if (c >= kTextDictBase) {
+      MemBlk blk = FindIndexInMemblk(dictionary, c - kTextDictBase);
+      memcpy(dst, blk.ptr, blk.size);
+      dst += blk.size;
+      continue;
+    }
+    // Decode the next byte or multibyte character (in case we support that in the future)
+    // This is dependent on the current language cause US / PAL encode commands differently
+    uint32 cmd = Text_DecodeCmd(c, src);
+    switch (TEXTCMD_CMD(cmd)) {
+    case kTextCmd_Name: dst = Text_WritePlayerName(dst); break;
+    case kTextCmd_Window:  // RenderText_ExtendedCommand_SetWindowType
+      text_render_state = TEXTCMD_PARAM(cmd);
      break;
-      case 0x67 + 5: {  // Text_WritePreloadedNumber
-        uint8 t = *src++;
-        uint8 v = byte_7E1CF2[t >> 1];
+    case kTextCmd_Number: {  // Text_WritePreloadedNumber
+      uint8 t = TEXTCMD_PARAM(cmd);
+      uint8 v = dialogue_number[t >> 1];
      *dst++ = 0x34 + ((t & 1) ? v >> 4 : v & 0xf);
      break;
    }
-      case 0x67 + 6:
-        text_msgbox_topleft = kText_Positions[*src++];
+    case kTextCmd_Position:
+      text_msgbox_topleft = kText_Positions[TEXTCMD_PARAM(cmd)];
      break;
-      case 0x67 + 16:
-        text_tilemap_cur = ((0x387F & 0xe300) | 0x180) | (*src++ << 10) & 0x3c00;
+    case kTextCmd_Color:
+      text_tilemap_cur = ((0x387F & 0xe300) | 0x180) | (TEXTCMD_PARAM(cmd) << 10) & 0x3c00;
      break;
-      case 0x67 + 7:
-      case 0x67 + 17:
-      case 0x67 + 18:
-      case 0x67 + 19:
-        *dst++ = c;
-        *dst++ = *src++;
-        break;
-      case 0x7f:
-        dialogue_msg_dst_offs = dst - messaging_text_buffer;
-        dialogue_msg_src_offs = src - src_org - 1;
-        *dst = 0x7f;
-        return; // done
    default:
+      // This combination is handled when rendering instead of here
      *dst++ = c;
+      if (TEXTCMD_MULTIBYTE(cmd))
+        *dst++ = *src;
      break;
    }
-    } else {
-      // dictionary
-      c -= 0x88;
-      int idx = kTextDictionary_Idx[c], num = kTextDictionary_Idx[c + 1] - idx;
-      memcpy(dst, &kTextDictionary[idx], num);
-      dst += num;
-    }
+    src += TEXTCMD_MULTIBYTE(cmd);
  }
+  *dst = 0x7f;
+  dialogue_msg_read_pos = 0;
 }

 uint8 *Text_WritePlayerName(uint8 *p) {  // 8ec5b3
@@ -2396,133 +2381,103 @@ void RenderText_Draw_CharacterTilemap() {  // 8ec97d
 }

 void RenderText_Draw_MessageCharacters() {  // 8ec984
-restart:
-  if (dialogue_msg_src_offs >= 99) {
-    dialogue_msg_src_offs = 0;
-    text_next_position = 0;
-  } else if (dialogue_msg_src_offs >= 59 && dialogue_msg_src_offs < 80) {
-    dialogue_msg_src_offs = 0x50;
-    text_next_position = 0;
-  } else if (dialogue_msg_src_offs >= 19 && dialogue_msg_src_offs < 40) {
-    dialogue_msg_src_offs = 0x28;
-    text_next_position = 0;
-  }
-  if ((dialogue_msg_src_offs == 18 || dialogue_msg_src_offs == 58 || dialogue_msg_src_offs == 98) && (text_next_position & 7) >= 6) {
-    dialogue_msg_src_offs++;
-    goto restart;
-  }
-  int t = (messaging_text_buffer[dialogue_msg_dst_offs] & 0x7f) - 0x66;
-  if (t < 0)
-    t = 0;
-  switch (t) {
-  case 0:  // RenderText_Draw_RenderCharacter
-    switch (vwf_line_mode < 2 ? vwf_line_mode : 2) {
-    case 0:  // RenderText_Draw_RenderCharacter_All
-      RenderText_Draw_RenderCharacter_All();
-      break;
-    case 1:  // VWF_RenderSingle
-      VWF_RenderSingle();
-      break;
-    default:
-      vwf_line_mode--;
+RESTART:;
+  uint32 cmd = Text_DecodeCmd(messaging_text_buffer[dialogue_msg_read_pos],
+      &messaging_text_buffer[dialogue_msg_read_pos + 1]);
+
+  switch (TEXTCMD_CMD(cmd)) {
+  case kTextCmd_IsLetter:
+    if (vwf_line_speed_cur >= 2) {
+      vwf_line_speed_cur--;
      break;
    }
+    VWF_RenderSingle(TEXTCMD_PARAM(cmd));
+    dialogue_msg_read_pos += 1 + TEXTCMD_MULTIBYTE(cmd);
+    if (vwf_line_speed_cur == 0)
+      goto RESTART;
    break;
-  case 1:  // RenderText_Draw_NextImage
+  case kTextCmd_NextPic:  // RenderText_Draw_NextImage
    if (main_module_index == 20) {
      PaletteFilterHistory();
      if (!BYTE(palette_filter_countdown))
-        dialogue_msg_dst_offs++;
+        goto COMMAND_DONE;
    } else {
-      dialogue_msg_dst_offs++;
+      goto COMMAND_DONE;
    }
    break;
-  case 2:  // RenderText_Draw_Choose2LowOr3
+  case kTextCmd_Choose:  // RenderText_Draw_Choose2LowOr3
    RenderText_Draw_Choose2LowOr3();
    break;
-  case 3:  // RenderText_Draw_ChooseItem
+  case kTextCmd_Item:  // RenderText_Draw_ChooseItem
    RenderText_Draw_ChooseItem();
    break;
-  case 4:  //
-  case 5:  //
-  case 6:  //
-  case 7:  //
-  case 8:  // RenderText_Draw_Ignore
-    byte_7E1CEA = messaging_text_buffer[dialogue_msg_dst_offs + 1];
-    dialogue_msg_dst_offs += 2;
-    break;
-  case 9:   // RenderText_Draw_Choose2HiOr3
-    RenderText_Draw_Choose2HiOr3();
-    break;
-  case 10:  //
+  case kTextCmd_Name:
+  case kTextCmd_Window:
+  case kTextCmd_Number:
+  case kTextCmd_Position:
+  case kTextCmd_Color:
+    // These get handled in Text_LoadCharacterBuffer
    assert(0);
    break;
-  case 11:  // RenderText_Draw_Choose3
+  // These are unused
+  case kTextCmd_Mark:
+  case kTextCmd_Mark2:
+  case kTextCmd_Clear:
+    assert(0);
+    break;
+  case kTextCmd_ScrollSpd:
+    dialogue_scroll_speed = TEXTCMD_PARAM(cmd);
+    goto COMMAND_DONE;
+  case kTextCmd_Selchg:   // RenderText_Draw_Choose2HiOr3
+    RenderText_Draw_Choose2HiOr3();
+    break;
+  case kTextCmd_Choose3:  // RenderText_Draw_Choose3
    RenderText_Draw_Choose3();
    break;
-  case 12:  // RenderText_Draw_Choose1Or2
+  case kTextCmd_Choose2:  // RenderText_Draw_Choose1Or2
    RenderText_Draw_Choose1Or2();
    break;
-  case 13:  // RenderText_Draw_Scroll
-    RenderText_Draw_Scroll();
+  case kTextCmd_Scroll:  // RenderText_Draw_Scroll
+    if (RenderText_Draw_Scroll())
+      goto COMMAND_DONE;
    break;
-  case 14:  //
-  case 15:  //
-  case 16:  // VWF_SetLine
-    dialogue_msg_src_offs = kVWF_LinePositions[(t + 2) & 3];
-    vwf_curline = kVWF_RowPositions[(t + 2) & 3];
+  case kTextCmd_1:  //
+  case kTextCmd_2:  //
+  case kTextCmd_3:  // VWF_SetLine
+    vwf_curline = kVWF_RowPositions[TEXTCMD_CMD(cmd) - kTextCmd_1];
    vwf_flag_next_line = 1;
-    dialogue_msg_dst_offs++;
-    text_next_position = 0;
-    break;
-  case 17:  // RenderText_Draw_SetColor
-    byte_7E1CDC &= ~0x1c;
-    byte_7E1CDC |= (messaging_text_buffer[dialogue_msg_dst_offs + 1] & 7) << 2;
-    dialogue_msg_dst_offs += 2;
-    break;
-  case 18:  // RenderText_Draw_Wait
-    switch (joypad1L_last & 0x80 ? 1 : text_wait_countdown >= 2 ? 2 : text_wait_countdown) {
+    goto COMMAND_DONE;
+  case kTextCmd_Wait:  // RenderText_Draw_Wait
+    switch (joypad1L_last & 0x80 ? 1 : text_wait_countdown) {
    case 0:
-      text_wait_countdown = kText_WaitDurations[messaging_text_buffer[dialogue_msg_dst_offs + 1] & 0xf] - 1;
+      text_wait_countdown = kText_WaitDurations[TEXTCMD_PARAM(cmd)] - 1;
      break;
    case 1:
-      dialogue_msg_dst_offs += 2;
      BYTE(text_wait_countdown) = 0;
-      break;
-    case 2:
+      goto COMMAND_DONE;
+    default:
      text_wait_countdown--;
      break;
    }
    break;
-  case 19:  // RenderText_Draw_PlaySfx
-    sound_effect_2 = messaging_text_buffer[dialogue_msg_dst_offs + 1];
-    dialogue_msg_dst_offs += 2;
-    break;
-  case 20:  // RenderText_Draw_SetSpeed
-    vwf_line_speed = vwf_line_mode = messaging_text_buffer[dialogue_msg_dst_offs + 1];
-    dialogue_msg_dst_offs += 2;
-    break;
-  case 21:  // RenderText_Draw_Command7B
-    RenderText_Draw_Command7B();
-    break;
-  case 22:  // RenderText_Draw_ABunchOfSpaces
-    RenderText_Draw_ABunchOfSpaces();
-    break;
-  case 23:  // RenderText_Draw_EmptyBuffer
-    RenderText_Draw_EmptyBuffer();
-    break;
-  case 24:  // RenderText_Draw_PauseForInput
+  case kTextCmd_Sound:  // RenderText_Draw_PlaySfx
+    sound_effect_2 = TEXTCMD_PARAM(cmd);
+    goto COMMAND_DONE;
+  case kTextCmd_Speed:  // RenderText_Draw_SetSpeed
+    vwf_line_speed = vwf_line_speed_cur = TEXTCMD_PARAM(cmd);
+    goto COMMAND_DONE;
+  case kTextCmd_Waitkey:  // RenderText_Draw_PauseForInput
    if (text_wait_countdown2 != 0) {
      if (--text_wait_countdown2 == 1)
        sound_effect_2 = 36;
    } else {
      if ((filtered_joypad_H | filtered_joypad_L) & 0xc0) {
-        dialogue_msg_dst_offs++;
        text_wait_countdown2 = 28;
+        goto COMMAND_DONE;
      }
    }
    break;
-  case 25:  // RenderText_Draw_Terminate
+  case kTextCmd_EndMessage:  // RenderText_Draw_Terminate
    if (text_wait_countdown2 != 0) {
      if (--text_wait_countdown2 == 1)
        sound_effect_2 = 36;
@@ -2534,6 +2489,9 @@ restart:
    }
    break;
  }
+  if (0) COMMAND_DONE: {
+    dialogue_msg_read_pos += 1 + TEXTCMD_MULTIBYTE(cmd);
+  }
  nmi_subroutine_index = 2;
  nmi_disable_core_updates = 2;
 }
@@ -2551,35 +2509,26 @@ void RenderText_Draw_Finish() {  // 8eca35
  main_module_index = saved_module_for_menu;
 }

-void RenderText_Draw_RenderCharacter_All() {  // 8eca99
-  VWF_RenderSingle();
-  if (dialogue_msg_src_offs != 19 && dialogue_msg_src_offs != 59 && dialogue_msg_src_offs != 99)
-    RenderText_Draw_MessageCharacters();
-}
-
-void VWF_RenderSingle() {  // 8ecab8
-  uint8 t = messaging_text_buffer[dialogue_msg_dst_offs];
-  if (t != 0x59)
+void VWF_RenderSingle(int c) {  // 8ecab8
+  if (c != 0x59)
    sound_effect_2 = 12;
-  VWF_RenderCharacter();
-  vwf_line_mode = vwf_line_speed;
-}
+  vwf_line_speed_cur = vwf_line_speed;

-void VWF_RenderCharacter() {  // 8ecb5e
  if (vwf_flag_next_line) {
    vwf_line_ptr = kVWF_RenderCharacter_renderPos[vwf_curline>>1];
    vwf_var1 = kVWF_RenderCharacter_linePositions[vwf_curline>>1];
    vwf_flag_next_line = 0;
  }
-  uint8 c = messaging_text_buffer[dialogue_msg_dst_offs];
-  uint8 width = kVWF_RenderCharacter_widths[c];
+  
+  const uint8 *kFontData = FindIndexInMemblk(g_zenv.dialogue_font_blk, 0).ptr;
+  uint8 width = FindIndexInMemblk(g_zenv.dialogue_font_blk, 1).ptr[c];
+
  int i = vwf_var1++;
  uint8 arrval = vwf_arr[i];
  vwf_arr[i + 1] = arrval + width;
  uint16 r10 = (c & 0x70) * 2 + (c & 0xf);
  uint16 r0 = arrval * 2;
-  const uint16 *const kTextBits = kFontData;
-  const uint16 *src2 = kTextBits + r10 * 8;
+  const uint16 *src2 = (uint16*)(kFontData + r10 * 16);
  uint8 *mbuf = (uint8 *)messaging_buf;
  for (int i = 0; i != 16; i += 2) {
    uint16 r4 = *src2++;
@@ -2604,7 +2553,7 @@ void VWF_RenderCharacter() {  // 8ecb5e
      WORD(mbuf[x + 0]) = r4;
  }
  uint16 r8 = vwf_line_ptr + 0x150;
-  const uint16 *src3 = kTextBits + (r10 + 16) * 8;
+  const uint16 *src3 = (uint16*)(kFontData + (r10 + 16) * 16);
  for (int i = 0; i != 16; i += 2) {
    uint16 r4 = *src3++;
    int y = r8 + r0;
@@ -2627,7 +2576,6 @@ void VWF_RenderCharacter() {  // 8ecb5e
    if (r4 != 0)
      WORD(mbuf[x + 0]) = r4;
  }
-  dialogue_msg_dst_offs++;
 }

 void RenderText_Draw_Choose2LowOr3() {  // 8ecd1a
@@ -2645,8 +2593,6 @@ void RenderText_Draw_Choose2LowOr3() {  // 8ecd1a
    sound_effect_2 = 32;
    dialogue_message_index = t + 1;
    Text_LoadCharacterBuffer();
-    text_next_position = 0;
-    dialogue_msg_dst_offs = 0;
    Text_InitVwfState();
  }
 }
@@ -2719,8 +2665,6 @@ void RenderText_Draw_Choose2HiOr3() {  // 8ece83
    sound_effect_2 = 32;
    dialogue_message_index = t + 11;
    Text_LoadCharacterBuffer();
-    text_next_position = 0;
-    dialogue_msg_dst_offs = 0;
    Text_InitVwfState();
  }
 }
@@ -2743,8 +2687,6 @@ void RenderText_Draw_Choose3() {  // 8ecef7
    sound_effect_2 = 32;
    dialogue_message_index = choice + 6;
    Text_LoadCharacterBuffer();
-    text_next_position = 0;
-    dialogue_msg_dst_offs = 0;
    Text_InitVwfState();
  }
 }
@@ -2765,14 +2707,12 @@ void RenderText_Draw_Choose1Or2() {  // 8ecf72
    sound_effect_2 = 32;
    dialogue_message_index = t + 9;
    Text_LoadCharacterBuffer();
-    text_next_position = 0;
-    dialogue_msg_dst_offs = 0;
    Text_InitVwfState();
  }
 }

-void RenderText_Draw_Scroll() {  // 8ecfe2
-  uint8 r2 = byte_7E1CEA;
+bool RenderText_Draw_Scroll() {  // 8ecfe2
+  uint8 r2 = dialogue_scroll_speed;
  do {
    for (int i = 0; i < 0x7e0; i += 16) {
      uint16 *p = (uint16 *)((uint8 *)messaging_buf + i);
@@ -2790,43 +2730,12 @@ void RenderText_Draw_Scroll() {  // 8ecfe2
      p[i] = 0;

    if ((++byte_7E1CDF & 0xf) == 0) {
-      dialogue_msg_dst_offs++;
-      dialogue_msg_src_offs = 80;
      vwf_curline = 4;
      vwf_flag_next_line = 1;
-      text_next_position = 0;
-      break;
+      return true;
    }
  } while (r2--);
-}
-
-void RenderText_Draw_Command7B() {  // 8ed18d
-  int i = (messaging_text_buffer[dialogue_msg_dst_offs + 1] & 0x7f);
-  int j = dialogue_msg_src_offs;
-  WORD(g_ram[0x2D8 + j]) = kVWF_Command7B[i * 2 + 0];
-  WORD(g_ram[0x300 + j]) = kVWF_Command7B[i * 2 + 1];
-  dialogue_msg_src_offs = j + 2;
-  dialogue_msg_dst_offs += 2;
-  RenderText_Draw_MessageCharacters();
-}
-
-void RenderText_Draw_ABunchOfSpaces() {  // 8ed1bd
-  int i = (messaging_text_buffer[dialogue_msg_dst_offs + 1] & 0x7f);
-  int j = dialogue_msg_src_offs;
-  WORD(g_ram[0x2D8 + j]) = kVWF_Command7C[i * 4 + 0];
-  WORD(g_ram[0x300 + j]) = kVWF_Command7C[i * 4 + 1];
-  WORD(g_ram[0x2DA + j]) = kVWF_Command7C[i * 4 + 2];
-  WORD(g_ram[0x302 + j]) = kVWF_Command7C[i * 4 + 3];
-  dialogue_msg_src_offs = j + 4;
-  dialogue_msg_dst_offs += 2;
-  RenderText_Draw_MessageCharacters();
-}
-
-void RenderText_Draw_EmptyBuffer() {  // 8ed1f9
-  memset(messaging_buf, 0, 0x7e0);
-  dialogue_msg_src_offs = 0;
-  dialogue_msg_dst_offs++;
-  text_next_position = 0;
+  return false;
 }

 void RenderText_SetDefaultWindowPosition() {  // 8ed280
@@ -2875,28 +2784,19 @@ void RenderText_Refresh() {  // 8ed307
  nmi_load_bg_from_vram = 1;
 }

+
 void Text_GenerateMessagePointers() {  // 8ed3eb
-  const uint8 *src = kDialogueText;
+  // This is not actually used. Only for ram compat.
+  MemBlk dialogue = FindIndexInMemblk(g_zenv.dialogue_blk, 1);
  uint32 p = 0x1c8000;
  uint8 *dst = kTextDialoguePointers;
-  for (int i = 0;; i++) {
+  for (int i = 0; i < 398; i++) {
    if (i == 359)
      p = 0xedf40;
    WORD(dst[0]) = p;
    dst[2] = p >> 16;
    dst += 3;
-
-    if (i == 397)
-      break;
-
-    for (;;) {
-      int j = *src;
-      int len = (j >= 0x67 && j < 0x80) ? kText_CommandLengths[j - 0x67] : 1;
-      src += len;
-      p += len;
-      if (j == 0x7f)
-        break;
-    }
+    p += (uint32)FindIndexInMemblk(dialogue, i).size + 1;
  }
 }

--- a/messaging.h
+++ b/messaging.h
@@ -4,7 +4,6 @@
 const uint8 *GetDungmapFloorLayout();
 uint8 GetOtherDungmapInfo(int count);
 void DungMap_4();
-const uint8 *GetCurrentTextPtr();
 void Module_Messaging_6();
 void OverworldMap_SetupHdma();
 const uint8 *GetLightOverworldTilemap();
@@ -108,9 +107,7 @@ void RenderText_Draw_BorderIncremental();
 void RenderText_Draw_CharacterTilemap();
 void RenderText_Draw_MessageCharacters();
 void RenderText_Draw_Finish();
-void RenderText_Draw_RenderCharacter_All();
 void VWF_RenderSingle();
-void VWF_RenderCharacter();
 void RenderText_Draw_Choose2LowOr3();
 void RenderText_Draw_ChooseItem();
 void RenderText_FindYItem_Previous();
@@ -119,10 +116,7 @@ void RenderText_DrawSelectedYItem();
 void RenderText_Draw_Choose2HiOr3();
 void RenderText_Draw_Choose3();
 void RenderText_Draw_Choose1Or2();
-void RenderText_Draw_Scroll();
-void RenderText_Draw_Command7B();
-void RenderText_Draw_ABunchOfSpaces();
-void RenderText_Draw_EmptyBuffer();
+bool RenderText_Draw_Scroll();
 void RenderText_SetDefaultWindowPosition();
 void RenderText_DrawBorderInitialize();
 uint16 *RenderText_DrawBorderRow(uint16 *d, int y);
--- a/other/make_text_dict.py
+++ b/other/make_text_dict.py
@@ -0,0 +1,117 @@
+import array
+
+memos = {}
+memoslist = []
+def memo(s):
+  m = memos.get(s)
+  if m == None:
+    m = len(memoslist)
+    memos[s] = m
+    memoslist.append(s)
+  return m
+
+def tos(s): return "".join(memoslist[c] for c in s)
+
+lines = []
+for line in open('dialogue.txt', 'r').read().splitlines():
+  line = line.split(': ')[1]
+
+  r = array.array('H')
+
+  i = 0
+  while i < len(line):
+    if line[i] == '[':
+      j = line.index(']', i + 1)
+      r.append(memo(line[i:j+1]))
+      i = j + 1
+    else:
+      r.append(memo(line[i]))
+      i += 1
+      
+  #print(repr(line))
+  #print(r)
+  lines.append(list(r))
+import collections
+
+
+def find_all_ngrams(lines, N, cost):
+  ctr = collections.Counter()
+  for line in lines:
+    for i in range(len(line) - N + 1):
+      if line[i] != line[i+1]:
+        ctr[tuple(line[i:i+N])] += 1
+  r = list((b, a) for a, b in ctr.items() if b >= 2)
+  if len(r) == 0:
+    return None, 0
+  b, a = max(r)
+  return a, (N - cost) * b - N - 2 # 2 is the overhead of the dict
+
+def find_best_ngram(cost):
+  best_score=0
+
+  for i in range(2, 32):
+    text, score = find_all_ngrams(lines, i, cost)
+    if score > best_score:
+      best_score = score
+      best_text = text
+  return best_score, best_text
+
+def update_ngrams(lines, replace_from, replace_to):
+  for line in lines:
+    for i in range(len(line) - len(replace_from) + 1):
+      if tuple(line[i:i+len(replace_from)]) == replace_from:
+        line[i:i+len(replace_from)] = replace_to
+
+total_gain = 0
+
+original_tokens = sum(len(line) for line in lines)
+
+
+kTextDictionary_US = [
+'    ', '   ', '  ', "'s ", 'and ', 
+'are ', 'all ', 'ain', 'and', 'at ', 
+'ast', 'an', 'at', 'ble', 'ba', 
+'be', 'bo', 'can ', 'che', 'com', 
+'ck', 'des', 'di', 'do', 'en ', 
+'er ', 'ear', 'ent', 'ed ', 'en', 
+'er', 'ev', 'for', 'fro', 'give ', 
+'get', 'go', 'have', 'has', 'her', 
+'hi', 'ha', 'ight ', 'ing ', 'in', 
+'is', 'it', 'just', 'know', 'ly ', 
+'la', 'lo', 'man', 'ma', 'me', 
+'mu', "n't ", 'non', 'not', 'open', 
+'ound', 'out ', 'of', 'on', 'or', 
+'per', 'ple', 'pow', 'pro', 're ', 
+'re', 'some', 'se', 'sh', 'so', 
+'st', 'ter ', 'thin', 'ter', 'tha', 
+'the', 'thi', 'to', 'tr', 'up', 
+'ver', 'with', 'wa', 'we', 'wh', 
+'wi', 'you', 'Her', 'Tha', 'The', 
+'Thi', 'You', 
+]
+
+
+dictionary = []
+
+for i in range(111+256):
+  best_score, best_text = find_best_ngram(1 if i < 111 else 2)
+  if best_score == 0:
+    break
+
+  total_gain += best_score
+
+  print(f'Removed best bigram "{tos(best_text)}" with gain {best_score}, total gain {total_gain} / {original_tokens}')
+
+  dictionary.append(best_text)
+
+  update_ngrams(lines, best_text, [memo('{%s}' % tos(best_text))])
+
+#print('kTextDictionary_NEW = [')
+#for i, d in enumerate(dictionary):
+#  repl = tos(d).replace('{', '').replace('}', '')
+#  print(f'{repr(repl)},')
+#print(']')
+
+
+for i, a in enumerate(lines):
+  print(i, tos(a))
--- a/overworld.c
+++ b/overworld.c
@@ -2449,11 +2449,11 @@ void Overworld_DecompressAndDrawAllQuadrants() {  // 82f54a
 }

 static const uint8 *GetOverworldHibytes(int i) {
-  return kOverworld_Hibytes_Comp + *(uint32 *)(kOverworld_Hibytes_Comp + i * 4);
+  return kOverworld_Hibytes_Comp(i).ptr;
 }

 static const uint8 *GetOverworldLobytes(int i) {
-  return kOverworld_Lobytes_Comp + *(uint32 *)(kOverworld_Lobytes_Comp + i * 4);
+  return kOverworld_Lobytes_Comp(i).ptr;
 }


--- a/sprite_main.c
+++ b/sprite_main.c
@@ -1058,8 +1058,8 @@ void FortuneTeller_LightOrDarkWorld(int k, bool dark_world) {
    if (!dark_world)
      sprite_graphics[k] = 0;
    j = kFortuneTeller_Prices[sprite_A[k]>>1];
-    byte_7E1CF2[0] = (j / 10) | (j % 10)<< 4 ;
-    byte_7E1CF2[1] = 0;
+    dialogue_number[0] = (j / 10) | (j % 10)<< 4 ;
+    dialogue_number[1] = 0;
    Sprite_ShowMessageUnconditional(0xf4);
    sprite_ai_state[k]++;
    break;
@@ -11396,7 +11396,7 @@ void Sprite_HappinessPond(int k) {  // 86c44c
    if (choice_in_multiselect_box == 0) {
      int i = (link_bomb_upgrades | link_arrow_upgrades) != 0;
      sprite_graphics[k] = i * 2;
-      WORD(byte_7E1CF2[0]) = WORD(kHappinessPondCostHex[i * 2]);
+      WORD(dialogue_number[0]) = WORD(kHappinessPondCostHex[i * 2]);
      Sprite_ShowMessageUnconditional(0x14e);
      sprite_ai_state[k] = 2;
      flag_is_link_immobilized = 1;
@@ -11409,7 +11409,7 @@ show_later_msg:
    break;
  case 2: {
    int i = sprite_graphics[k] + choice_in_multiselect_box;
-    byte_7E1CF2[1] = kHappinessPondCostHex[i];
+    dialogue_number[1] = kHappinessPondCostHex[i];
    if (link_rupees_goal < kHappinessPondCost[i]) {
      goto show_later_msg;
    } else {
@@ -11430,7 +11430,7 @@ show_later_msg:
      sprite_ai_state[k] = 5;
      return;
    }
-    byte_7E1CF2[0] = (link_rupees_in_pond / 10) * 16 + (link_rupees_in_pond % 10);
+    dialogue_number[0] = (link_rupees_in_pond / 10) * 16 + (link_rupees_in_pond % 10);
    sprite_ai_state[k] = 4;
    break;
  }
@@ -11481,7 +11481,7 @@ show_later_msg:
    int i = link_bomb_upgrades + 1;
    if (i != 8) {
      link_bomb_upgrades = i;
-      byte_7E1CF2[0] = link_bomb_filler = kMaxBombsForLevelHex[i];
+      dialogue_number[0] = link_bomb_filler = kMaxBombsForLevelHex[i];
      Sprite_ShowMessageUnconditional(0x96);
    } else {
      link_rupees_goal += 100;
@@ -11518,7 +11518,7 @@ show_later_msg:
    int i = link_arrow_upgrades + 1;
    if (i != 8) {
      link_arrow_upgrades = i;
-      byte_7E1CF2[0] = link_arrow_filler = kMaxArrowsForLevelHex[i];
+      dialogue_number[0] = link_arrow_filler = kMaxArrowsForLevelHex[i];
      Sprite_ShowMessageUnconditional(0x97);
    } else {
      link_rupees_goal += 100;
@@ -12947,8 +12947,8 @@ void Sprite_MazeGameGuy(int k) {  // 8dcbf2
    t %= 60;
    int c = t / 10;
    t %= 10;
-    byte_7E1CF2[0] = t | c << 4;
-    byte_7E1CF2[1] = b | a << 4;
+    dialogue_number[0] = t | c << 4;
+    dialogue_number[1] = b | a << 4;
    t = Sprite_ShowMessageOnContact(k, 0xcb);
    if (t & 0x100) {
      sprite_D[k] = sprite_head_dir[k] = (uint8)t;
--- a/tables/.gitignore
+++ b/tables/.gitignore
@@ -1,5 +1,5 @@
 zelda3.sfc
-dialogue.txt
+dialogue*.txt
 generated_*.h
 linksprite.png
 map32_to_map16.txt
@@ -9,3 +9,6 @@ sfx.txt
 sound_ending.txt
 sound_indoor.txt
 sound_intro.txt
+/hud_icons.png
+/font*.png
+
--- a/tables/compile_resources.py
+++ b/tables/compile_resources.py
@@ -9,13 +9,7 @@ import array, hashlib, struct
 from util import cache
 import sprite_sheets
 import argparse
-
-parser = argparse.ArgumentParser(description='Compile resources.')
-parser.add_argument('rom', nargs='?', help='the rom file')
-parser.add_argument('--sprites-from-png', action='store_true', help='Use the sprite images from the .PNG files')
-args = parser.parse_args()
-
-ROM = util.LoadedRom(args.rom)
+import os

 def flatten(xss):
    return [x for xs in xss for x in xs]
@@ -41,6 +35,10 @@ def add_asset_int16(name, data):
  assert name not in assets
  assets[name] = ('int16', bytes(array.array('h', data)))

+def add_asset_packed(name, data):
+  assert name not in assets
+  assets[name] = ('packed', pack_arrays(data))
+
 def print_map32_to_map16():
  tab = {}
  for line in open('map32_to_map16.txt'):
@@ -68,20 +66,12 @@ def print_map32_to_map16():
  add_asset_uint8('kMap32ToMap16_2', res[2])
  add_asset_uint8('kMap32ToMap16_3', res[3])

-  
-def print_dialogue():
-  new_r = []
-  offs = []
-  for line in open('dialogue.txt'):
-    line = line.strip('\n')
+def compress_dialogue(fname, lang):
+  lines = []
+  for line in open(fname, encoding='utf8').read().splitlines():
    a, b = line.split(': ', 1)
-    index = int(a)
-    offs.append(len(new_r))
-    r = text_compression.compress_string(b)
-    new_r.extend(r)
-
-  add_asset_uint16('kDialogueOffs', offs)
-  add_asset_uint8('kDialogueText', new_r)
+    lines.append(b)
+  return text_compression.compress_strings(lines, lang)

 def compress_store(r):
  rr = []
@@ -95,14 +85,20 @@ def compress_store(r):
  rr.append(0xff)
  return rr
  
-def pack_u32_arrays(arr):
-  all_offs, offs = [], len(arr) * 4
-  for i in range(len(arr)):
-    all_offs.append(offs)
+# Pack arrays and determine automatically the index size
+def pack_arrays(arr):
+  if len(arr) == 0:
+    return b''
+  all_offs, offs = [], 0
+  for i in range(len(arr) - 1):
    offs += len(arr[i])
-  return b''.join([struct.pack('I', i) for i in all_offs] + arr)
+    all_offs.append(offs)
+  if offs < 65536 and len(arr) <= 8192:
+    return b''.join([struct.pack('H', i) for i in all_offs] + arr + [struct.pack('H', len(arr) - 1)])
+  else:
+    return b''.join([struct.pack('I', i) for i in all_offs] + arr + [struct.pack('H', 8192 + len(arr) - 1)])

-def print_images():
+def print_images(args):
  sprsheet = sprite_sheets.load_sprite_sheets() if args.sprites_from_png else None

  all = []
@@ -114,25 +110,45 @@ def print_images():
    else:
      decomp, comp_len = util.decomp(tables.kCompSpritePtrs[i], ROM.get_byte, False, True)
      all.append(bytes(ROM.get_bytes(tables.kCompSpritePtrs[i], comp_len)))
-  add_asset_uint8('kSprGfx', pack_u32_arrays(all))
+  add_asset_packed('kSprGfx', all)

  all = []
  for i in range(len(tables.kCompBgPtrs)):
    decomp, comp_len = util.decomp(tables.kCompBgPtrs[i], ROM.get_byte, False, True)
    all.append(bytes(ROM.get_bytes(tables.kCompBgPtrs[i], comp_len)))
-  add_asset_uint8('kBgGfx', pack_u32_arrays(all))
+  add_asset_packed('kBgGfx', all)

+def print_dialogue(args):
+  from text_compression import kDialogueFilenames

+  languages = ['us']
+  if args.languages:
+    for a in args.languages.split(','):
+      if a in languages or a not in kDialogueFilenames:
+        raise Exception(f'Language {a} is not valid')
+      if not os.path.exists(kDialogueFilenames[a]):
+        raise Exception(f'{kDialogueFilenames[a]} not found. You need to extract it with --extract-dialogue using the ROM of that language.')
+      languages.append(a)

-def print_misc():
+  all_langs, all_fonts, mappings = [], [], []
+  for i, lang in enumerate(languages):
+    dict_packed = pack_arrays(text_compression.encode_dictionary(lang))
+    dialogue_packed = pack_arrays(compress_dialogue(kDialogueFilenames[lang], lang))
+    all_langs.append(pack_arrays([dict_packed, dialogue_packed]))
+    font_data, font_width = sprite_sheets.encode_font_from_png(lang)
+    all_fonts.append(pack_arrays([font_data, font_width]))
+    mappings.append(pack_arrays([lang.encode('utf8'), bytearray([i, i, i != 0])]))
+  add_asset_packed('kDialogue', all_langs)
+  add_asset_packed('kDialogueFont', all_fonts)
+  add_asset_packed('kDialogueMap', mappings)
+
+def print_misc(args):
  add_asset_uint8('kOverworldMapGfx', ROM.get_bytes(0x18c000, 0x4000))
  add_asset_uint8('kLightOverworldTilemap', ROM.get_bytes(0xac727, 4096))
  add_asset_uint8('kDarkOverworldTilemap', ROM.get_bytes(0xaD727, 1024))

  add_asset_uint16('kPredefinedTileData', ROM.get_words(0x9B52, 6438))

-  add_asset_uint16('kFontData', ROM.get_words(0xe8000, 2048))
-
  add_asset_uint16('kMap16ToMap8', ROM.get_words(0x8f8000, 3752 * 4))

  add_asset_uint8('kGeneratedWishPondItem', ROM.get_bytes(0x888450, 256))
@@ -175,14 +191,14 @@ def print_overworld():
    addr = ROM.get_24(0x82F94D + i * 3)
    decomp, comp_len = util.decomp(addr, ROM.get_byte, True, True)
    r.append(bytes(ROM.get_bytes(addr, comp_len)))
-  add_asset_uint8('kOverworld_Hibytes_Comp', pack_u32_arrays(r))
+  add_asset_packed('kOverworld_Hibytes_Comp', r)

  r = []
  for i in range(160):
    addr = ROM.get_24(0x82FB2D + i * 3)
    decomp, comp_len = util.decomp(addr, ROM.get_byte, True, True)
    r.append(bytes(ROM.get_bytes(addr, comp_len)))
-  add_asset_uint8('kOverworld_Lobytes_Comp', pack_u32_arrays(r))
+  add_asset_packed('kOverworld_Lobytes_Comp', r)

 def is_area_head(i):
  return i >= 128 or ROM.get_byte(0x82A5EC + (i & 63)) == (i & 63)
@@ -430,8 +446,8 @@ def print_dungeon_map():
    b = ROM.get_bytes(addr, nonzero_bytes)
    r2.append(bytes(b))
    
-  add_asset_uint8('kDungMap_FloorLayout', pack_u32_arrays(r))
-  add_asset_uint8('kDungMap_Tiles', pack_u32_arrays(r2))
+  add_asset_packed('kDungMap_FloorLayout', r)
+  add_asset_packed('kDungMap_Tiles', r2)


@cache
@@ -692,8 +708,6 @@ def print_dungeon_rooms():
  add_asset_uint16('kTorchDataInit', ROM.get_words(0x84F36A, 144))
  add_asset_uint16('kTorchDataJunk', ROM.get_words(0x84F48a, 48))
 
-
- 
 def print_enemy_damage_data():
  decomp, comp_len = util.decomp(0x83e800, ROM.get_byte, True, True)
  add_asset_uint8('kEnemyDamageData', decomp)
@@ -736,24 +750,21 @@ def print_sound_banks():
    name, data = compile_music.print_song(song)
    add_asset_uint8(name, data)

-def print_all():
+def print_all(args):
  print_sound_banks()
  print_dungeon_rooms()
  print_enemy_damage_data()
  print_link_graphics()
  print_dungeon_sprites()
  print_map32_to_map16()
-  print_dialogue()
-  print_images()
-  print_misc()
+  print_images(args)
+  print_misc(args)
+  print_dialogue(args)
  print_dungeon_map()
  print_tilemaps()
  print_overworld()
  print_overworld_tables()

-print_all()
-
-
 def write_assets_to_file(print_header = False):
  key_sig = b''
  all_data = []
@@ -765,10 +776,15 @@ enum {
  kNumberOfAssets = %d
 };
 extern const uint8 *g_asset_ptrs[kNumberOfAssets];
-extern uint32 g_asset_sizes[kNumberOfAssets];''' % len(assets))
+extern uint32 g_asset_sizes[kNumberOfAssets];
+extern MemBlk FindInAssetArray(int asset, int idx);
+''' % len(assets))

  for i, (k, (tp, data)) in enumerate(assets.items()):
    if print_header:
+      if tp == 'packed':
+        print('#define %s(idx) FindInAssetArray(%d, idx)' % (k, i))
+      else:
        print('#define %s ((%s*)g_asset_ptrs[%d])' % (k, tp, i))
        print('#define %s_SIZE (g_asset_sizes[%d])' % (k, i))
    key_sig += k.encode('utf8') + b'\0'
@@ -792,6 +808,17 @@ extern uint32 g_asset_sizes[kNumberOfAssets];''' % len(assets))

  open('zelda3_assets.dat', 'wb').write(file_data)

-write_assets_to_file(False)
+def main(args):
+  print_all(args)
+  write_assets_to_file(args.print_assets_header)

+if __name__ == "__main__":
+  ROM = util.load_rom(sys.argv[1] if len(sys.argv) >= 2 else None)
+  class DefaultArgs:
+    sprites_from_png = False
+    languages = None
+    print_assets_header = False
+  main(DefaultArgs())
+else:
+  ROM = util.ROM

--- a/tables/extract_resources.py
+++ b/tables/extract_resources.py
@@ -240,7 +240,7 @@ def print_all_overworld_areas():
      print_overworld_area(i)

 def print_dialogue():
-  text_compression.print_strings(open('dialogue.txt', 'w'), get_byte)
+  text_compression.print_strings(util.ROM, file = open(text_compression.kDialogueFilenames[util.ROM.language], 'w', encoding='utf8'))

 def decode_room_objects(p):
  objs = []
@@ -529,11 +529,13 @@ def print_all_text_stuff():
 def main():
  make_directories()
  print_all_text_stuff()
-  extract_music.extract_sound_data(ROM)
+  extract_music.extract_sound_data(util.ROM)
  sprite_sheets.decode_link_sprites()
  sprite_sheets.decode_sprite_sheets()
+  sprite_sheets.decode_hud_icons()
+  sprite_sheets.decode_font()
 
-ROM = util.load_rom(sys.argv[1] if len(sys.argv) >= 2 else None)
+if __name__ == "__main__":
+  util.load_rom(sys.argv[1] if len(sys.argv) >= 2 else None)
+  main()

-main()
-#sprite_sheets.decode_sprite_sheets()
--- a/tables/palette_usage.bin
+++ b/tables/palette_usage.bin
--- a/tables/restool.py
+++ b/tables/restool.py
@@ -0,0 +1,48 @@
+import argparse
+import util
+import sys
+
+parser = argparse.ArgumentParser(description='Resource tool used to build zelda3_assets.dat', allow_abbrev=False)
+parser.add_argument('-r', '--rom', nargs='?', metavar='ROM')
+parser.add_argument('--extract-from-rom', '-e', action='store_true', help='Extract/overwrite things from the ROM')
+
+optional = parser.add_argument_group('Language settings')
+optional.add_argument('--extract-dialogue', action='store_true', help = 'Extract dialogue from the german ROM')
+optional.add_argument('--languages', action='store', metavar='L1,L2', help = 'Comma separated list of additional languages to build (de).')
+
+optional = parser.add_argument_group('Debug things')
+optional.add_argument('--no-build', action='store_true', help="Don't actually build zelda3_assets.dat")
+optional.add_argument('--print-strings', action='store_true', help="Print all dialogue strings")
+optional.add_argument('--print-assets-header', action='store_true')
+
+optional = parser.add_argument_group('Image handling')
+optional.add_argument('--sprites-from-png', action='store_true', help="When compiling, load sprites from png instead of from ROM")
+
+args = parser.parse_args()
+
+if args.extract_dialogue:
+  ROM = util.load_rom(args.rom, True)
+  import extract_resources, sprite_sheets
+  extract_resources.print_dialogue()
+  sprite_sheets.decode_font()
+  sys.exit(0)
+
+ROM = util.load_rom(args.rom)
+
+want_compile = True
+
+if args.extract_from_rom:
+  import extract_resources
+  extract_resources.main()
+
+if args.print_strings:
+  import text_compression
+  text_compression.print_strings(ROM)
+  want_compile = False
+
+if want_compile and not args.no_build:
+  import compile_resources
+  compile_resources.main(args)
+
+
+
--- a/tables/sprite_sheets.py
+++ b/tables/sprite_sheets.py
@@ -4,6 +4,8 @@ import util
 from util import get_bytes, get_words, get_byte, cache
 import array
 import tables
+import sys
+
 override_armor_palette = None
 #override_armor_palette = [0x7fff, 0x237e, 0x11b7, 0x369e, 0x14a5,  0x1ff, 0x1078, 0x599d, 0x3647, 0x3b68, 0xa4a, 0x12ef, 0x2a5c, 0x1571, 0x7a18,
 #                          0x7fff, 0x237e, 0x11b7, 0x369e, 0x14a5,  0x1ff, 0x1078, 0x599d, 0x6980, 0x7691, 0x26b8, 0x437f, 0x2a5c, 0x1199, 0x7a18,
@@ -25,21 +27,20 @@ def save_as_24bpp_png(dimensions, data, fname):
  img.save(fname)

@cache
-def decode_2bit_tileset(tileset):
+def decode_2bit_tileset(tileset, height = 32, base = 0):
  data = util.decomp(tables.kCompSpritePtrs[tileset], get_byte, False)
-  assert len(data) == 0x400
-  height = 32
+  assert len(data) == 0x400 * height // 32
  dst = bytearray(128*height)
-  def decode_2bit(offs, toffs):
+  def decode_2bit(offs, toffs, base):
    for y in range(8):
      d0, d1 = data[offs + y * 2], data[offs + y * 2 + 1]
      for x in range(8):
        t = ((d0 >> x) & 1) * 1 + ((d1 >> x) & 1) * 2
-        dst[toffs + y * 128 + (7 - x)] = t * 255 // 3
+        dst[toffs + y * 128 + (7 - x)] = t + base
  for i in range(16*height//8):
    x = i % 16
    y = i // 16
-    decode_2bit(i * 16, x * 8 + y * 8 * 128)
+    decode_2bit(i * 16, x * 8 + y * 8 * 128, base[i] if isinstance(base, tuple) else base)
  return dst

 def is_high_3bit_tileset(tileset):
@@ -109,6 +110,94 @@ def decode_link_sprites():
  kLinkPalette = [0, 0x7fff, 0x237e, 0x11b7, 0x369e, 0x14a5,  0x1ff, 0x1078, 0x599d, 0x3647, 0x3b68,  0xa4a, 0x12ef, 0x2a5c, 0x1571, 0x7a18]
  save_as_png((128, 448), decode_4bit_tileset_link(), 'linksprite.png', convert_snes_palette(kLinkPalette))

+def get_hud_snes_palette():
+  hud_palette  = get_words(0x9BD660, 64)
+  palette = [(31 << 10 | 31) for i in range(256)]
+  for i in range(16):
+    for j in range(1, 4):
+      palette[i * 16 + j] = hud_palette[i * 4 + j]
+  return palette
+
+def decode_hud_icons():
+  class PaletteUsage:
+    def __init__(self):
+      self.data = open('palette_usage.bin', 'rb').read()
+    def get(self, icon):
+      usage = self.data[icon]
+      for j in range(8):
+        if usage & (1 << j):
+          return j 
+      return 0
+  pu = PaletteUsage()
+  dst = bytearray()
+  for slot, image_set in enumerate([106, 107, 105]):
+    tbase = tuple([pu.get(slot * 128 + i) * 16 for i in range(128)])
+    dst += decode_2bit_tileset(image_set, height = 64, base = tbase)
+
+  save_as_png((128, 64 * 3), dst, 'hud_icons.png', convert_snes_palette(get_hud_snes_palette()[:128]))
+
+kFontTypes = {
+  'us' : (0xe8000, 256, 'font.png', (0x8ECADF, 99)),
+  'de' : (0xCC6E8, 256, 'font_de.png', (0x8CDECF, 112)),
+}
+def decode_font():
+  lang = util.ROM.language
+  def decomp_one_spr_2bit(data, offs, target, toffs, pitch, palette_base):
+    for y in range(8):
+      d0, d1 = data[offs + y * 2], data[offs + y * 2 + 1]
+      for x in range(8):
+        t = ((d0 >> x) & 1) * 1 + ((d1 >> x) & 1) * 2
+        target[toffs + y * pitch + (7 - x)] = t + palette_base
+  ft = kFontTypes[lang]
+  W = get_bytes(*ft[3])
+  w = 128 + 15
+  hi = ft[1] // 32
+  h = hi * 17
+  data = get_bytes(ft[0], ft[1] * 16)
+  dst = bytearray(w * h)
+  for i in range(ft[1]):
+    x, y = i % 16, i // 16
+    pal_base = 6 * 16
+    base_offs = x * 9 + (y * 8 + (y >> 1)) * w
+    decomp_one_spr_2bit(data, i * 16, dst, base_offs + w, w, pal_base)
+    if (y & 1) == 0:
+      j = (y >> 1) * 16 + x
+      if j < len(W):
+        dst[base_offs + W[j] - 1] = 255
+  pal = convert_snes_palette(get_hud_snes_palette()[:128])
+  pal.extend([0] * 384)
+  pal[0], pal[1], pal[2] = 192, 192, 192
+  pal[255*3+0], pal[255*3+1], pal[255*3+2] = 128, 128, 128
+  save_as_png((w, h), dst, ft[2], pal)
+  assert (data, W) == encode_font_from_png(lang)
+
+def encode_font_from_png(lang):
+  font_data = Image.open(kFontTypes[lang][2]).tobytes()
+  def encode_one_spr_2bit(data, offs, target, toffs, pitch):
+    for y in range(8):
+      d0, d1 = 0, 0
+      for x in range(8):
+        pixel = data[offs + y * pitch + 7 - x]
+        d0 |= (pixel & 1) << x
+        d1 |= ((pixel >> 1) & 1) << x
+      target[toffs + y * 2 + 0], target[toffs + y * 2 + 1] = d0, d1
+  w = 128 + 15
+  dst = bytearray(256 * 16)
+  def get_width(base_offs):
+    for i in range(8):
+      if font_data[base_offs + i] == 255:
+        break
+    return i + 1
+  W = bytearray()
+  for i in range(256):
+    x, y = i % 16, i // 16
+    base_offs = x * 9 + (y * 8 + (y >> 1)) * w
+    if (y & 1) == 0:
+      W.append(get_width(base_offs))
+    encode_one_spr_2bit(font_data, base_offs + w, dst, i * 16, w)
+  chars_per_lang = kFontTypes[lang][3][1]
+  return dst, W[:chars_per_lang]
+
 # Returns the dungeon palette for the specified palette index
 # 0 = lightworld, 1 = darkworld, 2 = dungeon
@cache
@@ -425,7 +514,6 @@ class MasterTilesheets:
        encode_into((y * 16 + x) * 24, y * 8 * 128 + x * 8)
    return result

-
 def decode_sprite_sheets():
  master_tilesheets = MasterTilesheets()

@@ -516,3 +604,10 @@ def load_sprite_sheets():
            if not is_empty(src_pos):
              master_tilesheets.add_verify_8x8(tileset, pal_lut, img_data, pitch, dst_pos, src_pos)
  return master_tilesheets
+
+#if __name__ == "__main__":
+#  ROM = util.load_rom(sys.argv[1] if len(sys.argv) >= 2 else None, True)
+#  decode_font()
+  
+
+
--- a/tables/text_compression.py
+++ b/tables/text_compression.py
@@ -1,255 +1,315 @@
+import util, sys

-kTextAlphabet = [
-  "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
-  "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
+kTextAlphabet_US = [
+  "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", # 0 - 15
+  "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", # 16 - 31
+  "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", # 32 - 47
+  "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "!", "?", # 48 - 63
+  "-", ".", ",", 

-  "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
-  "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-
-  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-
-  # codes 0x3E and up
-  "!", "?", "-", ".", ",",
-
-  # codes 0x43 and up
+  # 64 - 79
  "[...]", ">", "(", ")",
-
-  # codes 0x47 and up
  "[Ankh]", "[Waves]", "[Snake]", "[LinkL]", "[LinkR]",
-  "\"", "[Up]", "[Down]", "[Left]", "[Right]", "'",
+  "\"", "[Up]", "[Down]", "[Left]",

-  # codes 0x52 and up
-  "[1HeartL]", "[1HeartR]", "[2HeartL]", "[3HeartL]",
-  "[3HeartR]", "[4HeartL]", "[4HeartR]",
-
-  " ", "<", "[A]", "[B]", "[X]", "[Y]",
+  # 80 - 95
+  "[Right]", "'", "[1HeartL]", "[1HeartR]", "[2HeartL]", "[3HeartL]", "[3HeartR]",
+  "[4HeartL]", "[4HeartR]", " ", "<", "[A]", "[B]", "[X]", "[Y]",
 ]

-kText_CommandLengths = [1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, ]
-kText_CommandNames = [
-  "NextPic",
-  "Choose",
-  "Item",
-  "Name",
-  "Window",
-  "Number",
-  "Position",
-  "ScrollSpd",
-  "Selchg",
-  "Crash",
-  "Choose3",
-  "Choose2",
-  "Scroll",
-  "1",
-  "2",
-  "3",
-  "Color",
-  "Wait",
-  "Sound",
-  "Speed",
-  "Mark",
-  "Mark2",
-  "Clear",
-  "Waitkey",
-  "EndMessage"
+kTextAlphabet_EU = [
+  "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", # 0 - 15
+  "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", # 16 - 31
+  "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", # 32 - 47
+  "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "!", "?", # 48 - 63
+  
+
+  # 64 - 79
+  "-", ".", ",",  "[...]", ">", "(", ")",
+  "[Ankh]", "[Waves]", "[Snake]", "[LinkL]", "[LinkR]",
+  "\"", "[UpL]", "[UpR]", "[LeftL]",
+
+
+  # 80 - 95
+  "[LeftR]", "'", "[1HeartL]", "[1HeartR]", "[2HeartL]", "[3HeartL]", "[3HeartR]",
+  "[4HeartL]", "[4HeartR]", " ", "ö", "[A]", "[B]", "[X]", "[Y]", "ü",
+
+  # 96-111
+  "ß", ":", "[DownL]", "[DownR]", "[RightL]", "[RightR]", "è", "é", "ê", "à", "ù", "ç", "Ä", "Ö", "Ü", "ä"
+  
+  # 112-
 ]

-kTextDictionary = [  0x59, 0x59, 0x59, 0x59,
-  0x59, 0x59, 0x59,
-  0x59, 0x59,
-  0x51, 0x2c, 0x59,
-  0x1a, 0x27, 0x1d, 0x59,
-  0x1a, 0x2b, 0x1e, 0x59,
-  0x1a, 0x25, 0x25, 0x59,
-  0x1a, 0x22, 0x27,
-  0x1a, 0x27, 0x1d,
-  0x1a, 0x2d, 0x59,
-  0x1a, 0x2c, 0x2d,
-  0x1a, 0x27,
-  0x1a, 0x2d,
-  0x1b, 0x25, 0x1e,
-  0x1b, 0x1a,
-  0x1b, 0x1e,
-  0x1b, 0x28,
-  0x1c, 0x1a, 0x27, 0x59,
-  0x1c, 0x21, 0x1e,
-  0x1c, 0x28, 0x26,
-  0x1c, 0x24,
-  0x1d, 0x1e, 0x2c,
-  0x1d, 0x22,
-  0x1d, 0x28,
-  0x1e, 0x27, 0x59,
-  0x1e, 0x2b, 0x59,
-  0x1e, 0x1a, 0x2b,
-  0x1e, 0x27, 0x2d,
-  0x1e, 0x1d, 0x59,
-  0x1e, 0x27,
-  0x1e, 0x2b,
-  0x1e, 0x2f,
-  0x1f, 0x28, 0x2b,
-  0x1f, 0x2b, 0x28,
-  0x20, 0x22, 0x2f, 0x1e, 0x59,
-  0x20, 0x1e, 0x2d,
-  0x20, 0x28,
-  0x21, 0x1a, 0x2f, 0x1e,
-  0x21, 0x1a, 0x2c,
-  0x21, 0x1e, 0x2b,
-  0x21, 0x22,
-  0x21, 0x1a,
-  0x22, 0x20, 0x21, 0x2d, 0x59,
-  0x22, 0x27, 0x20, 0x59,
-  0x22, 0x27,
-  0x22, 0x2c,
-  0x22, 0x2d,
-  0x23, 0x2e, 0x2c, 0x2d,
-  0x24, 0x27, 0x28, 0x30,
-  0x25, 0x32, 0x59,
-  0x25, 0x1a,
-  0x25, 0x28,
-  0x26, 0x1a, 0x27,
-  0x26, 0x1a,
-  0x26, 0x1e,
-  0x26, 0x2e,
-  0x27, 0x51, 0x2d, 0x59,
-  0x27, 0x28, 0x27,
-  0x27, 0x28, 0x2d,
-  0x28, 0x29, 0x1e, 0x27,
-  0x28, 0x2e, 0x27, 0x1d,
-  0x28, 0x2e, 0x2d, 0x59,
-  0x28, 0x1f,
-  0x28, 0x27,
-  0x28, 0x2b,
-  0x29, 0x1e, 0x2b,
-  0x29, 0x25, 0x1e,
-  0x29, 0x28, 0x30,
-  0x29, 0x2b, 0x28,
-  0x2b, 0x1e, 0x59,
-  0x2b, 0x1e,
-  0x2c, 0x28, 0x26, 0x1e,
-  0x2c, 0x1e,
-  0x2c, 0x21,
-  0x2c, 0x28,
-  0x2c, 0x2d,
-  0x2d, 0x1e, 0x2b, 0x59,
-  0x2d, 0x21, 0x22, 0x27,
-  0x2d, 0x1e, 0x2b,
-  0x2d, 0x21, 0x1a,
-  0x2d, 0x21, 0x1e,
-  0x2d, 0x21, 0x22,
-  0x2d, 0x28,
-  0x2d, 0x2b,
-  0x2e, 0x29,
-  0x2f, 0x1e, 0x2b,
-  0x30, 0x22, 0x2d, 0x21,
-  0x30, 0x1a,
-  0x30, 0x1e,
-  0x30, 0x21,
-  0x30, 0x22,
-  0x32, 0x28, 0x2e,
-  0x7, 0x1e, 0x2b,
-  0x13, 0x21, 0x1a,
-  0x13, 0x21, 0x1e,
-  0x13, 0x21, 0x22,
-  0x18, 0x28, 0x2e,
+kText_CommandLengths_US = [1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, ]
+kText_CommandNames_US = [
+  "NextPic", "Choose", "Item", "Name", "Window", "Number",
+  "Position","ScrollSpd", "Selchg", "Unused_Crash", "Choose3",
+  "Choose2", "Scroll", "1", "2", "3", "Color",
+  "Wait", "Sound", "Speed", "Unused_Mark", "Unused_Mark2", "Unused_Clear",
+  "Waitkey"
 ]

-kTextDictionary_Idx = [
-  0, 4, 7, 9, 12, 16, 20, 24, 27, 30, 33, 36, 38, 40, 43, 45, 47, 49, 53, 56, 59, 61, 64, 66, 68, 71, 74, 77, 80, 83, 85, 87, 89, 92, 95, 100, 103, 105, 109, 112, 115, 117, 119, 124, 128, 130, 132, 134, 138, 142, 145, 147, 149, 152, 154, 156, 158, 162, 165, 168, 172, 176, 180, 182, 184, 186, 189, 192, 195, 198, 201, 203, 207, 209, 211, 213, 215, 219, 223, 226, 229, 232, 235, 237, 239, 241, 244, 248, 250, 252, 254, 256, 259, 262, 265, 268, 271, 274
+kTextDictionary_US = [
+'    ', '   ', '  ', "'s ", 'and ', 
+'are ', 'all ', 'ain', 'and', 'at ', 
+'ast', 'an', 'at', 'ble', 'ba', 
+'be', 'bo', 'can ', 'che', 'com', 
+'ck', 'des', 'di', 'do', 'en ', 
+'er ', 'ear', 'ent', 'ed ', 'en', 
+'er', 'ev', 'for', 'fro', 'give ', 
+'get', 'go', 'have', 'has', 'her', 
+'hi', 'ha', 'ight ', 'ing ', 'in', 
+'is', 'it', 'just', 'know', 'ly ', 
+'la', 'lo', 'man', 'ma', 'me', 
+'mu', "n't ", 'non', 'not', 'open', 
+'ound', 'out ', 'of', 'on', 'or', 
+'per', 'ple', 'pow', 'pro', 're ', 
+'re', 'some', 'se', 'sh', 'so', 
+'st', 'ter ', 'thin', 'ter', 'tha', 
+'the', 'thi', 'to', 'tr', 'up', 
+'ver', 'with', 'wa', 'we', 'wh', 
+'wi', 'you', 'Her', 'Tha', 'The', 
+'Thi', 'You', 
 ]

-def make_dict():
-  r, rinv = {}, {}
-  for i in range(len(kTextDictionary_Idx) - 1):
-    ln = kTextDictionary_Idx[i + 1] - kTextDictionary_Idx[i]
-    idx = kTextDictionary_Idx[i]
-    s = "".join(kTextAlphabet[kTextDictionary[idx+i]] for i in range(ln))
-    r[i] = s
-    rinv[s] = i
-  return r, rinv

-kTextDictionary_Ascii, kTextDictionary_AsciiBack = make_dict()
+kText_CommandLengths_EU = [1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2]
+kText_CommandNames_EU = [
+  "Selchg", "Choose3", "Choose2", "Scroll", "1", "2", "3",
+  "Color", "Wait", "Sound", "Speed", "Mark", "Mark2",
+  "Clear", "Waitkey", "EndMessage", "NextPic", "Choose",
+  "Item", "Name", "Window", "Number", "Position", "ScrollSpd",
+]

-def decode_strings(get_byte):
-  p = 0x9c8000
+kTextDictionary_DE = [
+'    ', '   ', '                                          ', '-Knopf', ' ich ', 
+' Sch', ' Ver', ' zu ', ' es ', 'aber', 
+'alle', 'auch', 'ang', 'aus', 'auf', 
+'an', 'bist', 'bin', 'bei', 'der ', 
+'die ', 'das ', 'den ', 'dem ', 'daß', 
+'der', 'die', 'das', 'den', 'da', 
+'etwas', 'ein ', 'ein', 'en ', 'er ', 
+'es ', 'en', 'er', 'es', 'ei', 
+'für', 'fe', 'habe', 'hier', 'hast', 
+'her', 'ich ', 'icht', 'ich', 'ist', 
+'ie ', 'im', 'ie', 'kannst ', 'kannst', 
+'kommen', 'kann ', 'll', 'mich', 'mein', 
+'mit', 'mal', 'mir', 'nicht ', 'nicht', 
+'nen', 'nn', 'och ', 'och', 'or', 
+'schon', 'sich', 'sein', 'sch', 'sie', 
+'st', 'tte', 'te ', 'te', 'und ', 
+'und', 'ung', 'um', 'von', 'ver', 
+'vor', 'wird', 'zu ', 'Amulett', 'Aber', 
+'Deine', 'Dich ', 'Dir ', 'Dir', 'Der', 
+'Die', 'Das', 'Du ', 'Du', 'Da', 
+'Ein', 'Hyrule', 'Hier', 'Ich ', 'Master-Schwert', 
+'Mach', 'Rubine', 'Sch', 'Sie', 'Ver', 
+'Weisen', 'Zelda', 
+]
+
+class LangUS:
+  alphabet = kTextAlphabet_US
+  dictionary = kTextDictionary_US
+  command_lengths = kText_CommandLengths_US
+  command_names = kText_CommandNames_US
+  rom_addrs = [0x9c8000, 0x8edf40]
+  COMMAND_START = 0x67
+  SWITCH_BANK = 0x80
+  FINISH = 0xff
+  DICT_BASE_ENC, DICT_BASE_DEC = 0x88, 0x88
+  def encode_command(self, cmd_index, param):
+    name = self.command_names[cmd_index]
+    if param == None:
+      return [cmd_index + self.COMMAND_START]
+    return [cmd_index + self.COMMAND_START, int(param)]
+
+class LangDE:
+  alphabet = kTextAlphabet_EU
+  dictionary = kTextDictionary_DE
+  command_lengths = kText_CommandLengths_EU
+  command_names = kText_CommandNames_EU
+  rom_addrs = [0x9c8000, 0x8CEB00]
+  COMMAND_START = 0x70
+  SWITCH_BANK = 0x88
+  FINISH = 0x8f
+  DICT_BASE_ENC, DICT_BASE_DEC = 0x88, 0x90
+  US = False
+
+  kCmdInfo = {
+    "Scroll" : (0x80, ),
+    "Waitkey" : (0x81, ),
+    "1" : (0x82, ),
+    "2" : (0x83, ),
+    "3" : (0x84, ),
+    "Name" : (0x85, ),
+    "Wait" : (0x87, {i:i+0x00 for i in range(16)}),
+    "Color" : (0x87, {i:i+0x10 for i in range(16)}),
+    "Number" : (0x87, {i:i+0x20 for i in range(16)}),
+    "Speed" : (0x87, {i:i+0x30 for i in range(16)}),
+    "Sound" : (0x87, {45 : 0x40}),
+    "Choose" : (0x87, 0x80),
+    "Choose2" : (0x87, 0x81),
+    "Choose3" : (0x87, 0x82),
+    "Selchg" : (0x87, 0x83),
+    "Item" : (0x87, 0x84),
+    "NextPic" : (0x87, 0x85),
+    "Window" : (0x87, {0 : None, 2 : 0x86}),
+    "Position" : (0x87, {0: 0x87, 1: 0x88}),
+    "ScrollSpd" : (0, {0 : None}),
+  }
+
+  def encode_command(self, cmd_index, param):
+    info = self.kCmdInfo[self.command_names[cmd_index]]
+    if len(info) <= 1 or isinstance(info[1], int):
+      assert param == None
+      return info
+    else:
+      assert param != None
+      r = info[1][param]
+      return (info[0], r) if r != None else ()
+
+kLanguages = {
+  'us' : LangUS(),
+  'de' : LangDE(),
+}
+
+kDialogueFilenames = {
+  'us' : 'dialogue.txt',
+  'de' : 'dialogue_de.txt',
+}
+
+dict_expansion = []
+
+def decode_strings_generic(get_byte, lang):
+  info = kLanguages[lang]
+  p, rom_idx = info.rom_addrs[0], 1
  result = []
  while True:
-    org_p = p
-    #print('0x%x' % p)
-    s = ''
-    srcdata = []
+    s, srcdata = '', []
    while True:
      c = get_byte(p)
      srcdata.append(c)
-      l = kText_CommandLengths[c - 0x67] if c >= 0x67 and c < 0x80 else 1
+      l = info.command_lengths[c - info.COMMAND_START] if c >= info.COMMAND_START and c < info.SWITCH_BANK else 1
+
      p += l
-      if c == 0x7f:
+      if c == 0x7f: # EndMessage
        break
-      if c < 0x67:
-        s += kTextAlphabet[c]
-      elif c < 0x80:
+      if c < info.COMMAND_START:
+        s += info.alphabet[c]
+      elif c < info.SWITCH_BANK:
        if l == 2:
-          srcdata.append(get_byte(p-1))
-          s += '[%s %.2d]' % (kText_CommandNames[c - 0x67], get_byte(p-1))
+          srcdata.append(get_byte(p - 1))
+          s += '[%s %.2d]' % (info.command_names[c - info.COMMAND_START], get_byte(p - 1))
        else:
-          s += '[%s]' % kText_CommandNames[c - 0x67]
-      elif c == 0x80:
-        p = 0x8edf40
-        s = None
-        break
-      elif c > 0x80 and c < 0x88:
+          s += '[%s]' % info.command_names[c - info.COMMAND_START]
+      elif c == info.FINISH:
+        return result # done
+      elif c == info.SWITCH_BANK:
+        p = info.rom_addrs[rom_idx]; rom_idx += 1
+        s, srcdata = '', []
+      elif c < info.SWITCH_BANK + 8:
        assert 0
-      elif c == 0xff:
-        return result
      else:
-        s += kTextDictionary_Ascii[c - 0x88]
-    if s != None:
+        s += info.dictionary[c - info.DICT_BASE_DEC]
+        dict_expansion.append(len(info.dictionary[c - info.DICT_BASE_DEC]))
+
    result.append((s, srcdata))

-def print_strings(f, get_byte):
-  for i, s in enumerate(decode_strings(get_byte)):
-    print('%s: %s' % (i + 1, s[0]), file = f)
  
-def find_string_char_at(s, i):
+def print_strings(rom, file = None):
+  texts = decode_strings_generic(rom.get_byte, rom.language)
+  if len(texts) == 396:
+    extra_str = "[Speed 00]0- [Number 00]. 1- [Number 01][2]2- [Number 02]. 3- [Number 03]"
+    texts = texts[:4] + [(extra_str, None)] + texts[4:]
+
+  for i, s in enumerate(texts):
+    print('%s: %s' % (i + 1, s[0]), file = file)
+
+
+def encode_greedy_from_dict(s, i, rev, a2i, info):
  a = s[i:]
-
-  for k, v in kTextDictionary_AsciiBack.items():
+  if r := rev.get(a[0]):
+    for k, v in r.items():
      if a.startswith(k):
-      return [v + 0x88], len(k)
+        return [v + info.DICT_BASE_ENC], len(k)

-  for i, s in enumerate(kTextAlphabet):
-    if a.startswith(s):
-      return [i], len(s)
-
-  if a.startswith('['):
-    cmd = a[1:a.index(']')]
-    if cmd in kText_CommandNames:
-      i = kText_CommandNames.index(cmd)
-      return [i + 0x67], len(cmd) + 2
-    
-    for i, s in enumerate(kText_CommandNames):
-      if kText_CommandLengths[i] == 2 and cmd.startswith(s):
-        e = cmd[len(s):].strip()
-        return [i + 0x67, int(e)], len(cmd) + 2
+  if a[0] == '[':
+    cmd, param = a[1:a.index(']')], None
+    cmdlen = len(cmd)
+    if r := a2i.get(a[:cmdlen+2]):
+      return [r], cmdlen+2
+    if ' ' in cmd:
+      cmd, param = cmd.split(' ', 1)
+      param = int(param)
+    if cmd not in info.command_names:
+      raise Exception(f'Invalid cmd {cmd}')
+    i = info.command_names.index(cmd)
+    if info.command_lengths[i] != (1 if param == None else 2):
+      raise Exception(f'Invalid cmd params {cmd} {param}')
+    return info.encode_command(i, param), cmdlen + 2
+  else:
+    return [a2i[a[0]]], 1

  print('substr %s not found' % a)
  assert 0

-def compress_string(s):
-  # find the greedy best match
+def compress_strings(xs, lang = 'us'):
+  info = kLanguages[lang]
+  rev = {}
+  for a,b in enumerate(info.dictionary):
+    rev.setdefault(b[0], {})[b] = a
+  #rev = {b:a for a,b in enumerate(info.dictionary)}
+  a2i = {e:i for i,e in enumerate(info.alphabet)}
+  def compress_string(s):
    i = 0
-  r = []
+    r = bytearray()
    while i < len(s):
-    what, num = find_string_char_at(s, i)
+      what, num = encode_greedy_from_dict(s, i, rev, a2i, info)
      r.extend(what)
      i += num
-  r.append(0x7f)
    return r
+  return [compress_string(x) for x in xs]
  
 def verify(get_byte):
-  for i, (decoded, original) in enumerate(decode_strings(get_byte)):
-    c = compress_string(decoded)
+  for i, (decoded, original) in enumerate(decode_strings_generic(get_byte, 'us')):
+    c = compress_strings([decoded])[0]
    if c != original:
      print('String %s not match: %s, %s' % (decoded, c, original))
      break
    else:
      pass
+
+def encode_dictionary(lang = 'us'):
+  info = kLanguages[lang]
+  rev = {b:a for a,b in enumerate(info.alphabet)}
+  return [bytearray(rev[c] for c in line) for line in info.dictionary]
+
+if __name__ == "__main__":
+  ROM = util.load_rom(sys.argv[1] if len(sys.argv) >= 2 else None, True)
+
+  decoded = decode_strings_generic(ROM.get_byte, 'de')
+  print('Total bytes: %d' % sum(len(a[1]) for a in decoded))
+
+  print('Dict tokens: %d' % len(dict_expansion))
+  print('Dict save: %d' % (sum(dict_expansion) - len(dict_expansion)))
+
+  print('US size ', len(kTextDictionary_US))
+  print('DE size ', len(kTextDictionary_DE))
+
+  texts = [a[0] for a in decoded]
+
+
+  # Pal seems to have one string too little
+  if len(texts) == 396:
+    extra_str = "[Speed 00]0- [Number 00]. 1- [Number 01][2]2- [Number 02]. 3- [Number 03]"
+    texts = texts[:4] + [extra_str] + texts[4:]
+
+  #for i, s in enumerate(texts):
+  #  print('%s: %s' % (i + 1, s), file = None)
+
+
+  #encode_dictionary()
+  compr = compress_strings(texts, 'de')
+  print(f'Compressed size (excl eof): {sum(len(a) for a in compr)}')
+
+
--- a/tables/util.py
+++ b/tables/util.py
@@ -11,11 +11,16 @@ def cache(user_function):
 # Both are common SNES rom extensions. For Zelda3 (NA), they are equivalent files.
 COMMON_ROM_NAMES = ['zelda3.sfc', 'zelda3.smc']
 DEFAULT_ROM_DIRECTORY = os.path.dirname(__file__)
-ZELDA3_SHA256 = '66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb'

-def load_rom(filename):
+ZELDA3_SHA256_US = '66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb'
+ZELDA3_SHA256 = {
+  '030ff80d0087bca440094cd914c03da0aa199dc6edb9adfb43f1267e99fde45f' : 'de',
+   ZELDA3_SHA256_US : 'us',
+}
+
+def load_rom(filename, support_multilanguage = False):
  global ROM
-  ROM = LoadedRom(filename)
+  ROM = LoadedRom(filename, support_multilanguage)
  return ROM

 def get_byte(addr):
@@ -44,12 +49,18 @@ def get_word(addr):


 class LoadedRom:
-  def __init__(self, path = None):
+  def __init__(self, path = None, support_multilanguage = False):
    rom_path = self.__get_rom_path(path)
    self.ROM = open(rom_path, 'rb').read()
    hash = hashlib.sha256(self.ROM).hexdigest()
-    if hash != ZELDA3_SHA256:
-      raise Exception(f"ROM with hash {hash} not supported. Expected {ZELDA3_SHA256}. Please verify your ROM is the NA 1.0 version.");
+    self.language = ZELDA3_SHA256.get(hash)
+
+    if support_multilanguage:
+      if self.language == None:
+        raise Exception(f"ROM with hash {hash} not supported.");
+    else:
+      if self.language != 'us':
+        raise Exception(f"ROM with hash {hash} not supported. Expected {ZELDA3_SHA256_US}. Please verify your ROM is the NA 1.0 version.");

  def get_byte(self, ea):
    assert (ea & 0x8000)
--- a/third_party/.gitignore
+++ b/third_party/.gitignore
@@ -1,4 +1,3 @@
 /tcc/
-/SDL2-2.24.0/
-/SDL2-2.24.1/
+/SDL2-2.*/
 /gl_core/*.o
--- a/types.h
+++ b/types.h
@@ -92,6 +92,12 @@ typedef struct OamEnt {
  uint8 x, y, charnum, flags;
 } OamEnt;

+typedef struct MemBlk {
+  const uint8 *ptr;
+  size_t size;
+} MemBlk;
+MemBlk FindIndexInMemblk(MemBlk data, size_t i);
+
 void NORETURN Die(const char *error);

 #endif  // ZELDA3_TYPES_H_
--- a/util.c
+++ b/util.c
@@ -170,3 +170,26 @@ void ByteArray_AppendByte(ByteArray *arr, uint8 v) {
  ByteArray_Resize(arr, arr->size + 1);
  arr->data[arr->size - 1] = v;
 }
+
+// Automatically selects between 16 or 32 bit indexes. Can hold up to 8192 elements in 16-bit mode.
+MemBlk FindIndexInMemblk(MemBlk data, size_t i) {
+  if (data.size < 2)
+    return (MemBlk) { 0, 0 };
+  size_t end = data.size - 2, left_off, right_off;
+  size_t mx = *(uint16 *)(data.ptr + end);
+  if (mx < 8192) {
+    if (i > mx || mx * 2 > end)
+      return (MemBlk) { 0, 0 };
+    left_off = ((i == 0) ? mx * 2 : mx * 2 + *(uint16 *)(data.ptr + i * 2 - 2));
+    right_off = (i == mx) ? end : mx * 2 + *(uint16 *)(data.ptr + i * 2);
+  } else {
+    mx -= 8192;
+    if (i > mx || mx * 4 > end)
+      return (MemBlk) { 0, 0 };
+    left_off = ((i == 0) ? mx * 4 : mx * 4 + *(uint32 *)(data.ptr + i * 4 - 4));
+    right_off = (i == mx) ? end : mx * 4 + *(uint32 *)(data.ptr + i * 4);
+  }
+  if (left_off > right_off || right_off > end)
+    return (MemBlk) { 0, 0 };
+  return (MemBlk) { data.ptr + left_off, right_off - left_off };
+}
--- a/variables.h
+++ b/variables.h
@@ -814,12 +814,12 @@
 #define text_msgbox_topleft_copy (*(uint16*)(g_ram+0x1CD0))
 #define text_msgbox_topleft (*(uint16*)(g_ram+0x1CD2))
 #define text_render_state (*(uint8*)(g_ram+0x1CD4))
-#define vwf_line_mode (*(uint8*)(g_ram+0x1CD5))
+#define vwf_line_speed_cur (*(uint8*)(g_ram+0x1CD5))
 #define vwf_line_speed (*(uint8*)(g_ram+0x1CD6))
 #define text_incremental_state (*(uint8*)(g_ram+0x1CD7))
 #define messaging_module (*(uint8*)(g_ram+0x1CD8))
-#define dialogue_msg_dst_offs (*(uint16*)(g_ram+0x1CD9))
-#define byte_7E1CDC (*(uint8*)(g_ram+0x1CDC))
+#define dialogue_msg_read_pos (*(uint16*)(g_ram+0x1CD9))
+#define dialogue_text_color (*(uint8*)(g_ram+0x1CDC))
 #define dialogue_msg_src_offs (*(uint16*)(g_ram+0x1CDD))
 #define byte_7E1CDF (*(uint8*)(g_ram+0x1CDF))
 #define text_wait_countdown (*(uint16*)(g_ram+0x1CE0))
@@ -827,9 +827,11 @@
 #define text_next_position (*(uint8*)(g_ram+0x1CE6))
 #define choice_in_multiselect_box (*(uint8*)(g_ram+0x1CE8))
 #define text_wait_countdown2 (*(uint8*)(g_ram+0x1CE9))
-#define byte_7E1CEA (*(uint8*)(g_ram+0x1CEA))
+
+// This seems never nonzero
+#define dialogue_scroll_speed (*(uint8*)(g_ram+0x1CEA))
 #define dialogue_message_index (*(uint16*)(g_ram+0x1CF0))
-#define byte_7E1CF2 ((uint8*)(g_ram+0x1CF2))
+#define dialogue_number ((uint8*)(g_ram+0x1CF2))
 #define choice_in_multiselect_box_bak (*(uint8*)(g_ram+0x1CF4))
 #define alt_sprite_state ((uint8*)(g_ram+0x1D00))
 #define alt_sprite_type ((uint8*)(g_ram+0x1D10))
--- a/zelda3.ini
+++ b/zelda3.ini
@@ -15,6 +15,12 @@ ExtendedAspectRatio = 4:3
 # display is set to exactly 60hz)
 DisableFrameDelay = 0

+# Set which language to use. Note. In order to use other languages you need to create
+# the assets file appropriately.
+# python restool.py --extract-dialogue -r german.sfc
+# python restool.py --languages=de
+# Language = de
+
 [Graphics]
 # Window size ( Auto or WidthxHeight )
 WindowSize = Auto
--- a/zelda_cpu_infra.c
+++ b/zelda_cpu_infra.c
@@ -113,6 +113,8 @@ static void VerifySnapshotsEq(Snapshot *b, Snapshot *a, Snapshot *prev) {
  memcpy(a->ram + 0x1db20, b->ram + 0x1db20, 64 * 2);  // msu
  a->ram[0x654] = b->ram[0x654];  // msu_volume

+  memcpy(a->ram + 0x1CDD, b->ram + 0x1CDD, 2);  // dialogue_msg_src_offs
+  
  if (memcmp(b->ram, a->ram, 0x20000)) {
    fprintf(stderr, "@%d: Memory compare failed (mine != theirs, prev):\n", frame_counter);
    int j = 0;
--- a/zelda_rtl.c
+++ b/zelda_rtl.c
@@ -10,7 +10,7 @@
 #include "spc_player.h"
 #include "util.h"
 #include "audio.h"
-
+#include "assets.h"
 ZeldaEnv g_zenv;
 uint8 g_ram[131072];

@@ -739,7 +739,7 @@ bool ZeldaRunFrame(int inputs) {
    EmuSyncMemoryRegion(&g_ram[kRam_CrystalRotateCounter], 1);
  }

-  if (g_emu_runframe == NULL || enhanced_features0 != 0) {
+  if (g_emu_runframe == NULL || enhanced_features0 != 0 || g_zenv.dialogue_flags) {
    // can't compare against real impl when running with extra features.
    ZeldaRunFrameInternal(inputs, run_what);
  } else {
@@ -751,7 +751,28 @@ bool ZeldaRunFrame(int inputs) {
  return is_replay;
 }

-
+void ZeldaSetLanguage(const char *language) {
+  static const uint8 kDefaultConf[3] = { 0, 0, 0 };
+  MemBlk found = { kDefaultConf, 3 };
+  if (language) {
+    size_t n = strlen(language);
+    for (int i = 0; ; i++) {
+      MemBlk mb = kDialogueMap(i);
+      if (mb.ptr == 0) {
+        fprintf(stderr, "Unable to find language '%s'\n", language);
+        break;
+      }
+      MemBlk name = FindIndexInMemblk(mb, 0);
+      if (name.size == n && !memcmp(name.ptr, language, n)) {
+        found = FindIndexInMemblk(mb, 1);
+        break;
+      }
+    }
+  }
+  g_zenv.dialogue_blk = kDialogue(found.ptr[0]);
+  g_zenv.dialogue_font_blk = kDialogueFont(found.ptr[1]);
+  g_zenv.dialogue_flags = found.ptr[2];
+}


 static const char *const kReferenceSaves[] = {
--- a/zelda_rtl.h
+++ b/zelda_rtl.h
@@ -21,6 +21,10 @@ typedef struct ZeldaEnv {
  struct Ppu *ppu;
  struct SpcPlayer *player;
  struct Dma *dma;
+  
+  MemBlk dialogue_blk;
+  MemBlk dialogue_font_blk;
+  uint8 dialogue_flags;
 } ZeldaEnv;
 extern ZeldaEnv g_zenv;
 extern int frame_ctr_dbg;
@@ -50,7 +54,7 @@ void ZeldaApuLock();
 void ZeldaApuUnlock();
 bool ZeldaIsPlayingMusicTrack(uint8 track);
 uint8 ZeldaGetEntranceMusicTrack(int track);
-
+void ZeldaSetLanguage(const char *language);
 void PatchCommand(char cmd);

 // Things for state management