From 265fd20253e34adfc7ca1e9ff3c08a70224d98f6 Mon Sep 17 00:00:00 2001 From: "easyaspi314 (Devin)" Date: Sat, 24 Aug 2019 16:35:52 -0400 Subject: 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. --- graphics-de/unused/old_charmap.bin | Bin 4096 -> 0 bytes graphics-de/unused/old_charmap.png | Bin 1873 -> 0 bytes graphics/debug/debug_battle_charmap_en.bin | Bin 0 -> 4096 bytes graphics/debug/debug_battle_charmap_en.png | Bin 0 -> 1873 bytes graphics/debug/debug_battle_charmap_jp.bin | Bin 0 -> 4096 bytes graphics/debug/debug_battle_charmap_jp.png | Bin 0 -> 1934 bytes graphics/unused/old_charmap.bin | Bin 4096 -> 0 bytes graphics/unused/old_charmap.png | Bin 1934 -> 0 bytes src/battle_main.c | 14 +++++++------- src/data/graphics.c | 16 ++++++++++++---- 10 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 graphics-de/unused/old_charmap.bin delete mode 100644 graphics-de/unused/old_charmap.png create mode 100644 graphics/debug/debug_battle_charmap_en.bin create mode 100644 graphics/debug/debug_battle_charmap_en.png create mode 100644 graphics/debug/debug_battle_charmap_jp.bin create mode 100644 graphics/debug/debug_battle_charmap_jp.png delete mode 100644 graphics/unused/old_charmap.bin delete mode 100644 graphics/unused/old_charmap.png diff --git a/graphics-de/unused/old_charmap.bin b/graphics-de/unused/old_charmap.bin deleted file mode 100644 index 716a93f2d..000000000 Binary files a/graphics-de/unused/old_charmap.bin and /dev/null differ diff --git a/graphics-de/unused/old_charmap.png b/graphics-de/unused/old_charmap.png deleted file mode 100644 index 72ceffbf9..000000000 Binary files a/graphics-de/unused/old_charmap.png and /dev/null differ diff --git a/graphics/debug/debug_battle_charmap_en.bin b/graphics/debug/debug_battle_charmap_en.bin new file mode 100644 index 000000000..716a93f2d Binary files /dev/null and b/graphics/debug/debug_battle_charmap_en.bin differ diff --git a/graphics/debug/debug_battle_charmap_en.png b/graphics/debug/debug_battle_charmap_en.png new file mode 100644 index 000000000..72ceffbf9 Binary files /dev/null and b/graphics/debug/debug_battle_charmap_en.png differ diff --git a/graphics/debug/debug_battle_charmap_jp.bin b/graphics/debug/debug_battle_charmap_jp.bin new file mode 100644 index 000000000..aa15ea36e Binary files /dev/null and b/graphics/debug/debug_battle_charmap_jp.bin differ diff --git a/graphics/debug/debug_battle_charmap_jp.png b/graphics/debug/debug_battle_charmap_jp.png new file mode 100644 index 000000000..b5ea6e803 Binary files /dev/null and b/graphics/debug/debug_battle_charmap_jp.png differ diff --git a/graphics/unused/old_charmap.bin b/graphics/unused/old_charmap.bin deleted file mode 100644 index aa15ea36e..000000000 Binary files a/graphics/unused/old_charmap.bin and /dev/null differ diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png deleted file mode 100644 index b5ea6e803..000000000 Binary files a/graphics/unused/old_charmap.png and /dev/null differ diff --git a/src/battle_main.c b/src/battle_main.c index 9a9f954aa..c0147d11d 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1402,9 +1402,9 @@ extern const u16 gUnknown_Debug_821F424[][5]; extern const u16 gUnknown_Debug_821F56C[][5]; extern const u32 gUnknown_Debug_821F798[][4]; -extern const u8 gUnusedOldCharmap_Gfx_lz[]; -extern const u8 gUnusedOldCharmap_Tilemap_lz[]; -extern const u8 gUnusedOldCharmap_Pal_lz[]; +extern const u8 gDebugBattleCharmap_Gfx_lz[]; +extern const u8 gDebugBattleCharmap_Tilemap_lz[]; +extern const u8 gDebugBattleCharmap_Pal_lz[]; void debug_sub_8010800(void) { @@ -1457,10 +1457,10 @@ void debug_sub_80108B8(void) REG_BG1CNT = 0x4801; REG_BLDCNT = 0; REG_BLDY = 0; - LZDecompressVram(gUnusedOldCharmap_Gfx_lz, (void *)VRAM); - LZDecompressWram(gUnusedOldCharmap_Tilemap_lz, gSharedMem); - LZDecompressVram(gUnusedOldCharmap_Pal_lz, (void *)PLTT); - LZDecompressVram(gUnusedOldCharmap_Pal_lz, (void *)(PLTT + 0x1E0)); + LZDecompressVram(gDebugBattleCharmap_Gfx_lz, (void *)VRAM); + LZDecompressWram(gDebugBattleCharmap_Tilemap_lz, gSharedMem); + LZDecompressVram(gDebugBattleCharmap_Pal_lz, (void *)PLTT); + LZDecompressVram(gDebugBattleCharmap_Pal_lz, (void *)(PLTT + 0x1E0)); m4aSoundVSyncOn(); SetVBlankCallback(debug_sub_8011D40); SetMainCallback2(debug_sub_8010CAC); 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"); -- cgit v1.2.3