Merge into master

This commit is contained in:
DizzyEggg committed 2019-12-23 16:46:03 +01:00
commit 9a2888fdbf
233 files changed
+10138 -13455

No files matched your search

+1 -1
View File
@@ -685,7 +685,7 @@ $(EVENTOBJGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png
$(EVENTOBJGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 1
$(EVENTOBJGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png
$(EVENTOBJGFXDIR)/effects/lavaridge_gym_warp.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(EVENTOBJGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png