Reverted all files to 3c19d33

Author: a huge sonic fan

MERGE_NOTES.md

@@ -59,7 +59,7 @@ RSF             := $(TOPDIR)/$(RESOURCES)/template.rsf
 ARCH 		:= -march=armv6k -mtune=mpcore -mfloat-abi=hard -mfpu=vfp
 COMMON      := -Wall -O3 -mword-relocations -fomit-frame-pointer -ffunction-sections $(ARCH) $(INCLUDE) -D__3DS__ -DLODEPNG_NO_COMPILE_ALLOCATORS
 # TODO: Fix unused functions
-CFLAGS 		:= $(COMMON) -std=gnu99 -Wno-unused-function -DLODEPNG_NO_COMPILE_ALLOCATORS -DENABLE_BC16 -DENABLE_BC17
+CFLAGS 		:= $(COMMON) -std=gnu99 -Wno-unused-function -DLODEPNG_NO_COMPILE_ALLOCATORS
 CXXFLAGS    := $(COMMON) -fno-rtti -fno-exceptions -std=gnu++11
 ASFLAGS     := $(ARCH)
 LDFLAGS     := $(ARCH) -Wl,-Map,$(notdir $*.map)

Makefile

@@ -13,11 +13,6 @@ endif
 TOPDIR ?= $(CURDIR)
 include $(DEVKITPRO)/wut/share/wut_rules
 
-# Default to 2-way parallel builds unless caller already set -j.
-ifeq ($(filter -j%,$(MAKEFLAGS)),)
-MAKEFLAGS += -j2
-endif
-
 TARGET      := undertale
 BUILD       := build-wiiu
 SOURCES     := src src/wiiu
@@ -46,8 +41,8 @@ WIIU_SHADER_PREBUILT := $(WIIU_SHADERS) $(WIIU_SHADER_HDR)
 HAVE_CAFEGLSL := $(if $(wildcard $(CAFEGLSL)),1,0)
 
 COMMON      := -Wall -O2 -ffunction-sections -fdata-sections $(MACHDEP) $(INCLUDE) -D__WIIU__
-CFLAGS      := $(COMMON) -std=gnu99 -Wno-unused-function -DENABLE_BC16 -DENABLE_BC17
-CXXFLAGS    := $(COMMON) -std=gnu++11 -fno-rtti -fno-exceptions -DENABLE_BC16 -DENABLE_BC17
+CFLAGS      := $(COMMON) -std=gnu99 -Wno-unused-function
+CXXFLAGS    := $(COMMON) -std=gnu++11 -fno-rtti -fno-exceptions
 ASFLAGS     := $(MACHDEP)
 LDFLAGS     := $(RPXSPECS) -Wl,-Map,$(notdir $*.map),--gc-sections
 LIBS        := -lSDL2 -lwut -lm
@@ -141,4 +136,4 @@ DEPENDS := $(OFILES:.o=.d)
 
 $(OUTPUT_FILE).elf: $(OFILES)
 
-endif
+endif

Makefile.wiiu

@@ -1,9 +1,15 @@
 # Cinnamon
-A fork of butterscotch with 3DS and Wii U support!
+A fork of Butterscotch with 3DS and Wii U support!
 
 ### TO-DO:
-- ...optimize.
-- Real hardware support added back
+- Optimize 3DS
+- Fix room advancing on 3DS
+- Convert Asriel background into an animation
+- Fix Muffet pet attack
+- Fix rotation
+- Add colored sprites (3DS)
+- Disable lava_object or turn it into an animation
+- UPDATE SRC!!
 
 ### File Explanations:
 - runner.c handles events, rooms, instances, etc.