diff options
| -rw-r--r-- | graphics/debug/debug_battle_charmap_en.bin (renamed from graphics-de/unused/old_charmap.bin) | bin | 4096 -> 4096 bytes | |||
| -rw-r--r-- | graphics/debug/debug_battle_charmap_en.png (renamed from graphics-de/unused/old_charmap.png) | bin | 1873 -> 1873 bytes | |||
| -rw-r--r-- | graphics/debug/debug_battle_charmap_jp.bin (renamed from graphics/unused/old_charmap.bin) | bin | 4096 -> 4096 bytes | |||
| -rw-r--r-- | graphics/debug/debug_battle_charmap_jp.png (renamed from graphics/unused/old_charmap.png) | bin | 1934 -> 1934 bytes | |||
| -rw-r--r-- | src/battle_main.c | 14 | ||||
| -rw-r--r-- | src/data/graphics.c | 16 |
6 files changed, 19 insertions, 11 deletions
diff --git a/graphics-de/unused/old_charmap.bin b/graphics/debug/debug_battle_charmap_en.bin Binary files differindex 716a93f2d..716a93f2d 100644 --- a/graphics-de/unused/old_charmap.bin +++ b/graphics/debug/debug_battle_charmap_en.bin diff --git a/graphics-de/unused/old_charmap.png b/graphics/debug/debug_battle_charmap_en.png Binary files differindex 72ceffbf9..72ceffbf9 100644 --- a/graphics-de/unused/old_charmap.png +++ b/graphics/debug/debug_battle_charmap_en.png diff --git a/graphics/unused/old_charmap.bin b/graphics/debug/debug_battle_charmap_jp.bin Binary files differindex aa15ea36e..aa15ea36e 100644 --- a/graphics/unused/old_charmap.bin +++ b/graphics/debug/debug_battle_charmap_jp.bin diff --git a/graphics/unused/old_charmap.png b/graphics/debug/debug_battle_charmap_jp.png Binary files differindex b5ea6e803..b5ea6e803 100644 --- a/graphics/unused/old_charmap.png +++ b/graphics/debug/debug_battle_charmap_jp.png 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"); |
