Implemented a function table to optimize geo_process_node_and_siblings

Sometimes tools like Fast64 will export script.c files with
LOAD_MIO0_TEXTURE() macro "calls" even when you have "YAY0" toggled
under the export menu.  To keep this from being a roadblock for
compilation, LOAD_MIO0_TEXTURE() is defined in this commit as an alias
to the LOAD_YAY0_TEXTURE() macro! :-)

.gitignore

@@ -99,6 +99,7 @@ build/*
 !/textures/segment2/shadow_quarter_square_64.ia8.png
 
 
+
 # libultra
 
 !/lib/**/*.o

.vscode/c_cpp_properties.json

@@ -6,6 +6,7 @@
                 "${workspaceFolder}/include/n64/**",
                 "${workspaceFolder}/include/**",
                 "${workspaceFolder}/textures/**",
+                "${workspaceFolder}/build/us_n64/**",
                 "${workspaceFolder}/**"
             ],
             "forcedInclude": [
@@ -24,7 +25,7 @@
                 "TARGET_N64=1",
                 "VERSION_US=1",
                 "F3DEX_GBI_2=1",
-                "F3DZEX_GBI_2=1",
+                "F3DZEX_NON_GBI_2=1",
                 "F3DEX_GBI_SHARED=1",
                 "NON_MATCHING=1",
                 "AVOID_UB=1"

CODEOWNERS

@@ -4,6 +4,7 @@
 # These owners will be the default owners for everything in the repo.
 *       @Reonu
 *       @thecozies
+*       @Mr-Wiseguy
 
 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners

Makefile

@@ -6,9 +6,9 @@ include util.mk
 default: all
 
 # Preprocessor definitions
-DEFINES   :=
+DEFINES :=
 
-SRC_DIRS  :=
+SRC_DIRS :=
 USE_DEBUG := 0
 
 #==============================================================================#
@@ -22,7 +22,7 @@ USE_DEBUG := 0
 TARGET_N64 ?= 1
 
 # CONSOLE - selects the console to target
-#   bb  - Targets the iQue Player (codenamed BB)
+#   bb - Targets the iQue Player (codenamed BB)
 #   n64 - Targets the N64
 CONSOLE ?= n64
 $(eval $(call validate-option,CONSOLE,n64 bb))
@@ -37,24 +37,24 @@ else ifeq ($(CONSOLE),bb)
 endif
 
 # COMPILER - selects the C compiler to use
-#   gcc   - uses the GNU C Compiler
+#   gcc - uses the GNU C Compiler
 #   clang - uses clang C/C++ frontend for LLVM
 COMPILER ?= gcc
 $(eval $(call validate-option,COMPILER,gcc clang))
 
 
-# LIBGCCDIR  - selects the libgcc configuration for checking for dividing by zero
-#   trap     - GCC default behavior, uses teq instructions which some emulators don't like
+# LIBGCCDIR - selects the libgcc configuration for checking for dividing by zero
+#   trap - GCC default behavior, uses teq instructions which some emulators don't like
 #   divbreak - this is similar to IDO behavior, and is default.
-#   nocheck  - never checks for dividing by 0. Technically fastest, but also UB so not recommended
+#   nocheck - never checks for dividing by 0. Technically fastest, but also UB so not recommended
 LIBGCCDIR ?= divbreak
 $(eval $(call validate-option,LIBGCCDIR,trap divbreak nocheck))
 
 
 # SAVETYPE - selects the save type
-#   eep4k  - uses EEPROM 4kbit
+#   eep4k - uses EEPROM 4kbit
 #   eep16k - uses EEPROM 16kbit (There aren't any differences in syntax, but this is provided just in case)
-#   sram   - uses SRAM 256Kbit
+#   sram - uses SRAM 256Kbit
 SAVETYPE ?= eep4k
 $(eval $(call validate-option,SAVETYPE,eep4k eep16k sram))
 ifeq ($(SAVETYPE),eep4k)
@@ -108,7 +108,7 @@ else ifeq ($(GRUCODE),l3dex2) # Line3DEX2
 else ifeq ($(GRUCODE),f3dex2pl) # Fast3DEX2_PosLight
   DEFINES += F3DEX2PL_GBI=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
 else ifeq ($(GRUCODE),f3dzex) # Fast3DZEX (2.08J / Animal Forest - Dōbutsu no Mori)
-  DEFINES += F3DZEX_GBI_2=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
+  DEFINES += F3DZEX_NON_GBI_2=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
 else ifeq ($(GRUCODE),super3d) # Super3D
   $(warning Super3D is experimental. Try at your own risk.)
   DEFINES += SUPER3D_GBI=1 F3D_NEW=1
@@ -120,7 +120,7 @@ LIBRARIES := nustd hvqm2 z goddard
 #   s2dex_text_engine - Text Engine by someone2639
 TEXT_ENGINE := none
 ifeq ($(TEXT_ENGINE), s2dex_text_engine)
-  DEFINES   += S2DEX_GBI_2=1 S2DEX_TEXT_ENGINE=1
+  DEFINES += S2DEX_GBI_2=1 S2DEX_TEXT_ENGINE=1
   LIBRARIES += s2d_engine
   DUMMY != make -C src/s2d_engine COPY_DIR=$(shell pwd)/lib/
 endif
@@ -128,20 +128,78 @@ endif
 
 LINK_LIBRARIES = $(foreach i,$(LIBRARIES),-l$(i))
 
+
+#==============================================================================#
+# Optimization flags                                                           #
+#==============================================================================#
+
+# Default non-gcc opt flags
+DEFAULT_OPT_FLAGS = -Ofast
+
+# Main opt flags
+GCC_MAIN_OPT_FLAGS = \
+  -Ofast \
+  --param case-values-threshold=20 \
+  --param max-completely-peeled-insns=10 \
+  --param max-unrolled-insns=10 \
+  -finline-limit=1 \
+  -freorder-blocks-algorithm=simple  \
+  -ffunction-sections \
+  -fdata-sections
+
+# Surface Collision
+GCC_COLLISION_OPT_FLAGS = \
+  -Ofast \
+  --param case-values-threshold=20 \
+  --param max-completely-peeled-insns=100 \
+  --param max-unrolled-insns=100 \
+  -finline-limit=0 \
+  -fno-inline \
+  -freorder-blocks-algorithm=simple  \
+  -ffunction-sections \
+  -fdata-sections \
+  -falign-functions=32
+
+# Math Util
+GCC_MATH_UTIL_OPT_FLAGS = \
+  -Ofast \
+  -fno-unroll-loops \
+  -fno-peel-loops \
+  --param case-values-threshold=20  \
+  -ffunction-sections \
+  -fdata-sections \
+  -falign-functions=32
+#   - setting any sort of -finline-limit has shown to worsen performance with math_util.c,
+#     lower values were the worst, the higher you go - the closer performance gets to not setting it at all
+
+# Rendering graph node
+GCC_GRAPH_NODE_OPT_FLAGS = \
+  -Ofast \
+  --param case-values-threshold=20 \
+  --param max-completely-peeled-insns=100 \
+  --param max-unrolled-insns=100 \
+  -finline-limit=0 \
+  -freorder-blocks-algorithm=simple  \
+  -ffunction-sections \
+  -fdata-sections \
+  -falign-functions=32
+#==============================================================================#
+
 ifeq ($(COMPILER),gcc)
   NON_MATCHING := 1
   MIPSISET     := -mips3
-  OPT_FLAGS    := \
-    -Ofast \
-    --param case-values-threshold=20 \
-    --param max-completely-peeled-insns=10 \
-    --param max-unrolled-insns=10 \
-    -finline-limit=1
+  OPT_FLAGS           := $(GCC_MAIN_OPT_FLAGS)
+  COLLISION_OPT_FLAGS  = $(GCC_COLLISION_OPT_FLAGS)
+  MATH_UTIL_OPT_FLAGS  = $(GCC_MATH_UTIL_OPT_FLAGS)
+  GRAPH_NODE_OPT_FLAGS = $(GCC_GRAPH_NODE_OPT_FLAGS)
 else ifeq ($(COMPILER),clang)
   NON_MATCHING := 1
   # clang doesn't support ABI 'o32' for 'mips3'
   MIPSISET     := -mips2
-  OPT_FLAGS    := -Ofast
+  OPT_FLAGS    := $(DEFAULT_OPT_FLAGS)
+  COLLISION_OPT_FLAGS  = $(DEFAULT_OPT_FLAGS)
+  MATH_UTIL_OPT_FLAGS  = $(DEFAULT_OPT_FLAGS)
+  GRAPH_NODE_OPT_FLAGS = $(DEFAULT_OPT_FLAGS)
 endif
 
 
@@ -164,11 +222,11 @@ TARGET_STRING := sm64
 
 # UNF - whether to use UNFLoader flashcart library
 #   1 - includes code in ROM
-#   0 - does not
+#   0 - does not 
 UNF ?= 0
 $(eval $(call validate-option,UNF,0 1))
 ifeq ($(UNF),1)
-  DEFINES  += UNF=1
+  DEFINES += UNF=1
   SRC_DIRS += src/usb
   USE_DEBUG := 1
 endif
@@ -176,7 +234,7 @@ endif
 # ISVPRINT - whether to fake IS-Viewer presence,
 # allowing for usage of CEN64 (and possibly Project64) to print messages to terminal.
 #   1 - includes code in ROM
-#   0 - does not
+#   0 - does not 
 ISVPRINT ?= 0
 $(eval $(call validate-option,ISVPRINT,0 1))
 ifeq ($(ISVPRINT),1)
@@ -194,14 +252,18 @@ endif
 
 # HVQM - whether to use HVQM fmv library
 #   1 - includes code in ROM
-#   0 - does not
+#   0 - does not 
 HVQM ?= 0
 $(eval $(call validate-option,HVQM,0 1))
 ifeq ($(HVQM),1)
-  DEFINES  += HVQM=1
+  DEFINES += HVQM=1
   SRC_DIRS += src/hvqm
 endif
 
+BUILD_DIR_BASE := build
+# BUILD_DIR is the location where all build artifacts are placed
+BUILD_DIR      := $(BUILD_DIR_BASE)/$(VERSION)_$(CONSOLE)
+
 COMPRESS ?= rnc1
 $(eval $(call validate-option,COMPRESS,mio0 yay0 gzip rnc1 rnc2 uncomp))
 ifeq ($(COMPRESS),gzip)
@@ -225,7 +287,7 @@ $(eval $(call validate-option,GZIPVER,std libdef))
 
 # GODDARD - whether to use libgoddard (Mario Head)
 #   1 - includes code in ROM
-#   0 - does not
+#   0 - does not 
 GODDARD ?= 0
 $(eval $(call validate-option,GODDARD,0 1))
 ifeq ($(GODDARD),1)
@@ -261,11 +323,25 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
   ifeq ($(NOEXTRACT),0)
     DUMMY != $(PYTHON) extract_assets.py $(VERSION) >&2 || echo FAIL
     ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets)
+      $(error Failed to extract assets from US ROM)
     endif
-    DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
-    ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets)
+    ifneq (,$(wildcard baserom.jp.z64))
+      DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from JP ROM)
+      endif
+    endif
+    ifneq (,$(wildcard baserom.eu.z64))
+      DUMMY != $(PYTHON) extract_assets.py eu >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from EU ROM)
+      endif
+    endif
+    ifneq (,$(wildcard baserom.sh.z64))
+      DUMMY != $(PYTHON) extract_assets.py sh >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from SH ROM)
+      endif
     endif
   endif
 
@@ -309,7 +385,7 @@ include Makefile.split
 # Source code files
 LEVEL_C_FILES     := $(wildcard levels/*/leveldata.c) $(wildcard levels/*/script.c) $(wildcard levels/*/geo.c)
 C_FILES           := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES)
-LIBZ_C_FILES      := $(foreach dir,$(LIBZ_SRC_DIRS),$(wildcard $(dir)/*.c))
+LIBZ_C_FILES     := $(foreach dir,$(LIBZ_SRC_DIRS),$(wildcard $(dir)/*.c))
 GODDARD_C_FILES   := $(foreach dir,$(GODDARD_SRC_DIRS),$(wildcard $(dir)/*.c))
 S_FILES           := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.s))
 GENERATED_C_FILES := $(BUILD_DIR)/assets/mario_anim_data.c $(BUILD_DIR)/assets/demo_data.c
@@ -334,7 +410,7 @@ O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \
            $(foreach file,$(GENERATED_C_FILES),$(file:.c=.o)) \
            lib/PR/hvqm/hvqm2sp1.o lib/PR/hvqm/hvqm2sp2.o
 
-LIBZ_O_FILES    := $(foreach file,$(LIBZ_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
+LIBZ_O_FILES := $(foreach file,$(LIBZ_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
 GODDARD_O_FILES := $(foreach file,$(GODDARD_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
 
 # Automatic dependency files
@@ -402,9 +478,11 @@ DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(C_DEFINES)
 # C compiler options
 CFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) $(MIPSISET) $(DEF_INC_CFLAGS)
 ifeq ($(COMPILER),gcc)
-  CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-missing-braces
+  CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
+  CFLAGS += -Wno-missing-braces
 else ifeq ($(COMPILER),clang)
-  CFLAGS += -target mips -mabi=32 -G 0 -mhard-float -fomit-frame-pointer -fno-stack-protector -fno-common -I include -I src/ -I $(BUILD_DIR)/include -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-missing-braces -fno-jump-tables
+  CFLAGS += -mfpxx -target mips -mabi=32 -G 0 -mhard-float -fomit-frame-pointer -fno-stack-protector -fno-common -I include -I src/ -I $(BUILD_DIR)/include -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
+  CFLAGS += -Wno-missing-braces
 else
   CFLAGS += -non_shared -Wab,-r4300_mul -Xcpluscomm -Xfullwarn -signed -32
 endif
@@ -447,7 +525,7 @@ else
   RSPASM              := $(TOOLS_DIR)/armips
 endif
 ENDIAN_BITWIDTH       := $(BUILD_DIR)/endian-and-bitwidth
-EMULATOR = ~/Downloads/mupen64plus/mupen64plus-gui
+EMULATOR = mupen64plus
 EMU_FLAGS =
 LOADER = loader64
 LOADER_FLAGS = -vwf
@@ -498,6 +576,7 @@ test: $(ROM)
 
 test-pj64: $(ROM)
 	wine ~/Desktop/new64/Project64.exe $<
+# someone2639
 
 load: $(ROM)
 	$(LOADER) $(LOADER_FLAGS) $<
@@ -546,33 +625,21 @@ else
   endif
 endif
 
-$(BUILD_DIR)/src/usb/usb.o:                   OPT_FLAGS := -O0
-$(BUILD_DIR)/src/usb/usb.o:                   CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wno-unused-function
-$(BUILD_DIR)/src/usb/debug.o:                 OPT_FLAGS := -O0
-$(BUILD_DIR)/src/usb/debug.o:                 CFLAGS += -Wno-unused-parameter -Wno-maybe-uninitialized
+$(BUILD_DIR)/src/usb/usb.o: OPT_FLAGS := -O0
+$(BUILD_DIR)/src/usb/usb.o: CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wno-unused-function
+$(BUILD_DIR)/src/usb/debug.o: OPT_FLAGS := -O0
+$(BUILD_DIR)/src/usb/debug.o: CFLAGS += -Wno-unused-parameter -Wno-maybe-uninitialized
+# File specific opt flags
 $(BUILD_DIR)/src/audio/*.o:                   OPT_FLAGS := -Os -fno-jump-tables
-# Surface Collision
-$(BUILD_DIR)/src/engine/surface_collision.o:  OPT_FLAGS := \
-  -Ofast \
-  --param case-values-threshold=20 \
-  --param max-completely-peeled-insns=100 \
-  --param max-unrolled-insns=100 \
-  -finline-limit=0
 
-# Math Util
-$(BUILD_DIR)/src/engine/math_util.o:          OPT_FLAGS := \
-  -Ofast \
-  -fno-unroll-loops \
-  -fno-peel-loops \
-  --param case-values-threshold=20
-#   - setting any sort of -finline-limit has shown to worsen performance, lower values were the worst, the higher you go - the closer performance gets to not setting it at all
+$(BUILD_DIR)/src/engine/surface_collision.o:  OPT_FLAGS := $(COLLISION_OPT_FLAGS)
+$(BUILD_DIR)/src/engine/math_util.o:          OPT_FLAGS := $(MATH_UTIL_OPT_FLAGS)
+$(BUILD_DIR)/src/game/rendering_graph_node.o: OPT_FLAGS := $(GRAPH_NODE_OPT_FLAGS)
 
-$(BUILD_DIR)/src/game/rendering_graph_node.o: OPT_FLAGS := \
-  -Ofast \
-  --param case-values-threshold=20 \
-  --param max-completely-peeled-insns=100 \
-  --param max-unrolled-insns=100 \
-  -finline-limit=0
+# $(info OPT_FLAGS:            $(OPT_FLAGS))
+# $(info COLLISION_OPT_FLAGS:  $(COLLISION_OPT_FLAGS))
+# $(info MATH_UTIL_OPT_FLAGS:  $(MATH_UTIL_OPT_FLAGS))
+# $(info GRAPH_NODE_OPT_FLAGS: $(GRAPH_NODE_OPT_FLAGS))
 
 ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(TEXT_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION)
 
@@ -586,6 +653,7 @@ $(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/game/puppycam2.o:   $(BUILD_DIR)/include/text_strings.h
 
 
+
 #==============================================================================#
 # Texture Generation                                                           #
 #==============================================================================#

README.md

@@ -1,23 +1,44 @@
 # ![](https://i.imgur.com/CeOukzk.gif) HackerSM64 ![](https://i.imgur.com/s0LUbTo.gif)
 
-**[Thank you to Kaze Emanuar for these major optimizations!](https://www.youtube.com/watch?v=uYPH-NH3B6k)
-
-**AFTER CLONING THE REPO, CHECK OUT THE `include/config.h` FILE BEFORE ANYTHING ELSE! IT THERE'S A LOT OF STUFF IN THIS REPO THAT CAN BE TOGGLED THERE.**
+**AFTER CLONING THE REPO, CHECK OUT THE `include/config` FOLDER BEFORE ANYTHING ELSE! THERE'S A LOT OF STUFF IN THIS REPO THAT CAN BE TOGGLED THERE.**
 
 HackerSM64 now has a discord server! https://discord.gg/brETAakcXr
 
-This repo needs BOTH an US ROM and a JP ROM in order to build. Place baserom.us.z64 in the repo as usual and ALSO place baserom.jp.z64
+This repo requires BOTH a US ROM and a JP ROM in order to build. Place baserom.us.z64 in the repo as usual and ALSO include baserom.jp.z64.
 
 This repo needs gcc in order to be able to build it. To install it, run `sudo apt install gcc-mips-linux-gnu`
 
-This is a fork of the ultrasm64 repo by CrashOveride which includes the following commonly used patches (patches marked with `*` are toggleable in `config.h`):
+This is a fork of the ultrasm64 repo by CrashOveride which includes the following commonly used patches (patches marked with `*` are toggleable in the config files):
+
+**Credits**
+- **ArcticJaguar725**: Most audio configuration and layout changes, colored ia4 text, floombas, various bugfixes, and more
+- **CowQuack**: Adjustable skybox sizes, area-specific skybox function
+- **thecozies**: Water surface types, general maintenance, and time
+- **MrComit**: General use object defines, JUMP_KICK_FIX, LEDGE_GRABS_CHECK_SLOPE_ANGLE
+- **aglab2**: Bugfixes (particularly puppycam), refactor stuff
+- **someone2639**: math.s and crash screen disam, stack trace, map packing, shiftable segments 2, S2DEX engine
+- **Arthurtilly**: Platform Displacement 2
+- **Fazana**: PuppyLib, ucode swapping, audio load time optimisations (with Arctic), general hacker qol improvements, visual debug
+- **Reonu**: Starting the project/repo, widescreen, reonucam, various defines for hacker QoL
+- **JoshDuMan**: Decomp guy, general assistance
+- **Arceveti**: Silhouette, shadow optimisation, better hanging, breath meter
+- **axollyon**: Console testing, bugfixes, idea-guying, and had a hand in silhouettes
+- **Wiseguy**:  World scale reimplementation, silhouette, graph node optimisations, instant input patch, cake screen fix, segmented code support, and various optimizations/fixes
+- **Kaze**: Graph node optimisations, automatic optimal collision distance
+- **Pyro Jay**: Texture improvements, repo banner art, some QoL stuff
+- **CrashOveride**: creating the [ultrasm64](https://github.com/CrashOveride95/ultrasm64) repo
+- **falcobuster**: Original coordinate overflow fix (world scale), ASM version of extended bounds
+- **anonymous_moose**: porting falco's extended bounds to decomp
+- **tuxlovesyou**: `LOAD_MIO0_TEXTURE` macro and moral support
+
+Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
 
 **Lighting Engine by Wiseguy**
-- Lighting Engine is available on a separate branch `(lighting-engine)`. Instructions on how to use it are in the readme of that branch.
+- Lighting Engine is available on a separate branch ([base/lighting-engine-wip](https://github.com/Reonu/HackerSM64/tree/base/lighting-engine-wip)). Instructions on how to use it are in the readme of that branch.
 - Alternatively, the main repo has `Puppylights` available, which is a more lightweight, but limited lighting library intended to be used to modify existing light properties. You can look at `puppylights.c` to find out how to use it.
 
 **Puppycam**
-- Puppycam is available on the master branch now, you can toogle it in config.h. *
+- Puppycam is available on the master branch now, you can toggle it in `config/config_camera.h`. *
 
 **Collision:**
 - Slope fix and exposed ceilings fix
@@ -25,11 +46,11 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - Jump kick fix *
 - Configurable wallkick angle, in degrees *
 - Possibility of disabling BLJs *
-- Hanging fix (mario can grab hangable ceilings from any state, instead of only jump or double jump) *
+- Hanging fix (Mario can grab hangable ceilings from any state, instead of only jump or double jump) *
 - Increased maximum pole length (The game will read bparam1 and bparam2 together as a single value, so you can have a very long pole) *
 - Platform Displacement 2 by Arthurtilly *
 - Water Surface Type patch by thecozies
-- Better Wall Collision With Rounded Corners by FramePerfection, merged by Cheezepin & Arceveti
+- Better wall collision with rounded corners by FramePerfection, merged by Cheezepin & Arceveti
 - Automatically calculate the optimal collision distance for an object based on its vertices, by Kaze *
 
 **Common Hack Changes:**
@@ -42,8 +63,8 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - Removed course-specific camera processing *
 - You can increase the number of frames that you have to perform a firsty *
 - Ability to set Mario's movement speed when hanging from a ceiling *
-- Tighter hanging controls (mario will face the direction of the analog stick directly while hanging from a ceiling) *
-- reonucam3: custom camera by me. This is included as a .patch file in the enhancements folder, you need to apply it if you want this camera.
+- Tighter hanging controls (Mario will face the direction of the analog stick directly while hanging from a ceiling) *
+- reonucam3: custom camera by Reonu. This is included as a .patch file in the enhancements folder, you need to apply it if you want this camera.
   This video shows a rundown of the features: https://youtu.be/TQNkznX9Z3k
 - Ability to disable Mario getting suck in snow or sand
 
@@ -52,34 +73,34 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - Debug mode: prints mario's coordinates, angle and speed, and a FPS counter.
 - Automatic console/emulator detection. If emulator is detected, LODs are disabled. *
 - Ability to configure whether there's a 100 coin star at all and how many coins are required to spawn it *
-- Ability to easily change the warp that EXIT COURSE takes you to via config.h, or disable it entirely. *
-- 16 bit model IDs by someone2639. This means you can have up to 65536 models (lol). You can set the maximum number of model IDs in `config.h`.
+- Ability to easily change the warp that EXIT COURSE takes you to via `config/config_menu.h`, or disable it entirely. *
+- 16 bit model IDs by someone2639. This means you can have up to 65536 models (lol). You can set the maximum number of model IDs in `config/config_game.h`.
 - Apply_patch.sh improved
 - Removed the ifdef hell in `file_select.c` and `ingame_menu.c`
 - Added Blake's custom function for object model stuff: `obj_set_model` and `obj_has_model`
 - Added function to get the model ID from an object: `obj_get_model_id` (by Arceveti)
 - The "far" variable is now u16, allowing you to increase the farclip (the max distance at which geometry is rendered). However, when increasing the farclip, make sure to increase the nearclip by the same ratio, or rendering will break on console and LLE plugins.
-- Many general use defines for object struct members, meant for use in custom object behaviors. Check `object_fields.h` for more info on this. (By MrComit)
+- Many general use defines for object struct members, meant for use in custom object behaviors. Check `include/object_fields.h` for more info on this. (By MrComit)
 - Included `actors/group0.c` in `behavior_data.c`
-- The internal ROM name is now set with a define in `config.h` to make it simpler
+- The internal ROM name is now set with a define in `config/config_rom.h` to make it simpler
 - There is a `gIsConsole` variable that is 1 when running on console and 0 when running on emulator. This way you can wrap your code in a console check.
 - Expanded audio heap allows for a larger concurrent note count and the importing of more m64 sequences and sound banks (By ArcticJaguar725) *
-- You can set a test level in config.h in order to boot straight into it, so you can quickly test the level you're working on. *
-- Allows all surfaces in the game to have a `force` parameter. Activating this doesn't REQUIRE you to set `force` for every surface: If you don't set, it will default to 0x0000 rather than crashing. Increases RAM usage of collision. *
+- You can set a test level in `config/config_debug.h` in order to boot straight into it, so you can quickly test the level you're working on. *
+- Allow all surfaces in the game to have a `force` parameter. Activating this doesn't REQUIRE you to set `force` for every surface: If you don't set, it will default to 0x0000 rather than crashing. Increases RAM usage of collision. *
 - The clown font includes the entire English alphabet.
 - Colored ia4 text support. Format: `"@XXXXXXXX[YOUR TEXT]@--------"` (By ArcticJaguar725)
   - Example Text: `"@FF0000FFRED @00FF00FFGREEN @0000FFFFBLUE @FFFFFF00INVISIBLE @--------NORMAL"`
   - NOTE: It is not mandatory to reset the text color with `"@--------"`, but text will need to be recolored each time it scrolls in a dialog box, or the custom color will reset.
-- Toggle visiblity of collision surfaces and object hitboxes with Visual Surface Debug. `config.h` has VISUAL_DEBUG which can be turned on to enable this feature.
+- Toggle visiblity of collision surfaces and object hitboxes with Visual Surface Debug. `config/config_debug.h` has VISUAL_DEBUG which can be turned on to enable this feature.
 - Workaround for infinite death loops caused by using the wrong warp type for death warps. Mario's HP will be restored when being warped to any warp if (and only if) he was warped while dead. *
 
 **Other Bugfixes:**
-- Castle music fix (Fixes the castle music sometimes triggering after getting a dialog) *
-- bparam4 fix (the game no longer uses bparam4 to check if an object is mario and therefore you can safely use it)
+- Castle music fix (fixes the castle music sometimes triggering after getting a dialog) *
+- bparam4 fix (the game no longer uses bparam4 to check if an object is Mario and therefore you can safely use it)
 - Instant warp offset fix (makes the instant warp offset work even when warping to a different area) *
 - haveyourcake, also known as cake screen fix. Made by Wiseguy and ported/PR'd by Cheezepin
 - Tree particle fix (Whether a tree uses snow particles or not is decided via the model IDs instead of the course number) *
-- Coordinate overflow fix by falcobuster. Your levels will render correctly on console and LLE emulators even when using 2x or 4x bounds, while not hurting anything on HLE plugins. *This is automatic now, you don't have to set WORLD_SCALE manually.*
+- Adjustable world scale. You can change the geometry scaling of your level, which allow large levels to render correctly on console and LLE emulators while not hurting anything on HLE plugins.
 - A couple vanilla texture fixes
 - Smoke fix (the smoke texture uses the correct texture format)
 
@@ -88,14 +109,14 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
   - This means that you'll have to do your framebuffer effects on buffer 0 for emulator, but NOT for console. You can use the `gIsConsole` variable to check for console when doing your framebuffer effects.
 - Widescreen (16:9) support toggleable by pressing `L` in the pause menu. *
 - S2DEX engine by someone2639! To use it, compile with `make TEXT_ENGINE=s2dex_text_engine` or just set `TEXT_ENGINE` to `s2dex_text_engine` in the makefile.
-- ia8 coins (64x64), the vanilla coin texture is upgraded to accomodate. *
-- ia8 30 FPS (64x64) coins (Textures by InTheBeef, cleaned up by Arceveti). *
-- Floombas! Simply just retextured goombas with custom behaviors (does not overwrite standard goombas). *
+- ia8 (64x64) coins, the vanilla coin texture is upgraded to accomodate. *
+- ia8 (64x64) 30 FPS coins (Textures by InTheBeef, cleaned up by Arceveti). *
+- Floombas! Simply just retextured goombas with customizable behaviors (does not overwrite standard goombas). *
 - HD texture support for intro splash screen (with floombas if enabled). *
 - Mario's silhouette is shown when behind most surfaces (By Frame#5375, Axollyon, AloXado320, Wiseguy, Arceveti) *
-- Skybox size modifier. You can have 2x, 3x and 4x size skyboxes (you can select the skybox size in `config.h`.) Please note that this might affect console performance, especially 4x mode. 2x or 3x mode is recommended if aiming for console. By CowQuack *
+- Skybox size modifier. You can have 2x, 3x and 4x size skyboxes (you can select the skybox size in `config/config_graphics.h`.) Please note that this might affect console performance, especially 4x mode. 2x or 3x mode is recommended if aiming for console. By CowQuack *
 - You can set the black border size to different values for console and emulator. It's set to 0 by default for both. *
-- This repo supports much better implementation of reverb over vanilla's fake echo reverb. Great for caves or eerie levels, as well as just a better audio experience in general. See `audio/synthesis.c` for more configuration info. (By ArcticJaguar725) *
+- This repo supports a much better implementation of reverb over vanilla's fake echo reverb. Great for caves or eerie levels, as well as just a better audio experience in general. See `audio/synthesis.c` for more details and configuration info. (By ArcticJaguar725) *
 - Fazana's "puppyprint" text engine. *
   - Use `print_small_text` to print normal text. The two last params are aligment and how many characters to print (-1 means PRINT_ALL).
   - Use `render_multi_image` to draw large texture rectangles consisting of multiple images on the screen.

VERSION.txt

@@ -0,0 +1 @@
+v2.0.1

actors/blargg/anims/table.inc.c

@@ -1,4 +1,4 @@
-// unreferenced animation
+// unreferenced
 // 0x0500616C
 const struct Animation *const blargg_seg5_anims_0500616C[] = {
     &blargg_seg5_anim_05006154,

actors/blue_fish/geo.inc.c

@@ -6,9 +6,9 @@ const GeoLayout fish_shadow_geo[] = {
       GEO_OPEN_NODE(),
          GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -16, 0, 0, NULL),
          GEO_OPEN_NODE(),
-            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_body),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
             GEO_OPEN_NODE(),
-               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_tail),
+               GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
@@ -22,9 +22,9 @@ const GeoLayout fish_geo[] = {
    GEO_OPEN_NODE(),
       GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -16, 0, 0, NULL),
       GEO_OPEN_NODE(),
-         GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_body),
+         GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
          GEO_OPEN_NODE(),
-            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_tail),
+            GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),

actors/blue_fish/model.inc.c

@@ -12,44 +12,48 @@ ALIGNED8 static const Texture blue_fish_seg3_texture_0301B5E0[] = {
 };
 
 // 0x0301BDE0
-static const Vtx blue_fish_seg3_vertex_body[] = {
-    {{{  -108,      1,      0}, 0, {    14,    566}, {0x89, 0x00, 0xd7, 0xff}}}, // 0
-    {{{   -62,    -19,     12}, 0, {   210,    502}, {0xe8, 0x84, 0x0a, 0xff}}}, // 1
-    {{{   -62,     21,     12}, 0, {   210,    502}, {0xe8, 0x7c, 0x0b, 0xff}}}, // 2
-    {{{   -47,      1,    -64}, 0, {   274,    830}, {0xbd, 0xff, 0x95, 0xff}}}, // 3
-    {{{   -97,      1,     23}, 0, {    62,    462}, {0xa2, 0x00, 0x54, 0xff}}}, // 4
-    {{{    55,      1,    127}, 0, {   712,     -8}, {0x1a, 0x00, 0x7c, 0xff}}}, // 5
-    {{{    41,     16,     56}, 0, {   656,    298}, {0x43, 0x67, 0x1b, 0xff}}}, // 6
-    {{{    50,     16,    -43}, 0, {   692,    722}, {0x35, 0x6f, 0xe6, 0xff}}}, // 7
-    {{{    41,    -14,     56}, 0, {   656,    298}, {0x43, 0x99, 0x1b, 0xff}}}, // 8
-    {{{    50,    -13,    -43}, 0, {   692,    722}, {0x35, 0x91, 0xe6, 0xff}}}, // 9
-    {{{    62,      1,    -92}, 0, {   742,    930}, {0x42, 0xff, 0x94, 0xff}}}, // 10
-    {{{   101,      1,      1}, 0, {   910,    520}, {0x7e, 0x00, 0x01, 0xff}}}, // 11
+static const Vtx blue_fish_seg3_vertex_0301BDE0[] = {
+    {{{  -108,      1,      0}, 0, {    14,    566}, {0x89, 0x00, 0xd7, 0xff}}},
+    {{{   -44,    -13,    -31}, 0, {   286,    688}, {0xeb, 0x89, 0xdc, 0xff}}},
+    {{{   -62,    -19,     12}, 0, {   210,    502}, {0xe8, 0x84, 0x0a, 0xff}}},
+    {{{   -44,     16,    -31}, 0, {   286,    688}, {0xea, 0x77, 0xdc, 0xff}}},
+    {{{   -62,     21,     12}, 0, {   210,    502}, {0xe8, 0x7c, 0x0b, 0xff}}},
+    {{{   -47,      1,    -64}, 0, {   274,    830}, {0xbd, 0xff, 0x95, 0xff}}},
+    {{{   -97,      1,     23}, 0, {    62,    462}, {0xa2, 0x00, 0x54, 0xff}}},
+    {{{    55,      1,    127}, 0, {   712,     -8}, {0x1a, 0x00, 0x7c, 0xff}}},
+    {{{    41,     16,     56}, 0, {   656,    298}, {0x43, 0x67, 0x1b, 0xff}}},
+    {{{    50,     16,    -43}, 0, {   692,    722}, {0x35, 0x6f, 0xe6, 0xff}}},
+    {{{    41,    -14,     56}, 0, {   656,    298}, {0x43, 0x99, 0x1b, 0xff}}},
+    {{{    50,    -13,    -43}, 0, {   692,    722}, {0x35, 0x91, 0xe6, 0xff}}},
+    {{{    62,      1,    -92}, 0, {   742,    930}, {0x42, 0xff, 0x94, 0xff}}},
+    {{{   101,      1,      1}, 0, {   910,    520}, {0x7e, 0x00, 0x01, 0xff}}},
 };
 
 // 0x0301BEC0 - 0x0301BFB8
-const Gfx blue_fish_seg3_sub_dl_body[] = {
+const Gfx blue_fish_seg3_dl_0301BEC0[] = {
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, blue_fish_seg3_texture_0301B5E0),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPLight(&blue_fish_seg3_lights_0301B5C8.l, 1),
     gsSPLight(&blue_fish_seg3_lights_0301B5C8.a, 2),
-    gsSPVertex(blue_fish_seg3_vertex_body, 12, 0),
-    gsSP2Triangles( 3,  0,  2, 0x0,  1,  4,  0, 0x0),
-    gsSP2Triangles( 0,  4,  2, 0x0,  3,  1,  0, 0x0),
-    gsSP2Triangles( 2,  4,  5, 0x0,  4,  1,  5, 0x0),
-    gsSP2Triangles( 5,  6,  2, 0x0,  7,  2,  6, 0x0),
-    gsSP2Triangles( 1,  8,  5, 0x0,  9,  8,  1, 0x0),
-    gsSP2Triangles( 1,  3, 10, 0x0, 10,  3,  2, 0x0),
-    gsSP2Triangles( 7,  9, 10, 0x0,  2,  7, 10, 0x0),
-    gsSP2Triangles(10,  9,  1, 0x0,  6,  5,  8, 0x0),
-    gsSP2Triangles(11,  7,  6, 0x0,  7, 11,  9, 0x0),
-    gsSP2Triangles( 9, 11,  8, 0x0,  8, 11,  6, 0x0),
+    gsSPVertex(blue_fish_seg3_vertex_0301BDE0, 14, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  3,  0,  4, 0x0),
+    gsSP2Triangles( 5,  0,  3, 0x0,  2,  6,  0, 0x0),
+    gsSP2Triangles( 0,  6,  4, 0x0,  5,  1,  0, 0x0),
+    gsSP2Triangles( 4,  6,  7, 0x0,  6,  2,  7, 0x0),
+    gsSP2Triangles( 7,  8,  4, 0x0,  9,  4,  8, 0x0),
+    gsSP2Triangles( 9,  3,  4, 0x0,  2, 10,  7, 0x0),
+    gsSP2Triangles( 1, 11,  2, 0x0, 11, 10,  2, 0x0),
+    gsSP2Triangles( 1,  5, 12, 0x0, 12,  5,  3, 0x0),
+    gsSP2Triangles( 9, 11, 12, 0x0,  3,  9, 12, 0x0),
+    gsSP2Triangles(12, 11,  1, 0x0,  8,  7, 10, 0x0),
+    gsSP2Triangles(13,  9,  8, 0x0,  9, 13, 11, 0x0),
+    gsSP2Triangles(11, 13, 10, 0x0, 10, 13,  8, 0x0),
     gsSPEndDisplayList(),
 };
 
 // 0x0301BFB8 - 0x0301C018
-const Gfx blue_fish_seg3_dl_body[] = {
+const Gfx blue_fish_seg3_dl_0301BFB8[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD),
@@ -57,7 +61,7 @@ const Gfx blue_fish_seg3_dl_body[] = {
     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),
-    gsSPDisplayList(blue_fish_seg3_sub_dl_body),
+    gsSPDisplayList(blue_fish_seg3_dl_0301BEC0),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
@@ -65,42 +69,48 @@ const Gfx blue_fish_seg3_dl_body[] = {
 };
 
 // 0x0301C018
-static const Vtx blue_fish_seg3_vertex_tail[] = {
-    {{{    67,      0,    -58}, 0, {   736,    728}, {0x7a, 0x00, 0xde, 0xff}}}, // 0 bottom tip
-    {{{    67,      0,    -28}, 0, {   704,    574}, {0x54, 0x7f, 0x14, 0xff}}}, // 1 lower
-    {{{     0,      0,      0}, 0, {  1019,    336}, {0xa0, 0xfb, 0x7e, 0xff}}}, // 2 joint
-    {{{    53,      0,      0}, 0, {   744,    414}, {0x7e, 0x00, 0xfe, 0xff}}}, // 3 middle
-    {{{    67,      0,     27}, 0, {   644,    290}, {0x40, 0x7f, 0xef, 0xff}}}, // 4 upper
-    {{{    67,      0,     57}, 0, {   612,    138}, {0x7a, 0x00, 0x22, 0xff}}}, // 5 top tip
+static const Vtx blue_fish_seg3_vertex_0301C018[] = {
+    {{{    67,      0,    -58}, 0, {   736,    728}, {0x7a, 0x00, 0xde, 0xff}}},
+    {{{    67,     -3,    -28}, 0, {   704,    574}, {0x53, 0xa3, 0x14, 0xff}}},
+    {{{     0,      1,     -3}, 0, {  1022,    356}, {0xa1, 0xf9, 0xad, 0xff}}},
+    {{{    67,      4,     27}, 0, {   644,    290}, {0x3f, 0x6d, 0xf3, 0xff}}},
+    {{{    53,      0,      0}, 0, {   744,    414}, {0x7e, 0x00, 0xfe, 0xff}}},
+    {{{    67,     -3,     27}, 0, {   644,    290}, {0x40, 0x95, 0xeb, 0xff}}},
+    {{{     0,      0,      5}, 0, {  1016,    312}, {0x9e, 0xfd, 0x50, 0xff}}},
+    {{{    67,      4,    -28}, 0, {   704,    574}, {0x54, 0x5c, 0x15, 0xff}}},
+    {{{    67,      0,     57}, 0, {   612,    138}, {0x7a, 0x00, 0x22, 0xff}}},
 };
 
 // 0x0301C0A8 - 0x0301C150
-const Gfx blue_fish_seg3_sub_dl_tail[] = {
+const Gfx blue_fish_seg3_dl_0301C0A8[] = {
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, blue_fish_seg3_texture_0301B5E0),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPLight(&blue_fish_seg3_lights_0301B5C8.l, 1),
     gsSPLight(&blue_fish_seg3_lights_0301B5C8.a, 2),
-    gsSPVertex(blue_fish_seg3_vertex_tail, 6, 0),
-    gsSP2Triangles( 2,  4,  3, 0x0,  3,  1,  2, 0x0),
-    gsSP2Triangles( 2,  1,  0, 0x0,  2,  5,  4, 0x0),
+    gsSPVertex(blue_fish_seg3_vertex_0301C018, 9, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  2,  3,  4, 0x0),
+    gsSP2Triangles( 4,  5,  2, 0x0,  2,  5,  6, 0x0),
+    gsSP2Triangles( 2,  1,  4, 0x0,  2,  6,  3, 0x0),
+    gsSP2Triangles( 4,  7,  2, 0x0,  2,  7,  0, 0x0),
+    gsSP2Triangles( 6,  8,  3, 0x0,  3,  8,  5, 0x0),
+    gsSP2Triangles( 3,  5,  4, 0x0,  4,  1,  7, 0x0),
+    gsSP2Triangles( 6,  5,  8, 0x0,  1,  0,  7, 0x0),
     gsSPEndDisplayList(),
 };
 
 // 0x0301C150 - 0x0301C1B0
-const Gfx blue_fish_seg3_dl_tail[] = {
+const Gfx blue_fish_seg3_dl_0301C150[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB),
-    gsSPClearGeometryMode(G_CULL_BACK),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD),
     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),
-    gsSPDisplayList(blue_fish_seg3_sub_dl_tail),
+    gsSPDisplayList(blue_fish_seg3_dl_0301C0A8),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPSetGeometryMode(G_CULL_BACK),
     gsSPEndDisplayList(),
 };

actors/breakable_box/collision.inc.c

@@ -4,13 +4,13 @@
 const Collision breakable_box_seg8_collision[] = {
     COL_INIT(),
     COL_VERTEX_INIT(0x8),
-    COL_VERTEX(-100,   0, -100),
-    COL_VERTEX(-100,   0,  100),
-    COL_VERTEX(-100, 200,  100),
-    COL_VERTEX( 100,   0,  100),
-    COL_VERTEX( 100, 200,  100),
-    COL_VERTEX( 100,   0, -100),
-    COL_VERTEX( 100, 200, -100),
+    COL_VERTEX(-100, 0, -100),
+    COL_VERTEX(-100, 0, 100),
+    COL_VERTEX(-100, 200, 100),
+    COL_VERTEX(100, 0, 100),
+    COL_VERTEX(100, 200, 100),
+    COL_VERTEX(100, 0, -100),
+    COL_VERTEX(100, 200, -100),
     COL_VERTEX(-100, 200, -100),
 
     COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 12),
@@ -29,3 +29,6 @@ const Collision breakable_box_seg8_collision[] = {
     COL_TRI_STOP(),
     COL_END(),
 };
+
+UNUSED static const u32 breakable_box_unused_1 = 0;
+UNUSED static const u64 breakable_box_unused_2 = 0;

actors/bubba/model.inc.c

@@ -2,6 +2,9 @@
 // It's possible that bubba and bub used to be 2 "actors" in
 // one actor file.
 
+// Bin ID? What is this?
+UNUSED static const u64 bubba_unused_1 = 0;
+
 // Bubba
 
 // 0x05000008

actors/cannon_lid/geo.inc.c

@@ -1 +1,2 @@
 // Empty geo script
+UNUSED static const u64 cannon_lid_unused_1 = 0;

actors/chain_ball/model.inc.c

@@ -9,6 +9,9 @@ static const Vtx chain_ball_seg6_vertex_06020AA0[] = {
     {{{   -26,     26,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
 };
 
+// align? binid?
+UNUSED static const u64 chain_ball_unused_1 = 0;
+
 // 0x06020AE8
 ALIGNED8 static const Texture chain_ball_seg6_texture_06020AE8[] = {
 #include "actors/chain_ball/chain_ball.rgba16.inc.c"

actors/chair/model.inc.c

@@ -21,7 +21,7 @@ ALIGNED8 static const Texture chair_seg5_texture_05004060[] = {
 #include "actors/chair/chair_bottom.rgba16.inc.c"
 };
 
-// unreferenced texture
+// unreferenced
 // 0x05004460
 UNUSED ALIGNED8 static const Texture chair_seg5_texture_05004460[] = {
 #include "actors/chair/chair_surface_unused.rgba16.inc.c"

actors/common1.h

@@ -6,10 +6,10 @@
 // blue_fish
 extern const GeoLayout fish_shadow_geo[];
 extern const GeoLayout fish_geo[];
-extern const Gfx blue_fish_seg3_sub_dl_body[];
-extern const Gfx blue_fish_seg3_dl_body[];
-extern const Gfx blue_fish_seg3_sub_dl_tail[];
-extern const Gfx blue_fish_seg3_dl_tail[];
+extern const Gfx blue_fish_seg3_dl_0301BEC0[];
+extern const Gfx blue_fish_seg3_dl_0301BFB8[];
+extern const Gfx blue_fish_seg3_dl_0301C0A8[];
+extern const Gfx blue_fish_seg3_dl_0301C150[];
 extern const struct Animation *const blue_fish_seg3_anims_0301C2B0[];
 
 // bowser_key
@@ -133,12 +133,9 @@ extern const Gfx door_seg3_dl_one_star_near[];
 extern const Gfx door_seg3_dl_one_star_far[];
 extern const Gfx door_seg3_dl_three_stars_near[];
 extern const Gfx door_seg3_dl_three_stars_far[];
-extern const Gfx door_seg3_sub_dl_lock_begin[];
-extern const Gfx door_seg3_sub_dl_lock_end[];
-extern const Gfx door_seg3_dl_lock_far[];
-extern const Gfx door_seg3_dl_lock_near[];
+extern const Gfx door_seg3_dl_key_door[];
 extern const Gfx door_seg3_sub_dl_themed_handle_near[];
-extern const Gfx door_seg3_sub_dl_themed_door_overlay[];
+extern const Gfx door_seg3_sub_dl_themed_door_sides[];
 extern const Gfx door_seg3_sub_dl_themed_door[];
 extern const Gfx door_seg3_sub_dl_themed_door_begin[];
 extern const Gfx door_seg3_dl_rough_wooden_door_near[];

actors/cyan_fish/model.inc.c

@@ -1,5 +1,8 @@
 // Cyan Fish
 
+// ???
+UNUSED static const u64 cyan_fish_unused_1 = 0;
+
 // 0x0600D468
 ALIGNED8 static const Texture cyan_fish_seg6_texture_0600D468[] = {
 #include "actors/cyan_fish/cyan_fish.rgba16.inc.c"