diff options
| author | hjk321 <anderdude@outlook.com> | 2021-03-30 23:20:48 -0500 |
|---|---|---|
| committer | hjk321 <anderdude@outlook.com> | 2021-03-30 23:34:31 -0500 |
| commit | ea68ec3fd7359061eaa4ca0e2550ee9961a52449 (patch) | |
| tree | 7f4e63e6c09772fe03439c57e11d8c378ba5439e /graphics_file_rules.mk | |
| parent | 7d9bcc9f77aae2a59f657c77ffa670fd43a4bf87 (diff) | |
Merge battle graphics into battle_terrain and remove un-included files
The previous battle folder contained the used (and until recently undocumented) battle terrain graphics, while everything in the previous battle_terrain folder contained unused data (which is now at battle_terrain/unused, minus the files that never get included in the rom).
Diffstat (limited to 'graphics_file_rules.mk')
| -rw-r--r-- | graphics_file_rules.mk | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3fc4b3b7b..f3bed2da7 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -24,7 +24,7 @@ TITLESCREENGFXDIR := graphics/title_screen CREDITSGFXDIR := graphics/credits ITEMMENUGFXDIR := graphics/item_menu INTROGFXDIR := graphics/intro -BATTLEGFXDIR := graphics/battle +BATTLETERRAINGFXDIR := graphics/battle_terrain types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -528,44 +528,44 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(BATTLEGFXDIR)/terrain_building.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_building.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLEGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 106 -$(BATTLEGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 84 -$(BATTLEGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLEGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLEGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 133 -$(BATTLEGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLEGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 47 -$(BATTLEGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(BATTLEGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 75 -$(BATTLEGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(BATTLEGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 26 -$(BATTLEGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 85 -$(BATTLEGFXDIR)/terrain_water.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 81 |