Merge pull request #351 from sm64pc/nightly

Merge nightly into master
2020-06-19 23:48:05 +03:00 · 2020-06-19 23:48:05 +03:00 · f500541834
parent 55e2a3bacb af8c4fc4fa
commit f500541834
583 changed files with 59416 additions and 180116 deletions
--- a/.gitignore
+++ b/.gitignore
@ -54,6 +54,7 @@ build/*
 *.mio0
 *.z64
 *.map
+*.sav
 .assets-local.txt
 sm64_save_file.bin
 sm64config.txt
--- a/368
+++ b/368
@ -10,6 +10,8 @@ default: all
 # These options can either be changed by modifying the makefile, or
 # by building with 'make SETTING=value'. 'make clean' may be required.

+# Build debug version (default)
+DEBUG ?= 1
 # Version of the game to build
 VERSION ?= us
 # Graphics microcode used
@ -18,15 +20,20 @@ GRUCODE ?= f3d_old
 COMPARE ?= 1
 # If NON_MATCHING is 1, define the NON_MATCHING and AVOID_UB macros when building (recommended)
 NON_MATCHING ?= 1
-# Sane default until N64 build scripts rm'd
-TARGET_N64 = 0

 # Build and optimize for Raspberry Pi(s)
 TARGET_RPI ?= 0

+# Build for Emscripten/WebGL
+TARGET_WEB ?= 0
+
 # Makeflag to enable OSX fixes
 OSX_BUILD ?= 0

+# Specify the target you are building for, TARGET_BITS=0 means native
+TARGET_ARCH ?= native
+TARGET_BITS ?= 0
+
 # Disable better camera by default
 BETTERCAMERA ?= 0
 # Disable no drawing distance by default
@ -35,38 +42,74 @@ NODRAWINGDISTANCE ?= 0
 TEXTURE_FIX ?= 0
 # Enable extended options menu by default
 EXT_OPTIONS_MENU ?= 1
+# Disable text-based save-files by default
+TEXTSAVES ?= 0
+# Load resources from external files
+EXTERNAL_DATA ?= 0
+# Enable Discord Rich Presence
+DISCORDRPC ?= 0

-# Build for Emscripten/WebGL
-TARGET_WEB ?= 0
-# Specify the target you are building for, 0 means native
-TARGET_ARCH ?= native
+# Various workarounds for weird toolchains

-ifeq ($(CROSS),i686-w64-mingw32.static-)
-  TARGET_ARCH = i386pe
-else ifeq ($(CROSS),x86_64-w64-mingw32.static-)
-  TARGET_ARCH = i386pe
-else
-  TARGET_ARCH = native
-endif
+NO_BZERO_BCOPY ?= 0
+NO_LDIV ?= 0

-TARGET_BITS ?= 0
+# Backend selection

-ifneq ($(TARGET_BITS),0)
-  BITS := -m$(TARGET_BITS)
-else
-  BITS :=
-endif
+# Renderers: GL, GL_LEGACY, D3D11, D3D12
+RENDER_API ?= GL
+# Window managers: SDL2, DXGI (forced if D3D11 or D3D12 in RENDER_API)
+WINDOW_API ?= SDL2
+# Audio backends: SDL2
+AUDIO_API ?= SDL2
+# Controller backends (can have multiple, space separated): SDL2
+CONTROLLER_API ?= SDL2
+
+# Misc settings for EXTERNAL_DATA
+
+BASEDIR ?= res
+BASEPACK ?= base.zip

 # Automatic settings for PC port(s)

 NON_MATCHING := 1
 GRUCODE := f3dex2e
-WINDOWS_BUILD := 0
+WINDOWS_BUILD ?= 0
+
+# Attempt to detect OS
+
+ifeq ($(OS),Windows_NT)
+  HOST_OS ?= Windows
+else
+  HOST_OS ?= $(shell uname -s 2>/dev/null || echo Unknown)
+  # some weird MINGW/Cygwin env that doesn't define $OS
+  ifneq (,$(findstring MINGW,HOST_OS))
+    HOST_OS := Windows
+  endif
+endif

 ifeq ($(TARGET_WEB),0)
-ifeq ($(OS),Windows_NT)
-WINDOWS_BUILD := 1
+  ifeq ($(HOST_OS),Windows)
+    WINDOWS_BUILD := 1
+  endif
 endif
+
+# MXE overrides
+
+ifeq ($(WINDOWS_BUILD),1)
+  ifeq ($(CROSS),i686-w64-mingw32.static-)
+    TARGET_ARCH = i386pe
+    TARGET_BITS = 32
+    NO_BZERO_BCOPY := 1
+  else ifeq ($(CROSS),x86_64-w64-mingw32.static-)
+    TARGET_ARCH = i386pe
+    TARGET_BITS = 64
+    NO_BZERO_BCOPY := 1
+  endif
+endif
+
+ifneq ($(TARGET_BITS),0)
+  BITS := -m$(TARGET_BITS)
 endif

 # Release (version) flag defs
@ -108,6 +151,14 @@ endif
 endif
 endif

+# Stuff for showing the git hash in the intro on nightly builds
+# From https://stackoverflow.com/questions/44038428/include-git-commit-hash-and-or-branch-name-in-c-c-source
+ifeq ($(shell git rev-parse --abbrev-ref HEAD),nightly)
+  GIT_HASH=`git rev-parse --short HEAD`
+  COMPILE_TIME=`date -u +'%Y-%m-%d %H:%M:%S UTC'`
+  VERSION_CFLAGS += -DNIGHTLY -DGIT_HASH="\"$(GIT_HASH)\"" -DCOMPILE_TIME="\"$(COMPILE_TIME)\""
+endif
+
 # Microcode

 ifeq ($(GRUCODE),f3dex) # Fast3DEX
@ -160,7 +211,23 @@ VERSION_ASFLAGS := --defsym AVOID_UB=1
 COMPARE := 0

 ifeq ($(TARGET_WEB),1)
-  VERSION_CFLAGS := $(VERSION_CFLAGS) -DTARGET_WEB
+  VERSION_CFLAGS := $(VERSION_CFLAGS) -DTARGET_WEB -DUSE_GLES
+endif
+
+# Check backends
+
+ifneq (,$(filter $(RENDER_API),D3D11 D3D12))
+  ifneq ($(WINDOWS_BUILD),1)
+    $(error DirectX is only supported on Windows)
+  endif
+  ifneq ($(WINDOW_API),DXGI)
+    $(warning DirectX renderers require DXGI, forcing WINDOW_API value)
+    WINDOW_API := DXGI
+  endif
+else
+  ifeq ($(WINDOW_API),DXGI)
+    $(error DXGI can only be used with DirectX renderers)
+  endif
 endif

 ################### Universal Dependencies ###################
@ -229,9 +296,13 @@ LEVEL_DIRS := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h)))
 # Directories containing source files

 # Hi, I'm a PC
-SRC_DIRS := src src/engine src/game src/audio src/menu src/buffers actors levels bin data assets src/pc src/pc/gfx src/pc/audio src/pc/controller
+SRC_DIRS := src src/engine src/game src/audio src/menu src/buffers actors levels bin data assets src/pc src/pc/gfx src/pc/audio src/pc/controller src/pc/fs src/pc/fs/packtypes
 ASM_DIRS :=

+ifeq ($(DISCORDRPC),1)
+  SRC_DIRS += src/pc/discord
+endif
+
 BIN_DIRS := bin bin/$(VERSION)

 ULTRA_SRC_DIRS := lib/src lib/src/math
@ -243,14 +314,10 @@ GODDARD_SRC_DIRS := src/goddard src/goddard/dynlists
 MIPSISET := -mips2
 MIPSBIT := -32

-ifeq ($(VERSION),eu)
-  OPT_FLAGS := -O2
-else
-ifeq ($(VERSION),sh)
-  OPT_FLAGS := -O2
-else
+ifeq ($(DEBUG),1)
  OPT_FLAGS := -g
-endif
+else
+  OPT_FLAGS := -O2
 endif

 # Set BITS (32/64) to compile for
@ -260,10 +327,6 @@ ifeq ($(TARGET_WEB),1)
  OPT_FLAGS := -O2 -g4 --source-map-base http://localhost:8080/
 endif

-# Use a default opt flag for gcc, then override if RPi
-
-# OPT_FLAGS := -O2 # "Whole-compile optimization flag" Breaks sound on x86.
-
 ifeq ($(TARGET_RPI),1)
 	machine = $(shell sh -c 'uname -m 2>/dev/null || echo unknown')
 # Raspberry Pi B+, Zero, etc
@ -309,10 +372,6 @@ GODDARD_C_FILES := $(foreach dir,$(GODDARD_SRC_DIRS),$(wildcard $(dir)/*.c))
 GENERATED_C_FILES := $(BUILD_DIR)/assets/mario_anim_data.c $(BUILD_DIR)/assets/demo_data.c \
  $(addprefix $(BUILD_DIR)/bin/,$(addsuffix _skybox.c,$(notdir $(basename $(wildcard textures/skyboxes/*.png)))))

-ifeq ($(WINDOWS_BUILD),0)
-  CXX_FILES :=
-endif
-
 # We need to keep this for now
 # If we're not N64 use below

@ -411,6 +470,18 @@ ULTRA_O_FILES := $(foreach file,$(ULTRA_S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \

 GODDARD_O_FILES := $(foreach file,$(GODDARD_C_FILES),$(BUILD_DIR)/$(file:.c=.o))

+RPC_LIBS :=
+ifeq ($(DISCORDRPC),1)
+  ifeq ($(WINDOWS_BUILD),1)
+    RPC_LIBS := lib/discord/libdiscord-rpc.dll
+  else ifeq ($(OSX_BUILD),1) 
+    # needs testing
+    RPC_LIBS := lib/discord/libdiscord-rpc.dylib
+  else
+    RPC_LIBS := lib/discord/libdiscord-rpc.so
+  endif
+endif
+
 # Automatic dependency files
 DEP_FILES := $(O_FILES:.o=.d) $(ULTRA_O_FILES:.o=.d) $(GODDARD_O_FILES:.o=.d) $(BUILD_DIR)/$(LD_SCRIPT).d

@ -423,7 +494,7 @@ ENDIAN_BITWIDTH := $(BUILD_DIR)/endian-and-bitwidth

 # Huge deleted N64 section was here

-AS := as
+AS := $(CROSS)as

 ifeq ($(OSX_BUILD),1)
 AS := i686-w64-mingw32-as
@ -434,9 +505,14 @@ ifneq ($(TARGET_WEB),1) # As in, not-web PC port
  CXX := $(CROSS)g++
 else
  CC := emcc
+  CXX := emcc
 endif

-ifeq ($(WINDOWS_BUILD),1)
+LD := $(CC)
+
+ifeq ($(DISCORDRPC),1)
+  LD := $(CXX)
+else ifeq ($(WINDOWS_BUILD),1)
  ifeq ($(CROSS),i686-w64-mingw32.static-) # fixes compilation in MXE on Linux and WSL
    LD := $(CC)
  else ifeq ($(CROSS),x86_64-w64-mingw32.static-)
@ -444,41 +520,88 @@ ifeq ($(WINDOWS_BUILD),1)
  else
    LD := $(CXX)
  endif
-else
-  LD := $(CC)
 endif

 ifeq ($(WINDOWS_BUILD),1) # fixes compilation in MXE on Linux and WSL
  CPP := cpp -P
  OBJCOPY := objcopy
  OBJDUMP := $(CROSS)objdump
-else
-ifeq ($(OSX_BUILD),1)
- CPP := cpp-9 -P
- OBJDUMP := i686-w64-mingw32-objdump
- OBJCOPY := i686-w64-mingw32-objcopy
+else ifeq ($(OSX_BUILD),1)
+  CPP := cpp-9 -P
+  OBJDUMP := i686-w64-mingw32-objdump
+  OBJCOPY := i686-w64-mingw32-objcopy
 else # Linux & other builds
  CPP := $(CROSS)cpp -P
  OBJCOPY := $(CROSS)objcopy
  OBJDUMP := $(CROSS)objdump
 endif
-endif

 PYTHON := python3
 SDLCONFIG := $(CROSS)sdl2-config

+# configure backend flags
+
+BACKEND_CFLAGS := -DRAPI_$(RENDER_API)=1 -DWAPI_$(WINDOW_API)=1 -DAAPI_$(AUDIO_API)=1
+# can have multiple controller APIs
+BACKEND_CFLAGS += $(foreach capi,$(CONTROLLER_API),-DCAPI_$(capi)=1)
+BACKEND_LDFLAGS :=
+SDL2_USED := 0
+
+# for now, it's either SDL+GL or DXGI+DirectX, so choose based on WAPI
+ifeq ($(WINDOW_API),DXGI)
+  DXBITS := `cat $(ENDIAN_BITWIDTH) | tr ' ' '\n' | tail -1`
+  ifeq ($(RENDER_API),D3D11)
+    BACKEND_LDFLAGS += -ld3d11
+  else ifeq ($(RENDER_API),D3D12)
+    BACKEND_LDFLAGS += -ld3d12
+    BACKEND_CFLAGS += -Iinclude/dxsdk
+  endif
+  BACKEND_LDFLAGS += -ld3dcompiler -ldxgi -ldxguid
+  BACKEND_LDFLAGS += -lsetupapi -ldinput8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lwinmm -lversion -luuid -static
+else ifeq ($(WINDOW_API),SDL2)
+  ifeq ($(WINDOWS_BUILD),1)
+    BACKEND_LDFLAGS += -lglew32 -lglu32 -lopengl32
+  else ifeq ($(TARGET_RPI),1)
+    BACKEND_LDFLAGS += -lGLESv2
+  else ifeq ($(OSX_BUILD),1)
+    BACKEND_LDFLAGS += -framework OpenGL `pkg-config --libs glew`
+  else
+    BACKEND_LDFLAGS += -lGL
+  endif
+  SDL_USED := 2
+endif
+
+ifeq ($(AUDIO_API),SDL2)
+  SDL_USED := 2
+endif
+
+ifneq (,$(findstring SDL,$(CONTROLLER_API)))
+  SDL_USED := 2
+endif
+
+# SDL can be used by different systems, so we consolidate all of that shit into this
+ifeq ($(SDL_USED),2)
+  BACKEND_CFLAGS += -DHAVE_SDL2=1 `$(SDLCONFIG) --cflags`
+  ifeq ($(WINDOWS_BUILD),1)
+    BACKEND_LDFLAGS += `$(SDLCONFIG) --static-libs` -lsetupapi -luser32 -limm32 -lole32 -loleaut32 -lshell32 -lwinmm -lversion
+  else
+    BACKEND_LDFLAGS += `$(SDLCONFIG) --libs`
+  endif
+endif
+
 ifeq ($(WINDOWS_BUILD),1)
-CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) `$(SDLCONFIG) --cflags`
-CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv `$(SDLCONFIG) --cflags`
+  CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(BACKEND_CFLAGS) $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS)
+  CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(BACKEND_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv

 else ifeq ($(TARGET_WEB),1)
-CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -s USE_SDL=2
-CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv -s USE_SDL=2
+  CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(BACKEND_CFLAGS) $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -s USE_SDL=2
+  CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(BACKEND_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv -s USE_SDL=2

 # Linux / Other builds below
 else
-CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) `$(SDLCONFIG) --cflags`
-CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv `$(SDLCONFIG) --cflags`
+  CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(BACKEND_CFLAGS) $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS)
+  CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(BACKEND_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv
+
 endif

 # Check for enhancement options
@ -490,12 +613,23 @@ ifeq ($(BETTERCAMERA),1)
  EXT_OPTIONS_MENU := 1
 endif

+ifeq ($(TEXTSAVES),1)
+  CC_CHECK += -DTEXTSAVES
+  CFLAGS += -DTEXTSAVES
+endif
+
 # Check for no drawing distance option
 ifeq ($(NODRAWINGDISTANCE),1)
  CC_CHECK += -DNODRAWINGDISTANCE
  CFLAGS += -DNODRAWINGDISTANCE
 endif

+# Check for Discord Rich Presence option
+ifeq ($(DISCORDRPC),1)
+CC_CHECK += -DDISCORDRPC
+CFLAGS += -DDISCORDRPC
+endif
+
 # Check for texture fix option
 ifeq ($(TEXTURE_FIX),1)
  CC_CHECK += -DTEXTURE_FIX
@ -508,27 +642,59 @@ ifeq ($(EXT_OPTIONS_MENU),1)
  CFLAGS += -DEXT_OPTIONS_MENU
 endif

+# Check for no bzero/bcopy workaround option
+ifeq ($(NO_BZERO_BCOPY),1)
+  CC_CHECK += -DNO_BZERO_BCOPY
+  CFLAGS += -DNO_BZERO_BCOPY
+endif
+
+# Use internal ldiv()/lldiv()
+ifeq ($(NO_LDIV),1)
+  CC_CHECK += -DNO_LDIV
+  CFLAGS += -DNO_LDIV
+endif
+
+# Use OpenGL 1.3
+ifeq ($(LEGACY_GL),1)
+  CC_CHECK += -DLEGACY_GL
+  CFLAGS += -DLEGACY_GL
+endif
+
+# Load external textures
+ifeq ($(EXTERNAL_DATA),1)
+  CC_CHECK += -DEXTERNAL_DATA -DFS_BASEDIR="\"$(BASEDIR)\""
+  CFLAGS += -DEXTERNAL_DATA -DFS_BASEDIR="\"$(BASEDIR)\""
+  # tell skyconv to write names instead of actual texture data and save the split tiles so we can use them later
+  SKYTILE_DIR := $(BUILD_DIR)/textures/skybox_tiles
+  SKYCONV_ARGS := --store-names --write-tiles "$(SKYTILE_DIR)"
+endif
+
 ASFLAGS := -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS)

 ifeq ($(TARGET_WEB),1)
 LDFLAGS := -lm -lGL -lSDL2 -no-pie -s TOTAL_MEMORY=20MB -g4 --source-map-base http://localhost:8080/ -s "EXTRA_EXPORTED_RUNTIME_METHODS=['callMain']"
+
 else ifeq ($(WINDOWS_BUILD),1)
-  LDFLAGS := $(BITS) -march=$(TARGET_ARCH) -Llib -lpthread -lglew32 `$(SDLCONFIG) --static-libs` -lm -lglu32 -lsetupapi -ldinput8 -luser32 -lgdi32 -limm32 -lole32 -loleaut32 -lshell32 -lwinmm -lversion -luuid -lopengl32 -static
+  LDFLAGS := $(BITS) -march=$(TARGET_ARCH) -Llib -lpthread $(BACKEND_LDFLAGS) -static
  ifeq ($(CROSS),)
    LDFLAGS += -no-pie
  endif
  ifeq ($(WINDOWS_CONSOLE),1)
    LDFLAGS += -mconsole
  endif
+
 else ifeq ($(TARGET_RPI),1)
-# Linux / Other builds below
-LDFLAGS := $(OPT_FLAGS) -lm -lGLESv2 `$(SDLCONFIG) --libs` -no-pie
+  LDFLAGS := $(OPT_FLAGS) -lm $(BACKEND_LDFLAGS) -no-pie
+
+else ifeq ($(OSX_BUILD),1)
+  LDFLAGS := -lm $(BACKEND_LDFLAGS) -no-pie -lpthread
+
 else
-ifeq ($(OSX_BUILD),1)
-LDFLAGS := -lm -framework OpenGL `$(SDLCONFIG) --libs` -no-pie -lpthread `pkg-config --libs libusb-1.0 glfw3 glew`
-else
-LDFLAGS := $(BITS) -march=$(TARGET_ARCH) -lm -lGL `$(SDLCONFIG) --libs` -no-pie -lpthread
-endif
+  LDFLAGS := $(BITS) -march=$(TARGET_ARCH) -lm $(BACKEND_LDFLAGS) -no-pie -lpthread
+  ifeq ($(DISCORDRPC),1)
+    LDFLAGS += -ldl -Wl,-rpath .
+  endif
+
 endif # End of LDFLAGS

 # Prevent a crash with -sopt
@ -553,6 +719,7 @@ EMU_FLAGS = --noosd
 LOADER = loader64
 LOADER_FLAGS = -vwf
 SHA1SUM = sha1sum
+ZEROTERM = $(PYTHON) $(TOOLS_DIR)/zeroterm.py

 ###################### Dependency Check #####################

@ -562,6 +729,43 @@ SHA1SUM = sha1sum

 all: $(EXE)

+# thank you apple very cool
+ifeq ($(HOST_OS),Darwin)
+  CP := gcp
+else
+  CP := cp
+endif
+
+ifeq ($(EXTERNAL_DATA),1)
+
+BASEPACK_PATH := $(BUILD_DIR)/$(BASEDIR)/$(BASEPACK)
+BASEPACK_LST := $(BUILD_DIR)/basepack.lst
+
+# depend on resources as well
+all: $(BASEPACK_PATH)
+
+# phony target for building resources
+res: $(BASEPACK_PATH)
+
+# prepares the basepack.lst
+$(BASEPACK_LST): $(EXE)
+	@mkdir -p $(BUILD_DIR)/$(BASEDIR)
+	@echo -n > $(BASEPACK_LST)
+	@echo "$(BUILD_DIR)/sound/bank_sets sound/bank_sets" >> $(BASEPACK_LST)
+	@echo "$(BUILD_DIR)/sound/sequences.bin sound/sequences.bin" >> $(BASEPACK_LST)
+	@echo "$(BUILD_DIR)/sound/sound_data.ctl sound/sound_data.ctl" >> $(BASEPACK_LST)
+	@echo "$(BUILD_DIR)/sound/sound_data.tbl sound/sound_data.tbl" >> $(BASEPACK_LST)
+	@$(foreach f, $(wildcard $(SKYTILE_DIR)/*), echo $(f) gfx/$(f:$(BUILD_DIR)/%=%) >> $(BASEPACK_LST);)
+	@find actors -name \*.png -exec echo "{} gfx/{}" >> $(BASEPACK_LST) \;
+	@find levels -name \*.png -exec echo "{} gfx/{}" >> $(BASEPACK_LST) \;
+	@find textures -name \*.png -exec echo "{} gfx/{}" >> $(BASEPACK_LST) \;
+
+# prepares the resource ZIP with base data
+$(BASEPACK_PATH): $(BASEPACK_LST)
+	@$(PYTHON) $(TOOLS_DIR)/mkzip.py $(BASEPACK_LST) $(BASEPACK_PATH)
+
+endif
+
 clean:
 	$(RM) -r $(BUILD_DIR_BASE)

@ -578,6 +782,9 @@ test: $(ROM)
 load: $(ROM)
 	$(LOADER) $(LOADER_FLAGS) $<

+$(BUILD_DIR)/$(RPC_LIBS):
+	@$(CP) -f $(RPC_LIBS) $(BUILD_DIR)
+
 libultra: $(BUILD_DIR)/libultra.a

 asm/boot.s: $(BUILD_DIR)/lib/bin/ipl3_font.bin
@ -594,6 +801,9 @@ $(BUILD_DIR)/include/text_strings.h: include/text_strings.h.in
 $(BUILD_DIR)/include/text_menu_strings.h: include/text_menu_strings.h.in
 	$(TEXTCONV) charmap_menu.txt $< $@

+$(BUILD_DIR)/include/text_options_strings.h: include/text_options_strings.h.in
+	$(TEXTCONV) charmap.txt $< $@
+
 ifeq ($(VERSION),eu)
 TEXT_DIRS := text/de text/us text/fr

@ -633,6 +843,7 @@ ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS) $(GOD
 DUMMY != mkdir -p $(ALL_DIRS)

 $(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_menu_strings.h
+$(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_options_strings.h

 ifeq ($(VERSION),eu)
 $(BUILD_DIR)/src/menu/file_select.o: $(BUILD_DIR)/include/text_strings.h $(BUILD_DIR)/bin/eu/translation_en.o $(BUILD_DIR)/bin/eu/translation_de.o $(BUILD_DIR)/bin/eu/translation_fr.o
@ -640,11 +851,17 @@ $(BUILD_DIR)/src/menu/star_select.o: $(BUILD_DIR)/include/text_strings.h $(BUILD
 $(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h $(BUILD_DIR)/bin/eu/translation_en.o $(BUILD_DIR)/bin/eu/translation_de.o $(BUILD_DIR)/bin/eu/translation_fr.o
 $(BUILD_DIR)/src/game/options_menu.o: $(BUILD_DIR)/include/text_strings.h $(BUILD_DIR)/bin/eu/translation_en.o $(BUILD_DIR)/bin/eu/translation_de.o $(BUILD_DIR)/bin/eu/translation_fr.o
 O_FILES += $(BUILD_DIR)/bin/eu/translation_en.o $(BUILD_DIR)/bin/eu/translation_de.o $(BUILD_DIR)/bin/eu/translation_fr.o
+ifeq ($(DISCORDRPC),1)
+  $(BUILD_DIR)/src/pc/discord/discordrpc.o: $(BUILD_DIR)/include/text_strings.h $(BUILD_DIR)/bin/eu/translation_en.o $(BUILD_DIR)/bin/eu/translation_de.o $(BUILD_DIR)/bin/eu/translation_fr.o
+endif
 else
 $(BUILD_DIR)/src/menu/file_select.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/menu/star_select.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/game/options_menu.o: $(BUILD_DIR)/include/text_strings.h
+ifeq ($(DISCORDRPC),1)
+  $(BUILD_DIR)/src/pc/discord/discordrpc.o: $(BUILD_DIR)/include/text_strings.h
+endif
 endif

 ################################################################
@ -652,13 +869,19 @@ endif
 ################################################################

 # RGBA32, RGBA16, IA16, IA8, IA4, IA1, I8, I4
+ifeq ($(EXTERNAL_DATA),1)
+$(BUILD_DIR)/%: %.png
+	$(ZEROTERM) "$(patsubst %.png,%,$^)" > $@
+else
 $(BUILD_DIR)/%: %.png
 	$(N64GRAPHICS) -i $@ -g $< -f $(lastword $(subst ., ,$@))
+endif

 $(BUILD_DIR)/%.inc.c: $(BUILD_DIR)/% %.png
 	hexdump -v -e '1/1 "0x%X,"' $< > $@
 	echo >> $@

+ifeq ($(EXTERNAL_DATA),0)
 # Color Index CI8
 $(BUILD_DIR)/%.ci8: %.ci8.png
 	$(N64GRAPHICS_CI) -i $@ -g $< -f ci8
@ -666,6 +889,7 @@ $(BUILD_DIR)/%.ci8: %.ci8.png
 # Color Index CI4
 $(BUILD_DIR)/%.ci4: %.ci4.png
 	$(N64GRAPHICS_CI) -i $@ -g $< -f ci4
+endif

 ################################################################

@ -708,6 +932,18 @@ $(SOUND_BIN_DIR)/%.m64: $(SOUND_BIN_DIR)/%.o
 $(SOUND_BIN_DIR)/%.o: $(SOUND_BIN_DIR)/%.s
 	$(AS) $(ASFLAGS) -o $@ $<

+ifeq ($(EXTERNAL_DATA),1)
+
+$(SOUND_BIN_DIR)/sound_data.ctl.c: $(SOUND_BIN_DIR)/sound_data.ctl
+	echo "unsigned char gSoundDataADSR[] = \"sound/sound_data.ctl\";" > $@
+$(SOUND_BIN_DIR)/sound_data.tbl.c: $(SOUND_BIN_DIR)/sound_data.tbl
+	echo "unsigned char gSoundDataRaw[] = \"sound/sound_data.tbl\";" > $@
+$(SOUND_BIN_DIR)/sequences.bin.c: $(SOUND_BIN_DIR)/sequences.bin
+	echo "unsigned char gMusicData[] = \"sound/sequences.bin\";" > $@
+$(SOUND_BIN_DIR)/bank_sets.c: $(SOUND_BIN_DIR)/bank_sets
+	echo "unsigned char gBankSetsData[] = \"sound/bank_sets\";" > $@
+
+else

 $(SOUND_BIN_DIR)/sound_data.ctl.c: $(SOUND_BIN_DIR)/sound_data.ctl
 	echo "unsigned char gSoundDataADSR[] = {" > $@
@ -729,6 +965,8 @@ $(SOUND_BIN_DIR)/bank_sets.c: $(SOUND_BIN_DIR)/bank_sets
 	hexdump -v -e '1/1 "0x%X,"' $< >> $@
 	echo "};" >> $@

+endif
+
 $(BUILD_DIR)/levels/scripts.o: $(BUILD_DIR)/include/level_headers.h

 $(BUILD_DIR)/include/level_headers.h: levels/level_headers.h.in
@ -806,10 +1044,10 @@ $(BUILD_DIR)/%.o: %.s



-$(EXE): $(O_FILES) $(MIO0_FILES:.mio0=.o) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES)
+$(EXE): $(O_FILES) $(MIO0_FILES:.mio0=.o) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(BUILD_DIR)/$(RPC_LIBS)
 	$(LD) -L $(BUILD_DIR) -o $@ $(O_FILES) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(LDFLAGS)

-.PHONY: all clean distclean default diff test load libultra
+.PHONY: all clean distclean default diff test load libultra res
 .PRECIOUS: $(BUILD_DIR)/bin/%.elf $(SOUND_BIN_DIR)/%.ctl $(SOUND_BIN_DIR)/%.tbl $(SOUND_SAMPLE_TABLES) $(SOUND_BIN_DIR)/%.s $(BUILD_DIR)/%
 .DELETE_ON_ERROR:

--- a/Makefile.split
+++ b/Makefile.split
@ -5,7 +5,7 @@
 # obtain a list of segments from the *.c files in bin directory
 SEGMENTS := $(notdir $(basename $(wildcard bin/*.c))) $(addprefix $(VERSION)/,$(notdir $(basename $(wildcard bin/$(VERSION)/*.c)))) $(addsuffix _skybox,$(notdir $(basename $(wildcard textures/skyboxes/*.png))))
 ACTORS := $(filter %/,$(wildcard actors/*/))
-TEXTURE_DIRS := $(addprefix textures/,$(SEGMENTS)) $(ACTORS) textures/intro_raw
+TEXTURE_DIRS := $(addprefix textures/,$(SEGMENTS)) $(ACTORS) textures/intro_raw textures/skybox_tiles

 # NOTE: textures assume naming convention "texture.<encoding>.png" generates "texture.<encoding>"

@ -165,9 +165,9 @@ $(eval $(call level_rules,menu,generic)) # Menu (File Select)

 # Ending cake textures are generated in a special way
 $(BUILD_DIR)/levels/ending/cake_eu.inc.c: levels/ending/cake_eu.png
-	$(SKYCONV) --type cake-eu --split $^ $(BUILD_DIR)/levels/ending
+	$(SKYCONV) $(SKYCONV_ARGS) --type cake-eu --split $^ $(BUILD_DIR)/levels/ending
 $(BUILD_DIR)/levels/ending/cake.inc.c: levels/ending/cake.png
-	$(SKYCONV) --type cake --split $^ $(BUILD_DIR)/levels/ending
+	$(SKYCONV) $(SKYCONV_ARGS) --type cake --split $^ $(BUILD_DIR)/levels/ending

 # --------------------------------------
 # Texture Bin Rules
@ -235,7 +235,7 @@ $(BUILD_DIR)/bin/eu/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
 # --------------------------------------

 $(BUILD_DIR)/bin/%_skybox.c: textures/skyboxes/%.png
-	$(SKYCONV) --type sky --split $^ $(BUILD_DIR)/bin
+	$(SKYCONV) $(SKYCONV_ARGS) --type sky --split $^ $(BUILD_DIR)/bin

 $(BUILD_DIR)/bin/%_skybox.elf: SEGMENT_ADDRESS := 0x0A000000

--- a/README.md
+++ b/README.md
@ -1,26 +1,30 @@
-# sm64pc
-OpenGL adaptation of [n64decomp/sm64](https://github.com/n64decomp/sm64). 
+# sm64ex
+Fork of [sm64-port/sm64-port](https://github.com/sm64-port/sm64-port) with additional features. 

 Feel free to report bugs and contribute, but remember, there must be **no upload of any copyrighted asset**. 
-Run `./extract_assets.py --clean && make clean` or `make distclean` to remove ROM-originated content. This port has been made possible mostly thanks to [Emill](https://github.com/Emill) and his [n64-fast32-engine](https://github.com/Emill/n64-fast3d-engine/) renderer.
+Run `./extract_assets.py --clean && make clean` or `make distclean` to remove ROM-originated content.

+Please contribute **first** to the [nightly branch](https://github.com/sm64pc/sm64ex/tree/nightly/). New functionality will be merged to master once they're considered to be well-tested.

-Please contribute **first** to the [nightly branch](https://github.com/sm64pc/sm64pc/tree/nightly/). New functionality will be merged to master once they're considered to be well-tested.
+*Read this in other languages: [Español](README_es_ES.md), [Português](README_pt_BR.md) or [简体中文](README_zh_CN.md).*

-*Read this in other languages: [Español](README_es_ES.md) [简体中文](README_zh_CN.md).*
+## New features

-## Features
-
- * Native rendering. You can now play SM64 without the need of an emulator. 
- * Variable aspect ratio and resolution. The game can now correctly render at basically any window size.
- * Native xinput controller support. On Linux, DualShock 4 has been confirmed to work plug-and-play.
- * Analog camera control and mouse look. (Activate with `make BETTERCAMERA=1`.)
- * An option to disable drawing distances. (Activate with `make NODRAWINGDISTANCE=1`.)
- * In-game control binding, currently available on the `testing` branch.
+ * Options menu with various settings, including button remapping.
+ * Optional external data loading (so far only textures and assembled soundbanks), providing support for custom texture packs.
+ * Optional analog camera and mouse look (using [Puppycam](https://github.com/FazanaJ/puppycam)).
+ * Optional OpenGL1.3-based renderer for older machines, as well as the original GL2.1, D3D11 and D3D12 renderers from Emill's [n64-fast3d-engine](https://github.com/Emill/n64-fast3d-engine/).
+ * Option to disable drawing distances.
+ * Optional model and texture fixes (e.g. the smoke texture).
 * Skip introductory Peach & Lakitu cutscenes with the `--skip-intro` CLI option
- * Cheats menu in Options. (Activate with `--cheats`) Please note that if a cheat asks you to press "L" it's referring to the N64 button. Check your bindings and make sure you have the "L" button mapped to a button in your controller.
+ * Cheats menu in Options (activate with `--cheats` or by pressing L thrice in the pause menu).
+ * Support for both little-endian and big-endian save files (meaning you can use save files from both sm64-port and most emulators), as well as an optional text-based save format.
+
+Recent changes in Nightly have moved the save and configuration file path to `%HOMEPATH%\AppData\Roaming\sm64pc` on Windows and `$HOME/.local/share/sm64pc` on Linux. This behaviour can be changed with the `--savepath` CLI option.
+For example `--savepath .` will read saves from the current directory (which not always matches the exe directory, but most of the time it does);
+   `--savepath '!'` will read saves from the executable directory.

 ## Building
-For building instructions, please refer to the [wiki](https://github.com/sm64pc/sm64pc/wiki).
+For building instructions, please refer to the [wiki](https://github.com/sm64pc/sm64ex/wiki).

 **Make sure you have MXE first before attempting to compile for Windows on Linux and WSL. Follow the guide on the wiki.**
--- a/README_pt_BR.md
+++ b/README_pt_BR.md
@ -0,0 +1,33 @@
+# sm64pc
+Adaptação em OpenGL de [n64decomp/sm64](https://github.com/n64decomp/sm64). 
+
+Sinta-se livre para reportar bugs [aqui](https://github.com/sm64pc/sm64pc/issues) e contribuir, mas tenha em mente que não
+aceitamos compartilhamento de conteúdo protegido com direitos autorais.
+
+Se necessário, rode `./extract_assets.py --clean && make clean` ou `make distclean` para remover conteúdos advindos da ROM do jogo.
+Este port é possível graças à [Emill](https://github.com/Emill), [n64-fast32-engine](https://github.com/Emill/n64-fast3d-engine/), e, é claro, ao
+time do [n64decomp](https://github.com/n64decomp).
+
+Em caso de contribuições, crie _pull requests_ apenas para a [branch nightly](https://github.com/sm64pc/sm64pc/tree/nightly/).
+Novas funcionalidades serão adicionadas à branch master quando forem consideradas bem testadas.
+
+*Leia isso em outras linguas: [English](README.md) [简体中文](README_zh_CN.md).*
+
+## Recursos
+
+ * Renderização nativa. Você agora pode jogar SM64 no PC sem precisar de emulador.
+ * Proporção de tela e resolução variáveis. O jogo renderiza corretamente em basicamente qualquer tamanho de janela.
+ * Suporte a entradas de controle através de `xinput`. Tal como usando DualShock 4 em distribuições Linux.
+ * Controle de câmera com analógico ou mouse. (Ative com `make BETTERCAMERA=1`.)
+ * Uma opção para desativar distância de renderização. (Ative com `make NODRAWINGDISTANCE=1`.)
+ * Remapeamento de controles _in-game_.
+ * Pule as cenas introdutórias da Peach e Lakitu com usando a opção `--skip-intro` ao executar o jogo na linha de comando.
+ * Menu de cheats nas opções. (Ative com `--cheats`)
+ ** Note que se algum cheat pedir pelo botão "L", o botão em questão é o "L" do N64. Certifique-se de que este está mapeado, caso necessário.
+
+## Compilação
+Para instruções de compilaçao, consulte a [wiki](https://github.com/sm64pc/sm64pc/wiki).
+
+## Para usuários de Windows
+
+**Certifique-se de que você tem o [MXE](mxe.cc) antes de tentar compilar em Windows. Siga o guia na Wiki.**
--- a/SAVE_FORMAT.MD
+++ b/SAVE_FORMAT.MD
@ -0,0 +1,158 @@
+# Text-based savefile format
+This small document describes a new, TOML-like text format for game saves. This format allows the user to use a simple text editor to change the data necessary for the game (for example, special saves for speedrun training).
+
+All data is stored in pairs (*key = value*). Pairs can be placed arbitrarily within a single section. The format of values may differ for each section.
+
+Each savefile (4 total) must be named `save_file_X.sav`, where X - save slot (0, 1, 2 or 3).
+
+> **Note**: The game creates the savefile only when you are saved in the game after completing a course!
+___
+## Header
+The header is automatically generated by the game when saving progress. It mainly contains information about the value of the 0 and 1 flags, the character that the comment starts with, and the time when the file content changed.
+
+Example:
+```
+# Super Mario 64 save file
+# Comment starts with #
+# True = 1, False = 0
+# 2020-05-18 17:37:07
+```
+
+___
+## Commenting
+All comment lines starts with `#` character. Comments can be located on a separate line or as part of another line. When the game reads the save, comments are ignored.
+
+Example:
+```
+# This is a comment
+coin_score_age = ??     # This is a comment too!
+```
+
+___
+## Menu Section - [menu]
+This section contains two flags for menu. 
+
+| Flag | Value | Description |
+|---|---|---|
+| coin_score_age | 0, 1, 2, 3 | Each save file has a 2 bit "age"    for each course. The higher this value, the older the high score is. This is used for tie-breaking when displaying on the high score screen
+| sound_mode | stereo, mono, headset | Sound mode for the game
+
+Example:
+```
+[menu]
+coin_score_age = 0
+sound_mode = stereo
+```
+___
+## Flags Section - [flags]
+This section contains all main game flags (walkthought milestones).
+> **Note**: The value can be only 0 (False) or 1 (True).
+
+| Flag | Description |
+|---|---|
+| wing_cap | **Red Switch** is pressed 
+| metal_cap | **Green Switch** is pressed
+| vanish_cap | **Blue Switch** is pressed. 
+| key_1 | Key is found in **Bowser in the Dark World**
+| key_2 | Key is found in **Bowser in the Fire Sea**
+| basement_door | Mario unlocked castle's basement door
+| upstairs_door | Mario unlocked castle's upper floors
+| ddd_moved_back | **Dire Dire Docks** painting is moved back 
+| moat_drained | Water is drained in the moat of the castle
+| pps_door | **Princess's Secret Slide** window is unlocked
+| wf_door | **Whomp's Fortress door** is unlocked
+| ccm_door | **Cool, Cool Mountain door** is unlocked
+| jrb_door | **Jolly Roger Bay door** is unlocked
+| bitdw_door | **Bowser in the Dark World door** door is unlocked
+| bitfs_door | **Bowser in the Fire Sea** door is unlocked 
+| 50star_door | **Endless Staircase** is not endless anymore
+
+Example:
+```
+[flags]
+wing_cap = 1
+metal_cap = 1
+vanish_cap = 0
+key_1 = 1
+key_2 = 1
+```
+___
+## Main Courses Section - [courses]
+This section contains all stars and coins that Mario collected in each main course.
+
+The first value stores the number of coins collected.
+> **Warning!**: Make sure that coins count will not exceed 255!
+
+The second value stores the stars (or completed missions). Each mission (6 main + 1 bonus) is must be marked `0` (not completed) and `1` (completed). 
+> **Warning!**: The sequence of stars' missions goes from **RIGHT** to **LEFT**!
+> **Note**: Last star flag is **100 coins star**
+
+| Flag | Short for |
+|---|---|
+| bob | Bob-omb Battlefield |
+| wf | Whomp's Fortress
+| jrb | Jolly Roger Bay
+| ccm | Cool, Cool Mountain
+| bbh | Big Boo's Haunt
+| hmc | Hazy Maze Cave
+| lll | Lethal Lava Land
+| ssl | Shifting Sand Land
+| ddd | Dire, Dire Docks
+| sl | Snowman's Land
+| wdw | Wet-Dry World
+| ttm | Tall, Tall Mountain
+| thi | Tiny-Huge Island
+| ttc | Tick Tock Clock
+| rr | Rainbow Ride
+
+Example:
+```
+[courses]
+bob = "3, 0000011"
+wf = "3, 0000101"
+jrb = "0, 1000000"
+ccm = "1, 1111111"
+```
+___
+## Bonus Section - [bonus]
+This section contains all bonus stars that Mario collected in the castle and all bonus courses.
+> **Note**: The game takes into account only the number of bonus stars collected, the order of stars flags can be arbitrary
+
+| Flag | Stars | Description |
+|---|---|---|
+| hub | 5 | MIPS' stars and Toads' stars
+| bitdw | 1 | Bowser in the Dark World 
+| bitfs | 1 | Bowser in the Fire Sea 
+| bits | 1 | Bowser in the Sky
+| pss | 2 | The Princess's Secret Slide
+| cotmc | 1 | Cavern of the Metal Cap
+| totwc | 1 | Tower of the Wing Cap
+| vcutm | 1 | Vanish Cap Under the Moat
+| wmotr | 1 | Wing Mario Over the Rainbow
+| sa | 1 | The Secret Aquarium
+
+Example:
+```
+[bonus]
+hub = 11101
+bitdw = 1
+bitfs = 0
+bits = 1
+pss = 10
+```
+___
+## Cap Section - [cap]
+This section contains information about where Mario lost his cap and who take it.
+| Flag | Value | Description |
+|---|---|---|
+| type | ground, klepto, ukiki, mrblizzard | The one who or what took the cap from Mario. Default flag is **"ground"**
+| level | ssl, sl, ttm, none | Specifies the course where the cap is located. Default flag is **"none"**.
+| area | 1, 2 | Specifies the area in the course.
+
+Example:
+```
+[cap]
+type = ground
+level = ssl
+area = 1
+```
--- a/actors/bowser_flame/model.inc.c
+++ b/actors/bowser_flame/model.inc.c
@ -78,10 +78,10 @@ static const Vtx flame_seg6_vertex_0601C000[] = {
    {{{   150,    150,      0}, 0, {  2016,    992}, {0xff, 0xff, 0xff, 0xff}}},
    {{{   150,    300,      0}, 0, {  2016,      0}, {0xff, 0xff, 0xff, 0xff}}},
    {{{  -150,    300,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -150,      0,      0}, 0, {     0,    992}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   150,      0,      0}, 0, {  2016,    992}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   150,    150,      0}, 0, {  2016,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -150,    150,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -150,      0,      0}, 0, {     0,   2016}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   150,      0,      0}, 0, {  2016,   2016}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   150,    150,      0}, 0, {  2016,    992}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -150,    150,      0}, 0, {     0,    992}, {0xff, 0xff, 0xff, 0xff}}},
 };

 // 0x0601C080 - 0x0601C0B0
@ -117,10 +117,9 @@ const Gfx flame_seg6_dl_0601C0E0[] = {
 // 0x0601C108 - 0x0601C1A8
 const Gfx flame_seg6_dl_0601C108[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06000000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06000000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06000000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -129,10 +128,9 @@ const Gfx flame_seg6_dl_0601C108[] = {
 // 0x0601C1A8 - 0x0601C248
 const Gfx flame_seg6_dl_0601C1A8[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06002000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06002000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06002000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -141,10 +139,9 @@ const Gfx flame_seg6_dl_0601C1A8[] = {
 // 0x0601C248 - 0x0601C2E8
 const Gfx flame_seg6_dl_0601C248[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06004000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06004000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06004000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -153,10 +150,9 @@ const Gfx flame_seg6_dl_0601C248[] = {
 // 0x0601C2E8 - 0x0601C388
 const Gfx flame_seg6_dl_0601C2E8[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06006000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06006000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06006000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -165,10 +161,9 @@ const Gfx flame_seg6_dl_0601C2E8[] = {
 // 0x0601C388 - 0x0601C428
 const Gfx flame_seg6_dl_0601C388[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06008000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06008000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06008000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -177,10 +172,9 @@ const Gfx flame_seg6_dl_0601C388[] = {
 // 0x0601C428 - 0x0601C4C8
 const Gfx flame_seg6_dl_0601C428[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_0600A000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_0600A000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_0600A000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -189,10 +183,8 @@ const Gfx flame_seg6_dl_0601C428[] = {
 // 0x0601C4C8 - 0x0601C568
 const Gfx flame_seg6_dl_0601C4C8[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_0600C000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_0600C000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
-    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_0600C000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -201,10 +193,9 @@ const Gfx flame_seg6_dl_0601C4C8[] = {
 // 0x0601C568 - 0x0601C608
 const Gfx flame_seg6_dl_0601C568[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_0600E000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_0600E000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_0600E000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -213,10 +204,9 @@ const Gfx flame_seg6_dl_0601C568[] = {
 // 0x0601C608 - 0x0601C6A8
 const Gfx flame_seg6_dl_0601C608[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06010000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06010000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06010000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -225,10 +215,9 @@ const Gfx flame_seg6_dl_0601C608[] = {
 // 0x0601C6A8 - 0x0601C748
 const Gfx flame_seg6_dl_0601C6A8[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06012000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06012000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06012000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -237,10 +226,9 @@ const Gfx flame_seg6_dl_0601C6A8[] = {
 // 0x0601C748 - 0x0601C7E8
 const Gfx flame_seg6_dl_0601C748[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06014000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06014000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06014000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -249,10 +237,9 @@ const Gfx flame_seg6_dl_0601C748[] = {
 // 0x0601C7E8 - 0x0601C888
 const Gfx flame_seg6_dl_0601C7E8[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06016000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06016000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06016000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -261,10 +248,9 @@ const Gfx flame_seg6_dl_0601C7E8[] = {
 // 0x0601C888 - 0x0601C928
 const Gfx flame_seg6_dl_0601C888[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_06018000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_06018000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_06018000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
@ -273,10 +259,9 @@ const Gfx flame_seg6_dl_0601C888[] = {
 // 0x0601C928 - 0x0601C9C8
 const Gfx flame_seg6_dl_0601C928[] = {
    gsSPDisplayList(flame_seg6_dl_0601C080),
-    gsDPLoadTextureBlock(flame_seg6_texture_0601A000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(flame_seg6_texture_0601A000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
    gsSPDisplayList(flame_seg6_dl_0601C0B0),
-    gsDPLoadTextureBlock(flame_seg6_texture_0601A000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(flame_seg6_dl_0601C0C8),
    gsSPDisplayList(flame_seg6_dl_0601C0E0),
    gsSPEndDisplayList(),
--- a/actors/chuckya/model.inc.c
+++ b/actors/chuckya/model.inc.c
@ -357,7 +357,7 @@ static const Vtx chuckya_seg8_vertex_0800A680[] = {
 const Gfx chuckya_seg8_dl_0800A700[] = {
    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chuckya_seg8_texture_08006778),
    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
    gsSPLight(&chuckya_seg8_lights_0800A668.l, 1),
    gsSPLight(&chuckya_seg8_lights_0800A668.a, 2),
    gsSPVertex(chuckya_seg8_vertex_0800A680, 8, 0),
@ -375,7 +375,7 @@ const Gfx chuckya_seg8_dl_0800A758[] = {
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
    gsDPTileSync(),
    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
    gsSPDisplayList(chuckya_seg8_dl_0800A700),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsDPPipeSync(),
--- a/actors/exclamation_box/model.inc.c
+++ b/actors/exclamation_box/model.inc.c
@ -13,7 +13,7 @@ ALIGNED8 static const u8 exclamation_box_seg8_texture_08012E28[] = {

 // 0x08013628
 ALIGNED8 static const u8 exclamation_box_seg8_texture_08013628[] = {
-#include "actors/exclamation_box/vanish_cap_box_sides.rgba16.inc.c"
+#include "actors/exclamation_box/vanish_cap_box_side.rgba16.inc.c"
 };

 // 0x08014628
@ -33,7 +33,7 @@ ALIGNED8 static const u8 exclamation_box_seg8_texture_08015E28[] = {

 // 0x08016628
 ALIGNED8 static const u8 exclamation_box_seg8_texture_08016628[] = {
-#include "actors/exclamation_box/wing_cap_box_sides.rgba16.inc.c"
+#include "actors/exclamation_box/wing_cap_box_side.rgba16.inc.c"
 };

 // 0x08017628
--- a/actors/impact_smoke/model.inc.c
+++ b/actors/impact_smoke/model.inc.c
@ -28,10 +28,10 @@ static const Vtx impact_smoke_seg6_vertex_06062A28[] = {
    {{{   150,    150,      0}, 0, {  2016,    992}, {0x28, 0x19, 0x14, 0xff}}},
    {{{   150,    300,      0}, 0, {  2016,      0}, {0x28, 0x19, 0x14, 0xff}}},
    {{{  -150,    300,      0}, 0, {     0,      0}, {0x28, 0x19, 0x14, 0xff}}},
-    {{{  -150,      0,      0}, 0, {     0,    992}, {0x28, 0x19, 0x14, 0xff}}},
-    {{{   150,      0,      0}, 0, {  2016,    992}, {0x28, 0x19, 0x14, 0xff}}},
-    {{{   150,    150,      0}, 0, {  2016,      0}, {0x28, 0x19, 0x14, 0xff}}},
-    {{{  -150,    150,      0}, 0, {     0,      0}, {0x28, 0x19, 0x14, 0xff}}},
+    {{{  -150,      0,      0}, 0, {     0,   2016}, {0x28, 0x19, 0x14, 0xff}}},
+    {{{   150,      0,      0}, 0, {  2016,   2016}, {0x28, 0x19, 0x14, 0xff}}},
+    {{{   150,    150,      0}, 0, {  2016,    992}, {0x28, 0x19, 0x14, 0xff}}},
+    {{{  -150,    150,      0}, 0, {     0,    992}, {0x28, 0x19, 0x14, 0xff}}},
 };

 // 0x06062AA8 - 0x06062AD8
@ -68,10 +68,9 @@ const Gfx impact_smoke_seg6_dl_06062B08[] = {
 // 0x06062B38 - 0x06062BD8
 const Gfx impact_smoke_seg6_dl_06062B38[] = {
    gsSPDisplayList(impact_smoke_seg6_dl_06062AA8),
-    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605AA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605AA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(impact_smoke_seg6_vertex_06062A28, 8, 0),
    gsSPDisplayList(impact_smoke_seg6_dl_06062AD8),
-    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605AA28 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(impact_smoke_seg6_dl_06062AF0),
    gsSPDisplayList(impact_smoke_seg6_dl_06062B08),
    gsSPEndDisplayList(),
@ -80,10 +79,9 @@ const Gfx impact_smoke_seg6_dl_06062B38[] = {
 // 0x06062BD8 - 0x06062C78
 const Gfx impact_smoke_seg6_dl_06062BD8[] = {
    gsSPDisplayList(impact_smoke_seg6_dl_06062AA8),
-    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605CA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605CA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(impact_smoke_seg6_vertex_06062A28, 8, 0),
    gsSPDisplayList(impact_smoke_seg6_dl_06062AD8),
-    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605CA28 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(impact_smoke_seg6_dl_06062AF0),
    gsSPDisplayList(impact_smoke_seg6_dl_06062B08),
    gsSPEndDisplayList(),
@ -92,10 +90,9 @@ const Gfx impact_smoke_seg6_dl_06062BD8[] = {
 // 0x06062C78 - 0x06062D18
 const Gfx impact_smoke_seg6_dl_06062C78[] = {
    gsSPDisplayList(impact_smoke_seg6_dl_06062AA8),
-    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605EA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605EA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(impact_smoke_seg6_vertex_06062A28, 8, 0),
    gsSPDisplayList(impact_smoke_seg6_dl_06062AD8),
-    gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605EA28 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(impact_smoke_seg6_dl_06062AF0),
    gsSPDisplayList(impact_smoke_seg6_dl_06062B08),
    gsSPEndDisplayList(),
@ -104,10 +101,9 @@ const Gfx impact_smoke_seg6_dl_06062C78[] = {
 // 0x06062D18 - 0x06062DB8
 const Gfx impact_smoke_seg6_dl_06062D18[] = {
    gsSPDisplayList(impact_smoke_seg6_dl_06062AA8),
-    gsDPLoadTextureBlock(impact_smoke_seg6_texture_06060A28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(impact_smoke_seg6_texture_06060A28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPVertex(impact_smoke_seg6_vertex_06062A28, 8, 0),
    gsSPDisplayList(impact_smoke_seg6_dl_06062AD8),
-    gsDPLoadTextureBlock(impact_smoke_seg6_texture_06060A28 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
    gsSPDisplayList(impact_smoke_seg6_dl_06062AF0),
    gsSPDisplayList(impact_smoke_seg6_dl_06062B08),
    gsSPEndDisplayList(),
--- a/actors/king_bobomb/model.inc.c
+++ b/actors/king_bobomb/model.inc.c
@ -531,7 +531,7 @@ static const Vtx king_bobomb_seg5_vertex_0500B218[] = {
 const Gfx king_bobomb_seg5_dl_0500B278[] = {
    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, king_bobomb_seg5_texture_05004878),
    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
    gsSPLight(&king_bobomb_seg5_lights_0500B200.l, 1),
    gsSPLight(&king_bobomb_seg5_lights_0500B200.a, 2),
    gsSPVertex(king_bobomb_seg5_vertex_0500B218, 6, 0),
@ -548,7 +548,7 @@ const Gfx king_bobomb_seg5_dl_0500B2D0[] = {
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
    gsDPTileSync(),
    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
    gsSPDisplayList(king_bobomb_seg5_dl_0500B278),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsDPPipeSync(),
--- a/actors/star/model.inc.c
+++ b/actors/star/model.inc.c
@ -56,7 +56,7 @@ const Gfx star_seg3_dl_0302B870[] = {
    gsSPSetGeometryMode(G_TEXTURE_GEN),
    gsDPSetEnvColor(255, 255, 255, 255),
    gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
-    gsDPLoadTextureBlock(star_seg3_texture_0302A6F0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 5, 6, G_TX_NOLOD, G_TX_NOLOD), //! Dimensions loaded as 32x64 despite this texture having only 32x32 dimensions, harmless due to environment mapping (G_TEXTURE_GEN & gsSPTexture values)
+    gsDPLoadTextureBlock(star_seg3_texture_0302A6F0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 5, 6, G_TX_NOLOD, G_TX_NOLOD),
    gsSPTexture(0x07C0, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
    gsSPDisplayList(star_seg3_dl_0302B7B0),
    gsDPPipeSync(),
--- a/assets.json
+++ b/assets.json
@ -151,9 +151,9 @@
 "actors/exclamation_box/metal_cap_box_front.rgba16.png": [32,32,2048,{"jp":[2032944,83496],"us":[2040320,83496],"eu":[1912288,83496],"sh":[1888800,83496]}],
 "actors/exclamation_box/metal_cap_box_side.rgba16.png": [64,32,4096,{"jp":[2032944,85544],"us":[2040320,85544],"eu":[1912288,85544],"sh":[1888800,85544]}],
 "actors/exclamation_box/vanish_cap_box_front.rgba16.png": [32,32,2048,{"jp":[2032944,77352],"us":[2040320,77352],"eu":[1912288,77352],"sh":[1888800,77352]}],
-"actors/exclamation_box/vanish_cap_box_sides.rgba16.png": [64,32,4096,{"jp":[2032944,79400],"us":[2040320,79400],"eu":[1912288,79400],"sh":[1888800,79400]}],
+"actors/exclamation_box/vanish_cap_box_side.rgba16.png": [32,64,4096,{"jp":[2032944,79400],"us":[2040320,79400],"eu":[1912288,79400],"sh":[1888800,79400]}],
 "actors/exclamation_box/wing_cap_box_front.rgba16.png": [32,32,2048,{"jp":[2032944,89640],"us":[2040320,89640],"eu":[1912288,89640],"sh":[1888800,89640]}],
-"actors/exclamation_box/wing_cap_box_sides.rgba16.png": [64,32,4096,{"jp":[2032944,91688],"us":[2040320,91688],"eu":[1912288,91688],"sh":[1888800,91688]}],
+"actors/exclamation_box/wing_cap_box_side.rgba16.png": [32,64,4096,{"jp":[2032944,91688],"us":[2040320,91688],"eu":[1912288,91688],"sh":[1888800,91688]}],
 "actors/exclamation_box_outline/exclamation_box_outline.rgba16.png": [32,32,2048,{"jp":[2032944,151912],"us":[2040320,151912],"eu":[1912288,151912],"sh":[1888800,151912]}],
 "actors/exclamation_box_outline/exclamation_point.rgba16.png": [16,32,1024,{"jp":[2032944,154240],"us":[2040320,154240],"eu":[1912288,154240],"sh":[1888800,154240]}],
 "actors/explosion/explosion_0.rgba16.png": [32,32,2048,{"jp":[2094912,2568],"us":[2102288,2568],"eu":[1974256,2568],"sh":[1950768,2568]}],
--- a/bin/segment2.c
+++ b/bin/segment2.c
@ -2107,7 +2107,7 @@ const Gfx dl_hud_img_load_tex_block[] = {
    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD),
    gsDPLoadSync(),
    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 4, G_TX_NOLOD, G_TX_CLAMP, 4, G_TX_NOLOD),
    gsDPSetTileSize(0, 0, 0, (16 - 1) << G_TEXTURE_IMAGE_FRAC, (16 - 1) << G_TEXTURE_IMAGE_FRAC),
    gsSPEndDisplayList(),
 };
@ -2144,7 +2144,7 @@ const Gfx dl_rgba16_load_tex_block[] = {
    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD),
    gsDPLoadSync(),
    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 4, G_TX_NOLOD, G_TX_CLAMP, 4, G_TX_NOLOD),
    gsDPSetTileSize(0, 0, 0, (16 - 1) << G_TEXTURE_IMAGE_FRAC, (16 - 1) << G_TEXTURE_IMAGE_FRAC),
    gsSPEndDisplayList(),
 };
--- a/build.sh
+++ b/build.sh
@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Directories and Files
+LIBDIR=./tools/lib/
+LIBAFA=libaudiofile.a
+LIBAFLA=libaudiofile.la
+AUDDIR=./tools/audiofile-0.3.6
+
+# Command line options
+OPTIONS=("Analog Camera" "No Draw Distance" "Text-saves" "Smoke Texture Fix" "Release build" "Clean build")
+EXTRA=("BETTERCAMERA=1" "NODRAWINGDISTANCE=1" "TEXTSAVES=1" "TEXTURE_FIX=1" "DEBUG=0" "clean")
+
+# Colors
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+YELLOW=$(tput setaf 3)
+CYAN=$(tput setaf 6)
+RESET=$(tput sgr0)
+
+# Checks to see if the libaudio directory and files exist
+if [ -d "$LIBDIR" -a -e "${LIBDIR}$LIBAFA" -a -e "${LIBDIR}$LIBAFLA"  ]; then
+    printf "\n${GREEN}libaudio files exist, going straight to compiling.${RESET}\n"
+else 
+    printf "\n${GREEN}libaudio files not found, starting initialization process.${RESET}\n\n"
+
+    printf "${YELLOW} Changing directory to: ${CYAN}${AUDDIR}${RESET}\n\n"
+		cd $AUDDIR
+
+    printf "${YELLOW} Executing: ${CYAN}autoreconf -i${RESET}\n\n"
+		autoreconf -i
+
+    printf "\n${YELLOW} Executing: ${CYAN}./configure --disable-docs${RESET}\n\n"
+		PATH=/mingw64/bin:/mingw32/bin:$PATH LIBS=-lstdc++ ./configure --disable-docs
+
+    printf "\n${YELLOW} Executing: ${CYAN}make -j${RESET}\n\n"
+		PATH=/mingw64/bin:/mingw32/bin:$PATH make -j
+
+    printf "\n${YELLOW} Making new directory ${CYAN}../lib${RESET}\n\n"
+		mkdir ../lib
+
+
+    printf "${YELLOW} Copying libaudio files to ${CYAN}../lib${RESET}\n\n"
+		cp libaudiofile/.libs/libaudiofile.a ../lib/
+		cp libaudiofile/.libs/libaudiofile.la ../lib/
+
+    printf "${YELLOW} Going up one directory.${RESET}\n\n"
+		cd ../
+
+		printf "${GREEN}Notepad will now open, please follow the instructions carefully.\n\n"
+		printf "${YELLOW}Locate the line: " 
+		printf "${CYAN}tabledesign_CFLAGS := -Wno-uninitialized -laudiofile\n"
+		printf "${YELLOW}Then add at the end: ${CYAN}-lstdc++\n" 
+		printf "${YELLOW}So it reads: "
+		printf "${CYAN}tabledesign_CFLAGS := -Wno-uninitialized -laudiofile -lstdc++\n\n"
+		notepad "Makefile"
+		read -n 1 -r -s -p $'\e[32mPRESS ENTER TO CONTINUE...\e[0m\n'
+
+    printf "${YELLOW} Executing: ${CYAN}make -j${RESET}\n\n"
+		PATH=/mingw64/bin:/mingw32/bin:$PATH make -j		
+
+    printf "\n${YELLOW} Going up one directory.${RESET}\n"
+		cd ../
+fi 
+
+menu() {
+		printf "\nAvaliable options:\n"
+		for i in ${!OPTIONS[@]}; do 
+				printf "%3d%s) %s\n" $((i+1)) "${choices[i]:- }" "${OPTIONS[i]}"
+		done
+		if [[ "$msg" ]]; then echo "$msg"; fi
+		printf "${YELLOW}Please do not select \"Clean build\" with any other option.\n"
+		printf "Leave all options unchecked for a Vanilla build.\n${RESET}"
+}
+
+prompt="Check an option (again to uncheck, press ENTER):"
+while menu && read -rp "$prompt" num && [[ "$num" ]]; do
+		[[ "$num" != *[![:digit:]]* ]] &&
+		(( num > 0 && num <= ${#OPTIONS[@]} )) ||
+		{ msg="Invalid option: $num"; continue; }
+		((num--)); # msg="${OPTIONS[num]} was ${choices[num]:+un}checked"
+		[[ "${choices[num]}" ]] && choices[num]="" || choices[num]="+"
+done
+
+for i in ${!OPTIONS[@]}; do 
+		[[ "${choices[i]}" ]] && { CMDL+=" ${EXTRA[i]}"; }
+done 
+
+printf "\n${YELLOW} Executing: ${CYAN}make ${CMDL} -j${RESET}\n\n"
+PATH=/mingw32/bin:/mingw64/bin:$PATH make $CMDL -j
+
+if [ "${CMDL}" != " clean" ]; then
+
+	printf "\n${GREEN}If all went well you should have a compiled .EXE in the 'builds/us_pc/' folder.\n"
+	printf "${CYAN}Would you like to run the game? [y or n]: ${RESET}"
+	read TEST
+
+	if [ "${TEST}" = "y" ]; then
+		exec ./build/us_pc/sm64.us.f3dex2e.exe
+	fi 
+else
+	printf "\nYour build is now clean\n"
+fi 
--- a/doxygen/logo.png
+++ b/doxygen/logo.png
--- a/enhancements/README.md
+++ b/enhancements/README.md
@ -26,10 +26,6 @@ This allows you to draw 3D boxes for debugging purposes.
 Call the `debug_box` function whenever you want to draw one. `debug_box` by default takes two arguments: a center and bounds vec3f. This will draw a box starting from the point (center - bounds) to (center + bounds).
 Use `debug_box_rot` to draw a box rotated in the xz-plane. If you want to draw a box by specifying min and max points, use `debug_box_pos` instead.

-## FPS Counter - `fps.patch`
-
-This patch provides an in-game FPS counter to measure the frame rate.
-
 ## iQue Player Support - `ique_support.patch`

 This enhancement allows the same ROM to work on both the Nintendo 64 and the iQue Player.
--- a/extract_assets.py
+++ b/extract_assets.py
@ -47,6 +47,7 @@ def remove_file(fname):
 def clean_assets(local_asset_file):
    assets = set(read_asset_map().keys())
    assets.update(read_local_asset_list(local_asset_file))
+    local_asset_file.close()
    for fname in list(assets) + [".assets-local.txt"]:
        if fname.startswith("@"):
            continue
--- a/include/PR/os_libc.h
+++ b/include/PR/os_libc.h
@ -10,7 +10,7 @@
 // macOS libc has them
 #include <strings.h>

-#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L)
+#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) || defined(NO_BZERO_BCOPY)

 // there's no way that shit's defined, use memcpy/memset
 #include <string.h>
--- a/include/PR/ultratypes.h
+++ b/include/PR/ultratypes.h
@ -31,7 +31,15 @@ typedef double f64;

 #include <stddef.h>
 #include <stdint.h>
+#include <sys/types.h>
+
+#if defined(__MINGW32__) 
+#include <_mingw.h>
+#if !defined(__MINGW64_VERSION_MAJOR)
+typedef long ssize_t;
+#else
 typedef ptrdiff_t ssize_t;
-
-
 #endif
+#endif
+
+#endif // _ULTRA64_TYPES_H_
--- a/include/dxsdk/d3d12.h
+++ b/include/dxsdk/d3d12.h
--- a/include/dxsdk/d3d12sdklayers.h
+++ b/include/dxsdk/d3d12sdklayers.h
--- a/include/dxsdk/d3d12shader.h
+++ b/include/dxsdk/d3d12shader.h
@ -0,0 +1,459 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       D3D12Shader.h
+//  Content:    D3D12 Shader Types and APIs
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef __D3D12SHADER_H__
+#define __D3D12SHADER_H__
+
+#include "d3dcommon.h"
+
+typedef enum D3D12_SHADER_VERSION_TYPE
+{
+    D3D12_SHVER_PIXEL_SHADER    = 0,
+    D3D12_SHVER_VERTEX_SHADER   = 1,
+    D3D12_SHVER_GEOMETRY_SHADER = 2,
+    
+    // D3D11 Shaders
+    D3D12_SHVER_HULL_SHADER     = 3,
+    D3D12_SHVER_DOMAIN_SHADER   = 4,
+    D3D12_SHVER_COMPUTE_SHADER  = 5,
+
+    D3D12_SHVER_RESERVED0       = 0xFFF0,
+} D3D12_SHADER_VERSION_TYPE;
+
+#define D3D12_SHVER_GET_TYPE(_Version) \
+    (((_Version) >> 16) & 0xffff)
+#define D3D12_SHVER_GET_MAJOR(_Version) \
+    (((_Version) >> 4) & 0xf)
+#define D3D12_SHVER_GET_MINOR(_Version) \
+    (((_Version) >> 0) & 0xf)
+
+// Slot ID for library function return
+#define D3D_RETURN_PARAMETER_INDEX (-1)
+
+typedef D3D_RESOURCE_RETURN_TYPE D3D12_RESOURCE_RETURN_TYPE;
+
+typedef D3D_CBUFFER_TYPE D3D12_CBUFFER_TYPE;
+
+
+typedef struct _D3D12_SIGNATURE_PARAMETER_DESC
+{
+    LPCSTR                      SemanticName;   // Name of the semantic
+    UINT                        SemanticIndex;  // Index of the semantic
+    UINT                        Register;       // Number of member variables
+    D3D_NAME                    SystemValueType;// A predefined system value, or D3D_NAME_UNDEFINED if not applicable
+    D3D_REGISTER_COMPONENT_TYPE ComponentType;  // Scalar type (e.g. uint, float, etc.)
+    BYTE                        Mask;           // Mask to indicate which components of the register
+                                                // are used (combination of D3D10_COMPONENT_MASK values)
+    BYTE                        ReadWriteMask;  // Mask to indicate whether a given component is 
+                                                // never written (if this is an output signature) or
+                                                // always read (if this is an input signature).
+                                                // (combination of D3D_MASK_* values)
+    UINT                        Stream;         // Stream index
+    D3D_MIN_PRECISION           MinPrecision;   // Minimum desired interpolation precision
+} D3D12_SIGNATURE_PARAMETER_DESC;
+
+typedef struct _D3D12_SHADER_BUFFER_DESC
+{
+    LPCSTR                  Name;           // Name of the constant buffer
+    D3D_CBUFFER_TYPE        Type;           // Indicates type of buffer content
+    UINT                    Variables;      // Number of member variables
+    UINT                    Size;           // Size of CB (in bytes)
+    UINT                    uFlags;         // Buffer description flags
+} D3D12_SHADER_BUFFER_DESC;
+
+typedef struct _D3D12_SHADER_VARIABLE_DESC
+{
+    LPCSTR                  Name;           // Name of the variable
+    UINT                    StartOffset;    // Offset in constant buffer's backing store
+    UINT                    Size;           // Size of variable (in bytes)
+    UINT                    uFlags;         // Variable flags
+    LPVOID                  DefaultValue;   // Raw pointer to default value
+    UINT                    StartTexture;   // First texture index (or -1 if no textures used)
+    UINT                    TextureSize;    // Number of texture slots possibly used.
+    UINT                    StartSampler;   // First sampler index (or -1 if no textures used)
+    UINT                    SamplerSize;    // Number of sampler slots possibly used.
+} D3D12_SHADER_VARIABLE_DESC;
+
+typedef struct _D3D12_SHADER_TYPE_DESC
+{
+    D3D_SHADER_VARIABLE_CLASS   Class;          // Variable class (e.g. object, matrix, etc.)
+    D3D_SHADER_VARIABLE_TYPE    Type;           // Variable type (e.g. float, sampler, etc.)
+    UINT                        Rows;           // Number of rows (for matrices, 1 for other numeric, 0 if not applicable)
+    UINT                        Columns;        // Number of columns (for vectors & matrices, 1 for other numeric, 0 if not applicable)
+    UINT                        Elements;       // Number of elements (0 if not an array)
+    UINT                        Members;        // Number of members (0 if not a structure)
+    UINT                        Offset;         // Offset from the start of structure (0 if not a structure member)
+    LPCSTR                      Name;           // Name of type, can be NULL
+} D3D12_SHADER_TYPE_DESC;
+
+typedef D3D_TESSELLATOR_DOMAIN D3D12_TESSELLATOR_DOMAIN;
+
+typedef D3D_TESSELLATOR_PARTITIONING D3D12_TESSELLATOR_PARTITIONING;
+
+typedef D3D_TESSELLATOR_OUTPUT_PRIMITIVE D3D12_TESSELLATOR_OUTPUT_PRIMITIVE;
+
+typedef struct _D3D12_SHADER_DESC
+{
+    UINT                    Version;                     // Shader version
+    LPCSTR                  Creator;                     // Creator string
+    UINT                    Flags;                       // Shader compilation/parse flags
+    
+    UINT                    ConstantBuffers;             // Number of constant buffers
+    UINT                    BoundResources;              // Number of bound resources
+    UINT                    InputParameters;             // Number of parameters in the input signature
+    UINT                    OutputParameters;            // Number of parameters in the output signature
+
+    UINT                    InstructionCount;            // Number of emitted instructions
+    UINT                    TempRegisterCount;           // Number of temporary registers used 
+    UINT                    TempArrayCount;              // Number of temporary arrays used
+    UINT                    DefCount;                    // Number of constant defines 
+    UINT                    DclCount;                    // Number of declarations (input + output)
+    UINT                    TextureNormalInstructions;   // Number of non-categorized texture instructions
+    UINT                    TextureLoadInstructions;     // Number of texture load instructions
+    UINT                    TextureCompInstructions;     // Number of texture comparison instructions
+    UINT                    TextureBiasInstructions;     // Number of texture bias instructions
+    UINT                    TextureGradientInstructions; // Number of texture gradient instructions
+    UINT                    FloatInstructionCount;       // Number of floating point arithmetic instructions used
+    UINT                    IntInstructionCount;         // Number of signed integer arithmetic instructions used
+    UINT                    UintInstructionCount;        // Number of unsigned integer arithmetic instructions used
+    UINT                    StaticFlowControlCount;      // Number of static flow control instructions used
+    UINT                    DynamicFlowControlCount;     // Number of dynamic flow control instructions used
+    UINT                    MacroInstructionCount;       // Number of macro instructions used
+    UINT                    ArrayInstructionCount;       // Number of array instructions used
+    UINT                    CutInstructionCount;         // Number of cut instructions used
+    UINT                    EmitInstructionCount;        // Number of emit instructions used
+    D3D_PRIMITIVE_TOPOLOGY  GSOutputTopology;            // Geometry shader output topology
+    UINT                    GSMaxOutputVertexCount;      // Geometry shader maximum output vertex count
+    D3D_PRIMITIVE           InputPrimitive;              // GS/HS input primitive
+    UINT                    PatchConstantParameters;     // Number of parameters in the patch constant signature
+    UINT                    cGSInstanceCount;            // Number of Geometry shader instances
+    UINT                    cControlPoints;              // Number of control points in the HS->DS stage
+    D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive;  // Primitive output by the tessellator
+    D3D_TESSELLATOR_PARTITIONING HSPartitioning;         // Partitioning mode of the tessellator
+    D3D_TESSELLATOR_DOMAIN  TessellatorDomain;           // Domain of the tessellator (quad, tri, isoline)
+    // instruction counts
+    UINT cBarrierInstructions;                           // Number of barrier instructions in a compute shader
+    UINT cInterlockedInstructions;                       // Number of interlocked instructions
+    UINT cTextureStoreInstructions;                      // Number of texture writes
+} D3D12_SHADER_DESC;
+
+typedef struct _D3D12_SHADER_INPUT_BIND_DESC
+{
+    LPCSTR                      Name;           // Name of the resource
+    D3D_SHADER_INPUT_TYPE       Type;           // Type of resource (e.g. texture, cbuffer, etc.)
+    UINT                        BindPoint;      // Starting bind point
+    UINT                        BindCount;      // Number of contiguous bind points (for arrays)
+
+    UINT                        uFlags;         // Input binding flags
+    D3D_RESOURCE_RETURN_TYPE    ReturnType;     // Return type (if texture)
+    D3D_SRV_DIMENSION           Dimension;      // Dimension (if texture)
+    UINT                        NumSamples;     // Number of samples (0 if not MS texture)
+    UINT                        Space;          // Register space
+    UINT uID;                                   // Range ID in the bytecode
+} D3D12_SHADER_INPUT_BIND_DESC;
+
+#define D3D_SHADER_REQUIRES_DOUBLES                                                         0x00000001
+#define D3D_SHADER_REQUIRES_EARLY_DEPTH_STENCIL                                             0x00000002
+#define D3D_SHADER_REQUIRES_UAVS_AT_EVERY_STAGE                                             0x00000004
+#define D3D_SHADER_REQUIRES_64_UAVS                                                         0x00000008
+#define D3D_SHADER_REQUIRES_MINIMUM_PRECISION                                               0x00000010
+#define D3D_SHADER_REQUIRES_11_1_DOUBLE_EXTENSIONS                                          0x00000020
+#define D3D_SHADER_REQUIRES_11_1_SHADER_EXTENSIONS                                          0x00000040
+#define D3D_SHADER_REQUIRES_LEVEL_9_COMPARISON_FILTERING                                    0x00000080
+#define D3D_SHADER_REQUIRES_TILED_RESOURCES                                                 0x00000100
+#define D3D_SHADER_REQUIRES_STENCIL_REF                                                     0x00000200
+#define D3D_SHADER_REQUIRES_INNER_COVERAGE                                                  0x00000400
+#define D3D_SHADER_REQUIRES_TYPED_UAV_LOAD_ADDITIONAL_FORMATS                               0x00000800
+#define D3D_SHADER_REQUIRES_ROVS                                                            0x00001000
+#define D3D_SHADER_REQUIRES_VIEWPORT_AND_RT_ARRAY_INDEX_FROM_ANY_SHADER_FEEDING_RASTERIZER  0x00002000
+
+
+typedef struct _D3D12_LIBRARY_DESC
+{
+    LPCSTR    Creator;           // The name of the originator of the library.
+    UINT      Flags;             // Compilation flags.
+    UINT      FunctionCount;     // Number of functions exported from the library.
+} D3D12_LIBRARY_DESC;
+
+typedef struct _D3D12_FUNCTION_DESC
+{
+    UINT                    Version;                     // Shader version
+    LPCSTR                  Creator;                     // Creator string
+    UINT                    Flags;                       // Shader compilation/parse flags
+    
+    UINT                    ConstantBuffers;             // Number of constant buffers
+    UINT                    BoundResources;              // Number of bound resources
+
+    UINT                    InstructionCount;            // Number of emitted instructions
+    UINT                    TempRegisterCount;           // Number of temporary registers used 
+    UINT                    TempArrayCount;              // Number of temporary arrays used
+    UINT                    DefCount;                    // Number of constant defines 
+    UINT                    DclCount;                    // Number of declarations (input + output)
+    UINT                    TextureNormalInstructions;   // Number of non-categorized texture instructions
+    UINT                    TextureLoadInstructions;     // Number of texture load instructions
+    UINT                    TextureCompInstructions;     // Number of texture comparison instructions
+    UINT                    TextureBiasInstructions;     // Number of texture bias instructions
+    UINT                    TextureGradientInstructions; // Number of texture gradient instructions
+    UINT                    FloatInstructionCount;       // Number of floating point arithmetic instructions used
+    UINT                    IntInstructionCount;         // Number of signed integer arithmetic instructions used
+    UINT                    UintInstructionCount;        // Number of unsigned integer arithmetic instructions used
+    UINT                    StaticFlowControlCount;      // Number of static flow control instructions used
+    UINT                    DynamicFlowControlCount;     // Number of dynamic flow control instructions used
+    UINT                    MacroInstructionCount;       // Number of macro instructions used
+    UINT                    ArrayInstructionCount;       // Number of array instructions used
+    UINT                    MovInstructionCount;         // Number of mov instructions used
+    UINT                    MovcInstructionCount;        // Number of movc instructions used
+    UINT                    ConversionInstructionCount;  // Number of type conversion instructions used
+    UINT                    BitwiseInstructionCount;     // Number of bitwise arithmetic instructions used
+    D3D_FEATURE_LEVEL       MinFeatureLevel;             // Min target of the function byte code
+    UINT64                  RequiredFeatureFlags;        // Required feature flags
+
+    LPCSTR                  Name;                        // Function name
+    INT                     FunctionParameterCount;      // Number of logical parameters in the function signature (not including return)
+    BOOL                    HasReturn;                   // TRUE, if function returns a value, false - it is a subroutine
+    BOOL                    Has10Level9VertexShader;     // TRUE, if there is a 10L9 VS blob
+    BOOL                    Has10Level9PixelShader;      // TRUE, if there is a 10L9 PS blob
+} D3D12_FUNCTION_DESC;
+
+typedef struct _D3D12_PARAMETER_DESC
+{
+    LPCSTR                      Name;               // Parameter name.
+    LPCSTR                      SemanticName;       // Parameter semantic name (+index).
+    D3D_SHADER_VARIABLE_TYPE    Type;               // Element type.
+    D3D_SHADER_VARIABLE_CLASS   Class;              // Scalar/Vector/Matrix.
+    UINT                        Rows;               // Rows are for matrix parameters.
+    UINT                        Columns;            // Components or Columns in matrix.
+    D3D_INTERPOLATION_MODE      InterpolationMode;  // Interpolation mode.
+    D3D_PARAMETER_FLAGS         Flags;              // Parameter modifiers.
+
+    UINT                        FirstInRegister;    // The first input register for this parameter.
+    UINT                        FirstInComponent;   // The first input register component for this parameter.
+    UINT                        FirstOutRegister;   // The first output register for this parameter.
+    UINT                        FirstOutComponent;  // The first output register component for this parameter.
+} D3D12_PARAMETER_DESC;
+
+
+//////////////////////////////////////////////////////////////////////////////
+// Interfaces ////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
+typedef interface ID3D12ShaderReflectionType ID3D12ShaderReflectionType;
+typedef interface ID3D12ShaderReflectionType *LPD3D12SHADERREFLECTIONTYPE;
+
+typedef interface ID3D12ShaderReflectionVariable ID3D12ShaderReflectionVariable;
+typedef interface ID3D12ShaderReflectionVariable *LPD3D12SHADERREFLECTIONVARIABLE;
+
+typedef interface ID3D12ShaderReflectionConstantBuffer ID3D12ShaderReflectionConstantBuffer;
+typedef interface ID3D12ShaderReflectionConstantBuffer *LPD3D12SHADERREFLECTIONCONSTANTBUFFER;
+
+typedef interface ID3D12ShaderReflection ID3D12ShaderReflection;
+typedef interface ID3D12ShaderReflection *LPD3D12SHADERREFLECTION;
+
+typedef interface ID3D12LibraryReflection ID3D12LibraryReflection;
+typedef interface ID3D12LibraryReflection *LPD3D12LIBRARYREFLECTION;
+
+typedef interface ID3D12FunctionReflection ID3D12FunctionReflection;
+typedef interface ID3D12FunctionReflection *LPD3D12FUNCTIONREFLECTION;
+
+typedef interface ID3D12FunctionParameterReflection ID3D12FunctionParameterReflection;
+typedef interface ID3D12FunctionParameterReflection *LPD3D12FUNCTIONPARAMETERREFLECTION;
+
+
+// {E913C351-783D-48CA-A1D1-4F306284AD56}
+interface DECLSPEC_UUID("E913C351-783D-48CA-A1D1-4F306284AD56") ID3D12ShaderReflectionType;
+DEFINE_GUID(IID_ID3D12ShaderReflectionType, 
+0xe913c351, 0x783d, 0x48ca, 0xa1, 0xd1, 0x4f, 0x30, 0x62, 0x84, 0xad, 0x56);
+
+#undef INTERFACE
+#define INTERFACE ID3D12ShaderReflectionType
+
+DECLARE_INTERFACE(ID3D12ShaderReflectionType)
+{
+    STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_SHADER_TYPE_DESC *pDesc) PURE;
+    
+    STDMETHOD_(ID3D12ShaderReflectionType*, GetMemberTypeByIndex)(THIS_ _In_ UINT Index) PURE;
+    STDMETHOD_(ID3D12ShaderReflectionType*, GetMemberTypeByName)(THIS_ _In_ LPCSTR Name) PURE;
+    STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ _In_ UINT Index) PURE;
+
+    STDMETHOD(IsEqual)(THIS_ _In_ ID3D12ShaderReflectionType* pType) PURE;
+    STDMETHOD_(ID3D12ShaderReflectionType*, GetSubType)(THIS) PURE;
+    STDMETHOD_(ID3D12ShaderReflectionType*, GetBaseClass)(THIS) PURE;
+    STDMETHOD_(UINT, GetNumInterfaces)(THIS) PURE;
+    STDMETHOD_(ID3D12ShaderReflectionType*, GetInterfaceByIndex)(THIS_ _In_ UINT uIndex) PURE;
+    STDMETHOD(IsOfType)(THIS_ _In_ ID3D12ShaderReflectionType* pType) PURE;
+    STDMETHOD(ImplementsInterface)(THIS_ _In_ ID3D12ShaderReflectionType* pBase) PURE;
+};
+
+// {8337A8A6-A216-444A-B2F4-314733A73AEA}
+interface DECLSPEC_UUID("8337A8A6-A216-444A-B2F4-314733A73AEA") ID3D12ShaderReflectionVariable;
+DEFINE_GUID(IID_ID3D12ShaderReflectionVariable, 
+0x8337a8a6, 0xa216, 0x444a, 0xb2, 0xf4, 0x31, 0x47, 0x33, 0xa7, 0x3a, 0xea);
+
+#undef INTERFACE
+#define INTERFACE ID3D12ShaderReflectionVariable
+
+DECLARE_INTERFACE(ID3D12ShaderReflectionVariable)
+{
+    STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_SHADER_VARIABLE_DESC *pDesc) PURE;
+    
+    STDMETHOD_(ID3D12ShaderReflectionType*, GetType)(THIS) PURE;
+    STDMETHOD_(ID3D12ShaderReflectionConstantBuffer*, GetBuffer)(THIS) PURE;
+
+    STDMETHOD_(UINT, GetInterfaceSlot)(THIS_ _In_ UINT uArrayIndex) PURE;
+};
+
+// {C59598B4-48B3-4869-B9B1-B1618B14A8B7}
+interface DECLSPEC_UUID("C59598B4-48B3-4869-B9B1-B1618B14A8B7") ID3D12ShaderReflectionConstantBuffer;
+DEFINE_GUID(IID_ID3D12ShaderReflectionConstantBuffer, 
+0xc59598b4, 0x48b3, 0x4869, 0xb9, 0xb1, 0xb1, 0x61, 0x8b, 0x14, 0xa8, 0xb7);
+
+#undef INTERFACE
+#define INTERFACE ID3D12ShaderReflectionConstantBuffer
+
+DECLARE_INTERFACE(ID3D12ShaderReflectionConstantBuffer)
+{
+    STDMETHOD(GetDesc)(THIS_ D3D12_SHADER_BUFFER_DESC *pDesc) PURE;
+    
+    STDMETHOD_(ID3D12ShaderReflectionVariable*, GetVariableByIndex)(THIS_ _In_ UINT Index) PURE;
+    STDMETHOD_(ID3D12ShaderReflectionVariable*, GetVariableByName)(THIS_ _In_ LPCSTR Name) PURE;
+};
+
+// The ID3D12ShaderReflection IID may change from SDK version to SDK version
+// if the reflection API changes.  This prevents new code with the new API
+// from working with an old binary.  Recompiling with the new header
+// will pick up the new IID.
+
+// {5A58797D-A72C-478D-8BA2-EFC6B0EFE88E}
+interface DECLSPEC_UUID("5A58797D-A72C-478D-8BA2-EFC6B0EFE88E") ID3D12ShaderReflection;
+DEFINE_GUID(IID_ID3D12ShaderReflection, 
+0x5a58797d, 0xa72c, 0x478d, 0x8b, 0xa2, 0xef, 0xc6, 0xb0, 0xef, 0xe8, 0x8e);
+
+#undef INTERFACE
+#define INTERFACE ID3D12ShaderReflection
+
+DECLARE_INTERFACE_(ID3D12ShaderReflection, IUnknown)
+{
+    STDMETHOD(QueryInterface)(THIS_ _In_ REFIID iid,
+                              _Out_ LPVOID *ppv) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+
+    STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_SHADER_DESC *pDesc) PURE;
+    
+    STDMETHOD_(ID3D12ShaderReflectionConstantBuffer*, GetConstantBufferByIndex)(THIS_ _In_ UINT Index) PURE;
+    STDMETHOD_(ID3D12ShaderReflectionConstantBuffer*, GetConstantBufferByName)(THIS_ _In_ LPCSTR Name) PURE;
+    
+    STDMETHOD(GetResourceBindingDesc)(THIS_ _In_ UINT ResourceIndex,
+                                      _Out_ D3D12_SHADER_INPUT_BIND_DESC *pDesc) PURE;
+    
+    STDMETHOD(GetInputParameterDesc)(THIS_ _In_ UINT ParameterIndex,
+                                     _Out_ D3D12_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
+    STDMETHOD(GetOutputParameterDesc)(THIS_ _In_ UINT ParameterIndex,
+                                      _Out_ D3D12_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
+    STDMETHOD(GetPatchConstantParameterDesc)(THIS_ _In_ UINT ParameterIndex,
+                                             _Out_ D3D12_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
+
+    STDMETHOD_(ID3D12ShaderReflectionVariable*, GetVariableByName)(THIS_ _In_ LPCSTR Name) PURE;
+
+    STDMETHOD(GetResourceBindingDescByName)(THIS_ _In_ LPCSTR Name,
+                                            _Out_ D3D12_SHADER_INPUT_BIND_DESC *pDesc) PURE;
+
+    STDMETHOD_(UINT, GetMovInstructionCount)(THIS) PURE;
+    STDMETHOD_(UINT, GetMovcInstructionCount)(THIS) PURE;
+    STDMETHOD_(UINT, GetConversionInstructionCount)(THIS) PURE;
+    STDMETHOD_(UINT, GetBitwiseInstructionCount)(THIS) PURE;
+    
+    STDMETHOD_(D3D_PRIMITIVE, GetGSInputPrimitive)(THIS) PURE;
+    STDMETHOD_(BOOL, IsSampleFrequencyShader)(THIS) PURE;
+
+    STDMETHOD_(UINT, GetNumInterfaceSlots)(THIS) PURE;
+    STDMETHOD(GetMinFeatureLevel)(THIS_ _Out_ enum D3D_FEATURE_LEVEL* pLevel) PURE;
+
+    STDMETHOD_(UINT, GetThreadGroupSize)(THIS_
+                                         _Out_opt_ UINT* pSizeX,
+                                         _Out_opt_ UINT* pSizeY,
+                                         _Out_opt_ UINT* pSizeZ) PURE;
+
+    STDMETHOD_(UINT64, GetRequiresFlags)(THIS) PURE;
+};
+
+// {8E349D19-54DB-4A56-9DC9-119D87BDB804}
+interface DECLSPEC_UUID("8E349D19-54DB-4A56-9DC9-119D87BDB804") ID3D12LibraryReflection;
+DEFINE_GUID(IID_ID3D12LibraryReflection, 
+0x8e349d19, 0x54db, 0x4a56, 0x9d, 0xc9, 0x11, 0x9d, 0x87, 0xbd, 0xb8, 0x4);
+
+#undef INTERFACE
+#define INTERFACE ID3D12LibraryReflection
+
+DECLARE_INTERFACE_(ID3D12LibraryReflection, IUnknown)
+{
+    STDMETHOD(QueryInterface)(THIS_ _In_ REFIID iid, _Out_ LPVOID * ppv) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+
+    STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_LIBRARY_DESC * pDesc) PURE;
+    
+    STDMETHOD_(ID3D12FunctionReflection *, GetFunctionByIndex)(THIS_ _In_ INT FunctionIndex) PURE;
+};
+
+// {1108795C-2772-4BA9-B2A8-D464DC7E2799}
+interface DECLSPEC_UUID("1108795C-2772-4BA9-B2A8-D464DC7E2799") ID3D12FunctionReflection;
+DEFINE_GUID(IID_ID3D12FunctionReflection, 
+0x1108795c, 0x2772, 0x4ba9, 0xb2, 0xa8, 0xd4, 0x64, 0xdc, 0x7e, 0x27, 0x99);
+
+#undef INTERFACE
+#define INTERFACE ID3D12FunctionReflection
+
+DECLARE_INTERFACE(ID3D12FunctionReflection)
+{
+    STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_FUNCTION_DESC * pDesc) PURE;
+    
+    STDMETHOD_(ID3D12ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ _In_ UINT BufferIndex) PURE;
+    STDMETHOD_(ID3D12ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ _In_ LPCSTR Name) PURE;
+    
+    STDMETHOD(GetResourceBindingDesc)(THIS_ _In_ UINT ResourceIndex,
+                                      _Out_ D3D12_SHADER_INPUT_BIND_DESC * pDesc) PURE;
+    
+    STDMETHOD_(ID3D12ShaderReflectionVariable *, GetVariableByName)(THIS_ _In_ LPCSTR Name) PURE;
+
+    STDMETHOD(GetResourceBindingDescByName)(THIS_ _In_ LPCSTR Name,
+                                            _Out_ D3D12_SHADER_INPUT_BIND_DESC * pDesc) PURE;
+
+    // Use D3D_RETURN_PARAMETER_INDEX to get description of the return value.
+    STDMETHOD_(ID3D12FunctionParameterReflection *, GetFunctionParameter)(THIS_ _In_ INT ParameterIndex) PURE;
+};
+
+// {EC25F42D-7006-4F2B-B33E-02CC3375733F}
+interface DECLSPEC_UUID("EC25F42D-7006-4F2B-B33E-02CC3375733F") ID3D12FunctionParameterReflection;
+DEFINE_GUID(IID_ID3D12FunctionParameterReflection, 
+0xec25f42d, 0x7006, 0x4f2b, 0xb3, 0x3e, 0x2, 0xcc, 0x33, 0x75, 0x73, 0x3f);
+
+#undef INTERFACE
+#define INTERFACE ID3D12FunctionParameterReflection
+
+DECLARE_INTERFACE(ID3D12FunctionParameterReflection)
+{
+    STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_PARAMETER_DESC * pDesc) PURE;
+};
+
+
+//////////////////////////////////////////////////////////////////////////////
+// APIs //////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+    
+#endif //__D3D12SHADER_H__
+
--- a/include/dxsdk/d3dcommon.h
+++ b/include/dxsdk/d3dcommon.h
--- a/include/dxsdk/d3dcompiler.h
+++ b/include/dxsdk/d3dcompiler.h
@ -0,0 +1,586 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+//  File:       D3DCompiler.h
+//  Content:    D3D Compilation Types and APIs
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef __D3DCOMPILER_H__
+#define __D3DCOMPILER_H__
+
+#include <winapifamily.h>
+
+// Current name of the DLL shipped in the same SDK as this header.
+
+
+
+#define D3DCOMPILER_DLL_W L"d3dcompiler_47.dll"
+#define D3DCOMPILER_DLL_A "d3dcompiler_47.dll"
+
+// Current HLSL compiler version.
+
+#define D3D_COMPILER_VERSION 47
+
+#ifdef UNICODE
+    #define D3DCOMPILER_DLL D3DCOMPILER_DLL_W 
+#else
+    #define D3DCOMPILER_DLL D3DCOMPILER_DLL_A
+#endif
+
+#include "d3d11shader.h"
+#include "d3d12shader.h"
+
+//////////////////////////////////////////////////////////////////////////////
+// APIs //////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+
+#pragma region Application Family
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_GAMES)
+
+//----------------------------------------------------------------------------
+// D3DReadFileToBlob:
+// -----------------
+// Simple helper routine to read a file on disk into memory
+// for passing to other routines in this API.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DReadFileToBlob(_In_ LPCWSTR pFileName,
+                  _Out_ ID3DBlob** ppContents);
+
+//----------------------------------------------------------------------------
+// D3DWriteBlobToFile:
+// ------------------
+// Simple helper routine to write a memory blob to a file on disk.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DWriteBlobToFile(_In_ ID3DBlob* pBlob,
+                   _In_ LPCWSTR pFileName,
+                   _In_ BOOL bOverwrite);
+
+//----------------------------------------------------------------------------
+// D3DCOMPILE flags:
+// -----------------
+// D3DCOMPILE_DEBUG
+//   Insert debug file/line/type/symbol information.
+//
+// D3DCOMPILE_SKIP_VALIDATION
+//   Do not validate the generated code against known capabilities and
+//   constraints.  This option is only recommended when compiling shaders
+//   you KNOW will work.  (ie. have compiled before without this option.)
+//   Shaders are always validated by D3D before they are set to the device.
+//
+// D3DCOMPILE_SKIP_OPTIMIZATION 
+//   Instructs the compiler to skip optimization steps during code generation.
+//   Unless you are trying to isolate a problem in your code using this option 
+//   is not recommended.
+//
+// D3DCOMPILE_PACK_MATRIX_ROW_MAJOR
+//   Unless explicitly specified, matrices will be packed in row-major order
+//   on input and output from the shader.
+//
+// D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR
+//   Unless explicitly specified, matrices will be packed in column-major 
+//   order on input and output from the shader.  This is generally more 
+//   efficient, since it allows vector-matrix multiplication to be performed
+//   using a series of dot-products.
+//
+// D3DCOMPILE_PARTIAL_PRECISION
+//   Force all computations in resulting shader to occur at partial precision.
+//   This may result in faster evaluation of shaders on some hardware.
+//
+// D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT
+//   Force compiler to compile against the next highest available software
+//   target for vertex shaders.  This flag also turns optimizations off, 
+//   and debugging on.  
+//
+// D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT
+//   Force compiler to compile against the next highest available software
+//   target for pixel shaders.  This flag also turns optimizations off, 
+//   and debugging on.
+//
+// D3DCOMPILE_NO_PRESHADER
+//   Disables Preshaders. Using this flag will cause the compiler to not 
+//   pull out static expression for evaluation on the host cpu
+//
+// D3DCOMPILE_AVOID_FLOW_CONTROL
+//   Hint compiler to avoid flow-control constructs where possible.
+//
+// D3DCOMPILE_PREFER_FLOW_CONTROL
+//   Hint compiler to prefer flow-control constructs where possible.
+//
+// D3DCOMPILE_ENABLE_STRICTNESS
+//   By default, the HLSL/Effect compilers are not strict on deprecated syntax.
+//   Specifying this flag enables the strict mode. Deprecated syntax may be
+//   removed in a future release, and enabling syntax is a good way to make
+//   sure your shaders comply to the latest spec.
+//
+// D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY
+//   This enables older shaders to compile to 4_0 targets.
+//
+// D3DCOMPILE_DEBUG_NAME_FOR_SOURCE
+//   This enables a debug name to be generated based on source information.
+//   It requires D3DCOMPILE_DEBUG to be set, and is exclusive with
+//   D3DCOMPILE_DEBUG_NAME_FOR_BINARY.
+//
+// D3DCOMPILE_DEBUG_NAME_FOR_BINARY
+//   This enables a debug name to be generated based on compiled information.
+//   It requires D3DCOMPILE_DEBUG to be set, and is exclusive with
+//   D3DCOMPILE_DEBUG_NAME_FOR_SOURCE.
+//
+//----------------------------------------------------------------------------
+
+#define D3DCOMPILE_DEBUG                                (1 << 0)
+#define D3DCOMPILE_SKIP_VALIDATION                      (1 << 1)
+#define D3DCOMPILE_SKIP_OPTIMIZATION                    (1 << 2)
+#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR                (1 << 3)
+#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR             (1 << 4)
+#define D3DCOMPILE_PARTIAL_PRECISION                    (1 << 5)
+#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT             (1 << 6)
+#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT             (1 << 7)
+#define D3DCOMPILE_NO_PRESHADER                         (1 << 8)
+#define D3DCOMPILE_AVOID_FLOW_CONTROL                   (1 << 9)
+#define D3DCOMPILE_PREFER_FLOW_CONTROL                  (1 << 10)
+#define D3DCOMPILE_ENABLE_STRICTNESS                    (1 << 11)
+#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY       (1 << 12)
+#define D3DCOMPILE_IEEE_STRICTNESS                      (1 << 13)
+#define D3DCOMPILE_OPTIMIZATION_LEVEL0                  (1 << 14)
+#define D3DCOMPILE_OPTIMIZATION_LEVEL1                  0
+#define D3DCOMPILE_OPTIMIZATION_LEVEL2                  ((1 << 14) | (1 << 15))
+#define D3DCOMPILE_OPTIMIZATION_LEVEL3                  (1 << 15)
+#define D3DCOMPILE_RESERVED16                           (1 << 16)
+#define D3DCOMPILE_RESERVED17                           (1 << 17)
+#define D3DCOMPILE_WARNINGS_ARE_ERRORS                  (1 << 18)
+#define D3DCOMPILE_RESOURCES_MAY_ALIAS                  (1 << 19)
+#define D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES   (1 << 20)
+#define D3DCOMPILE_ALL_RESOURCES_BOUND                  (1 << 21)
+#define D3DCOMPILE_DEBUG_NAME_FOR_SOURCE                (1 << 22)
+#define D3DCOMPILE_DEBUG_NAME_FOR_BINARY                (1 << 23)
+
+//----------------------------------------------------------------------------
+// D3DCOMPILE_EFFECT flags:
+// -------------------------------------
+// These flags are passed in when creating an effect, and affect
+// either compilation behavior or runtime effect behavior
+//
+// D3DCOMPILE_EFFECT_CHILD_EFFECT
+//   Compile this .fx file to a child effect. Child effects have no
+//   initializers for any shared values as these are initialied in the
+//   master effect (pool).
+//
+// D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS
+//   By default, performance mode is enabled.  Performance mode
+//   disallows mutable state objects by preventing non-literal
+//   expressions from appearing in state object definitions.
+//   Specifying this flag will disable the mode and allow for mutable
+//   state objects.
+//
+//----------------------------------------------------------------------------
+
+#define D3DCOMPILE_EFFECT_CHILD_EFFECT              (1 << 0)
+#define D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS            (1 << 1)
+
+//----------------------------------------------------------------------------
+// D3DCOMPILE Flags2:
+// -----------------
+// Root signature flags. (passed in Flags2)
+#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_LATEST		0
+#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_0			(1 << 4)
+#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_1			(1 << 5)
+
+//----------------------------------------------------------------------------
+// D3DCompile:
+// ----------
+// Compile source text into bytecode appropriate for the given target.
+//----------------------------------------------------------------------------
+
+// D3D_COMPILE_STANDARD_FILE_INCLUDE can be passed for pInclude in any
+// API and indicates that a simple default include handler should be
+// used.  The include handler will include files relative to the
+// current directory and files relative to the directory of the initial source
+// file.  When used with APIs like D3DCompile pSourceName must be a
+// file name and the initial relative directory will be derived from it.
+#define D3D_COMPILE_STANDARD_FILE_INCLUDE ((ID3DInclude*)(UINT_PTR)1)
+
+HRESULT WINAPI
+D3DCompile(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+           _In_ SIZE_T SrcDataSize,
+           _In_opt_ LPCSTR pSourceName,
+           _In_reads_opt_(_Inexpressible_(pDefines->Name != NULL)) CONST D3D_SHADER_MACRO* pDefines,
+           _In_opt_ ID3DInclude* pInclude,
+           _In_opt_ LPCSTR pEntrypoint,
+           _In_ LPCSTR pTarget,
+           _In_ UINT Flags1,
+           _In_ UINT Flags2,
+           _Out_ ID3DBlob** ppCode,
+           _Always_(_Outptr_opt_result_maybenull_) ID3DBlob** ppErrorMsgs);
+
+typedef HRESULT (WINAPI *pD3DCompile)
+    (LPCVOID                         pSrcData,
+     SIZE_T                          SrcDataSize,
+     LPCSTR                          pFileName,
+     CONST D3D_SHADER_MACRO*         pDefines,
+     ID3DInclude*                    pInclude,
+     LPCSTR                          pEntrypoint,
+     LPCSTR                          pTarget,
+     UINT                            Flags1,
+     UINT                            Flags2,
+     ID3DBlob**                      ppCode,
+     ID3DBlob**                      ppErrorMsgs);
+
+#define D3DCOMPILE_SECDATA_MERGE_UAV_SLOTS              0x00000001
+#define D3DCOMPILE_SECDATA_PRESERVE_TEMPLATE_SLOTS      0x00000002
+#define D3DCOMPILE_SECDATA_REQUIRE_TEMPLATE_MATCH       0x00000004
+
+HRESULT WINAPI
+D3DCompile2(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+            _In_ SIZE_T SrcDataSize,
+            _In_opt_ LPCSTR pSourceName,
+            _In_reads_opt_(_Inexpressible_(pDefines->Name != NULL)) CONST D3D_SHADER_MACRO* pDefines,
+            _In_opt_ ID3DInclude* pInclude,
+            _In_ LPCSTR pEntrypoint,
+            _In_ LPCSTR pTarget,
+            _In_ UINT Flags1,
+            _In_ UINT Flags2,
+            _In_ UINT SecondaryDataFlags,
+            _In_reads_bytes_opt_(SecondaryDataSize) LPCVOID pSecondaryData,
+            _In_ SIZE_T SecondaryDataSize,
+            _Out_ ID3DBlob** ppCode,
+            _Always_(_Outptr_opt_result_maybenull_) ID3DBlob** ppErrorMsgs);
+
+HRESULT WINAPI
+D3DCompileFromFile(_In_ LPCWSTR pFileName,
+                   _In_reads_opt_(_Inexpressible_(pDefines->Name != NULL)) CONST D3D_SHADER_MACRO* pDefines,
+                   _In_opt_ ID3DInclude* pInclude,
+                   _In_ LPCSTR pEntrypoint,
+                   _In_ LPCSTR pTarget,
+                   _In_ UINT Flags1,
+                   _In_ UINT Flags2,
+                   _Out_ ID3DBlob** ppCode,
+                   _Always_(_Outptr_opt_result_maybenull_) ID3DBlob** ppErrorMsgs);
+
+//----------------------------------------------------------------------------
+// D3DPreprocess:
+// -------------
+// Process source text with the compiler's preprocessor and return
+// the resulting text.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DPreprocess(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+              _In_ SIZE_T SrcDataSize,
+              _In_opt_ LPCSTR pSourceName,
+              _In_opt_ CONST D3D_SHADER_MACRO* pDefines,
+              _In_opt_ ID3DInclude* pInclude,
+              _Out_ ID3DBlob** ppCodeText,
+              _Always_(_Outptr_opt_result_maybenull_) ID3DBlob** ppErrorMsgs);
+
+typedef HRESULT (WINAPI *pD3DPreprocess)
+    (LPCVOID                      pSrcData,
+     SIZE_T                       SrcDataSize,
+     LPCSTR                       pFileName,
+     CONST D3D_SHADER_MACRO*      pDefines,
+     ID3DInclude*                 pInclude,
+     ID3DBlob**                   ppCodeText,
+     ID3DBlob**                   ppErrorMsgs);
+
+//----------------------------------------------------------------------------
+// D3DGetDebugInfo:
+// -----------------------
+// Gets shader debug info.  Debug info is generated by D3DCompile and is
+// embedded in the body of the shader.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DGetDebugInfo(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+                _In_ SIZE_T SrcDataSize,
+                _Out_ ID3DBlob** ppDebugInfo);
+
+//----------------------------------------------------------------------------
+// D3DReflect:
+// ----------
+// Shader code contains metadata that can be inspected via the
+// reflection APIs.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DReflect(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+           _In_ SIZE_T SrcDataSize,
+           _In_ REFIID pInterface,
+           _Out_ void** ppReflector);
+
+//----------------------------------------------------------------------------
+// D3DReflectLibrary:
+// ----------
+// Library code contains metadata that can be inspected via the library
+// reflection APIs.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DReflectLibrary(__in_bcount(SrcDataSize) LPCVOID pSrcData,
+                  __in SIZE_T SrcDataSize,
+	              __in REFIID riid,
+                  __out LPVOID * ppReflector);
+
+//----------------------------------------------------------------------------
+// D3DDisassemble:
+// ----------------------
+// Takes a binary shader and returns a buffer containing text assembly.
+//----------------------------------------------------------------------------
+
+#define D3D_DISASM_ENABLE_COLOR_CODE            0x00000001
+#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS  0x00000002
+#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004
+#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE     0x00000008
+#define D3D_DISASM_DISABLE_DEBUG_INFO           0x00000010
+#define D3D_DISASM_ENABLE_INSTRUCTION_OFFSET    0x00000020
+#define D3D_DISASM_INSTRUCTION_ONLY             0x00000040
+#define D3D_DISASM_PRINT_HEX_LITERALS           0x00000080
+
+HRESULT WINAPI
+D3DDisassemble(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+               _In_ SIZE_T SrcDataSize,
+               _In_ UINT Flags,
+               _In_opt_ LPCSTR szComments,
+               _Out_ ID3DBlob** ppDisassembly);
+
+typedef HRESULT (WINAPI *pD3DDisassemble)
+    (_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+     _In_ SIZE_T SrcDataSize,
+     _In_ UINT Flags,
+     _In_opt_ LPCSTR szComments,
+     _Out_ ID3DBlob** ppDisassembly);
+
+HRESULT WINAPI
+D3DDisassembleRegion(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+                     _In_ SIZE_T SrcDataSize,
+                     _In_ UINT Flags,
+                     _In_opt_ LPCSTR szComments,
+                     _In_ SIZE_T StartByteOffset,
+                     _In_ SIZE_T NumInsts,
+                     _Out_opt_ SIZE_T* pFinishByteOffset,
+                     _Out_ ID3DBlob** ppDisassembly);
+    
+//----------------------------------------------------------------------------
+// Shader linking and Function Linking Graph (FLG) APIs
+//----------------------------------------------------------------------------
+HRESULT WINAPI
+D3DCreateLinker(__out interface ID3D11Linker ** ppLinker);
+
+HRESULT WINAPI
+D3DLoadModule(_In_ LPCVOID pSrcData,
+              _In_ SIZE_T cbSrcDataSize,
+              _Out_ interface ID3D11Module ** ppModule);
+
+HRESULT WINAPI
+D3DCreateFunctionLinkingGraph(_In_ UINT uFlags,
+                              _Out_ interface ID3D11FunctionLinkingGraph ** ppFunctionLinkingGraph);
+
+//----------------------------------------------------------------------------
+// D3DGetTraceInstructionOffsets:
+// -----------------------
+// Determines byte offsets for instructions within a shader blob.
+// This information is useful for going between trace instruction
+// indices and byte offsets that are used in debug information.
+//----------------------------------------------------------------------------
+
+#define D3D_GET_INST_OFFSETS_INCLUDE_NON_EXECUTABLE 0x00000001
+
+HRESULT WINAPI
+D3DGetTraceInstructionOffsets(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+                              _In_ SIZE_T SrcDataSize,
+                              _In_ UINT Flags,
+                              _In_ SIZE_T StartInstIndex,
+                              _In_ SIZE_T NumInsts,
+                              _Out_writes_to_opt_(NumInsts, min(NumInsts, *pTotalInsts)) SIZE_T* pOffsets,
+                              _Out_opt_ SIZE_T* pTotalInsts);
+
+//----------------------------------------------------------------------------
+// D3DGetInputSignatureBlob:
+// -----------------------
+// Retrieve the input signature from a compilation result.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DGetInputSignatureBlob(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+                         _In_ SIZE_T SrcDataSize,
+                         _Out_ ID3DBlob** ppSignatureBlob);
+
+//----------------------------------------------------------------------------
+// D3DGetOutputSignatureBlob:
+// -----------------------
+// Retrieve the output signature from a compilation result.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DGetOutputSignatureBlob(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+                          _In_ SIZE_T SrcDataSize,
+                          _Out_ ID3DBlob** ppSignatureBlob);
+
+//----------------------------------------------------------------------------
+// D3DGetInputAndOutputSignatureBlob:
+// -----------------------
+// Retrieve the input and output signatures from a compilation result.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DGetInputAndOutputSignatureBlob(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+                                  _In_ SIZE_T SrcDataSize,
+                                  _Out_ ID3DBlob** ppSignatureBlob);
+
+//----------------------------------------------------------------------------
+// D3DStripShader:
+// -----------------------
+// Removes unwanted blobs from a compilation result
+//----------------------------------------------------------------------------
+
+typedef enum D3DCOMPILER_STRIP_FLAGS
+{
+    D3DCOMPILER_STRIP_REFLECTION_DATA       = 0x00000001,
+    D3DCOMPILER_STRIP_DEBUG_INFO            = 0x00000002,
+    D3DCOMPILER_STRIP_TEST_BLOBS            = 0x00000004,
+    D3DCOMPILER_STRIP_PRIVATE_DATA          = 0x00000008,
+    D3DCOMPILER_STRIP_ROOT_SIGNATURE        = 0x00000010,
+    D3DCOMPILER_STRIP_FORCE_DWORD           = 0x7fffffff,
+} D3DCOMPILER_STRIP_FLAGS;
+
+HRESULT WINAPI
+D3DStripShader(_In_reads_bytes_(BytecodeLength) LPCVOID pShaderBytecode,
+               _In_ SIZE_T BytecodeLength,
+               _In_ UINT uStripFlags,
+               _Out_ ID3DBlob** ppStrippedBlob);
+
+//----------------------------------------------------------------------------
+// D3DGetBlobPart:
+// -----------------------
+// Extracts information from a compilation result.
+//----------------------------------------------------------------------------
+
+typedef enum D3D_BLOB_PART
+{
+    D3D_BLOB_INPUT_SIGNATURE_BLOB,
+    D3D_BLOB_OUTPUT_SIGNATURE_BLOB,
+    D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB,
+    D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB,
+    D3D_BLOB_ALL_SIGNATURE_BLOB,
+    D3D_BLOB_DEBUG_INFO,
+    D3D_BLOB_LEGACY_SHADER,
+    D3D_BLOB_XNA_PREPASS_SHADER,
+    D3D_BLOB_XNA_SHADER,
+    D3D_BLOB_PDB,
+    D3D_BLOB_PRIVATE_DATA,
+    D3D_BLOB_ROOT_SIGNATURE,
+    D3D_BLOB_DEBUG_NAME,
+
+    // Test parts are only produced by special compiler versions and so
+    // are usually not present in shaders.
+    D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000,
+    D3D_BLOB_TEST_COMPILE_DETAILS,
+    D3D_BLOB_TEST_COMPILE_PERF,
+    D3D_BLOB_TEST_COMPILE_REPORT,
+} D3D_BLOB_PART;
+
+HRESULT WINAPI 
+D3DGetBlobPart(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+               _In_ SIZE_T SrcDataSize,
+               _In_ D3D_BLOB_PART Part,
+               _In_ UINT Flags,
+               _Out_ ID3DBlob** ppPart);
+
+//----------------------------------------------------------------------------
+// D3DSetBlobPart:
+// -----------------------
+// Update information in a compilation result.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI 
+D3DSetBlobPart(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+               _In_ SIZE_T SrcDataSize,
+               _In_ D3D_BLOB_PART Part,
+               _In_ UINT Flags,
+               _In_reads_bytes_(PartSize) LPCVOID pPart,
+               _In_ SIZE_T PartSize,
+               _Out_ ID3DBlob** ppNewShader);
+
+//----------------------------------------------------------------------------
+// D3DCreateBlob:
+// -----------------------
+// Create an ID3DBlob instance.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DCreateBlob(_In_ SIZE_T Size,
+              _Out_ ID3DBlob** ppBlob);
+
+//----------------------------------------------------------------------------
+// D3DCompressShaders:
+// -----------------------
+// Compresses a set of shaders into a more compact form.
+//----------------------------------------------------------------------------
+
+typedef struct _D3D_SHADER_DATA
+{
+    LPCVOID pBytecode;
+    SIZE_T BytecodeLength;
+} D3D_SHADER_DATA;
+
+#define D3D_COMPRESS_SHADER_KEEP_ALL_PARTS 0x00000001
+
+HRESULT WINAPI
+D3DCompressShaders(_In_ UINT uNumShaders,
+                   _In_reads_(uNumShaders) D3D_SHADER_DATA* pShaderData,
+                   _In_ UINT uFlags,
+                   _Out_ ID3DBlob** ppCompressedData);
+
+//----------------------------------------------------------------------------
+// D3DDecompressShaders:
+// -----------------------
+// Decompresses one or more shaders from a compressed set.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DDecompressShaders(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData,
+                     _In_ SIZE_T SrcDataSize,
+                     _In_ UINT uNumShaders,	      
+                     _In_ UINT uStartIndex,
+                     _In_reads_opt_(uNumShaders) UINT* pIndices,
+                     _In_ UINT uFlags,
+                     _Out_writes_(uNumShaders) ID3DBlob** ppShaders,
+                     _Out_opt_ UINT* pTotalShaders);
+
+#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_GAMES) */
+#pragma endregion
+
+
+#pragma region Desktop Family
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+
+//----------------------------------------------------------------------------
+// D3DDisassemble10Effect:
+// -----------------------
+// Takes a D3D10 effect interface and returns a
+// buffer containing text assembly.
+//----------------------------------------------------------------------------
+
+HRESULT WINAPI
+D3DDisassemble10Effect(_In_ interface ID3D10Effect *pEffect, 
+                       _In_ UINT Flags,
+                       _Out_ ID3DBlob** ppDisassembly);
+
+#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
+#pragma endregion
+
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+    
+#endif // #ifndef __D3DCOMPILER_H__
--- a/include/dxsdk/d3dx12.h
+++ b/include/dxsdk/d3dx12.h
--- a/include/dxsdk/dxgi.h
+++ b/include/dxsdk/dxgi.h
--- a/include/dxsdk/dxgi1_4.h
+++ b/include/dxsdk/dxgi1_4.h
--- a/include/libc/stdlib.h
+++ b/include/libc/stdlib.h
@ -1,6 +1,9 @@
 #ifndef STDLIB_H
 #define STDLIB_H

+#include <stdlib.h>
+
+#ifdef NO_LDIV
 typedef struct lldiv_t
 {
    long long quot;
@ -15,5 +18,6 @@ typedef struct ldiv_t

 lldiv_t lldiv(long long num, long long denom);
 ldiv_t ldiv(long num, long denom);
+#endif

 #endif
--- a/include/macros.h
+++ b/include/macros.h
@ -51,4 +51,23 @@
 #define PHYSICAL_TO_VIRTUAL(addr)   ((uintptr_t)(addr))
 #define VIRTUAL_TO_PHYSICAL2(addr)  ((void *)(addr))

+// Byteswap macros
+#define BSWAP16(x) (((x) & 0xFF) << 8 | (((x) >> 8) & 0xFF))
+#define BSWAP32(x) \
+    ( (((x) >> 24) & 0x000000FF) | (((x) >>  8) & 0x0000FF00) | \
+      (((x) <<  8) & 0x00FF0000) | (((x) << 24) & 0xFF000000) )
+
+// Convenience macros for endian conversions
+#if IS_BIG_ENDIAN
+# define BE_TO_HOST16(x) (x)
+# define BE_TO_HOST32(x) (x)
+# define LE_TO_HOST16(x) BSWAP16(x)
+# define LE_TO_HOST32(x) BSWAP32(x)
+#else
+# define BE_TO_HOST16(x) BSWAP16(x)
+# define BE_TO_HOST32(x) BSWAP32(x)
+# define LE_TO_HOST16(x) (x)
+# define LE_TO_HOST32(x) (x)
+#endif
+
 #endif
--- a/include/stb/stb_image.h
+++ b/include/stb/stb_image.h
--- a/include/stb/stb_image_write.h
+++ b/include/stb/stb_image_write.h
--- a/include/text_options_strings.h.in
+++ b/include/text_options_strings.h.in
@ -0,0 +1,152 @@
+#ifndef TEXT_OPTIONS_STRINGS_H
+#define TEXT_OPTIONS_STRINGS_H
+
+/* Extended options menu text */
+
+// Menu title strings
+
+#define TEXT_OPT_OPTIONS   _("OPTIONS")
+#define TEXT_OPT_CAMERA    _("CAMERA")
+#define TEXT_OPT_CONTROLS  _("CONTROLS")
+#define TEXT_OPT_VIDEO     _("DISPLAY")
+#define TEXT_OPT_AUDIO     _("SOUND")
+#define TEXT_OPT_CHEATS    _("CHEATS")
+
+// Markers
+
+#define TEXT_OPT_HIGHLIGHT _("O")
+#define TEXT_OPT_UNBOUND   _("NONE")
+
+// Language specific strings
+
+#if defined(VERSION_JP) || defined(VERSION_SH)
+
+// TODO: Actually translate this to JP
+
+// No . in JP
+
+#define TEXT_OPT_PRESSKEY  _("・・・")
+
+// Option strings
+
+#define TEXT_OPT_BUTTON1   _("Ｒ OPTIONS")
+#define TEXT_OPT_BUTTON2   _("Ｒ RETURN")
+#define TEXT_OPT_ENABLED   _("ENABLED")
+#define TEXT_OPT_DISABLED  _("DISABLED")
+#define TEXT_OPT_CAMX      _("CAMERA X SENSITIVITY")
+#define TEXT_OPT_CAMY      _("CAMERA Y SENSITIVITY")
+#define TEXT_OPT_INVERTX   _("INVERT X AXIS")
+#define TEXT_OPT_INVERTY   _("INVERT Y AXIS")
+#define TEXT_OPT_CAMC      _("CAMERA CENTRE AGGRESSION")
+#define TEXT_OPT_CAMP      _("CAMERA PAN LEVEL")
+#define TEXT_OPT_CAMD      _("CAMERA DECELERATION")
+#define TEXT_OPT_ANALOGUE  _("ANALOGUE CAMERA")
+#define TEXT_OPT_MOUSE     _("MOUSE LOOK")
+#define TEXT_OPT_TEXFILTER _("TEXTURE FILTERING")
+#define TEXT_OPT_FSCREEN   _("FULLSCREEN")
+#define TEXT_OPT_NEAREST   _("NEAREST")
+#define TEXT_OPT_LINEAR    _("LINEAR")
+#define TEXT_OPT_MVOLUME   _("MASTER VOLUME")
+#define TEXT_OPT_MUSVOLUME _("MUSIC VOLUME")
+#define TEXT_OPT_SFXVOLUME _("SFX VOLUME")
+#define TEXT_OPT_ENVVOLUME _("ENV VOLUME")
+#define TEXT_OPT_VSYNC     _("VERTICAL SYNC")
+#define TEXT_OPT_DOUBLE    _("DOUBLE")
+#define TEXT_OPT_HUD       _("HUD")
+#define TEXT_OPT_THREEPT   _("THREE POINT")
+#define TEXT_OPT_APPLY     _("APPLY")
+#define TEXT_OPT_RESETWND  _("RESET WINDOW")
+
+#define TEXT_BIND_A        _("A BUTTON")
+#define TEXT_BIND_B        _("B BUTTON")
+#define TEXT_BIND_START    _("START BUTTON")
+#define TEXT_BIND_L        _("L TRIGGER")
+#define TEXT_BIND_R        _("R TRIGGER")
+#define TEXT_BIND_Z        _("Z TRIGGER")
+#define TEXT_BIND_C_UP     _("C-UP")
+#define TEXT_BIND_C_DOWN   _("C-DOWN")
+#define TEXT_BIND_C_LEFT   _("C-LEFT")
+#define TEXT_BIND_C_RIGHT  _("C-RIGHT")
+#define TEXT_BIND_UP       _("STICK UP")
+#define TEXT_BIND_DOWN     _("STICK DOWN")
+#define TEXT_BIND_LEFT     _("STICK LEFT")
+#define TEXT_BIND_RIGHT    _("STICK RIGHT")
+#define TEXT_OPT_DEADZONE  _("STICK DEADZONE")
+#define TEXT_OPT_RUMBLE    _("RUMBLE STRENGTH")
+
+#define TEXT_OPT_CHEAT1    _("ENABLE CHEATS")
+#define TEXT_OPT_CHEAT2    _("MOONJUMP (PRESS L)")
+#define TEXT_OPT_CHEAT3    _("INVINCIBLE MARIO")
+#define TEXT_OPT_CHEAT4    _("INFINITE LIVES")
+#define TEXT_OPT_CHEAT5    _("SUPER SPEED")
+#define TEXT_OPT_CHEAT6    _("SUPER RESPONSIVE CONTROLS")
+#define TEXT_OPT_CHEAT7    _("EXIT COURSE AT ANY TIME")
+#define TEXT_OPT_CHEAT8    _("HUGE MARIO")
+#define TEXT_OPT_CHEAT9    _("TINY MARIO")
+
+#else // VERSION
+
+// Markers
+
+#define TEXT_OPT_PRESSKEY  _("...")
+
+// Option strings
+
+#define TEXT_OPT_BUTTON1   _("[R] Options")
+#define TEXT_OPT_BUTTON2   _("[R] Return")
+#define TEXT_OPT_ENABLED   _("Enabled")
+#define TEXT_OPT_DISABLED  _("Disabled")
+#define TEXT_OPT_CAMX      _("Camera X Sensitivity")
+#define TEXT_OPT_CAMY      _("Camera Y Sensitivity")
+#define TEXT_OPT_INVERTX   _("Invert X Axis")
+#define TEXT_OPT_INVERTY   _("Invert Y Axis")
+#define TEXT_OPT_CAMC      _("Camera Centre Aggression")
+#define TEXT_OPT_CAMP      _("Camera Pan Level")
+#define TEXT_OPT_CAMD      _("Camera Deceleration")
+#define TEXT_OPT_ANALOGUE  _("Analogue Camera")
+#define TEXT_OPT_MOUSE     _("Mouse Look")
+#define TEXT_OPT_TEXFILTER _("Texture Filtering")
+#define TEXT_OPT_FSCREEN   _("Fullscreen")
+#define TEXT_OPT_NEAREST   _("Nearest")
+#define TEXT_OPT_LINEAR    _("Linear")
+#define TEXT_OPT_MVOLUME   _("Master Volume")
+#define TEXT_OPT_MUSVOLUME _("Music Volume")
+#define TEXT_OPT_SFXVOLUME _("Sfx Volume")
+#define TEXT_OPT_ENVVOLUME _("Env Volume")
+#define TEXT_OPT_VSYNC     _("Vertical Sync")
+#define TEXT_OPT_DOUBLE    _("Double")
+#define TEXT_OPT_HUD       _("HUD")
+#define TEXT_OPT_THREEPT   _("Three-point")
+#define TEXT_OPT_APPLY     _("Apply")
+#define TEXT_OPT_RESETWND  _("Reset Window")
+
+#define TEXT_BIND_A        _("A Button")
+#define TEXT_BIND_B        _("B Button")
+#define TEXT_BIND_START    _("Start Button")
+#define TEXT_BIND_L        _("L Trigger")
+#define TEXT_BIND_R        _("R Trigger")
+#define TEXT_BIND_Z        _("Z Trigger")
+#define TEXT_BIND_C_UP     _("C-Up")
+#define TEXT_BIND_C_DOWN   _("C-Down")
+#define TEXT_BIND_C_LEFT   _("C-Left")
+#define TEXT_BIND_C_RIGHT  _("C-Right")
+#define TEXT_BIND_UP       _("Stick Up")
+#define TEXT_BIND_DOWN     _("Stick Down")
+#define TEXT_BIND_LEFT     _("Stick Left")
+#define TEXT_BIND_RIGHT    _("Stick Right")
+#define TEXT_OPT_DEADZONE  _("Stick Deadzone")
+#define TEXT_OPT_RUMBLE    _("Rumble Strength")
+
+#define TEXT_OPT_CHEAT1    _("Enable cheats")
+#define TEXT_OPT_CHEAT2    _("Moonjump (Press L)")
+#define TEXT_OPT_CHEAT3    _("Invincible Mario")
+#define TEXT_OPT_CHEAT4    _("Infinite lives")
+#define TEXT_OPT_CHEAT5    _("Super speed")
+#define TEXT_OPT_CHEAT6    _("Super responsive controls")
+#define TEXT_OPT_CHEAT7    _("Exit course at any time")
+#define TEXT_OPT_CHEAT8    _("Huge Mario")
+#define TEXT_OPT_CHEAT9    _("Tiny Mario")
+
+#endif // VERSION
+
+#endif // TEXT_OPTIONS_STRINGS_H
--- a/include/text_strings.h.in
+++ b/include/text_strings.h.in
@ -1,60 +1,11 @@
-	#ifndef TEXT_STRINGS_H
+#ifndef TEXT_STRINGS_H
 #define TEXT_STRINGS_H

 #include "text_menu_strings.h"

-#define TEXT_OPT_CAMX      _("Camera X Sensitivity")
-#define TEXT_OPT_CAMY      _("Camera Y Sensitivity")
-#define TEXT_OPT_INVERTX   _("Invert X Axis")
-#define TEXT_OPT_INVERTY   _("Invert Y Axis")
-#define TEXT_OPT_CAMC      _("Camera Centre Aggression")
-#define TEXT_OPT_CAMP      _("Camera Pan Level")
-#define TEXT_OPT_CAMD      _("Camera Deceleration")
-#define TEXT_OPT_ENABLED   _("Enabled")
-#define TEXT_OPT_DISABLED  _("Disabled")
-#define TEXT_OPT_BUTTON1   _("[R]: Options")
-#define TEXT_OPT_BUTTON2   _("[R]: Return")
-#define TEXT_OPT_OPTIONS   _("OPTIONS")
-#define TEXT_OPT_CAMERA    _("CAMERA")
-#define TEXT_OPT_CONTROLS  _("CONTROLS")
-#define TEXT_OPT_VIDEO     _("DISPLAY")
-#define TEXT_OPT_AUDIO     _("SOUND")
-#define TEXT_OPT_HIGHLIGHT _("O")
-#define TEXT_OPT_ANALOGUE  _("Analogue Camera")
-#define TEXT_OPT_MOUSE     _("Mouse Look")
-#define TEXT_OPT_TEXFILTER _("Texture Filtering")
-#define TEXT_OPT_FSCREEN   _("Fullscreen")
-#define TEXT_OPT_NEAREST   _("Nearest")
-#define TEXT_OPT_LINEAR    _("Linear")
-#define TEXT_OPT_MVOLUME   _("Master Volume")
-#define TEXT_OPT_VSYNC     _("Vertical Sync")
-#define TEXT_OPT_DOUBLE    _("Double")
-#define TEXT_RESET_WINDOW  _("Reset Window")
-
-#define TEXT_OPT_UNBOUND   _("NONE")
-#define TEXT_OPT_PRESSKEY  _("...")
-#define TEXT_BIND_A        _("A Button")
-#define TEXT_BIND_B        _("B Button")
-#define TEXT_BIND_START    _("Start Button")
-#define TEXT_BIND_L        _("L Trigger")
-#define TEXT_BIND_R        _("R Trigger")
-#define TEXT_BIND_Z        _("Z Trigger")
-#define TEXT_BIND_C_UP     _("C-Up")
-#define TEXT_BIND_C_DOWN   _("C-Down")
-#define TEXT_BIND_C_LEFT   _("C-Left")
-#define TEXT_BIND_C_RIGHT  _("C-Right")
-#define TEXT_BIND_UP       _("Stick Up")
-#define TEXT_BIND_DOWN     _("Stick Down")
-#define TEXT_BIND_LEFT     _("Stick Left")
-#define TEXT_BIND_RIGHT    _("Stick Right")
-
-#define TEXT_OPT_CHEATS _("CHEATS")
-#define TEXT_OPT_CHEAT1 _("Enable cheats")
-#define TEXT_OPT_CHEAT2 _("Moonjump (Press L)")
-#define TEXT_OPT_CHEAT3 _("Invincible Mario")
-#define TEXT_OPT_CHEAT4 _("Infinite lives")
-#define TEXT_OPT_CHEAT5 _("Super speed")
-#define TEXT_OPT_CHEAT6 _("Super responsive controls")
+#ifdef EXT_OPTIONS_MENU
+#include "text_options_strings.h"
+#endif

 /**
 * Global Symbols
@ -143,7 +94,7 @@
 #define TEXT_COURSE _("コース")
 #define TEXT_MYSCORE _("マイスコア")
 #define TEXT_CONTINUE _("つづけて　マリオする？")
-#define TEXT_EXIT_GAME _("ゲームをしゅうりょうする？")
+#define TEXT_EXIT_GAME _("ゲームをしゅうりょうする")
 #define TEXT_EXIT_COURSE _("コースからでる？")
 #define TEXT_CAMERA_ANGLE_R _("Ｒボタンのカメラきりかえ")

--- a/include/tinfl.h
+++ b/include/tinfl.h
@ -0,0 +1,724 @@
+/* tinfl.c v1.11 - public domain inflate with zlib header parsing/adler32 checking (inflate-only subset of miniz.c)
+   See "unlicense" statement at the end of this file.
+   Rich Geldreich <richgel99@gmail.com>, last updated May 20, 2011
+   Implements RFC 1950: https://www.ietf.org/rfc/rfc1950.txt and RFC 1951: https://www.ietf.org/rfc/rfc1951.txt
+
+   The entire decompressor coroutine is implemented in tinfl_decompress(). The other functions are optional high-level helpers.
+*/
+#ifndef TINFL_HEADER_INCLUDED
+#define TINFL_HEADER_INCLUDED
+
+#include <stdint.h>
+
+typedef uint8_t mz_uint8;
+typedef int16_t mz_int16;
+typedef uint16_t mz_uint16;
+typedef uint32_t mz_uint32;
+typedef unsigned int mz_uint; 
+typedef uint64_t mz_uint64;
+
+/* For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. */
+typedef unsigned long mz_ulong;
+
+/* Heap allocation callbacks. */
+typedef void *(*mz_alloc_func)(void *opaque, unsigned int items, unsigned int size);
+typedef void (*mz_free_func)(void *opaque, void *address);
+
+#if defined(_M_IX86) || defined(_M_X64)
+/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 if integer loads and stores to unaligned addresses are acceptable on the target platform (slightly faster). */
+#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
+/* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */
+#define MINIZ_LITTLE_ENDIAN 1
+#endif
+
+#if defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__)
+/* Set MINIZ_HAS_64BIT_REGISTERS to 1 if the processor has 64-bit general purpose registers (enables 64-bit bitbuffer in inflator) */
+#define MINIZ_HAS_64BIT_REGISTERS 1
+#endif
+
+/* Works around MSVC's spammy "warning C4127: conditional expression is constant" message. */
+#ifdef _MSC_VER
+#define MZ_MACRO_END while (0, 0)
+#else
+#define MZ_MACRO_END while (0)
+#endif
+
+/* Decompression flags. */
+enum
+{
+  TINFL_FLAG_PARSE_ZLIB_HEADER = 1,
+  TINFL_FLAG_HAS_MORE_INPUT = 2,
+  TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4,
+  TINFL_FLAG_COMPUTE_ADLER32 = 8
+};
+
+struct tinfl_decompressor_tag; typedef struct tinfl_decompressor_tag tinfl_decompressor;
+
+/* Max size of LZ dictionary. */
+#define TINFL_LZ_DICT_SIZE 32768
+
+/* Return status. */
+typedef enum
+{
+  TINFL_STATUS_BAD_PARAM = -3,
+  TINFL_STATUS_ADLER32_MISMATCH = -2,
+  TINFL_STATUS_FAILED = -1,
+  TINFL_STATUS_DONE = 0,
+  TINFL_STATUS_NEEDS_MORE_INPUT = 1,
+  TINFL_STATUS_HAS_MORE_OUTPUT = 2
+} tinfl_status;
+
+/* Initializes the decompressor to its initial state. */
+#define tinfl_init(r) do { (r)->m_state = 0; } MZ_MACRO_END
+#define tinfl_get_adler32(r) (r)->m_check_adler32
+
+/* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */
+/* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */
+static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags);
+
+/* Internal/private bits follow. */
+enum
+{
+  TINFL_MAX_HUFF_TABLES = 3, TINFL_MAX_HUFF_SYMBOLS_0 = 288, TINFL_MAX_HUFF_SYMBOLS_1 = 32, TINFL_MAX_HUFF_SYMBOLS_2 = 19,
+  TINFL_FAST_LOOKUP_BITS = 10, TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS
+};
+
+typedef struct
+{
+  mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0];
+  mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
+} tinfl_huff_table;
+
+#if MINIZ_HAS_64BIT_REGISTERS
+  #define TINFL_USE_64BIT_BITBUF 1
+#endif
+
+#if TINFL_USE_64BIT_BITBUF
+  typedef mz_uint64 tinfl_bit_buf_t;
+  #define TINFL_BITBUF_SIZE (64)
+#else
+  typedef mz_uint32 tinfl_bit_buf_t;
+  #define TINFL_BITBUF_SIZE (32)
+#endif
+
+struct tinfl_decompressor_tag
+{
+  mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES];
+  tinfl_bit_buf_t m_bit_buf;
+  size_t m_dist_from_out_buf_start;
+  tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES];
+  mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137];
+};
+
+#endif /* #ifdef TINFL_HEADER_INCLUDED */
+
+/* ------------------- End of Header: Implementation follows. (If you only want the header, define MINIZ_HEADER_FILE_ONLY.) */
+
+#ifndef TINFL_HEADER_FILE_ONLY
+
+#ifdef MINIZ_NO_MALLOC
+  #define MZ_MALLOC(x) NULL
+  #define MZ_FREE(x) x, ((void)0)
+  #define MZ_REALLOC(p, x) NULL
+#else
+  #define MZ_MALLOC(x) malloc(x)
+  #define MZ_FREE(x) free(x)
+  #define MZ_REALLOC(p, x) realloc(p, x)
+#endif
+
+#define MZ_MAX(a,b) (((a)>(b))?(a):(b))
+#define MZ_MIN(a,b) (((a)<(b))?(a):(b))
+#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj))
+
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
+  #define MZ_READ_LE16(p) *((const mz_uint16 *)(p))
+  #define MZ_READ_LE32(p) *((const mz_uint32 *)(p))
+#else
+  #define MZ_READ_LE16(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U))
+  #define MZ_READ_LE32(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U))
+#endif
+
+#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l)
+#define TINFL_MEMSET(p, c, l) memset(p, c, l)
+
+#define TINFL_CR_BEGIN switch(r->m_state) { case 0:
+#define TINFL_CR_RETURN(state_index, result) do { status = result; r->m_state = state_index; goto common_exit; case state_index:; } MZ_MACRO_END
+#define TINFL_CR_RETURN_FOREVER(state_index, result) do { for ( ; ; ) { TINFL_CR_RETURN(state_index, result); } } MZ_MACRO_END
+#define TINFL_CR_FINISH }
+
+/* TODO: If the caller has indicated that there's no more input, and we attempt to read beyond the input buf, then something is wrong with the input because the inflator never */
+/* reads ahead more than it needs to. Currently TINFL_GET_BYTE() pads the end of the stream with 0's in this scenario. */
+#define TINFL_GET_BYTE(state_index, c) do { \
+  if (pIn_buf_cur >= pIn_buf_end) { \
+    for ( ; ; ) { \
+      if (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) { \
+        TINFL_CR_RETURN(state_index, TINFL_STATUS_NEEDS_MORE_INPUT); \
+        if (pIn_buf_cur < pIn_buf_end) { \
+          c = *pIn_buf_cur++; \
+          break; \
+        } \
+      } else { \
+        c = 0; \
+        break; \
+      } \
+    } \
+  } else c = *pIn_buf_cur++; } MZ_MACRO_END
+
+#define TINFL_NEED_BITS(state_index, n) do { mz_uint c; TINFL_GET_BYTE(state_index, c); bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); num_bits += 8; } while (num_bits < (mz_uint)(n))
+#define TINFL_SKIP_BITS(state_index, n) do { if (num_bits < (mz_uint)(n)) { TINFL_NEED_BITS(state_index, n); } bit_buf >>= (n); num_bits -= (n); } MZ_MACRO_END
+#define TINFL_GET_BITS(state_index, b, n) do { if (num_bits < (mz_uint)(n)) { TINFL_NEED_BITS(state_index, n); } b = bit_buf & ((1 << (n)) - 1); bit_buf >>= (n); num_bits -= (n); } MZ_MACRO_END
+
+/* TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes remaining in the input buffer falls below 2. */
+/* It reads just enough bytes from the input stream that are needed to decode the next Huffman code (and absolutely no more). It works by trying to fully decode a */
+/* Huffman code by using whatever bits are currently present in the bit buffer. If this fails, it reads another byte, and tries again until it succeeds or until the */
+/* bit buffer contains >=15 bits (deflate's max. Huffman code size). */
+#define TINFL_HUFF_BITBUF_FILL(state_index, pHuff) \
+  do { \
+    temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]; \
+    if (temp >= 0) { \
+      code_len = temp >> 9; \
+      if ((code_len) && (num_bits >= code_len)) \
+      break; \
+    } else if (num_bits > TINFL_FAST_LOOKUP_BITS) { \
+       code_len = TINFL_FAST_LOOKUP_BITS; \
+       do { \
+          temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \
+       } while ((temp < 0) && (num_bits >= (code_len + 1))); if (temp >= 0) break; \
+    } TINFL_GET_BYTE(state_index, c); bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); num_bits += 8; \
+  } while (num_bits < 15);
+
+/* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex than you would initially expect because the zlib API expects the decompressor to never read */
+/* beyond the final byte of the deflate stream. (In other words, when this macro wants to read another byte from the input, it REALLY needs another byte in order to fully */
+/* decode the next Huffman code.) Handling this properly is particularly important on raw deflate (non-zlib) streams, which aren't followed by a byte aligned adler-32. */
+/* The slow path is only executed at the very end of the input buffer. */
+#define TINFL_HUFF_DECODE(state_index, sym, pHuff) do { \
+  int temp; mz_uint code_len, c; \
+  if (num_bits < 15) { \
+    if ((pIn_buf_end - pIn_buf_cur) < 2) { \
+       TINFL_HUFF_BITBUF_FILL(state_index, pHuff); \
+    } else { \
+       bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) | (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8)); pIn_buf_cur += 2; num_bits += 16; \
+    } \
+  } \
+  if ((temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0) \
+    code_len = temp >> 9, temp &= 511; \
+  else { \
+    code_len = TINFL_FAST_LOOKUP_BITS; do { temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; } while (temp < 0); \
+  } sym = temp; bit_buf >>= code_len; num_bits -= code_len; } MZ_MACRO_END
+
+static void tinfl_def_free_func(void *opaque, void *address) {
+  (void)opaque, (void)address;
+  MZ_FREE(address);
+}
+
+static void *tinfl_def_alloc_func(void *opaque, unsigned int items, unsigned int size) {
+  (void)opaque, (void)items, (void)size;
+  return MZ_MALLOC(items * size);
+}
+
+static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
+{
+  static const int s_length_base[31] = { 3,4,5,6,7,8,9,10,11,13, 15,17,19,23,27,31,35,43,51,59, 67,83,99,115,131,163,195,227,258,0,0 };
+  static const int s_length_extra[31]= { 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
+  static const int s_dist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, 257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
+  static const int s_dist_extra[32] = { 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+  static const mz_uint8 s_length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
+  static const int s_min_table_sizes[3] = { 257, 1, 4 };
+
+  tinfl_status status = TINFL_STATUS_FAILED; mz_uint32 num_bits, dist, counter, num_extra; tinfl_bit_buf_t bit_buf;
+  const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size;
+  mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next + *pOut_buf_size;
+  size_t out_buf_size_mask = (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) ? (size_t)-1 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, dist_from_out_buf_start;
+
+  /* Ensure the output buffer's size is a power of 2, unless the output buffer is large enough to hold the entire output file (in which case it doesn't matter). */
+  if (((out_buf_size_mask + 1) & out_buf_size_mask) || (pOut_buf_next < pOut_buf_start)) { *pIn_buf_size = *pOut_buf_size = 0; return TINFL_STATUS_BAD_PARAM; }
+
+  num_bits = r->m_num_bits; bit_buf = r->m_bit_buf; dist = r->m_dist; counter = r->m_counter; num_extra = r->m_num_extra; dist_from_out_buf_start = r->m_dist_from_out_buf_start;
+  TINFL_CR_BEGIN
+
+  bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0; r->m_z_adler32 = r->m_check_adler32 = 1;
+  if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
+  {
+    TINFL_GET_BYTE(1, r->m_zhdr0); TINFL_GET_BYTE(2, r->m_zhdr1);
+    counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8));
+    if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)(1U << (8U + (r->m_zhdr0 >> 4)))));
+    if (counter) { TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED); }
+  }
+
+  do
+  {
+    TINFL_GET_BITS(3, r->m_final, 3); r->m_type = r->m_final >> 1;
+    if (r->m_type == 0)
+    {
+      TINFL_SKIP_BITS(5, num_bits & 7);
+      for (counter = 0; counter < 4; ++counter) { if (num_bits) TINFL_GET_BITS(6, r->m_raw_header[counter], 8); else TINFL_GET_BYTE(7, r->m_raw_header[counter]); }
+      if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != (mz_uint)(0xFFFF ^ (r->m_raw_header[2] | (r->m_raw_header[3] << 8)))) { TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED); }
+      while ((counter) && (num_bits))
+      {
+        TINFL_GET_BITS(51, dist, 8);
+        while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT); }
+        *pOut_buf_cur++ = (mz_uint8)dist;
+        counter--;
+      }
+      while (counter)
+      {
+        size_t n; while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT); }
+        while (pIn_buf_cur >= pIn_buf_end)
+        {
+          if (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT)
+          {
+            TINFL_CR_RETURN(38, TINFL_STATUS_NEEDS_MORE_INPUT);
+          }
+          else
+          {
+            TINFL_CR_RETURN_FOREVER(40, TINFL_STATUS_FAILED);
+          }
+        }
+        n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur), (size_t)(pIn_buf_end - pIn_buf_cur)), counter);
+        TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n); pIn_buf_cur += n; pOut_buf_cur += n; counter -= (mz_uint)n;
+      }
+    }
+    else if (r->m_type == 3)
+    {
+      TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED);
+    }
+    else
+    {
+      if (r->m_type == 1)
+      {
+        mz_uint8 *p = r->m_tables[0].m_code_size; mz_uint i;
+        r->m_table_sizes[0] = 288; r->m_table_sizes[1] = 32; TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32);
+        for ( i = 0; i <= 143; ++i) *p++ = 8;
+        for ( ; i <= 255; ++i) *p++ = 9;
+        for ( ; i <= 279; ++i) *p++ = 7;
+        for ( ; i <= 287; ++i) *p++ = 8;
+      }
+      else
+      {
+        for (counter = 0; counter < 3; counter++) { TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]); r->m_table_sizes[counter] += s_min_table_sizes[counter]; }
+        MZ_CLEAR_OBJ(r->m_tables[2].m_code_size); for (counter = 0; counter < r->m_table_sizes[2]; counter++) { mz_uint s; TINFL_GET_BITS(14, s, 3); r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s; }
+        r->m_table_sizes[2] = 19;
+      }
+      for ( ; (int)r->m_type >= 0; r->m_type--)
+      {
+        int tree_next, tree_cur; tinfl_huff_table *pTable;
+        mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16]; pTable = &r->m_tables[r->m_type]; MZ_CLEAR_OBJ(total_syms); MZ_CLEAR_OBJ(pTable->m_look_up); MZ_CLEAR_OBJ(pTable->m_tree);
+        for (i = 0; i < r->m_table_sizes[r->m_type]; ++i) total_syms[pTable->m_code_size[i]]++;
+        used_syms = 0, total = 0; next_code[0] = next_code[1] = 0;
+        for (i = 1; i <= 15; ++i) { used_syms += total_syms[i]; next_code[i + 1] = (total = ((total + total_syms[i]) << 1)); }
+        if ((65536 != total) && (used_syms > 1))
+        {
+          TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED);
+        }
+        for (tree_next = -1, sym_index = 0; sym_index < r->m_table_sizes[r->m_type]; ++sym_index)
+        {
+          mz_uint rev_code = 0, l, cur_code, code_size = pTable->m_code_size[sym_index]; if (!code_size) continue;
+          cur_code = next_code[code_size]++; for (l = code_size; l > 0; l--, cur_code >>= 1) rev_code = (rev_code << 1) | (cur_code & 1);
+          if (code_size <= TINFL_FAST_LOOKUP_BITS) { mz_int16 k = (mz_int16)((code_size << 9) | sym_index); while (rev_code < TINFL_FAST_LOOKUP_SIZE) { pTable->m_look_up[rev_code] = k; rev_code += (1 << code_size); } continue; }
+          if (0 == (tree_cur = pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)])) { pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = (mz_int16)tree_next; tree_cur = tree_next; tree_next -= 2; }
+          rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1);
+          for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--)
+          {
+            tree_cur -= ((rev_code >>= 1) & 1);
+            if (!pTable->m_tree[-tree_cur - 1]) { pTable->m_tree[-tree_cur - 1] = (mz_int16)tree_next; tree_cur = tree_next; tree_next -= 2; } else tree_cur = pTable->m_tree[-tree_cur - 1];
+          }
+          tree_cur -= ((rev_code >>= 1) & 1); pTable->m_tree[-tree_cur - 1] = (mz_int16)sym_index;
+        }
+        if (r->m_type == 2)
+        {
+          for (counter = 0; counter < (r->m_table_sizes[0] + r->m_table_sizes[1]); )
+          {
+            mz_uint s; TINFL_HUFF_DECODE(16, dist, &r->m_tables[2]); if (dist < 16) { r->m_len_codes[counter++] = (mz_uint8)dist; continue; }
+            if ((dist == 16) && (!counter))
+            {
+              TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED);
+            }
+            num_extra = "\02\03\07"[dist - 16]; TINFL_GET_BITS(18, s, num_extra); s += "\03\03\013"[dist - 16];
+            TINFL_MEMSET(r->m_len_codes + counter, (dist == 16) ? r->m_len_codes[counter - 1] : 0, s); counter += s;
+          }
+          if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter)
+          {
+            TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED);
+          }
+          TINFL_MEMCPY(r->m_tables[0].m_code_size, r->m_len_codes, r->m_table_sizes[0]); TINFL_MEMCPY(r->m_tables[1].m_code_size, r->m_len_codes + r->m_table_sizes[0], r->m_table_sizes[1]);
+        }
+      }
+      for ( ; ; )
+      {
+        mz_uint8 *pSrc;
+        for ( ; ; )
+        {
+          if (((pIn_buf_end - pIn_buf_cur) < 4) || ((pOut_buf_end - pOut_buf_cur) < 2))
+          {
+            TINFL_HUFF_DECODE(23, counter, &r->m_tables[0]);
+            if (counter >= 256)
+              break;
+            while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT); }
+            *pOut_buf_cur++ = (mz_uint8)counter;
+          }
+          else
+          {
+            int sym2; mz_uint code_len;
+#if TINFL_USE_64BIT_BITBUF
+            if (num_bits < 30) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits); pIn_buf_cur += 4; num_bits += 32; }
+#else
+            if (num_bits < 15) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); pIn_buf_cur += 2; num_bits += 16; }
+#endif
+            if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
+              code_len = sym2 >> 9;
+            else
+            {
+              code_len = TINFL_FAST_LOOKUP_BITS; do { sym2 = r->m_tables[0].m_tree[~sym2 + ((bit_buf >> code_len++) & 1)]; } while (sym2 < 0);
+            }
+            counter = sym2; bit_buf >>= code_len; num_bits -= code_len;
+            if (counter & 256)
+              break;
+
+#if !TINFL_USE_64BIT_BITBUF
+            if (num_bits < 15) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); pIn_buf_cur += 2; num_bits += 16; }
+#endif
+            if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
+              code_len = sym2 >> 9;
+            else
+            {
+              code_len = TINFL_FAST_LOOKUP_BITS; do { sym2 = r->m_tables[0].m_tree[~sym2 + ((bit_buf >> code_len++) & 1)]; } while (sym2 < 0);
+            }
+            bit_buf >>= code_len; num_bits -= code_len;
+
+            pOut_buf_cur[0] = (mz_uint8)counter;
+            if (sym2 & 256)
+            {
+              pOut_buf_cur++;
+              counter = sym2;
+              break;
+            }
+            pOut_buf_cur[1] = (mz_uint8)sym2;
+            pOut_buf_cur += 2;
+          }
+        }
+        if ((counter &= 511) == 256) break;
+
+        num_extra = s_length_extra[counter - 257]; counter = s_length_base[counter - 257];
+        if (num_extra) { mz_uint extra_bits; TINFL_GET_BITS(25, extra_bits, num_extra); counter += extra_bits; }
+
+        TINFL_HUFF_DECODE(26, dist, &r->m_tables[1]);
+        num_extra = s_dist_extra[dist]; dist = s_dist_base[dist];
+        if (num_extra) { mz_uint extra_bits; TINFL_GET_BITS(27, extra_bits, num_extra); dist += extra_bits; }
+
+        dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start;
+        if ((dist > dist_from_out_buf_start) && (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
+        {
+          TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED);
+        }
+
+        pSrc = pOut_buf_start + ((dist_from_out_buf_start - dist) & out_buf_size_mask);
+
+        if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end)
+        {
+          while (counter--)
+          {
+            while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT); }
+            *pOut_buf_cur++ = pOut_buf_start[(dist_from_out_buf_start++ - dist) & out_buf_size_mask];
+          }
+          continue;
+        }
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
+        else if ((counter >= 9) && (counter <= dist))
+        {
+          const mz_uint8 *pSrc_end = pSrc + (counter & ~7);
+          do
+          {
+            ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0];
+            ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1];
+            pOut_buf_cur += 8;
+          } while ((pSrc += 8) < pSrc_end);
+          if ((counter &= 7) < 3)
+          {
+            if (counter)
+            {
+              pOut_buf_cur[0] = pSrc[0];
+              if (counter > 1)
+                pOut_buf_cur[1] = pSrc[1];
+              pOut_buf_cur += counter;
+            }
+            continue;
+          }
+        }
+#endif
+        do
+        {
+          pOut_buf_cur[0] = pSrc[0];
+          pOut_buf_cur[1] = pSrc[1];
+          pOut_buf_cur[2] = pSrc[2];
+          pOut_buf_cur += 3; pSrc += 3;
+        } while ((int)(counter -= 3) > 2);
+        if ((int)counter > 0)
+        {
+          pOut_buf_cur[0] = pSrc[0];
+          if ((int)counter > 1)
+            pOut_buf_cur[1] = pSrc[1];
+          pOut_buf_cur += counter;
+        }
+      }
+    }
+  } while (!(r->m_final & 1));
+  if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
+  {
+    TINFL_SKIP_BITS(32, num_bits & 7); for (counter = 0; counter < 4; ++counter) { mz_uint s; if (num_bits) TINFL_GET_BITS(41, s, 8); else TINFL_GET_BYTE(42, s); r->m_z_adler32 = (r->m_z_adler32 << 8) | s; }
+  }
+  TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE);
+  TINFL_CR_FINISH
+
+common_exit:
+  r->m_num_bits = num_bits; r->m_bit_buf = bit_buf; r->m_dist = dist; r->m_counter = counter; r->m_num_extra = num_extra; r->m_dist_from_out_buf_start = dist_from_out_buf_start;
+  *pIn_buf_size = pIn_buf_cur - pIn_buf_next; *pOut_buf_size = pOut_buf_cur - pOut_buf_next;
+  if ((decomp_flags & (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) && (status >= 0))
+  {
+    const mz_uint8 *ptr = pOut_buf_next; size_t buf_len = *pOut_buf_size;
+    mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, s2 = r->m_check_adler32 >> 16; size_t block_len = buf_len % 5552;
+    while (buf_len)
+    {
+      for (i = 0; i + 7 < block_len; i += 8, ptr += 8)
+      {
+        s1 += ptr[0], s2 += s1; s1 += ptr[1], s2 += s1; s1 += ptr[2], s2 += s1; s1 += ptr[3], s2 += s1;
+        s1 += ptr[4], s2 += s1; s1 += ptr[5], s2 += s1; s1 += ptr[6], s2 += s1; s1 += ptr[7], s2 += s1;
+      }
+      for ( ; i < block_len; ++i) s1 += *ptr++, s2 += s1;
+      s1 %= 65521U, s2 %= 65521U; buf_len -= block_len; block_len = 5552;
+    }
+    r->m_check_adler32 = (s2 << 16) + s1; if ((status == TINFL_STATUS_DONE) && (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) && (r->m_check_adler32 != r->m_z_adler32)) status = TINFL_STATUS_ADLER32_MISMATCH;
+  }
+  return status;
+}
+
+/* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other stuff is for advanced use. */
+enum { MZ_NO_FLUSH = 0, MZ_PARTIAL_FLUSH = 1, MZ_SYNC_FLUSH = 2, MZ_FULL_FLUSH = 3, MZ_FINISH = 4, MZ_BLOCK = 5 };
+
+/* Return status codes. MZ_PARAM_ERROR is non-standard. */
+enum { MZ_OK = 0, MZ_STREAM_END = 1, MZ_NEED_DICT = 2, MZ_ERRNO = -1, MZ_STREAM_ERROR = -2, MZ_DATA_ERROR = -3, MZ_MEM_ERROR = -4, MZ_BUF_ERROR = -5, MZ_VERSION_ERROR = -6, MZ_PARAM_ERROR = -10000 };
+
+/* Compression levels. */
+enum { MZ_NO_COMPRESSION = 0, MZ_BEST_SPEED = 1, MZ_BEST_COMPRESSION = 9, MZ_DEFAULT_COMPRESSION = -1 };
+
+/* Window bits */
+#define MZ_DEFAULT_WINDOW_BITS 15
+
+struct mz_internal_state;
+
+/* Compression/decompression stream struct. */
+typedef struct mz_stream_s
+{
+  const unsigned char *next_in;     /* pointer to next byte to read */
+  unsigned int avail_in;            /* number of bytes available at next_in */
+  mz_ulong total_in;                /* total number of bytes consumed so far */
+
+  unsigned char *next_out;          /* pointer to next byte to write */
+  unsigned int avail_out;           /* number of bytes that can be written to next_out */
+  mz_ulong total_out;               /* total number of bytes produced so far */
+
+  char *msg;                        /* error msg (unused) */
+  struct mz_internal_state *state;  /* internal state, allocated by zalloc/zfree */
+
+  mz_alloc_func zalloc;             /* optional heap allocation function (defaults to malloc) */
+  mz_free_func zfree;               /* optional heap free function (defaults to free) */
+  void *opaque;                     /* heap alloc function user pointer */
+
+  int data_type;                    /* data_type (unused) */
+  mz_ulong adler;                   /* adler32 of the source or uncompressed data */
+  mz_ulong reserved;                /* not used */
+} mz_stream;
+
+typedef mz_stream *mz_streamp;
+
+
+typedef struct
+{
+  tinfl_decompressor m_decomp;
+  mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed; int m_window_bits;
+  mz_uint8 m_dict[TINFL_LZ_DICT_SIZE];
+  tinfl_status m_last_status;
+} inflate_state;
+
+static int mz_inflateInit2(mz_streamp pStream, int window_bits)
+{
+  inflate_state *pDecomp;
+  if (!pStream) return MZ_STREAM_ERROR;
+  if ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS)) return MZ_PARAM_ERROR;
+
+  pStream->data_type = 0;
+  pStream->adler = 0;
+  pStream->msg = NULL;
+  pStream->total_in = 0;
+  pStream->total_out = 0;
+  pStream->reserved = 0;
+  if (!pStream->zalloc) pStream->zalloc = tinfl_def_alloc_func;
+  if (!pStream->zfree) pStream->zfree = tinfl_def_free_func;
+
+  pDecomp = (inflate_state*)pStream->zalloc(pStream->opaque, 1, sizeof(inflate_state));
+  if (!pDecomp) return MZ_MEM_ERROR;
+
+  pStream->state = (struct mz_internal_state *)pDecomp;
+
+  tinfl_init(&pDecomp->m_decomp);
+  pDecomp->m_dict_ofs = 0;
+  pDecomp->m_dict_avail = 0;
+  pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
+  pDecomp->m_first_call = 1;
+  pDecomp->m_has_flushed = 0;
+  pDecomp->m_window_bits = window_bits;
+
+  return MZ_OK;
+}
+
+static int mz_inflate(mz_streamp pStream, int flush)
+{
+  inflate_state* pState;
+  mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32;
+  size_t in_bytes, out_bytes, orig_avail_in;
+  tinfl_status status;
+
+  if ((!pStream) || (!pStream->state)) return MZ_STREAM_ERROR;
+  if (flush == MZ_PARTIAL_FLUSH) flush = MZ_SYNC_FLUSH;
+  if ((flush) && (flush != MZ_SYNC_FLUSH) && (flush != MZ_FINISH)) return MZ_STREAM_ERROR;
+
+  pState = (inflate_state*)pStream->state;
+  if (pState->m_window_bits > 0) decomp_flags |= TINFL_FLAG_PARSE_ZLIB_HEADER;
+  orig_avail_in = pStream->avail_in;
+
+  first_call = pState->m_first_call; pState->m_first_call = 0;
+  if (pState->m_last_status < 0) return MZ_DATA_ERROR;
+
+  if (pState->m_has_flushed && (flush != MZ_FINISH)) return MZ_STREAM_ERROR;
+  pState->m_has_flushed |= (flush == MZ_FINISH);
+
+  if ((flush == MZ_FINISH) && (first_call))
+  {
+    /* MZ_FINISH on the first call implies that the input and output buffers are large enough to hold the entire compressed/decompressed file. */
+    decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF;
+    in_bytes = pStream->avail_in; out_bytes = pStream->avail_out;
+    status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pStream->next_out, pStream->next_out, &out_bytes, decomp_flags);
+    pState->m_last_status = status;
+    pStream->next_in += (mz_uint)in_bytes; pStream->avail_in -= (mz_uint)in_bytes; pStream->total_in += (mz_uint)in_bytes;
+    pStream->adler = tinfl_get_adler32(&pState->m_decomp);
+    pStream->next_out += (mz_uint)out_bytes; pStream->avail_out -= (mz_uint)out_bytes; pStream->total_out += (mz_uint)out_bytes;
+
+    if (status < 0)
+      return MZ_DATA_ERROR;
+    else if (status != TINFL_STATUS_DONE)
+    {
+      pState->m_last_status = TINFL_STATUS_FAILED;
+      return MZ_BUF_ERROR;
+    }
+    return MZ_STREAM_END;
+  }
+  /* flush != MZ_FINISH then we must assume there's more input. */
+  if (flush != MZ_FINISH) decomp_flags |= TINFL_FLAG_HAS_MORE_INPUT;
+
+  if (pState->m_dict_avail)
+  {
+    n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
+    memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
+    pStream->next_out += n; pStream->avail_out -= n; pStream->total_out += n;
+    pState->m_dict_avail -= n; pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
+    return ((pState->m_last_status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
+  }
+
+  for ( ; ; )
+  {
+    in_bytes = pStream->avail_in;
+    out_bytes = TINFL_LZ_DICT_SIZE - pState->m_dict_ofs;
+
+    status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags);
+    pState->m_last_status = status;
+
+    pStream->next_in += (mz_uint)in_bytes; pStream->avail_in -= (mz_uint)in_bytes;
+    pStream->total_in += (mz_uint)in_bytes; pStream->adler = tinfl_get_adler32(&pState->m_decomp);
+
+    pState->m_dict_avail = (mz_uint)out_bytes;
+
+    n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
+    memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
+    pStream->next_out += n; pStream->avail_out -= n; pStream->total_out += n;
+    pState->m_dict_avail -= n; pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
+
+    if (status < 0)
+       return MZ_DATA_ERROR; /* Stream is corrupted (there could be some uncompressed data left in the output dictionary - oh well). */
+    else if ((status == TINFL_STATUS_NEEDS_MORE_INPUT) && (!orig_avail_in))
+      return MZ_BUF_ERROR; /* Signal caller that we can't make forward progress without supplying more input or by setting flush to MZ_FINISH. */
+    else if (flush == MZ_FINISH)
+    {
+       /* The output buffer MUST be large to hold the remaining uncompressed data when flush==MZ_FINISH. */
+       if (status == TINFL_STATUS_DONE)
+          return pState->m_dict_avail ? MZ_BUF_ERROR : MZ_STREAM_END;
+       /* status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's at least 1 more byte on the way. If there's no more room left in the output buffer then something is wrong. */
+       else if (!pStream->avail_out)
+          return MZ_BUF_ERROR;
+    }
+    else if ((status == TINFL_STATUS_DONE) || (!pStream->avail_in) || (!pStream->avail_out) || (pState->m_dict_avail))
+      break;
+  }
+
+  return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
+}
+
+static int mz_inflateEnd(mz_streamp pStream)
+{
+  if (!pStream)
+    return MZ_STREAM_ERROR;
+  if (pStream->state)
+  {
+    pStream->zfree(pStream->opaque, pStream->state);
+    pStream->state = NULL;
+  }
+  return MZ_OK;
+}
+
+/* make this a drop-in replacement for zlib... */
+  #define voidpf void*
+  #define uInt unsigned int
+  #define z_stream              mz_stream
+  #define inflateInit2          mz_inflateInit2
+  #define inflate               mz_inflate
+  #define inflateEnd            mz_inflateEnd
+  #define Z_SYNC_FLUSH          MZ_SYNC_FLUSH
+  #define Z_FINISH              MZ_FINISH
+  #define Z_OK                  MZ_OK
+  #define Z_STREAM_END          MZ_STREAM_END
+  #define Z_NEED_DICT           MZ_NEED_DICT
+  #define Z_ERRNO               MZ_ERRNO
+  #define Z_STREAM_ERROR        MZ_STREAM_ERROR
+  #define Z_DATA_ERROR          MZ_DATA_ERROR
+  #define Z_MEM_ERROR           MZ_MEM_ERROR
+  #define Z_BUF_ERROR           MZ_BUF_ERROR
+  #define Z_VERSION_ERROR       MZ_VERSION_ERROR
+  #define MAX_WBITS             15
+
+#endif /* #ifndef TINFL_HEADER_FILE_ONLY */
+
+/* 
+  This is free and unencumbered software released into the public domain.
+
+  Anyone is free to copy, modify, publish, use, compile, sell, or
+  distribute this software, either in source code form or as a compiled
+  binary, for any purpose, commercial or non-commercial, and by any
+  means.
+
+  In jurisdictions that recognize copyright laws, the author or authors
+  of this software dedicate any and all copyright interest in the
+  software to the public domain. We make this dedication for the benefit
+  of the public at large and to the detriment of our heirs and
+  successors. We intend this dedication to be an overt act of
+  relinquishment in perpetuity of all present and future rights to this
+  software under copyright law.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+
+  For more information, please refer to <https://unlicense.org/>
+*/
+
--- a/include/types.h
+++ b/include/types.h
@ -1,5 +1,5 @@
-#ifndef _TYPES_H_
-#define _TYPES_H_
+#ifndef _SM64_TYPES_H_
+#define _SM64_TYPES_H_

 // This file contains various data types used in Super Mario 64 that don't yet
 // have an appropriate header.
@ -30,9 +30,7 @@ struct Controller
  /*0x12*/ u16 buttonPressed;
  /*0x14*/ OSContStatus *statusData;
  /*0x18*/ OSContPad *controllerData;
-#ifdef VERSION_SH
  /*0x1C*/ int port;
-#endif
 };

 typedef f32 Vec2f[2];
--- a/include/ultra64.h
+++ b/include/ultra64.h
@ -30,4 +30,13 @@
 #include <PR/libaudio.h>
 #include <PR/libultra.h>

+#if defined(__MINGW32__)
+#include <_mingw.h>
+#if !defined(__MINGW64_VERSION_MAJOR)
+#include <string.h>
+#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
+#define bcopy(s1, s2, n) memmove((s2), (s1), (n))
+#endif
+#endif
+
 #endif
--- a/lib/PR/audio/aspMain.bin
+++ b/lib/PR/audio/aspMain.bin
--- a/lib/PR/audio/aspMain_data.bin
+++ b/lib/PR/audio/aspMain_data.bin
--- a/lib/PR/boot/F3D_boot.bin
+++ b/lib/PR/boot/F3D_boot.bin
--- a/lib/PR/boot/F3D_boot_eu.bin
+++ b/lib/PR/boot/F3D_boot_eu.bin
--- a/lib/PR/f3d/new/F3D.bin
+++ b/lib/PR/f3d/new/F3D.bin
--- a/lib/PR/f3d/new/F3D_data.bin
+++ b/lib/PR/f3d/new/F3D_data.bin
--- a/lib/PR/f3d/new/F3D_data_EU.bin
+++ b/lib/PR/f3d/new/F3D_data_EU.bin
--- a/lib/PR/f3d/old/F3D.bin
+++ b/lib/PR/f3d/old/F3D.bin
--- a/lib/PR/f3d/old/F3D_data.bin
+++ b/lib/PR/f3d/old/F3D_data.bin
--- a/lib/PR/f3dex/F3DEX.bin
+++ b/lib/PR/f3dex/F3DEX.bin
--- a/lib/PR/f3dex/F3DEX_NoN.bin
+++ b/lib/PR/f3dex/F3DEX_NoN.bin
--- a/lib/PR/f3dex/F3DEX_NoN_data.bin
+++ b/lib/PR/f3dex/F3DEX_NoN_data.bin
--- a/lib/PR/f3dex/F3DEX_data.bin
+++ b/lib/PR/f3dex/F3DEX_data.bin
--- a/lib/PR/f3dex/F3DLX.bin
+++ b/lib/PR/f3dex/F3DLX.bin
--- a/lib/PR/f3dex/F3DLX_NoN.bin
+++ b/lib/PR/f3dex/F3DLX_NoN.bin
--- a/lib/PR/f3dex/F3DLX_NoN_data.bin
+++ b/lib/PR/f3dex/F3DLX_NoN_data.bin
--- a/lib/PR/f3dex/F3DLX_Rej.bin
+++ b/lib/PR/f3dex/F3DLX_Rej.bin
--- a/lib/PR/f3dex/F3DLX_Rej_data.bin
+++ b/lib/PR/f3dex/F3DLX_Rej_data.bin
--- a/lib/PR/f3dex/F3DLX_data.bin
+++ b/lib/PR/f3dex/F3DLX_data.bin
--- a/lib/PR/f3dex/L3DEX.bin
+++ b/lib/PR/f3dex/L3DEX.bin
--- a/lib/PR/f3dex/L3DEX_data.bin
+++ b/lib/PR/f3dex/L3DEX_data.bin
--- a/lib/PR/f3dex2/F3DEX2.bin
+++ b/lib/PR/f3dex2/F3DEX2.bin
--- a/lib/PR/f3dex2/F3DEX2_NoN.bin
+++ b/lib/PR/f3dex2/F3DEX2_NoN.bin
--- a/lib/PR/f3dex2/F3DEX2_NoN_data.bin
+++ b/lib/PR/f3dex2/F3DEX2_NoN_data.bin
--- a/lib/PR/f3dex2/F3DEX2_data.bin
+++ b/lib/PR/f3dex2/F3DEX2_data.bin
--- a/lib/PR/f3dex2/F3DLX2_Rej.bin
+++ b/lib/PR/f3dex2/F3DLX2_Rej.bin
--- a/lib/PR/f3dex2/F3DLX2_Rej_data.bin
+++ b/lib/PR/f3dex2/F3DLX2_Rej_data.bin
--- a/lib/PR/f3dex2/F3DZEX.bin
+++ b/lib/PR/f3dex2/F3DZEX.bin
--- a/lib/PR/f3dex2/F3DZEX_data.bin
+++ b/lib/PR/f3dex2/F3DZEX_data.bin
--- a/lib/PR/f3dex2/L3DEX2.bin
+++ b/lib/PR/f3dex2/L3DEX2.bin
--- a/lib/PR/f3dex2/L3DEX2_data.bin
+++ b/lib/PR/f3dex2/L3DEX2_data.bin
--- a/lib/PR/s2dex/S2DEX.bin
+++ b/lib/PR/s2dex/S2DEX.bin
--- a/lib/PR/s2dex/S2DEX_data.bin
+++ b/lib/PR/s2dex/S2DEX_data.bin
--- a/lib/asm/__osDisableInt.s
+++ b/lib/asm/__osDisableInt.s
@ -1,18 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-
-glabel __osDisableInt
-  mfc0  $t0, $12
-  and   $t1, $t0, -2
-  mtc0  $t1, $12
-  andi  $v0, $t0, 1
-  nop
-  jr    $ra
-   nop
-
--- a/lib/asm/__osExceptionPreamble.s
+++ b/lib/asm/__osExceptionPreamble.s
--- a/lib/asm/__osGetCause.s
+++ b/lib/asm/__osGetCause.s
@ -1,15 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel __osGetCause
-    mfc0  $v0, $13
-    jr    $ra
-     nop
-
-    nop
-
--- a/lib/asm/__osGetSR.s
+++ b/lib/asm/__osGetSR.s
@ -1,15 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel __osGetSR
-    mfc0  $v0, $12
-    jr    $ra
-     nop
-
-    nop
-
--- a/lib/asm/__osProbeTLB.s
+++ b/lib/asm/__osProbeTLB.s
@ -1,64 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel __osProbeTLB
-    mfc0  $t0, $10
-    andi  $t1, $t0, 0xff
-    li    $at, -8192
-    and   $t2, $a0, $at
-    or    $t1, $t1, $t2
-    mtc0  $t1, $10
-    nop
-    nop
-    nop
-    tlbp
-    nop
-    nop
-    mfc0  $t3, $0
-    lui   $at, 0x8000
-    and   $t3, $t3, $at
-    bnez  $t3, .L8032A0D8
-     nop
-    tlbr
-    nop
-    nop
-    nop
-    mfc0  $t3, $5
-    addi  $t3, $t3, 0x2000
-    srl   $t3, $t3, 1
-    and   $t4, $t3, $a0
-    bnez  $t4, .L8032A0A8
-     addi  $t3, $t3, -1
-    mfc0  $v0, $2
-    b     .L8032A0AC
-     nop
-.L8032A0A8:
-    mfc0  $v0, $3
-.L8032A0AC:
-    andi  $t5, $v0, 2
-    beqz  $t5, .L8032A0D8
-     nop
-    lui   $at, (0x3FFFFFC0 >> 16) # lui $at, 0x3fff
-    ori   $at, (0x3FFFFFC0 & 0xFFFF) # ori $at, $at, 0xffc0
-    and   $v0, $v0, $at
-    sll   $v0, $v0, 6
-    and   $t5, $a0, $t3
-    add   $v0, $v0, $t5
-    b     .L8032A0DC
-     nop
-.L8032A0D8:
-    li    $v0, -1
-.L8032A0DC:
-    mtc0  $t0, $10
-    jr    $ra
-     nop
-
-    nop
-    nop
-
--- a/lib/asm/__osRestoreInt.s
+++ b/lib/asm/__osRestoreInt.s
@ -1,19 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel __osRestoreInt
-    mfc0  $t0, $12
-    or    $t0, $t0, $a0
-    mtc0  $t0, $12
-    nop
-    nop
-    jr    $ra
-     nop
-
-    nop
-
--- a/lib/asm/__osSetCompare.s
+++ b/lib/asm/__osSetCompare.s
@ -1,15 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel __osSetCompare
-    mtc0  $a0, $11
-    jr    $ra
-     nop
-
-    nop
-
--- a/lib/asm/__osSetFpcCsr.s
+++ b/lib/asm/__osSetFpcCsr.s
@ -1,14 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel __osSetFpcCsr
-    cfc1  $v0, $31
-    ctc1  $a0, $31
-    jr    $ra
-     nop
-
--- a/lib/asm/__osSetSR.s
+++ b/lib/asm/__osSetSR.s
@ -1,14 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel __osSetSR
-    mtc0  $a0, $12
-    nop
-    jr    $ra
-     nop
-
--- a/lib/asm/__os_eu_802ef550.s
+++ b/lib/asm/__os_eu_802ef550.s
@ -1,22 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-.set noat
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-# cache related
-glabel __os_eu_802ef550
-    lui     $t0,0x8000
-    li      $t2,0x2000
-    addu    $t1,$t0,$t2
-    addiu   $t1,$t1,-0x10
-.L:    cache   0x1,0($t0)
-    sltu    $at,$t0,$t1
-    bnez    $at,.L
-    addiu   $t0,$t0,0x10
-    jr      $ra
-    nop
-    nop
-    nop
--- a/lib/asm/bcopy.s
+++ b/lib/asm/bcopy.s
@ -1,232 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel bcopy
-    beqz  $a2, .L80323A4C
-     move  $a3, $a1
-    beq   $a0, $a1, .L80323A4C
-     slt   $at, $a1, $a0
-    bnezl $at, .L80323A14
-     slti  $at, $a2, 0x10
-    add   $v0, $a0, $a2
-    slt   $at, $a1, $v0
-    beql  $at, $zero, .L80323A14
-     slti  $at, $a2, 0x10
-    b     .L80323B78
-     slti  $at, $a2, 0x10
-    slti  $at, $a2, 0x10
-.L80323A14:
-    bnez  $at, .L80323A2C
-     nop
-    andi  $v0, $a0, 3
-    andi  $v1, $a1, 3
-    beq   $v0, $v1, .L80323A54
-     nop
-.L80323A2C:
-    beqz  $a2, .L80323A4C
-     nop
-    addu  $v1, $a0, $a2
-.L80323A38:
-    lb    $v0, ($a0)
-    addiu $a0, $a0, 1
-    addiu $a1, $a1, 1
-    bne   $a0, $v1, .L80323A38
-     sb    $v0, -1($a1)
-.L80323A4C:
-    jr    $ra
-     move  $v0, $a3
-
-.L80323A54:
-    beqz  $v0, .L80323AB8
-     li    $at, 1
-    beq   $v0, $at, .L80323A9C
-     li    $at, 2
-    beql  $v0, $at, .L80323A88
-     lh    $v0, ($a0)
-    lb    $v0, ($a0)
-    addiu $a0, $a0, 1
-    addiu $a1, $a1, 1
-    addiu $a2, $a2, -1
-    b     .L80323AB8
-     sb    $v0, -1($a1)
-    lh    $v0, ($a0)
-.L80323A88:
-    addiu $a0, $a0, 2
-    addiu $a1, $a1, 2
-    addiu $a2, $a2, -2
-    b     .L80323AB8
-     sh    $v0, -2($a1)
-.L80323A9C:
-    lb    $v0, ($a0)
-    lh    $v1, 1($a0)
-    addiu $a0, $a0, 3
-    addiu $a1, $a1, 3
-    addiu $a2, $a2, -3
-    sb    $v0, -3($a1)
-    sh    $v1, -2($a1)
-.L80323AB8:
-    slti  $at, $a2, 0x20
-    bnezl $at, .L80323B18
-     slti  $at, $a2, 0x10
-    lw    $v0, ($a0)
-    lw    $v1, 4($a0)
-    lw    $t0, 8($a0)
-    lw    $t1, 0xc($a0)
-    lw    $t2, 0x10($a0)
-    lw    $t3, 0x14($a0)
-    lw    $t4, 0x18($a0)
-    lw    $t5, 0x1c($a0)
-    addiu $a0, $a0, 0x20
-    addiu $a1, $a1, 0x20
-    addiu $a2, $a2, -0x20
-    sw    $v0, -0x20($a1)
-    sw    $v1, -0x1c($a1)
-    sw    $t0, -0x18($a1)
-    sw    $t1, -0x14($a1)
-    sw    $t2, -0x10($a1)
-    sw    $t3, -0xc($a1)
-    sw    $t4, -8($a1)
-    b     .L80323AB8
-     sw    $t5, -4($a1)
-.L80323B14:
-    slti  $at, $a2, 0x10
-.L80323B18:
-    bnezl $at, .L80323B54
-     slti  $at, $a2, 4
-    lw    $v0, ($a0)
-    lw    $v1, 4($a0)
-    lw    $t0, 8($a0)
-    lw    $t1, 0xc($a0)
-    addiu $a0, $a0, 0x10
-    addiu $a1, $a1, 0x10
-    addiu $a2, $a2, -0x10
-    sw    $v0, -0x10($a1)
-    sw    $v1, -0xc($a1)
-    sw    $t0, -8($a1)
-    b     .L80323B14
-     sw    $t1, -4($a1)
-.L80323B50:
-    slti  $at, $a2, 4
-.L80323B54:
-    bnez  $at, .L80323A2C
-     nop
-    lw    $v0, ($a0)
-    addiu $a0, $a0, 4
-    addiu $a1, $a1, 4
-    addiu $a2, $a2, -4
-    b     .L80323B50
-     sw    $v0, -4($a1)
-    slti  $at, $a2, 0x10
-.L80323B78:
-    add   $a0, $a0, $a2
-    bnez  $at, .L80323B94
-     add   $a1, $a1, $a2
-    andi  $v0, $a0, 3
-    andi  $v1, $a1, 3
-    beq   $v0, $v1, .L80323BC4
-     nop
-.L80323B94:
-    beqz  $a2, .L80323A4C
-     nop
-    addiu $a0, $a0, -1
-    addiu $a1, $a1, -1
-    subu  $v1, $a0, $a2
-.L80323BA8:
-    lb    $v0, ($a0)
-    addiu $a0, $a0, -1
-    addiu $a1, $a1, -1
-    bne   $a0, $v1, .L80323BA8
-     sb    $v0, 1($a1)
-    jr    $ra
-     move  $v0, $a3
-
-.L80323BC4:
-    beqz  $v0, .L80323C28
-     li    $at, 3
-    beq   $v0, $at, .L80323C0C
-     li    $at, 2
-    beql  $v0, $at, .L80323BF8
-     lh    $v0, -2($a0)
-    lb    $v0, -1($a0)
-    addiu $a0, $a0, -1
-    addiu $a1, $a1, -1
-    addiu $a2, $a2, -1
-    b     .L80323C28
-     sb    $v0, ($a1)
-    lh    $v0, -2($a0)
-.L80323BF8:
-    addiu $a0, $a0, -2
-    addiu $a1, $a1, -2
-    addiu $a2, $a2, -2
-    b     .L80323C28
-     sh    $v0, ($a1)
-.L80323C0C:
-    lb    $v0, -1($a0)
-    lh    $v1, -3($a0)
-    addiu $a0, $a0, -3
-    addiu $a1, $a1, -3
-    addiu $a2, $a2, -3
-    sb    $v0, 2($a1)
-    sh    $v1, ($a1)
-.L80323C28:
-    slti  $at, $a2, 0x20
-    bnezl $at, .L80323C88
-     slti  $at, $a2, 0x10
-    lw    $v0, -4($a0)
-    lw    $v1, -8($a0)
-    lw    $t0, -0xc($a0)
-    lw    $t1, -0x10($a0)
-    lw    $t2, -0x14($a0)
-    lw    $t3, -0x18($a0)
-    lw    $t4, -0x1c($a0)
-    lw    $t5, -0x20($a0)
-    addiu $a0, $a0, -0x20
-    addiu $a1, $a1, -0x20
-    addiu $a2, $a2, -0x20
-    sw    $v0, 0x1c($a1)
-    sw    $v1, 0x18($a1)
-    sw    $t0, 0x14($a1)
-    sw    $t1, 0x10($a1)
-    sw    $t2, 0xc($a1)
-    sw    $t3, 8($a1)
-    sw    $t4, 4($a1)
-    b     .L80323C28
-     sw    $t5, ($a1)
-.L80323C84:
-    slti  $at, $a2, 0x10
-.L80323C88:
-    bnezl $at, .L80323CC4
-     slti  $at, $a2, 4
-    lw    $v0, -4($a0)
-    lw    $v1, -8($a0)
-    lw    $t0, -0xc($a0)
-    lw    $t1, -0x10($a0)
-    addiu $a0, $a0, -0x10
-    addiu $a1, $a1, -0x10
-    addiu $a2, $a2, -0x10
-    sw    $v0, 0xc($a1)
-    sw    $v1, 8($a1)
-    sw    $t0, 4($a1)
-    b     .L80323C84
-     sw    $t1, ($a1)
-.L80323CC0:
-    slti  $at, $a2, 4
-.L80323CC4:
-    bnez  $at, .L80323B94
-     nop
-    lw    $v0, -4($a0)
-    addiu $a0, $a0, -4
-    addiu $a1, $a1, -4
-    addiu $a2, $a2, -4
-    b     .L80323CC0
-     sw    $v0, ($a1)
-    nop
-    nop
-    nop
-
--- a/lib/asm/bzero.s
+++ b/lib/asm/bzero.s
@ -1,53 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-#this file is probably handwritten
-
-.section .text, "ax"
-
-glabel bzero
-    blt  $a1, 0xc, .L803236BC
-     negu  $v1, $a0
-    andi  $v1, $v1, 3
-    beqz  $v1, .L80323660
-     subu  $a1, $a1, $v1
-    swl   $zero, ($a0)
-    addu  $a0, $a0, $v1
-.L80323660:
-    and   $a3, $a1, -32
-    beqz  $a3, .L8032369C
-     subu  $a1, $a1, $a3
-    addu  $a3, $a3, $a0
-.L80323674:
-    addiu $a0, $a0, 0x20
-    sw    $zero, -0x20($a0)
-    sw    $zero, -0x1c($a0)
-    sw    $zero, -0x18($a0)
-    sw    $zero, -0x14($a0)
-    sw    $zero, -0x10($a0)
-    sw    $zero, -0xc($a0)
-    sw    $zero, -8($a0)
-    bne   $a0, $a3, .L80323674
-     sw    $zero, -4($a0)
-.L8032369C:
-    and   $a3, $a1, -4
-    beqz  $a3, .L803236BC
-     subu  $a1, $a1, $a3
-    addu  $a3, $a3, $a0
-.L803236B0:
-    addiu $a0, $a0, 4
-    bne   $a0, $a3, .L803236B0
-     sw    $zero, -4($a0)
-.L803236BC:
-    blez  $a1, .L803236D4
-     nop
-    addu  $a1, $a1, $a0
-.L803236C8:
-    addiu $a0, $a0, 1
-    bne   $a0, $a1, .L803236C8
-     sb    $zero, -1($a0)
-.L803236D4:
-    jr    $ra
-
--- a/lib/asm/llmuldiv_gcc.s
+++ b/lib/asm/llmuldiv_gcc.s
@ -1,100 +0,0 @@
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-/* -------------------------------------------------------------------------------------- */
-/* need to asm these functions because lib32gcc-7-dev-mips-cross does not exist so we     */
-/* cannot naturally link a libgcc variant for this target given this architecture and     */
-/* compiler. Until we have a good workaround with a gcc target that doesn't involve       */
-/* assuming a 32-bit to 64-bit change, we have to encode these functions as raw assembly  */
-/* for it to compile.                                                                     */
-/* -------------------------------------------------------------------------------------- */
-
-/* TODO: Is there a non-insane way to fix this hack that doesn't involve the user compiling */
-/* a library themselves?                                                                    */
-glabel __umoddi3
-    sw    $a0, ($sp)
-    sw    $a1, 4($sp)
-    sw    $a2, 8($sp)
-    sw    $a3, 0xc($sp)
-    ld    $t7, 8($sp)
-    ld    $t6, ($sp)
-    ddivu $zero, $t6, $t7
-    bnez  $t7, .L80324144
-     nop
-    break 7
-.L80324144:
-    mfhi  $v0
-    dsll32 $v1, $v0, 0
-    dsra32 $v1, $v1, 0
-    jr    $ra
-     dsra32 $v0, $v0, 0
-
-glabel __udivdi3
-    sw    $a0, ($sp)
-    sw    $a1, 4($sp)
-    sw    $a2, 8($sp)
-    sw    $a3, 0xc($sp)
-    ld    $t7, 8($sp)
-    ld    $t6, ($sp)
-    ddivu $zero, $t6, $t7
-    bnez  $t7, .L80324180
-     nop
-    break 7
-.L80324180:
-    mflo  $v0
-    dsll32 $v1, $v0, 0
-    dsra32 $v1, $v1, 0
-    jr    $ra
-     dsra32 $v0, $v0, 0
-
-glabel __moddi3
-    sw    $a0, ($sp)
-    sw    $a1, 4($sp)
-    sw    $a2, 8($sp)
-    sw    $a3, 0xc($sp)
-    ld    $t7, 8($sp)
-    ld    $t6, ($sp)
-    ddivu $zero, $t6, $t7
-    bnez  $t7, .L803241E8
-     nop
-    break 7
-.L803241E8:
-    mfhi  $v0
-    dsll32 $v1, $v0, 0
-    dsra32 $v1, $v1, 0
-    jr    $ra
-     dsra32 $v0, $v0, 0
-
-glabel __divdi3
-    sw    $a0, ($sp)
-    sw    $a1, 4($sp)
-    sw    $a2, 8($sp)
-    sw    $a3, 0xc($sp)
-    ld    $t7, 8($sp)
-    ld    $t6, ($sp)
-    ddiv  $zero, $t6, $t7
-    nop
-    bnez  $t7, .L80324228
-     nop
-    break 7
-.L80324228:
-    daddiu $at, $zero, -1
-    bne   $t7, $at, .L80324244
-     daddiu $at, $zero, 1
-    dsll32 $at, $at, 0x1f
-    bne   $t6, $at, .L80324244
-     nop
-    break 6
-.L80324244:
-    mflo  $v0
-    dsll32 $v1, $v0, 0
-    dsra32 $v1, $v1, 0
-    jr    $ra
-     dsra32 $v0, $v0, 0
--- a/lib/asm/osGetCount.s
+++ b/lib/asm/osGetCount.s
@ -1,15 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel osGetCount
-    mfc0  $v0, $9
-    jr    $ra
-     nop
-
-    nop
-
--- a/lib/asm/osInvalDCache.s
+++ b/lib/asm/osInvalDCache.s
@ -1,59 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel osInvalDCache
-    blez  $a1, .L80323500
-    nop
-    li    $t3, 8192
-    sltu  $at, $a1, $t3
-    beqz  $at, .L80323508
-    nop
-    move  $t0, $a0
-    addu  $t1, $a0, $a1
-    sltu  $at, $t0, $t1
-    beqz  $at, .L80323500
-    nop
-    andi  $t2, $t0, 0xf
-    beqz  $t2, .L803234D0
-    addiu $t1, $t1, -0x10
-    subu  $t0, $t0, $t2
-    cache 0x15, ($t0)
-    sltu  $at, $t0, $t1
-    beqz  $at, .L80323500
-    nop
-    addiu $t0, $t0, 0x10
-.L803234D0:
-    andi  $t2, $t1, 0xf
-    beqz  $t2, .L803234F0
-    nop
-    subu  $t1, $t1, $t2
-    cache 0x15, 0x10($t1)
-    sltu  $at, $t1, $t0
-    bnez  $at, .L80323500
-    nop
-.L803234F0:
-    cache 0x11, ($t0)
-    sltu  $at, $t0, $t1
-    bnez  $at, .L803234F0
-    addiu $t0, $t0, 0x10
-.L80323500:
-    jr    $ra
-    nop
-
-.L80323508:
-    li    $t0, K0BASE
-    addu  $t1, $t0, $t3
-    addiu $t1, $t1, -0x10
-.L80323514:
-    cache 1, ($t0)
-    sltu  $at, $t0, $t1
-    bnez  $at, .L80323514
-     addiu $t0, $t0, 0x10
-    jr    $ra
-     nop
--- a/lib/asm/osInvalICache.s
+++ b/lib/asm/osInvalICache.s
@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel osInvalICache
-    blez  $a1, .L80323728
-     nop
-    li    $t3, 16384
-    sltu  $at, $a1, $t3
-    beqz  $at, .L80323730
-     nop
-    move  $t0, $a0
-    addu  $t1, $a0, $a1
-    sltu  $at, $t0, $t1
-    beqz  $at, .L80323728
-     nop
-    andi  $t2, $t0, 0x1f
-    addiu $t1, $t1, -0x20
-    subu  $t0, $t0, $t2
-.L80323718:
-    cache 0x10, ($t0)
-    sltu  $at, $t0, $t1
-    bnez  $at, .L80323718
-     addiu $t0, $t0, 0x20
-.L80323728:
-    jr    $ra
-     nop
-
-.L80323730:
-    li    $t0, K0BASE
-    addu  $t1, $t0, $t3
-    addiu $t1, $t1, -0x20
-.L8032373C:
-    cache 0, ($t0)
-    sltu  $at, $t0, $t1
-    bnez  $at, .L8032373C
-     addiu $t0, $t0, 0x20
-    jr    $ra
-     nop
--- a/lib/asm/osMapTLB.s
+++ b/lib/asm/osMapTLB.s
@ -1,63 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-# This file is handwritten
-
-#void osMapTLB(s32 index, OSPageMask pm, void *vaddr, u32 evenpaddr, u32 oddpaddr, s32 asid);
-glabel osMapTLB
-    mfc0  $t0, $10
-    mtc0  $a0, $0
-    mtc0  $a1, $5
-    lw    $t1, 0x14($sp) #asid
-    beq   $t1, -1, .L803214D8
-    li    $t4, 1
-    li    $t2, 30
-    b     .L803214DC
-    or    $a2, $a2, $t1 #vaddr
-.L803214D8:
-    li    $t2, 31
-.L803214DC:
-    mtc0  $a2, $10 #vaddr
-    beq   $a3, -1, .L80321500 #even paddr
-    nop
-    srl   $t3, $a3, 6   #evenpaddr
-    or    $t3, $t3, $t2
-    mtc0  $t3, $2
-    b     .L80321504
-    nop
-.L80321500:
-    mtc0  $t4, $2
-.L80321504:
-    lw    $t3, 0x10($sp) #oddpaddr
-    beq   $t3, -1, .L80321528
-    nop
-    srl   $t3, $t3, 6
-    or    $t3, $t3, $t2
-    mtc0  $t3, $3
-    b     .L80321540
-    nop
-.L80321528:
-    mtc0  $t4, $3
-    bne   $a3, -1, .L80321540 #evenpaddr
-    nop
-    lui   $t3, 0x8000
-    mtc0  $t3, $10
-.L80321540:
-    nop
-    tlbwi
-    nop
-    nop
-    nop
-    nop
-    mtc0  $t0, $10
-    jr    $ra
-    nop   #file gets padded but
-    nop
-    nop
-    nop
-
--- a/lib/asm/osMapTLBRdb.s
+++ b/lib/asm/osMapTLBRdb.s
@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel osMapTLBRdb
-    mfc0  $t0, $10
-    li    $t1, 31
-    mtc0  $t1, $0
-    mtc0  $zero, $5
-    li    $t2, 23
-    lui   $t1, 0xc000
-    mtc0  $t1, $10
-    lui   $t1, 0x8000
-    srl   $t3, $t1, 6
-    or    $t3, $t3, $t2
-    mtc0  $t3, $2
-    li    $t1, 1
-    mtc0  $t1, $3
-    nop
-    tlbwi
-    nop
-    nop
-    nop
-    nop
-    mtc0  $t0, $10
-    jr    $ra
-     nop
-
-    nop
-    nop
-
--- a/lib/asm/osSetIntMask.s
+++ b/lib/asm/osSetIntMask.s
@ -1,138 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-.eqv MI_INTR_MASK_REG, 0xA430000C
-
-.section .text, "ax"
-
-glabel osSetIntMask
-.ifndef VERSION_EU
-    mfc0  $t1, $12
-    andi  $v0, $t1, 0xff01
-.else
-    mfc0  $t4, $12
-    andi  $v0, $t4, 0xff01
-    lui   $t0, %hi(D_8030208C) # $t0, 0x8030
-    addiu $t0, %lo(D_8030208C) # addiu $t0, $t0, 0x208c
-    lw    $t3, ($t0)
-    li    $at, -1
-    xor   $t0, $t3, $at
-    andi  $t0, $t0, 0xff00
-    or    $v0, $v0, $t0
-.endif
-    lui   $t2, %hi(MI_INTR_MASK_REG) # $t2, 0xa430
-    lw    $t2, %lo(MI_INTR_MASK_REG)($t2)
-.ifdef VERSION_EU
-    beqz  $t2, .L80200074
-    srl   $t1, $t3, 0x10
-    li    $at, -1
-    xor   $t1, $t1, $at
-    andi  $t1, $t1, 0x3f
-    or    $t2, $t2, $t1
-.L80200074:
-.endif
-    sll   $t2, $t2, 0x10
-    or    $v0, $v0, $t2
-    lui   $at, 0x3f
-    and   $t0, $a0, $at
-.ifdef VERSION_EU
-    and   $t0, $t0, $t3
-.endif
-    srl   $t0, $t0, 0xf
-    lui   $t2, %hi(D_803386D0)
-    addu  $t2, $t2, $t0
-    lhu   $t2, %lo(D_803386D0)($t2)
-    lui   $at, %hi(MI_INTR_MASK_REG) # $at, 0xa430
-    sw    $t2, %lo(MI_INTR_MASK_REG)($at)
-    andi  $t0, $a0, 0xff01
-.ifdef VERSION_EU
-    andi  $t1, $t3, 0xff00
-    and   $t0, $t0, $t1
-.endif
-    lui   $at, (0xFFFF00FF >> 16) # lui $at, 0xffff
-    ori   $at, (0xFFFF00FF & 0xFFFF) # ori $at, $at, 0xff
-.ifndef VERSION_EU
-    and   $t1, $t1, $at
-    or    $t1, $t1, $t0
-    mtc0  $t1, $12
-.else
-    and   $t4, $t4, $at
-    or    $t4, $t4, $t0
-    mtc0  $t4, $12
-.endif
-    nop
-    nop
-    jr    $ra
-     nop
-
-
-.section .rodata
-
-glabel D_803386D0
-.half 0x0555
-.half 0x0556
-.half 0x0559
-.half 0x055A
-.half 0x0565
-.half 0x0566
-.half 0x0569
-.half 0x056A
-.half 0x0595
-.half 0x0596
-.half 0x0599
-.half 0x059A
-.half 0x05A5
-.half 0x05A6
-.half 0x05A9
-.half 0x05AA
-.half 0x0655
-.half 0x0656
-.half 0x0659
-.half 0x065A
-.half 0x0665
-.half 0x0666
-.half 0x0669
-.half 0x066A
-.half 0x0695
-.half 0x0696
-.half 0x0699
-.half 0x069A
-.half 0x06A5
-.half 0x06A6
-.half 0x06A9
-.half 0x06AA
-.half 0x0955
-.half 0x0956
-.half 0x0959
-.half 0x095A
-.half 0x0965
-.half 0x0966
-.half 0x0969
-.half 0x096A
-.half 0x0995
-.half 0x0996
-.half 0x0999
-.half 0x099A
-.half 0x09A5
-.half 0x09A6
-.half 0x09A9
-.half 0x09AA
-.half 0x0A55
-.half 0x0A56
-.half 0x0A59
-.half 0x0A5A
-.half 0x0A65
-.half 0x0A66
-.half 0x0A69
-.half 0x0A6A
-.half 0x0A95
-.half 0x0A96
-.half 0x0A99
-.half 0x0A9A
-.half 0x0AA5
-.half 0x0AA6
-.half 0x0AA9
-.half 0x0AAA
--- a/lib/asm/osUnmapTLBAll.s
+++ b/lib/asm/osUnmapTLBAll.s
@ -1,32 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel osUnmapTLBAll
-    mfc0  $t0, $10
-    li    $t1, 31
-    lui   $t2, 0x8000
-    mtc0  $t2, $10
-    mtc0  $zero, $2
-    mtc0  $zero, $3
-.L80321588:
-    mtc0  $t1, $0
-    nop
-    tlbwi
-    nop
-    nop
-    addi  $t1, $t1, -1
-    bnezl $t1, .L80321588  #bnezl, bnez but with likely hint
-     nop
-    mtc0  $t0, $10
-    jr    $ra
-     nop
-
-    nop
-    nop
-    nop
-
--- a/lib/asm/osWritebackDCache.s
+++ b/lib/asm/osWritebackDCache.s
@ -1,39 +0,0 @@
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel osWritebackDCache
-    blez  $a1, .osWritebackDCacheReturn
-     nop
-    li    $t3, 8192
-    bgeu  $a1, $t3, .L80324E40
-     nop
-    move  $t0, $a0
-    addu  $t1, $a0, $a1
-    bgeu  $t0, $t1, .osWritebackDCacheReturn
-     nop
-    andi  $t2, $t0, 0xf
-    addiu $t1, $t1, -0x10
-    subu  $t0, $t0, $t2
-.L80324E28:
-    cache 0x19, ($t0)
-    bltu  $t0, $t1, .L80324E28
-     addiu $t0, $t0, 0x10
-.osWritebackDCacheReturn:
-    jr    $ra
-     nop
-
-.L80324E40:
-    lui   $t0, 0x8000
-    addu  $t1, $t0, $t3
-    addiu $t1, $t1, -0x10
-.L80324E4C:
-    cache 1, ($t0)
-    bltu  $t0, $t1, .L80324E4C
-     addiu $t0, 0x10 # addiu $t0, $t0, 0x10
-    jr    $ra
-     nop
--- a/lib/asm/osWritebackDCacheAll.s
+++ b/lib/asm/osWritebackDCacheAll.s
@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64
-
-.include "macros.inc"
-
-
-.section .text, "ax"
-
-glabel osWritebackDCacheAll
-    li    $t0, K0BASE
-    li    $t2, 8192
-    addu  $t1, $t0, $t2
-    addiu $t1, $t1, -0x10
-.L80322020:
-    cache 1, ($t0)
-    sltu  $at, $t0, $t1
-    bnez  $at, .L80322020
-     addiu $t0, $t0, 0x10
-    jr    $ra
-     nop
-
-    nop
-    nop
--- a/lib/asm/parameters.s
+++ b/lib/asm/parameters.s
@ -1,18 +0,0 @@
-.macro gsymbol sym addr
-.global \sym
-.set \sym, \addr
-.ifndef VERSION_JP
-nop
-nop
-.endif
-.endm
-
-.text
-gsymbol osTvType 0x80000300
-gsymbol osRomType 0x80000304
-gsymbol osRomBase 0x80000308
-gsymbol osResetType 0x8000030C
-gsymbol osCiCId 0x80000310
-gsymbol osVersion 0x80000314
-gsymbol osMemSize 0x80000318
-gsymbol osAppNmiBuffer 0x8000031C
--- a/lib/discord/libdiscord-rpc.dll
+++ b/lib/discord/libdiscord-rpc.dll
--- a/lib/discord/libdiscord-rpc.dylib
+++ b/lib/discord/libdiscord-rpc.dylib
--- a/lib/discord/libdiscord-rpc.so
+++ b/lib/discord/libdiscord-rpc.so
--- a/lib/rsp.s
+++ b/lib/rsp.s
@ -1,252 +0,0 @@
-.include "macros.inc"
-.set UCODE_SIZE, 0x800
-
-.section .text
-
-.balign 16
-glabel rspF3DBootStart
-    .ifndef VERSION_EU
-    .incbin "lib/PR/boot/F3D_boot.bin"
-    .else
-    .incbin "lib/PR/boot/F3D_boot_eu.bin"
-    .half 0
-    .endif
-glabel rspF3DBootEnd
-
-.balign 16
-.ifndef F3DEX_GBI_SHARED
-glabel rspF3DStart /* Use regular Fast3D bins (default) */
-    .ifndef F3D_OLD
-    .incbin "lib/PR/f3d/new/F3D.bin" /* OS 2.0H (J2 and IQ) */
-    .else
-    .incbin "lib/PR/f3d/old/F3D.bin" /* OS 2.0D (US and JP) */
-    .endif
-glabel rspF3DEnd
-
-.else /* Use one of the Fast3DEX series grucodes. */
-glabel rspF3DStart
-    .if F3DEX_GBI_2 == 1
-        .incbin "lib/PR/f3dex2/F3DEX2.bin"
-    .elseif F3DEX_GBI == 1
-        .incbin "lib/PR/f3dex/F3DEX.bin"
-    .else /* Fast3DZEX */
-        .incbin "lib/PR/f3dex2/F3DZEX.bin"
-    .endif
-glabel rspF3DEnd
-.endif
-
-/* Audio Bins */
-
-.balign 16
-glabel rspAspMainStart
-    .incbin "lib/PR/audio/aspMain.bin"
-glabel rspAspMainEnd
-
-/*
- * LESS COMMON MICROCODES
- * These are setup to be loaded by G_LOAD_UCODE
- */
-
-/* Fast3DEX NoN Text */
-.ifdef F3DEX_NON_GBI
-glabel rspF3DEXNoNStart
-    .balign 16
-    .incbin "lib/PR/f3dex/F3DEX_NoN.bin"
-glabel rspF3DEXNoNEnd
-.endif
-
-/* Fast3DLX Text */
-.ifdef F3DLX_GBI
-glabel rspF3DLXStart
-    .incbin "lib/PR/f3dex/F3DLX.bin"
-glabel rspF3DLXEnd
-.endif
-
-/* Fast3DLX NoN Text */
-.ifdef F3DLX_NON_GBI
-glabel rspF3DLXNoNStart
-    .balign 16
-    .incbin "lib/PR/f3dex/F3DLX_NoN.bin"
-glabel rspF3DLXNoNEnd
-.endif
-
-/* Fast3DLX Rej Text */
-.ifdef F3DLX_REJ_GBI
-glabel rspF3DLXRejStart
-    .balign 16
-    .incbin "lib/PR/f3dex/F3DLX_Rej.bin"
-glabel rspF3DLXRejEnd
-.endif
-
-/* Line3DEX Text */
-.ifdef L3DEX_GBI
-glabel rspL3DEXStart
-    .balign 16
-    .incbin "lib/PR/f3dex/L3DEX.bin"
-glabel rspL3DEXEnd
-.endif
-
-/* S2DEX Text */
-.ifdef S2DEX_GBI
-glabel rspS2DEXStart
-    .balign 16
-    .incbin "lib/PR/s2dex/S2DEX.bin"
-glabel rspS2DEXEnd
-.endif
-
-/* Fast3DEX2 series */
-
-/* Fast3DEX2 NoN Text */
-.ifdef F3DEX2_NON_GBI
-.balign 16
-glabel rspF3DEX2NoNStart
-    .incbin "lib/PR/f3dex2/F3DEX2_NoN.bin"
-glabel rspF3DEX2NoNEnd
-.endif
-
-/* Fast3DEX2 Rej Text */
-.ifdef F3DEX2_REJ_GBI
-.balign 16
-glabel rspF3DEX2RejStart
-    .incbin "lib/PR/f3dex2/F3DEX2_Rej.bin"
-glabel rspF3DEX2RejEnd
-.endif
-
-/* Line3DEX2 Text */
-.ifdef L3DEX2_GBI
-.balign 16
-glabel rspL3DEX2Start
-    .incbin "lib/PR/f3dex2/L3DEX2.bin"
-glabel rspL3DEX2End
-.endif
-
-/* S2DEX2 Text */
-.ifdef S2DEX_GBI_2
-.balign 16
-glabel rspS2DEXStart
-    .incbin "lib/PR/s2dex/S2DEX2.bin"
-glabel rspS2DEXEnd
-.endif
-
-/* DATA SECTION START */
-
-.section .rodata
-
-.balign 16
-.ifndef F3DEX_GBI_SHARED /* Use regular Fast3D data (default) */
-glabel rspF3DDataStart
-    .ifndef F3D_OLD /* OS 2.0H (J2 and IQ) */
-    .ifdef VERSION_EU
-    .incbin "lib/PR/f3d/new/F3D_data_EU.bin"
-    .else
-    .incbin "lib/PR/f3d/new/F3D_data.bin"
-    .endif
-    .else /* OS 2.0D (US and JP) */
-    .incbin "lib/PR/f3d/old/F3D_data.bin"
-    .endif
-glabel rspF3DDataEnd
-
-.else /* Using one of the Fast3DEX series grucodes */
-glabel rspF3DDataStart
-    .if F3DEX_GBI_2 == 1
-        .incbin "lib/PR/f3dex2/F3DEX2_data.bin"
-    .elseif F3DEX_GBI == 1
-        .incbin "lib/PR/f3dex/F3DEX_data.bin"
-    .else /* Fast3DZEX */
-        .incbin "lib/PR/f3dex2/F3DZEX_data.bin"
-    .endif
-glabel rspF3DDataEnd
-.endif
-
-/* Audio Data */
-
-.balign 16
-glabel rspAspMainDataStart
-    .incbin "lib/PR/audio/aspMain_data.bin"
-glabel rspAspMainDataEnd
-
-/* LESS COMMON MICROCODES */
-
-/* Fast3DEX Series */
-
-/* Fast3DEX NoN Data */
-.ifdef F3DEX_NON_GBI
-.balign 16
-glabel rspF3DEXNoNDataStart
-    .incbin "lib/PR/f3dex/F3DEX_NoN_data.bin"
-glabel rspF3DEXNoNDataEnd
-.endif
-
-/* Fast3DLX Data */
-.ifdef F3DLX_GBI
-.balign 16
-glabel rspF3DLXDataStart
-    .incbin "lib/PR/f3dex/F3DLX_data.bin"
-glabel rspF3DLXDataEnd
-.endif
-
-/* Fast3DLX NoN Data */
-.ifdef F3DLX_NON_GBI
-.balign 16
-glabel rspF3DLXNoNDataStart
-    .incbin "lib/PR/f3dex/F3DLX_NoN_data.bin"
-glabel rspF3DLXNoNDataEnd
-.endif
-
-/* Fast3DLX Rej Data */
-.ifdef F3DLX_REJ_GBI
-.balign 16
-glabel rspF3DLXRejDataStart
-    .incbin "lib/PR/f3dex/F3DLX_Rej_data.bin"
-glabel rspF3DLXRejDataEnd
-.endif
-
-/* Line3DEX Data */
-.ifdef L3DEX_GBI
-.balign 16
-glabel rspL3DEXDataStart
-    .incbin "lib/PR/f3dex/L3DEX_data.bin"
-glabel rspL3DEXDataEnd
-.endif
-
-/* S2DEX Data */
-.ifdef S2DEX_GBI
-.balign 16
-glabel rspS2DEXDataStart
-    .incbin "lib/PR/s2dex/S2DEX_data.bin"
-glabel rspS2DEXDataEnd
-.endif
-
-/* Fast3DEX2 Series */
-
-/* Fast3DEX2 NoN Data */
-.ifdef F3DEX2_NON_GBI
-.balign 16
-glabel rspF3DEX2NoNStart
-    .incbin "lib/PR/f3dex2/F3DEX2_NoN_data.bin"
-glabel rspF3DEX2NoNEnd
-.endif
-
-/* Fast3DEX2 Rej Data */
-.ifdef F3DEX2_REJ_GBI
-.balign 16
-glabel rspF3DEX2RejStart
-    .incbin "lib/PR/f3dex2/F3DEX2_Rej_data.bin"
-glabel rspF3DEX2RejEnd
-.endif
-
-/* Line3DEX2 Data */
-.ifdef L3DEX2_GBI
-.balign 16
-glabel rspL3DEX2Start
-    .incbin "lib/PR/f3dex2/L3DEX2_data.bin"
-glabel rspL3DEX2End
-.endif
-
-/* S2DEX2 Data */
-.ifdef S2DEX_GBI_2
-.balign 16
-glabel rspS2DEXStart
-    .incbin "lib/PR/s2dex/S2DEX2_data.bin"
-glabel rspS2DEXEnd
-.endif
--- a/lib/src/ldiv.c
+++ b/lib/src/ldiv.c
@ -1,7 +1,8 @@
 #include "libultra_internal.h"
-#include <stdlib.h>
+#include "stdlib.h"
+
+#ifdef NO_LDIV

-#ifndef OSX_BUILD
 lldiv_t lldiv(long long num, long long denom) {
    lldiv_t ret;

@ -14,7 +15,6 @@ lldiv_t lldiv(long long num, long long denom) {

    return ret;
 }
-#endif // OSX_BUILD cannot use this

 ldiv_t ldiv(long num, long denom) {
    ldiv_t ret;
@ -28,3 +28,5 @@ ldiv_t ldiv(long num, long denom) {

    return ret;
 }
+
+#endif
--- a/src/audio/data.c
+++ b/src/audio/data.c
@ -175,9 +175,9 @@ s8 gVibratoCurve[16] = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96, 104,
 #endif

 struct AdsrEnvelope gDefaultEnvelope[] = {
-    { BSWAP16(4), BSWAP16(32000) },    // go from 0 to 32000 over the course of 16ms
-    { BSWAP16(1000), BSWAP16(32000) }, // stay there for 4.16 seconds
-    { BSWAP16(ADSR_HANG), 0 }          // then continue staying there
+    { BE_TO_HOST16(4), BE_TO_HOST16(32000) },    // go from 0 to 32000 over the course of 16ms
+    { BE_TO_HOST16(1000), BE_TO_HOST16(32000) }, // stay there for 4.16 seconds
+    { BE_TO_HOST16(ADSR_HANG), 0 }          // then continue staying there
 };

 #ifdef VERSION_EU
--- a/src/audio/effects.c
+++ b/src/audio/effects.c
@ -18,7 +18,8 @@ static void sequence_channel_process_sound(struct SequenceChannel *seqChannel, s
    s32 i;

    if (seqChannel->changes.as_bitfields.volume || recalculateVolume) {
-        channelVolume = seqChannel->volume * seqChannel->volumeScale * seqChannel->seqPlayer->appliedFadeVolume;
+        channelVolume = seqChannel->volume * seqChannel->volumeScale *
+            seqChannel->seqPlayer->appliedFadeVolume * seqChannel->seqPlayer->volumeScale;
        if (seqChannel->seqPlayer->muted && (seqChannel->muteBehavior & MUTE_BEHAVIOR_SOFTEN) != 0) {
            channelVolume = seqChannel->seqPlayer->muteVolumeScale * channelVolume;
        }
@ -59,7 +60,8 @@ static void sequence_channel_process_sound(struct SequenceChannel *seqChannel) {
    f32 panFromChannel;
    s32 i;

-    channelVolume = seqChannel->volume * seqChannel->volumeScale * seqChannel->seqPlayer->fadeVolume;
+    channelVolume = seqChannel->volume * seqChannel->volumeScale *
+        seqChannel->seqPlayer->fadeVolume * seqChannel->seqPlayer->volumeScale;
    if (seqChannel->seqPlayer->muted && (seqChannel->muteBehavior & MUTE_BEHAVIOR_SOFTEN) != 0) {
        channelVolume *= seqChannel->seqPlayer->muteVolumeScale;
    }
@ -391,7 +393,7 @@ s32 adsr_update(struct AdsrState *adsr) {
            // fallthrough

        case ADSR_STATE_LOOP:
-            adsr->delay = BSWAP16(adsr->envelope[adsr->envIndex].delay);
+            adsr->delay = BE_TO_HOST16(adsr->envelope[adsr->envIndex].delay);
            switch (adsr->delay) {
                case ADSR_DISABLE:
                    adsr->state = ADSR_STATE_DISABLED;
@ -400,7 +402,7 @@ s32 adsr_update(struct AdsrState *adsr) {
                    adsr->state = ADSR_STATE_HANG;
                    break;
                case ADSR_GOTO:
-                    adsr->envIndex = BSWAP16(adsr->envelope[adsr->envIndex].arg);
+                    adsr->envIndex = BE_TO_HOST16(adsr->envelope[adsr->envIndex].arg);
                    break;
                case ADSR_RESTART:
                    adsr->state = ADSR_STATE_INITIAL;
@ -411,11 +413,11 @@ s32 adsr_update(struct AdsrState *adsr) {
                    if (adsr->delay >= 4) {
                        adsr->delay = adsr->delay * gAudioBufferParameters.updatesPerFrame / 4;
                    }
-                    adsr->target = (f32) BSWAP16(adsr->envelope[adsr->envIndex].arg) / 32767.0;
+                    adsr->target = (f32) BE_TO_HOST16(adsr->envelope[adsr->envIndex].arg) / 32767.0;
                    adsr->target = adsr->target * adsr->target;
                    adsr->velocity = (adsr->target - adsr->current) / adsr->delay;
 #else
-                    adsr->target = BSWAP16(adsr->envelope[adsr->envIndex].arg);
+                    adsr->target = BE_TO_HOST16(adsr->envelope[adsr->envIndex].arg);
                    adsr->velocity = ((adsr->target - adsr->current) << 0x10) / adsr->delay;
 #endif
                    adsr->state = ADSR_STATE_FADE;
--- a/Show More
+++ b/Show More