diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-12-31 00:40:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-31 00:40:45 -0500 |
| commit | ec85c01e7c6d15060eddcc653db33a4b317646d2 (patch) | |
| tree | 4266c43bcdc1c80c52def44e1470182d3f1c665c /graphics_file_rules.mk | |
| parent | 093610b46e99b517a416ccd5a572054dff09801b (diff) | |
| parent | 0c74e2097ffbe8395d6f3659c2a49fc829d69b99 (diff) | |
Merge branch 'master' into doc-factscreen
Diffstat (limited to 'graphics_file_rules.mk')
| -rw-r--r-- | graphics_file_rules.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 019f382eb..f9ea40532 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -457,23 +457,23 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ $(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png +$(RAYQUAZAGFXDIR)/scene_2/rayquaza.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 227 -$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_2/bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 313 -$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_3/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 124 -$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp +$(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail.4bpp cp $< $@ head -c 12 /dev/zero >> $@ -$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_4/streaks.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 -$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_4/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 155 graphics/picture_frame/frame5.4bpp: %.4bpp: %.png @@ -709,7 +709,7 @@ $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ $(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png +$(PKNAVGFXDIR)/device_outline.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 $(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png |