From 0517667b5b5eddb4c64ace3502e85c269e01c66c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 18 Nov 2022 22:02:26 -0500 Subject: [PATCH] Standardize battle_transition graphics --- ..._pokeball_tileset.png => big_pokeball.png} | Bin ...rid_square_tileset.png => grid_square.png} | Bin .../{vsbar_tileset.png => mugshot_banner.png} | Bin ...eball_tilemap.bin => sliding_pokeball.bin} | Bin graphics_file_rules.mk | 25 ------------------ src/battle_transition.c | 24 ++++++++--------- 6 files changed, 12 insertions(+), 37 deletions(-) rename graphics/battle_transitions/{big_pokeball_tileset.png => big_pokeball.png} (100%) rename graphics/battle_transitions/{grid_square_tileset.png => grid_square.png} (100%) rename graphics/battle_transitions/{vsbar_tileset.png => mugshot_banner.png} (100%) rename graphics/battle_transitions/{sliding_pokeball_tilemap.bin => sliding_pokeball.bin} (100%) diff --git a/graphics/battle_transitions/big_pokeball_tileset.png b/graphics/battle_transitions/big_pokeball.png similarity index 100% rename from graphics/battle_transitions/big_pokeball_tileset.png rename to graphics/battle_transitions/big_pokeball.png diff --git a/graphics/battle_transitions/grid_square_tileset.png b/graphics/battle_transitions/grid_square.png similarity index 100% rename from graphics/battle_transitions/grid_square_tileset.png rename to graphics/battle_transitions/grid_square.png diff --git a/graphics/battle_transitions/vsbar_tileset.png b/graphics/battle_transitions/mugshot_banner.png similarity index 100% rename from graphics/battle_transitions/vsbar_tileset.png rename to graphics/battle_transitions/mugshot_banner.png diff --git a/graphics/battle_transitions/sliding_pokeball_tilemap.bin b/graphics/battle_transitions/sliding_pokeball.bin similarity index 100% rename from graphics/battle_transitions/sliding_pokeball_tilemap.bin rename to graphics/battle_transitions/sliding_pokeball.bin diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 06ba0b330..77b059049 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -248,28 +248,6 @@ $(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \ $(ROULETTEGFXDIR)/makuhita.4bpp @cat $^ >$@ -$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 53 -Wnum_tiles - -$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 938 -Wnum_tiles - -$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ - $(BATTRANSGFXDIR)/frontier_squares_1.4bpp - @cat $^ >$@ - -$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ - $(BATTRANSGFXDIR)/frontier_squares_2.4bpp - @cat $^ >$@ - -$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ - $(BATTRANSGFXDIR)/frontier_squares_3.4bpp - @cat $^ >$@ - -$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ - $(BATTRANSGFXDIR)/frontier_squares_4.4bpp - @cat $^ >$@ - $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \ $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp @cat $^ >$@ @@ -450,9 +428,6 @@ $(FIELDEFFECTSGFXDIR)/pics/tree_disguise.4bpp: %.4bpp: %.png $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 8 -Wnum_tiles - -$(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 43 -Wnum_tiles graphics/tm_case/tm_case.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 91 -Wnum_tiles diff --git a/src/battle_transition.c b/src/battle_transition.c index b4f69f6b9..673a2f3d9 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -207,13 +207,13 @@ static void IncrementTrainerPicState(s16 spriteId); static s16 IsTrainerPicSlideDone(s16 spriteId); static void Mugshots_CreateTrainerPics(struct Task *task); -static const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball_tileset.4bpp"); -static const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/sliding_pokeball_tilemap.bin"); -static const u8 sPokeball_Gfx[] = INCBIN_U8("graphics/battle_transitions/sliding_pokeball.4bpp"); -static const u32 sVsBarTileset[] = INCBIN_U32("graphics/battle_transitions/vsbar_tileset.4bpp"); +static const u32 sBigPokeball_Gfx[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp"); +static const u32 sSlidingPokeball_Tilemap[] = INCBIN_U32("graphics/battle_transitions/sliding_pokeball.bin"); +static const u8 sSlidingPokeball_Gfx[] = INCBIN_U8("graphics/battle_transitions/sliding_pokeball.4bpp"); +static const u32 sMugshotBanner_Gfx[] = INCBIN_U32("graphics/battle_transitions/mugshot_banner.4bpp"); static const u8 sUnusedBrendan_Gfx[] = INCBIN_U8("graphics/battle_transitions/unused_brendan.4bpp"); static const u8 sUnusedLass_Gfx[] = INCBIN_U8("graphics/battle_transitions/unused_lass.4bpp"); -static const u32 sGridSquareTileset[] = INCBIN_U32("graphics/battle_transitions/grid_square_tileset.4bpp"); +static const u32 sGridSquare_Gfx[] = INCBIN_U32("graphics/battle_transitions/grid_square.4bpp"); // All battle transitions use the same intro static const TaskFunc sTasks_Intro[] = @@ -453,8 +453,8 @@ static const TransitionStateFunc sTransitionIntroFuncs[] = static const struct SpriteFrameImage sSpriteImage_Pokeball[] = { { - .data = sPokeball_Gfx, - .size = sizeof(sPokeball_Gfx), + .data = sSlidingPokeball_Gfx, + .size = sizeof(sSlidingPokeball_Gfx), }, }; @@ -928,7 +928,7 @@ static bool8 BigPokeball_Init(struct Task *task) InitPatternWeaveTransition(task); GetBg0TilesDst(&tilemap, &tileset); CpuFill16(0, tilemap, BG_SCREEN_SIZE); - CpuCopy16(sBigPokeball_Tileset, tileset, 0x580); + CpuCopy16(sBigPokeball_Gfx, tileset, sizeof(sBigPokeball_Gfx)); LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball)); task->tState++; return FALSE; @@ -1098,7 +1098,7 @@ static bool8 PokeballsTrail_Init(struct Task *task) u16 *tilemap, *tileset; GetBg0TilesDst(&tilemap, &tileset); - CpuCopy16(sPokeballTrail_Tileset, tileset, 0x40); + CpuCopy16(sSlidingPokeball_Tilemap, tileset, 0x40); CpuFill32(0, tilemap, BG_SCREEN_SIZE); LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball)); task->tState++; @@ -1897,7 +1897,7 @@ static bool8 Mugshot_SetGfx(struct Task *task) const u16 *mugshotsMap = sMugshotsTilemap; GetBg0TilesDst(&tilemap, &tileset); - CpuCopy16(sVsBarTileset, tileset, 0x1E0); + CpuCopy16(sMugshotBanner_Gfx, tileset, sizeof(sMugshotBanner_Gfx)); LoadPalette(sOpponentMugshotsPals[task->tMugshotId], 0xF0, 0x20); LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], 0xFA, 0xC); @@ -2578,7 +2578,7 @@ static bool8 GridSquares_Init(struct Task *task) u16 *tilemap, *tileset; GetBg0TilesDst(&tilemap, &tileset); - CpuCopy16(sGridSquareTileset, tileset, 0x20); + CpuCopy16(sGridSquare_Gfx, tileset, 0x20); CpuFill16(0xF0 << 8, tilemap, BG_SCREEN_SIZE); LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball)); task->tState++; @@ -2594,7 +2594,7 @@ static bool8 GridSquares_Main(struct Task *task) GetBg0TilemapDst(&tileset); task->tDelay = 3; task->tShrinkStage++; - CpuCopy16(&sGridSquareTileset[task->tShrinkStage * 8], tileset, 0x20); + CpuCopy16(&sGridSquare_Gfx[task->tShrinkStage * 8], tileset, 0x20); if (task->tShrinkStage > 13) { task->tState++;