From b80442645dc880216a35a780e5bed232aea1f92a Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Fri, 23 Apr 2021 11:10:15 -0600 Subject: [PATCH] Reorganize battle terrain gfx --- .../anim.bin} | Bin .../anim.png} | Bin .../terrain.bin} | Bin .../terrain.pal} | 0 .../terrain.png} | Bin .../{terrain_cave_anim.bin => cave/anim.bin} | Bin .../{terrain_cave_anim.png => cave/anim.png} | Bin .../{terrain_cave.bin => cave/terrain.bin} | Bin .../{terrain_cave.pal => cave/terrain.pal} | 0 .../{terrain_cave.png => cave/terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../{terrain_grass.bin => grass/terrain.bin} | Bin .../{terrain_grass.pal => grass/terrain.pal} | 0 .../{terrain_grass.png => grass/terrain.png} | Bin .../{terrain_indoor_1.pal => indoor/1.pal} | 0 .../{terrain_indoor_2.pal => indoor/2.pal} | 0 .../agatha.pal} | 0 .../bruno.pal} | 0 .../champion.pal} | 0 .../gym.pal} | 0 .../lance.pal} | 0 .../leader.pal} | 0 .../link.pal} | 0 .../lorelei.pal} | 0 .../plain.pal} | 0 .../terrain.bin} | Bin .../terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../terrain.bin} | Bin .../terrain.pal} | 0 .../terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../terrain.bin} | Bin .../terrain.pal} | 0 .../terrain.png} | Bin .../{terrain_pond_anim.bin => pond/anim.bin} | Bin .../{terrain_pond_anim.png => pond/anim.png} | Bin .../{terrain_pond.bin => pond/terrain.bin} | Bin .../{terrain_pond.pal => pond/terrain.pal} | 0 .../{terrain_pond.png => pond/terrain.png} | Bin .../{terrain_sand_anim.bin => sand/anim.bin} | Bin .../{terrain_sand_anim.png => sand/anim.png} | Bin .../{terrain_sand.bin => sand/terrain.bin} | Bin .../{terrain_sand.pal => sand/terrain.pal} | 0 .../{terrain_sand.png => sand/terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../terrain.bin} | Bin .../terrain.pal} | 0 .../terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../{terrain_water.bin => water/terrain.bin} | Bin .../{terrain_water.pal => water/terrain.pal} | 0 .../{terrain_water.png => water/terrain.png} | Bin graphics_file_rules.mk | 28 ++--- src/battle_bg.c | 116 +++++++++--------- 60 files changed, 72 insertions(+), 72 deletions(-) rename graphics/battle_terrain/{terrain_building_anim.bin => building/anim.bin} (100%) rename graphics/battle_terrain/{terrain_building_anim.png => building/anim.png} (100%) rename graphics/battle_terrain/{terrain_building.bin => building/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_building.pal => building/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_building.png => building/terrain.png} (100%) rename graphics/battle_terrain/{terrain_cave_anim.bin => cave/anim.bin} (100%) rename graphics/battle_terrain/{terrain_cave_anim.png => cave/anim.png} (100%) rename graphics/battle_terrain/{terrain_cave.bin => cave/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_cave.pal => cave/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_cave.png => cave/terrain.png} (100%) rename graphics/battle_terrain/{terrain_grass_anim.bin => grass/anim.bin} (100%) rename graphics/battle_terrain/{terrain_grass_anim.png => grass/anim.png} (100%) rename graphics/battle_terrain/{terrain_grass.bin => grass/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_grass.pal => grass/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_grass.png => grass/terrain.png} (100%) rename graphics/battle_terrain/{terrain_indoor_1.pal => indoor/1.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_2.pal => indoor/2.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_agatha.pal => indoor/agatha.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_bruno.pal => indoor/bruno.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_champion.pal => indoor/champion.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_gym.pal => indoor/gym.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_lance.pal => indoor/lance.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_leader.pal => indoor/leader.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_link.pal => indoor/link.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_lorelei.pal => indoor/lorelei.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_plain.pal => indoor/plain.pal} (100%) rename graphics/battle_terrain/{terrain_indoor.bin => indoor/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_indoor.png => indoor/terrain.png} (100%) rename graphics/battle_terrain/{terrain_longgrass_anim.bin => longgrass/anim.bin} (100%) rename graphics/battle_terrain/{terrain_longgrass_anim.png => longgrass/anim.png} (100%) rename graphics/battle_terrain/{terrain_longgrass.bin => longgrass/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_longgrass.pal => longgrass/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_longgrass.png => longgrass/terrain.png} (100%) rename graphics/battle_terrain/{terrain_mountain_anim.bin => mountain/anim.bin} (100%) rename graphics/battle_terrain/{terrain_mountain_anim.png => mountain/anim.png} (100%) rename graphics/battle_terrain/{terrain_mountain.bin => mountain/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_mountain.pal => mountain/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_mountain.png => mountain/terrain.png} (100%) rename graphics/battle_terrain/{terrain_pond_anim.bin => pond/anim.bin} (100%) rename graphics/battle_terrain/{terrain_pond_anim.png => pond/anim.png} (100%) rename graphics/battle_terrain/{terrain_pond.bin => pond/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_pond.pal => pond/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_pond.png => pond/terrain.png} (100%) rename graphics/battle_terrain/{terrain_sand_anim.bin => sand/anim.bin} (100%) rename graphics/battle_terrain/{terrain_sand_anim.png => sand/anim.png} (100%) rename graphics/battle_terrain/{terrain_sand.bin => sand/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_sand.pal => sand/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_sand.png => sand/terrain.png} (100%) rename graphics/battle_terrain/{terrain_underwater_anim.bin => underwater/anim.bin} (100%) rename graphics/battle_terrain/{terrain_underwater_anim.png => underwater/anim.png} (100%) rename graphics/battle_terrain/{terrain_underwater.bin => underwater/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_underwater.pal => underwater/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_underwater.png => underwater/terrain.png} (100%) rename graphics/battle_terrain/{terrain_water_anim.bin => water/anim.bin} (100%) rename graphics/battle_terrain/{terrain_water_anim.png => water/anim.png} (100%) rename graphics/battle_terrain/{terrain_water.bin => water/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_water.pal => water/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_water.png => water/terrain.png} (100%) diff --git a/graphics/battle_terrain/terrain_building_anim.bin b/graphics/battle_terrain/building/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_building_anim.bin rename to graphics/battle_terrain/building/anim.bin diff --git a/graphics/battle_terrain/terrain_building_anim.png b/graphics/battle_terrain/building/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_building_anim.png rename to graphics/battle_terrain/building/anim.png diff --git a/graphics/battle_terrain/terrain_building.bin b/graphics/battle_terrain/building/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_building.bin rename to graphics/battle_terrain/building/terrain.bin diff --git a/graphics/battle_terrain/terrain_building.pal b/graphics/battle_terrain/building/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_building.pal rename to graphics/battle_terrain/building/terrain.pal diff --git a/graphics/battle_terrain/terrain_building.png b/graphics/battle_terrain/building/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_building.png rename to graphics/battle_terrain/building/terrain.png diff --git a/graphics/battle_terrain/terrain_cave_anim.bin b/graphics/battle_terrain/cave/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_cave_anim.bin rename to graphics/battle_terrain/cave/anim.bin diff --git a/graphics/battle_terrain/terrain_cave_anim.png b/graphics/battle_terrain/cave/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_cave_anim.png rename to graphics/battle_terrain/cave/anim.png diff --git a/graphics/battle_terrain/terrain_cave.bin b/graphics/battle_terrain/cave/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_cave.bin rename to graphics/battle_terrain/cave/terrain.bin diff --git a/graphics/battle_terrain/terrain_cave.pal b/graphics/battle_terrain/cave/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_cave.pal rename to graphics/battle_terrain/cave/terrain.pal diff --git a/graphics/battle_terrain/terrain_cave.png b/graphics/battle_terrain/cave/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_cave.png rename to graphics/battle_terrain/cave/terrain.png diff --git a/graphics/battle_terrain/terrain_grass_anim.bin b/graphics/battle_terrain/grass/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_grass_anim.bin rename to graphics/battle_terrain/grass/anim.bin diff --git a/graphics/battle_terrain/terrain_grass_anim.png b/graphics/battle_terrain/grass/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_grass_anim.png rename to graphics/battle_terrain/grass/anim.png diff --git a/graphics/battle_terrain/terrain_grass.bin b/graphics/battle_terrain/grass/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_grass.bin rename to graphics/battle_terrain/grass/terrain.bin diff --git a/graphics/battle_terrain/terrain_grass.pal b/graphics/battle_terrain/grass/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_grass.pal rename to graphics/battle_terrain/grass/terrain.pal diff --git a/graphics/battle_terrain/terrain_grass.png b/graphics/battle_terrain/grass/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_grass.png rename to graphics/battle_terrain/grass/terrain.png diff --git a/graphics/battle_terrain/terrain_indoor_1.pal b/graphics/battle_terrain/indoor/1.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_1.pal rename to graphics/battle_terrain/indoor/1.pal diff --git a/graphics/battle_terrain/terrain_indoor_2.pal b/graphics/battle_terrain/indoor/2.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_2.pal rename to graphics/battle_terrain/indoor/2.pal diff --git a/graphics/battle_terrain/terrain_indoor_agatha.pal b/graphics/battle_terrain/indoor/agatha.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_agatha.pal rename to graphics/battle_terrain/indoor/agatha.pal diff --git a/graphics/battle_terrain/terrain_indoor_bruno.pal b/graphics/battle_terrain/indoor/bruno.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_bruno.pal rename to graphics/battle_terrain/indoor/bruno.pal diff --git a/graphics/battle_terrain/terrain_indoor_champion.pal b/graphics/battle_terrain/indoor/champion.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_champion.pal rename to graphics/battle_terrain/indoor/champion.pal diff --git a/graphics/battle_terrain/terrain_indoor_gym.pal b/graphics/battle_terrain/indoor/gym.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_gym.pal rename to graphics/battle_terrain/indoor/gym.pal diff --git a/graphics/battle_terrain/terrain_indoor_lance.pal b/graphics/battle_terrain/indoor/lance.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_lance.pal rename to graphics/battle_terrain/indoor/lance.pal diff --git a/graphics/battle_terrain/terrain_indoor_leader.pal b/graphics/battle_terrain/indoor/leader.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_leader.pal rename to graphics/battle_terrain/indoor/leader.pal diff --git a/graphics/battle_terrain/terrain_indoor_link.pal b/graphics/battle_terrain/indoor/link.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_link.pal rename to graphics/battle_terrain/indoor/link.pal diff --git a/graphics/battle_terrain/terrain_indoor_lorelei.pal b/graphics/battle_terrain/indoor/lorelei.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_lorelei.pal rename to graphics/battle_terrain/indoor/lorelei.pal diff --git a/graphics/battle_terrain/terrain_indoor_plain.pal b/graphics/battle_terrain/indoor/plain.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_plain.pal rename to graphics/battle_terrain/indoor/plain.pal diff --git a/graphics/battle_terrain/terrain_indoor.bin b/graphics/battle_terrain/indoor/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_indoor.bin rename to graphics/battle_terrain/indoor/terrain.bin diff --git a/graphics/battle_terrain/terrain_indoor.png b/graphics/battle_terrain/indoor/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_indoor.png rename to graphics/battle_terrain/indoor/terrain.png diff --git a/graphics/battle_terrain/terrain_longgrass_anim.bin b/graphics/battle_terrain/longgrass/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_longgrass_anim.bin rename to graphics/battle_terrain/longgrass/anim.bin diff --git a/graphics/battle_terrain/terrain_longgrass_anim.png b/graphics/battle_terrain/longgrass/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_longgrass_anim.png rename to graphics/battle_terrain/longgrass/anim.png diff --git a/graphics/battle_terrain/terrain_longgrass.bin b/graphics/battle_terrain/longgrass/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_longgrass.bin rename to graphics/battle_terrain/longgrass/terrain.bin diff --git a/graphics/battle_terrain/terrain_longgrass.pal b/graphics/battle_terrain/longgrass/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_longgrass.pal rename to graphics/battle_terrain/longgrass/terrain.pal diff --git a/graphics/battle_terrain/terrain_longgrass.png b/graphics/battle_terrain/longgrass/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_longgrass.png rename to graphics/battle_terrain/longgrass/terrain.png diff --git a/graphics/battle_terrain/terrain_mountain_anim.bin b/graphics/battle_terrain/mountain/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_mountain_anim.bin rename to graphics/battle_terrain/mountain/anim.bin diff --git a/graphics/battle_terrain/terrain_mountain_anim.png b/graphics/battle_terrain/mountain/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_mountain_anim.png rename to graphics/battle_terrain/mountain/anim.png diff --git a/graphics/battle_terrain/terrain_mountain.bin b/graphics/battle_terrain/mountain/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_mountain.bin rename to graphics/battle_terrain/mountain/terrain.bin diff --git a/graphics/battle_terrain/terrain_mountain.pal b/graphics/battle_terrain/mountain/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_mountain.pal rename to graphics/battle_terrain/mountain/terrain.pal diff --git a/graphics/battle_terrain/terrain_mountain.png b/graphics/battle_terrain/mountain/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_mountain.png rename to graphics/battle_terrain/mountain/terrain.png diff --git a/graphics/battle_terrain/terrain_pond_anim.bin b/graphics/battle_terrain/pond/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_pond_anim.bin rename to graphics/battle_terrain/pond/anim.bin diff --git a/graphics/battle_terrain/terrain_pond_anim.png b/graphics/battle_terrain/pond/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_pond_anim.png rename to graphics/battle_terrain/pond/anim.png diff --git a/graphics/battle_terrain/terrain_pond.bin b/graphics/battle_terrain/pond/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_pond.bin rename to graphics/battle_terrain/pond/terrain.bin diff --git a/graphics/battle_terrain/terrain_pond.pal b/graphics/battle_terrain/pond/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_pond.pal rename to graphics/battle_terrain/pond/terrain.pal diff --git a/graphics/battle_terrain/terrain_pond.png b/graphics/battle_terrain/pond/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_pond.png rename to graphics/battle_terrain/pond/terrain.png diff --git a/graphics/battle_terrain/terrain_sand_anim.bin b/graphics/battle_terrain/sand/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_sand_anim.bin rename to graphics/battle_terrain/sand/anim.bin diff --git a/graphics/battle_terrain/terrain_sand_anim.png b/graphics/battle_terrain/sand/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_sand_anim.png rename to graphics/battle_terrain/sand/anim.png diff --git a/graphics/battle_terrain/terrain_sand.bin b/graphics/battle_terrain/sand/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_sand.bin rename to graphics/battle_terrain/sand/terrain.bin diff --git a/graphics/battle_terrain/terrain_sand.pal b/graphics/battle_terrain/sand/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_sand.pal rename to graphics/battle_terrain/sand/terrain.pal diff --git a/graphics/battle_terrain/terrain_sand.png b/graphics/battle_terrain/sand/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_sand.png rename to graphics/battle_terrain/sand/terrain.png diff --git a/graphics/battle_terrain/terrain_underwater_anim.bin b/graphics/battle_terrain/underwater/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_underwater_anim.bin rename to graphics/battle_terrain/underwater/anim.bin diff --git a/graphics/battle_terrain/terrain_underwater_anim.png b/graphics/battle_terrain/underwater/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_underwater_anim.png rename to graphics/battle_terrain/underwater/anim.png diff --git a/graphics/battle_terrain/terrain_underwater.bin b/graphics/battle_terrain/underwater/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_underwater.bin rename to graphics/battle_terrain/underwater/terrain.bin diff --git a/graphics/battle_terrain/terrain_underwater.pal b/graphics/battle_terrain/underwater/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_underwater.pal rename to graphics/battle_terrain/underwater/terrain.pal diff --git a/graphics/battle_terrain/terrain_underwater.png b/graphics/battle_terrain/underwater/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_underwater.png rename to graphics/battle_terrain/underwater/terrain.png diff --git a/graphics/battle_terrain/terrain_water_anim.bin b/graphics/battle_terrain/water/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_water_anim.bin rename to graphics/battle_terrain/water/anim.bin diff --git a/graphics/battle_terrain/terrain_water_anim.png b/graphics/battle_terrain/water/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_water_anim.png rename to graphics/battle_terrain/water/anim.png diff --git a/graphics/battle_terrain/terrain_water.bin b/graphics/battle_terrain/water/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_water.bin rename to graphics/battle_terrain/water/terrain.bin diff --git a/graphics/battle_terrain/terrain_water.pal b/graphics/battle_terrain/water/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_water.pal rename to graphics/battle_terrain/water/terrain.pal diff --git a/graphics/battle_terrain/terrain_water.png b/graphics/battle_terrain/water/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_water.png rename to graphics/battle_terrain/water/terrain.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3ad7cf542..72dd013b0 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -530,46 +530,46 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(BATTLETERRAINGFXDIR)/terrain_building.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLETERRAINGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/cave/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 106 -$(BATTLETERRAINGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/cave/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 84 -$(BATTLETERRAINGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/grass/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLETERRAINGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/indoor/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLETERRAINGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/longgrass/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 133 -$(BATTLETERRAINGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/longgrass/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLETERRAINGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/mountain/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 47 -$(BATTLETERRAINGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/pond/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(BATTLETERRAINGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/pond/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 75 -$(BATTLETERRAINGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/sand/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(BATTLETERRAINGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/underwater/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 26 -$(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/underwater/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 85 -$(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/water/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 81 $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png diff --git a/src/battle_bg.c b/src/battle_bg.c index 44f26494b..c30f10643 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -343,73 +343,73 @@ static const struct WindowTemplate gUnknown_8248330[] = { }, DUMMY_WIN_TEMPLATE }; -static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.gbapal.lz"); -static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/anim.bin.lz"); -static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.gbapal.lz"); -static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.4bpp.lz"); -static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.bin.lz"); -static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass_anim.bin.lz"); +static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.gbapal.lz"); -static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.gbapal.lz"); -static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.gbapal.lz"); -static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle_terrain/water/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.gbapal.lz"); -static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.gbapal.lz"); -static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.gbapal.lz"); -static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.gbapal.lz"); -static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle_terrain/building/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_link.gbapal.lz"); -static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_gym.gbapal.lz"); -static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_leader.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_2.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_1.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_lorelei.gbapal.lz"); -static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_bruno.gbapal.lz"); -static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_agatha.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_lance.gbapal.lz"); -static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_champion.gbapal.lz"); -static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_plain.gbapal.lz"); -static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor.bin.lz"); +static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle_terrain/indoor/link.gbapal.lz"); +static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle_terrain/indoor/gym.gbapal.lz"); +static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle_terrain/indoor/leader.gbapal.lz"); +static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle_terrain/indoor/2.gbapal.lz"); +static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle_terrain/indoor/1.gbapal.lz"); +static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle_terrain/indoor/lorelei.gbapal.lz"); +static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle_terrain/indoor/bruno.gbapal.lz"); +static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle_terrain/indoor/agatha.gbapal.lz"); +static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle_terrain/indoor/lance.gbapal.lz"); +static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle_terrain/indoor/champion.gbapal.lz"); +static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle_terrain/indoor/plain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle_terrain/indoor/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle_terrain/indoor/terrain.bin.lz"); static const struct BattleBackground sBattleTerrainTable[] = { [BATTLE_TERRAIN_GRASS] =