diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
commit | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (patch) | |
tree | 65b32493ea3eaef107ac73f804d23563da0f9ada /spritesheet_rules.mk | |
parent | 949509aade2627ded031669c296453c3d0ea9e59 (diff) | |
parent | 026e1108b26f4ce5cea362997135bd8efc7cb28a (diff) |
Merge master into ObjEvent rename
Diffstat (limited to 'spritesheet_rules.mk')
-rw-r--r-- | spritesheet_rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 262d53232..23dd6fbcf 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -653,7 +653,7 @@ $(OBJEVENTGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(OBJEVENTGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/lavaridge_gym_warp.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 $(OBJEVENTGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png |