diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-15 09:01:56 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-15 09:01:56 -0500 |
| commit | 89b695278d0a126279ac232d534aebdc351cc2be (patch) | |
| tree | 2b22248f02a30a906187553274dee989c6ddb74e /graphics_file_rules.mk | |
| parent | 79609d52c8d8489b490589a1150b0754c0f61568 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
Merge branch 'master' into heal_location
Diffstat (limited to 'graphics_file_rules.mk')
| -rw-r--r-- | graphics_file_rules.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 7411d6305..38806bbd3 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -5,6 +5,7 @@ monpaldir := graphics/pokemon/palettes INTROGFXDIR := graphics/intro interfacedir := graphics/interface PKNAVGFXDIR := graphics/pokenav +MISCGFXDIR := graphics/misc $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ @@ -71,7 +72,7 @@ $(tilesetdir)/secondary/battle_frontier_outside_west/tiles.4bpp: $(tilesetdir)/s $(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: $(tilesetdir)/secondary/battle_frontier_outside_east/tiles.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/primary/inside_building/tiles.4bpp: $(tilesetdir)/primary/inside_building/tiles.png +$(tilesetdir)/primary/building/tiles.4bpp: $(tilesetdir)/primary/building/tiles.png $(GFX) $< $@ -num_tiles 502 $(tilesetdir)/secondary/shop/tiles.4bpp: $(tilesetdir)/secondary/shop/tiles.png @@ -288,10 +289,11 @@ graphics/title_screen/pokemon_logo.gbapal: graphics/title_screen/pokemon_logo.pa $(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png $(GFX) $< $@ -num_tiles 39 - + $(interfacedir)/pkmnjump_bg.4bpp: $(interfacedir)/pkmnjump_bg.png $(GFX) $< $@ -num_tiles 63 - $(PKNAVGFXDIR)/region_map.8bpp: $(PKNAVGFXDIR)/region_map.png $(GFX) $< $@ -num_tiles 233 +$(MISCGFXDIR)/japanese_hof.4bpp: $(MISCGFXDIR)/japanese_hof.png + $(GFX) $< $@ -num_tiles 29 |