summaryrefslogtreecommitdiff
path: root/src/data/graphics.c
diff options
context:
space:
mode:
authoreasyaspi314 (Devin) <easyaspi314@users.noreply.github.com>2019-08-24 16:35:52 -0400
committereasyaspi314 (Devin) <easyaspi314@users.noreply.github.com>2019-08-24 16:35:52 -0400
commit265fd20253e34adfc7ca1e9ff3c08a70224d98f6 (patch)
treecdef172bcc1e809bda616010b9ab685a00778b61 /src/data/graphics.c
parent2c42658d8713bf75a01e39bcc72ae76295033e24 (diff)
Rename old_charmap and move from graphics-de/unused to graphics/debug.
The debug battle text is in English on German ROMs and Japanese on English ROMs. Additionally, old_charmap.bin held the actual text. Weird. I also choose the English when DEBUG_TRANSLATE is on.
Diffstat (limited to 'src/data/graphics.c')
-rw-r--r--src/data/graphics.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/data/graphics.c b/src/data/graphics.c
index ce2f02b2c..4d076e083 100644
--- a/src/data/graphics.c
+++ b/src/data/graphics.c
@@ -10,10 +10,18 @@ const u8 gMonBackPic_CircledQuestionMark[] = INCBIN_U8("graphics/pokemon/circled
const u16 gMonPalette_CircledQuestionMark[] = INCBIN_U16("graphics/pokemon/circled_question_mark/normal.gbapal.lz");
const u16 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U16("graphics/pokemon/circled_question_mark/shiny.gbapal.lz");
-// japanese table and bunch of stuff
-const u8 gUnusedOldCharmap_Gfx_lz[] = INCBIN_U8("graphics/unused/old_charmap.4bpp.lz");
-const u8 gUnusedOldCharmap_Tilemap_lz[] = INCBIN_U8("graphics/unused/old_charmap.bin.lz");
-const u16 gUnusedOldCharmap_Pal_lz[] = INCBIN_U16("graphics/unused/old_charmap.gbapal.lz");
+// The test menu debug battle tileset. This uses the old Crystal charmap and
+// rendering method (it uses tiles instead of text).
+// Oddly, the English version is in Japanese and the German version is in English.
+#if DEBUG_TRANSLATE || GERMAN
+const u8 gDebugBattleCharmap_Gfx_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_en.4bpp.lz");
+const u8 gDebugBattleCharmap_Tilemap_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_en.bin.lz");
+const u8 gDebugBattleCharmap_Pal_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_en.gbapal.lz");
+#else
+const u8 gDebugBattleCharmap_Gfx_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_jp.4bpp.lz");
+const u8 gDebugBattleCharmap_Tilemap_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_jp.bin.lz");
+const u8 gDebugBattleCharmap_Pal_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_jp.gbapal.lz");
+#endif
const u8 gSmokescreenImpactTiles[] = INCBIN_U8("graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz");
const u16 gSmokescreenImpactPalette[] = INCBIN_U16("graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz");