From 0a78cb5c9edf7d6b39297a5b4c874d59c6a69b39 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 10:04:47 -0500 Subject: Fix some battle dome graphics names --- graphics/battle_frontier/text_pp.pal | 19 ------------------- graphics/battle_frontier/tourney_bg.png | Bin 983 -> 0 bytes graphics/battle_frontier/tourney_line_mask_map.bin | Bin 2048 -> 0 bytes graphics/battle_frontier/tourney_tree.bin | Bin 0 -> 2048 bytes graphics/battle_frontier/tourney_tree.png | Bin 0 -> 983 bytes graphics/battle_interface/text_pp.pal | 19 +++++++++++++++++++ include/graphics.h | 4 ++-- src/battle_dome.c | 4 ++-- src/graphics.c | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 graphics/battle_frontier/text_pp.pal delete mode 100644 graphics/battle_frontier/tourney_bg.png delete mode 100644 graphics/battle_frontier/tourney_line_mask_map.bin create mode 100644 graphics/battle_frontier/tourney_tree.bin create mode 100644 graphics/battle_frontier/tourney_tree.png create mode 100644 graphics/battle_interface/text_pp.pal diff --git a/graphics/battle_frontier/text_pp.pal b/graphics/battle_frontier/text_pp.pal deleted file mode 100644 index 8c2a27418..000000000 --- a/graphics/battle_frontier/text_pp.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 197 0 -255 246 139 -255 131 0 -255 238 115 -230 24 0 -246 222 156 -74 74 74 -222 222 222 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_frontier/tourney_bg.png b/graphics/battle_frontier/tourney_bg.png deleted file mode 100644 index f60dd49d3..000000000 Binary files a/graphics/battle_frontier/tourney_bg.png and /dev/null differ diff --git a/graphics/battle_frontier/tourney_line_mask_map.bin b/graphics/battle_frontier/tourney_line_mask_map.bin deleted file mode 100644 index 7f3e36737..000000000 Binary files a/graphics/battle_frontier/tourney_line_mask_map.bin and /dev/null differ diff --git a/graphics/battle_frontier/tourney_tree.bin b/graphics/battle_frontier/tourney_tree.bin new file mode 100644 index 000000000..7f3e36737 Binary files /dev/null and b/graphics/battle_frontier/tourney_tree.bin differ diff --git a/graphics/battle_frontier/tourney_tree.png b/graphics/battle_frontier/tourney_tree.png new file mode 100644 index 000000000..f60dd49d3 Binary files /dev/null and b/graphics/battle_frontier/tourney_tree.png differ diff --git a/graphics/battle_interface/text_pp.pal b/graphics/battle_interface/text_pp.pal new file mode 100644 index 000000000..8c2a27418 --- /dev/null +++ b/graphics/battle_interface/text_pp.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 197 0 +255 246 139 +255 131 0 +255 238 115 +230 24 0 +246 222 156 +74 74 74 +222 222 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/include/graphics.h b/include/graphics.h index e2fe5cf77..c072babf3 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4121,11 +4121,11 @@ extern const u32 gDomeTourneyInfoCardBg_Tilemap[]; extern const u32 gDomeTourneyTree_Pal[]; extern const u32 gDomeTourneyTreeButtons_Pal[]; extern const u32 gDomeTourneyMatchCardBg_Pal[]; -extern const u32 gDomeTourneyBg_Gfx[]; +extern const u32 gDomeTourneyTree_Gfx[]; extern const u32 gDomeTourneyLine_Gfx[]; extern const u32 gDomeTourneyLineDown_Tilemap[]; extern const u32 gDomeTourneyLineUp_Tilemap[]; -extern const u32 gDomeTourneyLineMask_Tilemap[]; +extern const u32 gDomeTourneyTree_Tilemap[]; extern const u32 gDomeTourneyTreeButtons_Gfx[]; extern const u16 gTilesetAnims_BattleDomePals0_0[]; extern const u16 gTilesetAnims_BattleDomePals0_1[]; diff --git a/src/battle_dome.c b/src/battle_dome.c index 2f77491c9..aadd85afd 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -5304,10 +5304,10 @@ static void Task_ShowTourneyTree(u8 taskId) break; case 2: sTilemapBuffer = AllocZeroed(BG_SCREEN_SIZE); - LZDecompressWram(gDomeTourneyLineMask_Tilemap, sTilemapBuffer); + LZDecompressWram(gDomeTourneyTree_Tilemap, sTilemapBuffer); SetBgTilemapBuffer(1, sTilemapBuffer); CopyBgTilemapBufferToVram(1); - DecompressAndLoadBgGfxUsingHeap(1, gDomeTourneyBg_Gfx, 0x2000, 0, 0); + DecompressAndLoadBgGfxUsingHeap(1, gDomeTourneyTree_Gfx, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLine_Gfx, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLineDown_Tilemap, 0x2000, 0, 1); DecompressAndLoadBgGfxUsingHeap(3, gDomeTourneyLineUp_Tilemap, 0x2000, 0, 1); diff --git a/src/graphics.c b/src/graphics.c index 47b82b6b7..b79d449ae 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -950,9 +950,9 @@ const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz") #include "data/graphics/battle_terrain.h" // Battle Dome -const u32 gDomeTourneyBg_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_bg.4bpp.lz"); +const u32 gDomeTourneyTree_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_tree.4bpp.lz"); const u32 gDomeTourneyLine_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_line.4bpp.lz"); // the red glow mask for the tourney advancement lines -const u32 gDomeTourneyLineMask_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_line_mask_map.bin.lz"); +const u32 gDomeTourneyTree_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_tree.bin.lz"); const u32 gDomeTourneyLineDown_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_line_down_map.bin.lz"); const u32 gDomeTourneyLineUp_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_line_up_map.bin.lz"); const u32 gDomeTourneyInfoCard_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_info_card.4bpp.lz"); @@ -967,7 +967,7 @@ const u32 gBattleArenaJudgementSymbolsGfx[] = INCBIN_U32("graphics/battle_fronti const u32 gBattleArenaJudgementSymbolsPalette[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.gbapal.lz"); const u32 gBattleWindowTextPalette[] = INCBIN_U32("graphics/battle_interface/text.gbapal.lz"); -const u16 gPPTextPalette[] = INCBIN_U16("graphics/battle_frontier/text_pp.gbapal"); +const u16 gPPTextPalette[] = INCBIN_U16("graphics/battle_interface/text_pp.gbapal"); const u16 gTilesetAnims_BattleDomePals0_0[] = INCBIN_U16("graphics/battle_frontier/dome_anim1.gbapal"); const u16 gTilesetAnims_BattleDomePals0_1[] = INCBIN_U16("graphics/battle_frontier/dome_anim2.gbapal"); -- cgit v1.2.3