Merge master into ObjEvent rename

This commit is contained in:
GriffinR
2019-12-21 05:19:27 -05:00
67 changed files with 1026 additions and 822 deletions

View File

@@ -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