Clean up debug startup spawn parameters config defines

Clarify startup spawn config descriptions
Move sFirstWarp out of level_cmd_set_mario_start_pos
2026-01-21 10:35:32 -08:00 · 2022-09-29 15:00:26 -07:00 · 2022-09-29 14:44:19 -07:00 · 2022-09-29 14:41:27 -07:00 · 2022-09-29 14:37:58 -07:00 · 2022-09-29 14:34:57 -07:00
312 changed files with 17957 additions and 35336 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -38,9 +38,6 @@
 # datadump
 /tools/ddump/*

-# python cache in tools/
-/tools/__pycache__/*
-
 # Text editor remnants
 *.swp
 .vscode/*
@@ -2149,6 +2146,3 @@ lib/libs2d_engine.a

 # :Zone_Identifier files
 *Zone.Identifier
-
-# user-specific config file
-include/config/config_local.h
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "lib/libpl"]
-	path = lib/libpl
-	url = https://gitlab.com/parallel-launcher/libpl.git
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -26,13 +26,12 @@
                "VERSION_US=1",
                "F3DEX_GBI_2=1",
                "F3DZEX_NON_GBI_2=1",
-                "F3DEX_GBI_SHARED=1",
-                "LIBPL=1"
+                "F3DEX_GBI_SHARED=1"
            ],
            "compilerPath": "/usr/bin/mips-linux-gnu-gcc",
            "cStandard": "gnu17",
            "cppStandard": "gnu++14",
-            "intelliSenseMode": "linux-gcc-x86"
+            "intelliSenseMode": "linux-gcc-x64"
        }
    ],
    "version": 4
--- a/4
+++ b/4
@@ -2,7 +2,9 @@
 # Each line is a file pattern followed by one or more owners.

 # These owners will be the default owners for everything in the repo.
-*       @Reonu @gheskett @arthurtilly
+*       @Reonu
+*       @thecozies
+*       @gheskett

 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners
--- a/15
+++ b/15
@@ -1,18 +1,17 @@
-FROM ubuntu:22.04 as build
+FROM ubuntu:18.04 as build

 RUN apt-get update && \
    apt-get install -y \
        binutils-mips-linux-gnu \
-        bsdextrautils \
+        bsdmainutils \
        build-essential \
-        gcc-mips-linux-gnu \
        libcapstone-dev \
        pkgconf \
        python3

-RUN mkdir /hackersm64
-WORKDIR /hackersm64
-ENV PATH="/hackersm64/tools:${PATH}"
+RUN mkdir /sm64
+WORKDIR /sm64
+ENV PATH="/sm64/tools:${PATH}"

-CMD echo 'Usage: docker run --rm -v ${PWD}:/hackersm64 hackersm64 make VERSION=us -j4\n' \
-         'See https://github.com/HackerN64/HackerSM64/blob/master/README.md for more information'
+CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=us -j4\n' \
+         'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage'
--- a/195
+++ b/195
@@ -119,31 +119,31 @@ else ifeq ($(GRUCODE),super3d) # Super3D
  DEFINES += SUPER3D_GBI=1 F3D_NEW=1
 endif

+LIBRARIES := nustd hvqm2 z goddard
+
 # TEXT ENGINES
 #   s2dex_text_engine - Text Engine by someone2639
 TEXT_ENGINE := none
-$(eval $(call validate-option,TEXT_ENGINE,none s2dex_text_engine))
-
 ifeq ($(TEXT_ENGINE), s2dex_text_engine)
  DEFINES += S2DEX_GBI_2=1 S2DEX_TEXT_ENGINE=1
-  SRC_DIRS += src/s2d_engine
+  LIBRARIES += s2d_engine
+  DUMMY != make -C src/s2d_engine COPY_DIR=$(shell pwd)/lib/
 endif
 # add more text engines here

+LINK_LIBRARIES = $(foreach i,$(LIBRARIES),-l$(i))
+
+
 #==============================================================================#
 # Optimization flags                                                           #
 #==============================================================================#

 # Default non-gcc opt flags
-DEFAULT_OPT_FLAGS = -Ofast -falign-functions=32
-# Note: -fno-associative-math is used here to suppress warnings, ideally we would enable this as an optimization but
-# this conflicts with -ftrapping-math apparently.
-# TODO: Figure out how to allow -fassociative-math to be enabled
-SAFETY_OPT_FLAGS = -ftrapping-math -fno-associative-math
+DEFAULT_OPT_FLAGS = -Ofast

 # Main opt flags
 GCC_MAIN_OPT_FLAGS = \
-  $(DEFAULT_OPT_FLAGS) $(SAFETY_OPT_FLAGS) \
+  -Ofast \
  --param case-values-threshold=20 \
  --param max-completely-peeled-insns=10 \
  --param max-unrolled-insns=10 \
@@ -154,7 +154,7 @@ GCC_MAIN_OPT_FLAGS = \

 # Surface Collision
 GCC_COLLISION_OPT_FLAGS = \
-  $(DEFAULT_OPT_FLAGS) $(SAFETY_OPT_FLAGS) \
+  -Ofast \
  --param case-values-threshold=20 \
  --param max-completely-peeled-insns=100 \
  --param max-unrolled-insns=100 \
@@ -167,7 +167,7 @@ GCC_COLLISION_OPT_FLAGS = \

 # Math Util
 GCC_MATH_UTIL_OPT_FLAGS = \
-  $(DEFAULT_OPT_FLAGS) $(SAFETY_OPT_FLAGS) \
+  -Ofast \
  -fno-unroll-loops \
  -fno-peel-loops \
  --param case-values-threshold=20  \
@@ -179,7 +179,7 @@ GCC_MATH_UTIL_OPT_FLAGS = \

 # Rendering graph node
 GCC_GRAPH_NODE_OPT_FLAGS = \
-  $(DEFAULT_OPT_FLAGS) $(SAFETY_OPT_FLAGS) \
+  -Ofast \
  --param case-values-threshold=20 \
  --param max-completely-peeled-insns=100 \
  --param max-unrolled-insns=100 \
@@ -210,15 +210,10 @@ endif
 #   0 - does not
 UNF ?= 0
 $(eval $(call validate-option,UNF,0 1))
-
-# if `unf` is a target, make sure that UNF is set
-ifneq ($(filter unf,$(MAKECMDGOALS)),)
-	UNF = 1
-endif
-
 ifeq ($(UNF),1)
  DEFINES += UNF=1
  SRC_DIRS += src/usb
+  USE_DEBUG := 1
 endif

 # ISVPRINT - whether to fake IS-Viewer presence,
@@ -234,13 +229,10 @@ endif

 ifeq ($(USE_DEBUG),1)
  ULTRALIB := ultra_d
-  DEFINES += DEBUG=1 OVERWRITE_OSPRINT=1
-else ifeq ($(UNF),1)
-  ULTRALIB := ultra
-  DEFINES += _FINALROM=1 NDEBUG=1 OVERWRITE_OSPRINT=1
+  DEFINES += DEBUG=1
 else
  ULTRALIB := ultra_rom
-  DEFINES += _FINALROM=1 NDEBUG=1 OVERWRITE_OSPRINT=0
+  DEFINES += _FINALROM=1 NDEBUG=1
 endif

 # HVQM - whether to use HVQM fmv library
@@ -253,23 +245,11 @@ ifeq ($(HVQM),1)
  SRC_DIRS += src/hvqm
 endif

-# LIBPL - whether to include libpl library for interfacing with Parallel Launcher
-# (library will be pulled into repo after building with this enabled for the first time)
-#   1 - includes code in ROM
-#   0 - does not
-LIBPL ?= 0
-LIBPL_DIR := lib/libpl
-$(eval $(call validate-option,LIBPL,0 1))
-ifeq ($(LIBPL),1)
-  DEFINES += LIBPL=1
-  SRC_DIRS += $(LIBPL_DIR)
-endif
-
 BUILD_DIR_BASE := build
 # BUILD_DIR is the location where all build artifacts are placed
 BUILD_DIR      := $(BUILD_DIR_BASE)/$(VERSION)_$(CONSOLE)

-COMPRESS ?= yay0
+COMPRESS ?= rnc1
 $(eval $(call validate-option,COMPRESS,mio0 yay0 gzip rnc1 rnc2 uncomp))
 ifeq ($(COMPRESS),gzip)
  DEFINES += GZIP=1
@@ -317,23 +297,23 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
  # Make sure assets exist
  NOEXTRACT ?= 0
  ifeq ($(NOEXTRACT),0)
-    DUMMY != $(PYTHON) extract_assets.py us >&2 || echo FAIL
+    DUMMY != $(PYTHON) extract_assets.py $(VERSION) >&2 || echo FAIL
    ifeq ($(DUMMY),FAIL)
      $(error Failed to extract assets from US ROM)
    endif
-    ifneq (,$(shell python3 tools/detect_baseroms.py jp))
+    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 (,$(shell python3 tools/detect_baseroms.py eu))
+    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 (,$(shell python3 tools/detect_baseroms.py sh))
+    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)
@@ -347,18 +327,6 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
    ifeq ($(DUMMY),FAIL)
      $(error Failed to build tools)
    endif
-
-  # Clone any needed submodules
-  ifeq ($(LIBPL),1)
-    ifeq ($(wildcard $(LIBPL_DIR)/*.h),)
-      $(info Cloning libpl submodule...)
-      DUMMY != git submodule update --init $(LIBPL_DIR) > /dev/null || echo FAIL
-      ifeq ($(DUMMY),FAIL)
-        $(error Failed to clone libpl submodule)
-      endif
-    endif
-  endif
-
  $(info Building ROM...)

 endif
@@ -393,15 +361,11 @@ 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)
-CPP_FILES         := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp))
-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

-# Ignore all .inc.c files
-C_FILES           := $(filter-out %.inc.c,$(C_FILES))
-
 # Sound files
 SOUND_BANK_FILES    := $(wildcard sound/sound_banks/*.json)
 SOUND_SAMPLE_DIRS   := $(wildcard sound/samples/*)
@@ -418,7 +382,6 @@ SOUND_SEQUENCE_FILES := \

 # Object files
 O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \
-           $(foreach file,$(CPP_FILES),$(BUILD_DIR)/$(file:.cpp=.o)) \
           $(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \
           $(foreach file,$(GENERATED_C_FILES),$(file:.c=.o)) \
           lib/PR/hvqm/hvqm2sp1.o lib/PR/hvqm/hvqm2sp2.o
@@ -436,37 +399,27 @@ DEP_FILES := $(O_FILES:.o=.d) $(LIBZ_O_FILES:.o=.d) $(GODDARD_O_FILES:.o=.d) $(B
 # detect prefix for MIPS toolchain
 ifneq ($(call find-command,mips64-elf-ld),)
  CROSS := mips64-elf-
-else ifneq ($(call find-command,mips-n64-ld),)
-  CROSS := mips-n64-
 else ifneq ($(call find-command,mips64-ld),)
  CROSS := mips64-
 else ifneq ($(call find-command,mips-linux-gnu-ld),)
  CROSS := mips-linux-gnu-
 else ifneq ($(call find-command,mips64-linux-gnu-ld),)
  CROSS := mips64-linux-gnu-
-else ifneq ($(call find-command,mips64-none-elf-ld),)
-  CROSS := mips64-none-elf-
 else ifneq ($(call find-command,mips-ld),)
  CROSS := mips-
 else
  $(error Unable to detect a suitable MIPS toolchain installed)
 endif

-LIBRARIES := nustd hvqm2 z goddard
-
-LINK_LIBRARIES = $(foreach i,$(LIBRARIES),-l$(i))
-
 export LD_LIBRARY_PATH=./tools

 AS        := $(CROSS)as
 ifeq ($(COMPILER),gcc)
  CC      := $(CROSS)gcc
-  CXX     := $(CROSS)g++
  $(BUILD_DIR)/actors/%.o:           OPT_FLAGS := -Ofast -mlong-calls
  $(BUILD_DIR)/levels/%.o:           OPT_FLAGS := -Ofast -mlong-calls
 else ifeq ($(COMPILER),clang)
  CC      := clang
-  CXX     := clang++
 endif
 # Prefer gcc's cpp if installed on the system
 ifneq (,$(call find-command,cpp-10))
@@ -483,13 +436,6 @@ AR        := $(CROSS)ar
 OBJDUMP   := $(CROSS)objdump
 OBJCOPY   := $(CROSS)objcopy

-ifeq ($(LD), tools/mips64-elf-ld)
-  ifeq ($(shell ls -la tools/mips64-elf-ld | awk '{print $1}' | grep x),)
-    $(warning [ERROR]: A required file in this repository is no longer executable.)
-    $(error *    Please run: 'chmod +x tools/mips64-elf-ld', then run `make` again)
-  endif
-endif
-
 ifeq ($(TARGET_N64),1)
  TARGET_CFLAGS := -nostdinc -DTARGET_N64 -D_LANGUAGE_C
  CC_CFLAGS := -fno-builtin
@@ -530,6 +476,7 @@ CPPFLAGS := -P -Wno-trigraphs $(DEF_INC_CFLAGS)
 YAY0TOOL              := $(TOOLS_DIR)/slienc
 MIO0TOOL              := $(TOOLS_DIR)/mio0
 RNCPACK               := $(TOOLS_DIR)/rncpack
+ROMALIGN              := $(TOOLS_DIR)/romalign
 FILESIZER             := $(TOOLS_DIR)/filesizer
 N64CKSUM              := $(TOOLS_DIR)/n64cksum
 N64GRAPHICS           := $(TOOLS_DIR)/n64graphics
@@ -541,7 +488,6 @@ VADPCM_ENC            := $(TOOLS_DIR)/vadpcm_enc
 EXTRACT_DATA_FOR_MIO  := $(TOOLS_DIR)/extract_data_for_mio
 SKYCONV               := $(TOOLS_DIR)/skyconv
 FIXLIGHTS_PY          := $(TOOLS_DIR)/fixlights.py
-FLIPS                 := $(TOOLS_DIR)/flips
 ifeq ($(GZIPVER),std)
 GZIP                  := gzip
 else
@@ -553,21 +499,11 @@ ifneq (,$(call find-command,armips))
 else
  RSPASM              := $(TOOLS_DIR)/armips
 endif
-
-ifneq (,$(call find-command,wslview))
-    EMULATOR = "/mnt/c/Program Files (x86)/parallel-launcher/parallel-launcher.exe"
-else
-    EMULATOR = parallel-launcher
-endif
-
+ENDIAN_BITWIDTH       := $(BUILD_DIR)/endian-and-bitwidth
+EMULATOR = mupen64plus
 EMU_FLAGS =
-
-ifneq (,$(call find-command,wslview))
-    LOADER = ./$(TOOLS_DIR)/UNFLoader.exe
-else
-    LOADER = ./$(TOOLS_DIR)/UNFLoader
-endif
-
+LOADER = loader64
+LOADER_FLAGS = -vwf
 SHA1SUM = sha1sum
 PRINT = printf

@@ -604,10 +540,7 @@ all: $(ROM)

 clean:
 	$(RM) -r $(BUILD_DIR_BASE)
-
-rebuildtools:
-	$(MAKE) -C tools distclean
-	$(MAKE) -C tools
+	make -C src/s2d_engine clean

 distclean: clean
 	$(PYTHON) extract_assets.py --clean
@@ -620,26 +553,13 @@ test-pj64: $(ROM)
 	wine ~/Desktop/new64/Project64.exe $<
 # someone2639

-# download and extract most recent unfloader build if needed
-$(LOADER):
-ifeq (,$(wildcard $(LOADER)))
-	@$(PRINT) "Downloading latest UNFLoader...$(NO_COL)\n"
-	$(PYTHON) $(TOOLS_DIR)/get_latest_unfloader.py $(TOOLS_DIR)
-endif
-
-load: $(ROM) $(LOADER)
-	$(LOADER) -r $<
-
-unf: $(ROM) $(LOADER)
-	$(LOADER) -d -r $<
+load: $(ROM)
+	$(LOADER) $(LOADER_FLAGS) $<

 libultra: $(BUILD_DIR)/libultra.a

-patch: $(ROM)
-	$(FLIPS) --create --bps $(shell python3 tools/detect_baseroms.py $(VERSION)) $(ROM) $(BUILD_DIR)/$(TARGET_STRING).bps
-
 # Extra object file dependencies
-$(BUILD_DIR)/asm/ipl3.o:              $(IPL3_RAW_FILES)
+$(BUILD_DIR)/asm/boot.o:              $(IPL3_RAW_FILES)
 $(BUILD_DIR)/src/game/crash_screen.o: $(CRASH_TEXTURE_C_FILES)
 $(BUILD_DIR)/src/game/version.o:      $(BUILD_DIR)/src/game/version_data.h
 $(BUILD_DIR)/lib/aspMain.o:           $(BUILD_DIR)/rsp/audio.bin
@@ -744,11 +664,9 @@ $(BUILD_DIR)/%.ci4.inc.c: %.ci4.png
 $(BUILD_DIR)/%.elf: $(BUILD_DIR)/%.o
 	$(call print,Linking ELF file:,$<,$@)
 	$(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map -o $@ $<
-# Override for leveldata.elf, which otherwise matches the above pattern.
-# Has to be a static pattern rule for make-4.4 and above to trigger the second
-# expansion.
+# Override for leveldata.elf, which otherwise matches the above pattern
 .SECONDEXPANSION:
-$(LEVEL_ELF_FILES): $(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/leveldata.o $(BUILD_DIR)/bin/$$(TEXTURE_BIN).elf
+$(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/leveldata.o $(BUILD_DIR)/bin/$$(TEXTURE_BIN).elf
 	$(call print,Linking ELF file:,$<,$@)
 	$(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map --just-symbols=$(BUILD_DIR)/bin/$(TEXTURE_BIN).elf -o $@ $<

@@ -780,15 +698,23 @@ endif

 $(BUILD_DIR)/%.table: %.aiff
 	$(call print,Extracting codebook:,$<,$@)
-	$(V)$(AIFF_EXTRACT_CODEBOOK) $< $@
+	$(V)$(AIFF_EXTRACT_CODEBOOK) $< >$@

 $(BUILD_DIR)/%.aifc: $(BUILD_DIR)/%.table %.aiff
 	$(call print,Encoding ADPCM:,$(word 2,$^),$@)
 	$(V)$(VADPCM_ENC) -c $^ $@

-$(SOUND_BIN_DIR)/sound_data.ctl: sound/sound_banks/ $(SOUND_BANK_FILES) $(SOUND_SAMPLE_AIFCS)
+$(ENDIAN_BITWIDTH): $(TOOLS_DIR)/determine-endian-bitwidth.c
+	@$(PRINT) "$(GREEN)Generating endian-bitwidth $(NO_COL)\n"
+	$(V)$(CC) -c $(CFLAGS) -o $@.dummy2 $< 2>$@.dummy1; true
+	$(V)grep -o 'msgbegin --endian .* --bitwidth .* msgend' $@.dummy1 > $@.dummy2
+	$(V)head -n1 <$@.dummy2 | cut -d' ' -f2-5 > $@
+	$(V)$(RM) $@.dummy1
+	$(V)$(RM) $@.dummy2
+
+$(SOUND_BIN_DIR)/sound_data.ctl: sound/sound_banks/ $(SOUND_BANK_FILES) $(SOUND_SAMPLE_AIFCS) $(ENDIAN_BITWIDTH)
 	@$(PRINT) "$(GREEN)Generating:  $(BLUE)$@ $(NO_COL)\n"
-	$(V)$(PYTHON) $(TOOLS_DIR)/assemble_sound.py $(BUILD_DIR)/sound/samples/ sound/sound_banks/ $(SOUND_BIN_DIR)/sound_data.ctl $(SOUND_BIN_DIR)/ctl_header $(SOUND_BIN_DIR)/sound_data.tbl $(SOUND_BIN_DIR)/tbl_header $(C_DEFINES)
+	$(V)$(PYTHON) $(TOOLS_DIR)/assemble_sound.py $(BUILD_DIR)/sound/samples/ sound/sound_banks/ $(SOUND_BIN_DIR)/sound_data.ctl $(SOUND_BIN_DIR)/ctl_header $(SOUND_BIN_DIR)/sound_data.tbl $(SOUND_BIN_DIR)/tbl_header $(C_DEFINES) $$(cat $(ENDIAN_BITWIDTH))

 $(SOUND_BIN_DIR)/sound_data.tbl: $(SOUND_BIN_DIR)/sound_data.ctl
 	@true
@@ -799,9 +725,9 @@ $(SOUND_BIN_DIR)/ctl_header: $(SOUND_BIN_DIR)/sound_data.ctl
 $(SOUND_BIN_DIR)/tbl_header: $(SOUND_BIN_DIR)/sound_data.ctl
 	@true

-$(SOUND_BIN_DIR)/sequences.bin: $(SOUND_BANK_FILES) sound/sequences.json $(SOUND_SEQUENCE_DIRS) $(SOUND_SEQUENCE_FILES)
+$(SOUND_BIN_DIR)/sequences.bin: $(SOUND_BANK_FILES) sound/sequences.json $(SOUND_SEQUENCE_DIRS) $(SOUND_SEQUENCE_FILES) $(ENDIAN_BITWIDTH)
 	@$(PRINT) "$(GREEN)Generating:  $(BLUE)$@ $(NO_COL)\n"
-	$(V)$(PYTHON) $(TOOLS_DIR)/assemble_sound.py --sequences $@ $(SOUND_BIN_DIR)/sequences_header $(SOUND_BIN_DIR)/bank_sets sound/sound_banks/ sound/sequences.json $(SOUND_SEQUENCE_FILES) $(C_DEFINES)
+	$(V)$(PYTHON) $(TOOLS_DIR)/assemble_sound.py --sequences $@ $(SOUND_BIN_DIR)/sequences_header $(SOUND_BIN_DIR)/bank_sets sound/sound_banks/ sound/sequences.json $(SOUND_SEQUENCE_FILES) $(C_DEFINES) $$(cat $(ENDIAN_BITWIDTH))

 $(SOUND_BIN_DIR)/bank_sets: $(SOUND_BIN_DIR)/sequences.bin
 	@true
@@ -856,7 +782,7 @@ $(BUILD_DIR)/include/level_headers.h: levels/level_headers.h.in
 # Generate version_data.h
 $(BUILD_DIR)/src/game/version_data.h: tools/make_version.sh
 	@$(PRINT) "$(GREEN)Generating:  $(BLUE)$@ $(NO_COL)\n"
-	$(V)sh tools/make_version.sh $(CROSS) > $@
+	$(V)tools/make_version.sh $(CROSS) > $@

 #==============================================================================#
 # Compilation Recipes                                                          #
@@ -865,15 +791,12 @@ $(BUILD_DIR)/src/game/version_data.h: tools/make_version.sh
 # Compile C code
 ifeq ($(FIXLIGHTS),1)
 # This must not be run multiple times at once, so we run it ahead of time rather than in a rule
-DUMMY != $(PYTHON) $(FIXLIGHTS_PY) actors
-DUMMY != $(PYTHON) $(FIXLIGHTS_PY) levels
+DUMMY != $(FIXLIGHTS_PY) actors
+DUMMY != $(FIXLIGHTS_PY) levels
 endif
 $(BUILD_DIR)/%.o: %.c
 	$(call print,Compiling:,$<,$@)
 	$(V)$(CC) -c $(CFLAGS) -MMD -MF $(BUILD_DIR)/$*.d  -o $@ $<
-$(BUILD_DIR)/%.o: %.cpp
-	$(call print,Compiling (C++):,$<,$@)
-	$(V)$(CXX) -c $(CFLAGS) -std=c++17 -Wno-register -MMD -MF $(BUILD_DIR)/$*.d  -o $@ $<
 $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c
 	$(call print,Compiling:,$<,$@)
 	$(V)$(CC) -c $(CFLAGS) -MMD -MF $(BUILD_DIR)/$*.d  -o $@ $<
@@ -891,7 +814,7 @@ $(BUILD_DIR)/rsp/%.bin $(BUILD_DIR)/rsp/%_data.bin: rsp/%.s
 # Run linker script through the C preprocessor
 $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) $(BUILD_DIR)/goddard.txt
 	$(call print,Preprocessing linker script:,$<,$@)
-	$(V)$(CPP) $(CPPFLAGS) -DBUILD_DIR=$(BUILD_DIR) -DULTRALIB=lib$(ULTRALIB) $(DEBUG_MAP_STACKTRACE_FLAG) -MMD -MP -MT $@ -MF $@.d -o $@ $<
+	$(V)$(CPP) $(CPPFLAGS) -DBUILD_DIR=$(BUILD_DIR) $(DEBUG_MAP_STACKTRACE_FLAG) -MMD -MP -MT $@ -MF $@.d -o $@ $<

 # Link libgoddard
 $(BUILD_DIR)/libgoddard.a: $(GODDARD_O_FILES)
@@ -906,11 +829,11 @@ $(BUILD_DIR)/libz.a: $(LIBZ_O_FILES)
 # SS2: Goddard rules to get size
 $(BUILD_DIR)/sm64_prelim.ld: sm64.ld $(O_FILES) $(YAY0_OBJ_FILES) $(SEG_FILES) $(BUILD_DIR)/libgoddard.a $(BUILD_DIR)/libz.a
 	$(call print,Preprocessing preliminary linker script:,$<,$@)
-	$(V)$(CPP) $(CPPFLAGS) -DPRELIMINARY=1 -DBUILD_DIR=$(BUILD_DIR) -DULTRALIB=lib$(ULTRALIB) -MMD -MP -MT $@ -MF $@.d -o $@ $<
+	$(V)$(CPP) $(CPPFLAGS) -DPRELIMINARY=1 -DBUILD_DIR=$(BUILD_DIR) -MMD -MP -MT $@ -MF $@.d -o $@ $<

 $(BUILD_DIR)/sm64_prelim.elf: $(BUILD_DIR)/sm64_prelim.ld
 	@$(PRINT) "$(GREEN)Linking Preliminary ELF file:  $(BLUE)$@ $(NO_COL)\n"
-	$(V)$(LD) --gc-sections -L $(BUILD_DIR) -T $< -Map $(BUILD_DIR)/sm64_prelim.map --no-check-sections $(addprefix -R ,$(SEG_FILES)) -o $@ $(O_FILES) -L$(LIBS_DIR) -l$(ULTRALIB) -Llib $(LINK_LIBRARIES) -u sprintf -u osMapTLB -Llib/gcclib/$(LIBGCCDIR) -lgcc
+	$(V)$(LD) --gc-sections -L $(BUILD_DIR) -T undefined_syms.txt -T $< -Map $(BUILD_DIR)/sm64_prelim.map --no-check-sections $(addprefix -R ,$(SEG_FILES)) -o $@ $(O_FILES) -L$(LIBS_DIR) -l$(ULTRALIB) -Llib $(LINK_LIBRARIES) -u sprintf -u osMapTLB -Llib/gcclib/$(LIBGCCDIR) -lgcc

 $(BUILD_DIR)/goddard.txt: $(BUILD_DIR)/sm64_prelim.elf
 	$(call print,Getting Goddard size...)
@@ -918,25 +841,17 @@ $(BUILD_DIR)/goddard.txt: $(BUILD_DIR)/sm64_prelim.elf

 $(BUILD_DIR)/asm/debug/map.o: asm/debug/map.s $(BUILD_DIR)/sm64_prelim.elf
 	$(call print,Assembling:,$<,$@)
-	$(V)python3 tools/mapPacker.py $(BUILD_DIR)/sm64_prelim.elf $(BUILD_DIR)/bin/addr.bin $(BUILD_DIR)/bin/name.bin
+	$(V)python3 tools/mapPacker.py $(BUILD_DIR)/sm64_prelim.map $(BUILD_DIR)/bin/addr.bin $(BUILD_DIR)/bin/name.bin
 	$(V)$(CROSS)gcc -c $(ASMFLAGS) $(foreach i,$(INCLUDE_DIRS),-Wa,-I$(i)) -x assembler-with-cpp -MMD -MF $(BUILD_DIR)/$*.d  -o $@ $<

 # Link SM64 ELF file
-$(ELF): $(BUILD_DIR)/sm64_prelim.elf $(BUILD_DIR)/asm/debug/map.o $(O_FILES) $(YAY0_OBJ_FILES) $(SEG_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/libz.a $(BUILD_DIR)/libgoddard.a
+$(ELF): $(BUILD_DIR)/sm64_prelim.elf $(BUILD_DIR)/asm/debug/map.o $(O_FILES) $(YAY0_OBJ_FILES) $(SEG_FILES) $(BUILD_DIR)/$(LD_SCRIPT) undefined_syms.txt $(BUILD_DIR)/libz.a $(BUILD_DIR)/libgoddard.a
 	@$(PRINT) "$(GREEN)Linking ELF file:  $(BLUE)$@ $(NO_COL)\n"
-	$(V)$(LD) --gc-sections -L $(BUILD_DIR) -T $(BUILD_DIR)/$(LD_SCRIPT) -T goddard.txt -Map $(BUILD_DIR)/sm64.$(VERSION).map --no-check-sections $(addprefix -R ,$(SEG_FILES)) -o $@ $(O_FILES) -L$(LIBS_DIR) -l$(ULTRALIB) -Llib $(LINK_LIBRARIES) -u sprintf -u osMapTLB -Llib/gcclib/$(LIBGCCDIR) -lgcc
+	$(V)$(LD) --gc-sections -L $(BUILD_DIR) -T undefined_syms.txt -T $(BUILD_DIR)/$(LD_SCRIPT) -T goddard.txt -Map $(BUILD_DIR)/sm64.$(VERSION).map --no-check-sections $(addprefix -R ,$(SEG_FILES)) -o $@ $(O_FILES) -L$(LIBS_DIR) -l$(ULTRALIB) -Llib $(LINK_LIBRARIES) -u sprintf -u osMapTLB -Llib/gcclib/$(LIBGCCDIR) -lgcc -lrtc

 # Build ROM
-ifeq (n,$(findstring n,$(firstword -$(MAKEFLAGS))))
-# run with -n / --dry-run
-$(ROM):
-	@$(PRINT) "$(BLUE)DRY RUNS ARE DISABLED$(NO_COL)\n"
-else
-# not running with -n / --dry-run
 $(ROM): $(ELF)
 	$(call print,Building ROM:,$<,$@)
-endif
-
 ifeq      ($(CONSOLE),n64)
 	$(V)$(OBJCOPY) --pad-to=0x101000 --gap-fill=0xFF $< $@ -O binary
 else ifeq ($(CONSOLE),bb)
@@ -949,7 +864,7 @@ endif
 $(BUILD_DIR)/$(TARGET).objdump: $(ELF)
 	$(OBJDUMP) -D $< > $@

-.PHONY: all clean distclean default test load rebuildtools
+.PHONY: all clean distclean default test load
 # with no prerequisites, .SECONDARY causes no intermediate target to be removed
 .SECONDARY:

--- a/Makefile.split
+++ b/Makefile.split
@@ -39,8 +39,6 @@ ACTOR_GROUPS := \

 LEVEL_FILES := $(addsuffix leveldata,$(LEVEL_DIRS))

-LEVEL_ELF_FILES := $(foreach level_dir,$(LEVEL_DIRS),$(BUILD_DIR)/levels/$(level_dir)leveldata.elf)
-
 SEG_FILES := \
    $(SEGMENTS:%=$(BUILD_DIR)/bin/%.elf) \
    $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.elf) \
--- a/README.lighting-engine.md
+++ b/README.lighting-engine.md
@@ -1,22 +0,0 @@
-**Lighting Engine by Wiseguy**
- Lighting Engine is NOT finished. It's a WIP. Expect issues and expect it to be somewhat hard to use. Point lights in particular are extremely finnicky. 
- In order for lighting engine to work, your materials must have Shade Color in the combiner, **but you have to DISABLE Shade Color in sources**. If you leave Shade Color ticked for even a single material, the lighting will break **for the entire mesh**. Until Fast64 gets some sort of Lighting Engine support, it's recommended you create some custom presets to make this less annoying. 
-  - You can intentionally make a material fullbright by leaving Shade Color out of the combiner for that material. Useful for, say, a lamp.
- Use the function `set_directional_light` to set the directional light for the current area. It takes a `Vec3f` for the direction and three `s32` for the RGB values.
- Use the function `set_ambient_light` to set the ambient light for the current area. It takes three `s32` for the RGB values.
- You can use the function `emit_light` to emit a point light via code. It takes a `Vec3f` for the position, three `s32` for the RGB values and three `u32` for each one of the falloff types. The falloff is basically how strong the light is: the HIGHER the falloff is, the DIMMER the light will be. The three types of falloffs can be stacked, and work like this:
-  - 2 for constant falloff = the point light is half as bright always.
-  - 2 for linear falloff = the point light is half as bright when you double the distance
-  - 2 for quadratic falloff = the point is half as bright when you double the square of the distance
- Important note regarding point lights: They are affected by WORLD_SCALE, which is set based on your extended bounds mode. Esentially, at 2x bounds lights will be twice as bright as in 1x bounds, and with 4x bounds they will be twice as bright as that. This can be dealt with simply by using high falloffs, but it can be annoying if you decide to change the extended bounds mode mid-development.
- You can also make an object emit light by using the `OBJ_FLAG_EMIT_LIGHT` object flag, as well as `SET_LIGHT_COLOR` and `SET_LIGHT_FALLOFF` in the script.
-
-
-Actors ready for use with lighting engine:
- mario (it is a completely CUSTOM mario)
- breakable box
- bully
- goomba
- snowman
- white particle
- white particle small
--- a/README.md
+++ b/README.md
@@ -14,39 +14,28 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - **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
+- **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, 4 controller support
+- **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, emulator detector
+- **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
- **devwizard**: the PJ64 pre-v3.0 detection part of the emulator detector

 Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff

 **Lighting Engine by Wiseguy**
- Lighting Engine is NOT finished. It's a WIP. Expect issues and expect it to be somewhat hard to use. Point lights in particular are extremely finnicky. 
- In order for lighting engine to work, your materials must have Shade Color in the combiner, **but you have to DISABLE Shade Color in sources**. If you leave Shade Color ticked for even a single material, the lighting will break **for the entire mesh**. Until Fast64 gets some sort of Lighting Engine support, it's recommended you create some custom presets to make this less annoying. 
-  - You can intentionally make a material fullbright by leaving Shade Color out of the combiner for that material. Useful for, say, a lamp.
- Use the function `set_directional_light` to set the directional light for the current area. It takes a `Vec3f` for the direction and three `s32` for the RGB values.
- Use the function `set_ambient_light` to set the ambient light for the current area. It takes three `s32` for the RGB values.
- You can use the function `emit_light` to emit a point light via code. It takes a `Vec3f` for the position, three `s32` for the RGB values and three `u32` for each one of the falloff types. The falloff is basically how strong the light is: the HIGHER the falloff is, the DIMMER the light will be. The three types of falloffs can be stacked, and work like this:
-  - 2 for constant falloff = the point light is half as bright always.
-  - 2 for linear falloff = the point light is half as bright when you double the distance
-  - 2 for quadratic falloff = the point is half as bright when you double the square of the distance
- Important note regarding point lights: They are affected by WORLD_SCALE, which is set based on your extended bounds mode. Esentially, at 2x bounds lights will be twice as bright as in 1x bounds, and with 4x bounds they will be twice as bright as that. This can be dealt with simply by using high falloffs, but it can be annoying if you decide to change the extended bounds mode mid-development.
- You can also make an object emit light by using the `OBJ_FLAG_EMIT_LIGHT` object flag, as well as `SET_LIGHT_COLOR` and `SET_LIGHT_FALLOFF` in the script.
-
+- Lighting Engine is available on a separate branch ([base/lighting-engine](https://github.com/Reonu/HackerSM64/tree/base/lighting-engine)). 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 toggle it in `config/config_camera.h`. *
@@ -72,6 +61,7 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
 - Toggle to disable fall damage and the fall damage sound *
 - Nonstop stars *
 - 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 Reonu. This is included as a .patch file in the enhancements folder, you need to apply it if you want this camera.
@@ -93,7 +83,7 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
 - 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/config_rom.h` to make it simpler
- There is a `gEmulator` variable to detect console or specific emulators and emulator versions
+- 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/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. *
@@ -116,7 +106,7 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff

 **Neat Misc. Changes:**
 - Instant Input patch by Wiseguy (Removes all input lag caused by plugins supporting framebuffer)
-  - This means that you'll have to do your framebuffer effects on buffer 0 for emulator, but NOT for console. You can use the `gEmulator` variable to check for console when doing your framebuffer effects.
+  - 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 (64x64) coins, the vanilla coin texture is upgraded to accomodate. *
@@ -132,7 +122,7 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
  - Use `render_multi_image` to draw large texture rectangles consisting of multiple images on the screen.
  - More info in `puppyprint.c`
 - Wiseguy's Farcall TLB mapping allows to store executable code inside uncompressed segments, that can be loaded and ran as needed, instead of it having to be loaded at all times. See `farcall.h` in the include folder for instructions and details.
- Red Coin Stars now support up to 99 red coins! In addition, multi-area red coin missions can now be created by setting the 2nd behavior paramater of the red coin star to the number of reds required for the star to spawn.
+
 # UltraSM64

 - This repo contains a full decompilation of Super Mario 64 (J), (U), (E), and (SH).
@@ -146,7 +136,7 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
 - It has been patched with someone2639's shiftable segments patch
 - Wiseguy's instant input patch has been added to allow for less input lag on emulation (Does not affect console)
  This does mean that any framebuffer effects will have to be done on buffer 0 if targeting emulators
- Automatic console and emulator detection: Use the `gEmulator` variable to wrap your code in an emulator check.
+- Automatic console and emulator detection: Use the `gIsConsole` variable to wrap your code in an emulator check.
 - Separate defines for emulator and console black border height.
 - Getting HVQM FMV support to work with the game is WIP.

--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-v2.3.0
+v2.0.3
--- a/actors/breakable_box/model.inc.c
+++ b/actors/breakable_box/model.inc.c
@@ -44,6 +44,8 @@ static const Vtx breakable_box_seg8_vertex[] = {

 // 0x08012C30 - 0x08012CD8
 const Gfx breakable_box_seg8_sub_dl_end[] = {
+    gsSPLightColor(LIGHT_1, 0xffffffff),
+    gsSPLightColor(LIGHT_2, 0x3f3f3fff),
    gsSPVertex(breakable_box_seg8_vertex, 26, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  5, 0x0),
    gsSP2Triangles( 3,  5,  6, 0x0,  7,  8,  9, 0x0),
--- a/actors/bully/model.inc.c
+++ b/actors/bully/model.inc.c
@@ -44,7 +44,8 @@ const Gfx bully_seg5_dl_050002E0[] = {
 // 0x05000398 - 0x05000408
 const Gfx bully_seg5_dl_05000398[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEI, G_CC_MODULATEI),
+    gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
@@ -54,6 +55,7 @@ const Gfx bully_seg5_dl_05000398[] = {
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
 };

@@ -294,10 +296,9 @@ static const Vtx bully_seg5_vertex_05003608[] = {

 // 0x05003708 - 0x050037A0
 const Gfx bully_seg5_dl_05003708[] = {
+    gsSPLightColor(LIGHT_1, 0xe300ff),
+    gsSPLightColor(LIGHT_2, 0x3800ff),
    gsSPVertex(bully_seg5_vertex_05002C68, 14, 0),
-    gsDPPipeSync(),
-    gsDPSetPrimColor(0, 0, 0, 227, 00, 255),
-    gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, 1, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, 1),
    gsSP2Triangles( 0,  1,  2, 0x0,  2,  1,  3, 0x0),
    gsSP2Triangles( 2,  3,  4, 0x0,  1,  5,  6, 0x0),
    gsSP2Triangles( 1,  6,  7, 0x0,  0,  5,  1, 0x0),
@@ -311,6 +312,8 @@ const Gfx bully_seg5_dl_05003708[] = {

 // 0x050037A0 - 0x05003838
 const Gfx bully_seg5_dl_050037A0[] = {
+    gsSPLightColor(LIGHT_1, 0xff00ff),
+    gsSPLightColor(LIGHT_2, 0x3f00ff),
    gsSPVertex(bully_seg5_vertex_05002D88, 14, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  1, 0x0),
    gsSP2Triangles( 3,  1,  0, 0x0,  5,  6,  7, 0x0),
@@ -325,6 +328,8 @@ const Gfx bully_seg5_dl_050037A0[] = {

 // 0x05003878 - 0x05003C50
 const Gfx bully_seg5_dl_05003878[] = {
+    gsSPLightColor(LIGHT_1, 0xff),
+    gsSPLightColor(LIGHT_2, 0xff),
    gsSPVertex(bully_seg5_vertex_05002F08, 16, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  1,  0,  3, 0x0),
    gsSP2Triangles( 1,  3,  4, 0x0,  4,  3,  5, 0x0),
@@ -431,7 +436,8 @@ const Gfx bully_seg5_dl_05003D08[] = {
 // 0x05003D40 - 0x05003DB8
 const Gfx bully_seg5_dl_05003D40[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
@@ -442,6 +448,7 @@ const Gfx bully_seg5_dl_05003D40[] = {
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
 };

@@ -484,7 +491,8 @@ const Gfx bully_seg5_dl_05003E70[] = {
 // 0x05003EA8 - 0x05003F20
 const Gfx bully_seg5_dl_05003EA8[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
@@ -495,6 +503,7 @@ const Gfx bully_seg5_dl_05003EA8[] = {
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
 };

@@ -522,7 +531,8 @@ const Gfx bully_seg5_dl_05003F80[] = {
 // 0x05003FC8 - 0x05004038
 const Gfx bully_seg5_dl_05003FC8[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
@@ -532,5 +542,6 @@ const Gfx bully_seg5_dl_05003FC8[] = {
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
 };
--- a/actors/goomba/model.inc.c
+++ b/actors/goomba/model.inc.c
@@ -155,8 +155,8 @@ static const Vtx goomba_seg8_vertex_0801B238[] = {

 // 0x0801B2E8 - 0x0801B560
 const Gfx goomba_seg8_dl_0801B2E8[] = {
-    gsDPPipeSync(),
-    gsDPSetEnvColor(0xFF, 0xFF, 0xFF, 0xFF),
+    gsSPLightColor(LIGHT_1, 0xffffffff),
+    gsSPLightColor(LIGHT_2, 0x7f7f7fff),
    gsSPVertex(goomba_seg8_vertex_0801AD48, 15, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  5, 0x0),
    gsSP2Triangles( 6,  5,  4, 0x0,  5,  7,  3, 0x0),
@@ -220,7 +220,7 @@ const Gfx goomba_seg8_dl_0801B5A0[] = {
    gsSPDisplayList(goomba_seg8_dl_0801B2E8),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsDPPipeSync(),
-    gsDPSetCombineLERP(ENVIRONMENT, 0, SHADE, 0, 0, 0, 0, SHADE, ENVIRONMENT, 0, SHADE, 0, 0, 0, 0, SHADE),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
 };

@@ -262,10 +262,10 @@ const Gfx floomba_seg8_dl_blink[] = {

 // 0x0801B618
 static const Vtx goomba_seg8_vertex_0801B618[] = {
-    {{{    18,     18,      0}, 0, {   990,      0}, {0x00, 0x00, 0x7f, 0xff}}},
-    {{{   -18,     18,      0}, 0, {     0,      0}, {0x00, 0x00, 0x7f, 0xff}}},
-    {{{   -18,    -18,      0}, 0, {     0,    990}, {0x00, 0x00, 0x7f, 0xff}}},
-    {{{    18,    -18,      0}, 0, {   990,    990}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{    18,     18,      0}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   -18,     18,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   -18,    -18,      0}, 0, {     0,    990}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    18,    -18,      0}, 0, {   990,    990}, {0xff, 0xff, 0xff, 0xff}}},
 };

 // 0x0801B658 - 0x0801B690
@@ -281,8 +281,8 @@ const Gfx goomba_seg8_dl_0801B658[] = {
 // 0x0801B690 - 0x0801B700
 const Gfx goomba_seg8_dl_0801B690[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),
-    // gsSPClearGeometryMode(G_LIGHTING),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
@@ -291,7 +291,7 @@ const Gfx goomba_seg8_dl_0801B690[] = {
    gsSPDisplayList(goomba_seg8_dl_0801B658),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsDPPipeSync(),
-    gsDPSetCombineLERP(ENVIRONMENT, 0, SHADE, 0, 0, 0, 0, SHADE, ENVIRONMENT, 0, SHADE, 0, 0, 0, 0, SHADE),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
 };
@@ -772,8 +772,8 @@ static const Vtx goomba_seg8_vertex_0801CDF0[] = {

 // 0x0801CE20 - 0x0801CF78
 const Gfx goomba_seg8_dl_0801CE20[] = {
-    gsDPPipeSync(),
-    gsDPSetEnvColor(0x54, 0x2e, 0x10, 0xFF),
+    gsSPLightColor(LIGHT_1, 0x542e10ff),
+    gsSPLightColor(LIGHT_2, 0x150b04ff),
    gsSPVertex(goomba_seg8_vertex_0801B700, 16, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSP2Triangles( 4,  5,  6, 0x0,  4,  6,  7, 0x0),
@@ -801,8 +801,8 @@ const Gfx goomba_seg8_dl_0801CE20[] = {

 // 0x0801CF78 - 0x0801D0D0
 const Gfx goomba_seg8_dl_0801CF78[] = {
-    gsDPPipeSync(),
-    gsDPSetEnvColor(0x61, 0x34, 0x13, 0xFF),
+    gsSPLightColor(LIGHT_1, 0x613413ff),
+    gsSPLightColor(LIGHT_2, 0x180d04ff),
    gsSPVertex(goomba_seg8_vertex_0801BA50, 15, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSP2Triangles( 1,  4,  5, 0x0,  1,  5,  2, 0x0),
@@ -830,8 +830,8 @@ const Gfx goomba_seg8_dl_0801CF78[] = {

 // 0x0801D0D0 - 0x0801D360
 const Gfx goomba_seg8_dl_0801D0D0[] = {
-    gsDPPipeSync(),
-    gsDPSetEnvColor(0x77, 0x42, 0x20, 0xFF),
+    gsSPLightColor(LIGHT_1, 0x774220ff),
+    gsSPLightColor(LIGHT_2, 0x1d1008ff),
    gsSPVertex(goomba_seg8_vertex_0801BDC0, 16, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSP2Triangles( 4,  5,  6, 0x0,  4,  6,  7, 0x0),
@@ -882,8 +882,8 @@ const Gfx goomba_seg8_dl_0801D0D0[] = {

 // 0x0801D360 - 0x0801D760
 const Gfx goomba_seg8_dl_0801D360[] = {
-    gsDPPipeSync(),
-    gsDPSetEnvColor(0xde, 0xb4, 0x4e, 0xFF),
+    gsSPLightColor(LIGHT_1, 0xdeb44eff),
+    gsSPLightColor(LIGHT_2, 0x372d13ff),
    gsSPVertex(goomba_seg8_vertex_0801C620, 16, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSP2Triangles( 4,  5,  1, 0x0,  4,  1,  0, 0x0),
@@ -957,6 +957,6 @@ const Gfx goomba_seg8_dl_0801D360[] = {

 // 0x0801D760 - 0x0801D770
 const Gfx goomba_seg8_dl_0801D760[] = {
-    // gsSPNumLights(NUMLIGHTS_1),
+    gsSPNumLights(NUMLIGHTS_1),
    gsSPEndDisplayList(),
 };
--- a/actors/group0.c
+++ b/actors/group0.c
@@ -27,6 +27,6 @@
 #include "sparkle_animation/model.inc.c"

 #ifdef S2DEX_TEXT_ENGINE
-#include "src/s2d_engine/s2d_config.h"
+#include "src/s2d_engine/config.h"
 #include FONT_C_FILE
 #endif
--- a/actors/group0.h
+++ b/actors/group0.h
@@ -331,6 +331,4 @@ extern const Gfx white_particle_small_dl_end[];
 extern const Gfx white_particle_small_dl[];
 extern const Gfx white_particle_small_unused_dl[];

-#include "mario/geo_header.h"
-
 #endif
--- a/actors/mario/geo.inc.c
+++ b/actors/mario/geo.inc.c
--- a/actors/mario/geo_header.h
+++ b/actors/mario/geo_header.h
@@ -1,193 +0,0 @@
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt1_switch_face_opt1[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt1_switch_face_opt2[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt1_switch_face_opt3[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt1_switch_face_opt4[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt1_switch_face_opt5[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt1_switch_face_opt6[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt1_switch_face_opt7[];
-extern const GeoLayout mario_armature_002_switch_option_002[];
-extern const GeoLayout mario_right_hand_open_armature[];
-extern const GeoLayout mario_left_hand_open_armature[];
-extern const GeoLayout mario_left_hand_peace_armature[];
-extern const GeoLayout mario_left_hand_cap_armature[];
-extern const GeoLayout mario_left_hand_wing_cap_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt1_switch_face_opt1[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt1_switch_face_opt2[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt1_switch_face_opt3[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt1_switch_face_opt4[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt1_switch_face_opt5[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt1_switch_face_opt6[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt1_switch_face_opt7[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_jump_mario_armature_002_switch_option_002[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_jump_mario_right_hand_open_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_jump_mario_left_hand_open_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_jump_mario_left_hand_peace_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_jump_mario_left_hand_cap_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_jump_mario_left_hand_wing_cap_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt1[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt2[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt3[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt4[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt5[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt6[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt7[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt1[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt2_jump_mario_armature_002_switch_option_002[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt2_jump_mario_right_hand_open_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt2_jump_mario_left_hand_open_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt2_jump_mario_left_hand_peace_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt2_jump_mario_left_hand_cap_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt2_jump_mario_left_hand_wing_cap_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt2[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt3_jump_mario_armature_002_switch_option_002[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt3_jump_mario_right_hand_open_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt3_jump_mario_left_hand_open_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt3_jump_mario_left_hand_peace_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt3_jump_mario_left_hand_cap_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt3_jump_mario_left_hand_wing_cap_armature[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt3[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt1[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt2[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt3[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt4[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt5[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt6[];
-extern const GeoLayout mario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt7[];
-extern const GeoLayout mario_geo[];
-extern Vtx mario_000_offset_mesh_vtx_0[53];
-extern Gfx mario_000_offset_mesh_tri_0[];
-extern Vtx mario_000_offset_001_mesh_vtx_0[88];
-extern Gfx mario_000_offset_001_mesh_tri_0[];
-extern Vtx mario_000_offset_001_mesh_vtx_1[23];
-extern Gfx mario_000_offset_001_mesh_tri_1[];
-extern Vtx mario_000_offset_001_mesh_vtx_2[14];
-extern Gfx mario_000_offset_001_mesh_tri_2[];
-extern Vtx mario_000_displaylist_mesh_vtx_0[10];
-extern Gfx mario_000_displaylist_mesh_tri_0[];
-extern Vtx mario_000_displaylist_mesh_vtx_1[71];
-extern Gfx mario_000_displaylist_mesh_tri_1[];
-extern Vtx mario_000_displaylist_mesh_vtx_2[24];
-extern Gfx mario_000_displaylist_mesh_tri_2[];
-extern Vtx mario_000_displaylist_mesh_vtx_3[19];
-extern Gfx mario_000_displaylist_mesh_tri_3[];
-extern Vtx mario_000_displaylist_mesh_vtx_4[12];
-extern Gfx mario_000_displaylist_mesh_tri_4[];
-extern Vtx mario_000_displaylist_mesh_vtx_5[30];
-extern Gfx mario_000_displaylist_mesh_tri_5[];
-extern Vtx mario_000_displaylist_mesh_vtx_6[7];
-extern Gfx mario_000_displaylist_mesh_tri_6[];
-extern Vtx mario_002_switch_option_head__no_cap__mesh_vtx_0[85];
-extern Gfx mario_002_switch_option_head__no_cap__mesh_tri_0[];
-extern Vtx mario_002_switch_option_head__no_cap__mesh_vtx_1[26];
-extern Gfx mario_002_switch_option_head__no_cap__mesh_tri_1[];
-extern Vtx mario_002_switch_option_head__no_cap__mesh_vtx_2[12];
-extern Gfx mario_002_switch_option_head__no_cap__mesh_tri_2[];
-extern Vtx mario_002_switch_option_head__no_cap__mesh_vtx_3[75];
-extern Gfx mario_002_switch_option_head__no_cap__mesh_tri_3[];
-extern Vtx mario_000_displaylist_001_mesh_vtx_0[4];
-extern Gfx mario_000_displaylist_001_mesh_tri_0[];
-extern Vtx mario_000_displaylist_001_mesh_vtx_1[4];
-extern Gfx mario_000_displaylist_001_mesh_tri_1[];
-extern Vtx mario_000_displaylist_002_mesh_vtx_0[4];
-extern Gfx mario_000_displaylist_002_mesh_tri_0[];
-extern Vtx mario_000_displaylist_002_mesh_vtx_1[4];
-extern Gfx mario_000_displaylist_002_mesh_tri_1[];
-extern Vtx mario_000_offset_003_mesh_vtx_0[20];
-extern Gfx mario_000_offset_003_mesh_tri_0[];
-extern Vtx mario_000_offset_004_mesh_vtx_0[16];
-extern Gfx mario_000_offset_004_mesh_tri_0[];
-extern Vtx mario_000_displaylist_003_mesh_vtx_0[30];
-extern Gfx mario_000_displaylist_003_mesh_tri_0[];
-extern Vtx mario_002_switch_option_right_hand_open_mesh_vtx_0[42];
-extern Gfx mario_002_switch_option_right_hand_open_mesh_tri_0[];
-extern Vtx mario_000_offset_006_mesh_vtx_0[20];
-extern Gfx mario_000_offset_006_mesh_tri_0[];
-extern Vtx mario_000_offset_007_mesh_vtx_0[16];
-extern Gfx mario_000_offset_007_mesh_tri_0[];
-extern Vtx mario_000_displaylist_004_mesh_vtx_0[30];
-extern Gfx mario_000_displaylist_004_mesh_tri_0[];
-extern Vtx mario_002_switch_option_left_hand_open_mesh_vtx_0[42];
-extern Gfx mario_002_switch_option_left_hand_open_mesh_tri_0[];
-extern Vtx mario_004_switch_option_left_hand_peace_mesh_vtx_0[61];
-extern Gfx mario_004_switch_option_left_hand_peace_mesh_tri_0[];
-extern Vtx mario_005_switch_option_left_hand_cap_mesh_vtx_0[47];
-extern Gfx mario_005_switch_option_left_hand_cap_mesh_tri_0[];
-extern Vtx mario_005_switch_option_left_hand_cap_mesh_vtx_1[30];
-extern Gfx mario_005_switch_option_left_hand_cap_mesh_tri_1[];
-extern Vtx mario_006_switch_option_left_hand_wing_cap_mesh_vtx_0[47];
-extern Gfx mario_006_switch_option_left_hand_wing_cap_mesh_tri_0[];
-extern Vtx mario_006_switch_option_left_hand_wing_cap_mesh_vtx_1[30];
-extern Gfx mario_006_switch_option_left_hand_wing_cap_mesh_tri_1[];
-extern Vtx mario_006_switch_option_left_hand_wing_cap_wings_mesh_vtx_0[8];
-extern Gfx mario_006_switch_option_left_hand_wing_cap_wings_mesh_tri_0[];
-extern Vtx mario_006_switch_option_left_hand_wing_cap_wings_mesh_vtx_1[8];
-extern Gfx mario_006_switch_option_left_hand_wing_cap_wings_mesh_tri_1[];
-extern Vtx mario_000_offset_009_mesh_vtx_0[17];
-extern Gfx mario_000_offset_009_mesh_tri_0[];
-extern Vtx mario_000_offset_010_mesh_vtx_0[12];
-extern Gfx mario_000_offset_010_mesh_tri_0[];
-extern Vtx mario_000_offset_011_mesh_vtx_0[23];
-extern Gfx mario_000_offset_011_mesh_tri_0[];
-extern Vtx mario_000_offset_012_mesh_vtx_0[17];
-extern Gfx mario_000_offset_012_mesh_tri_0[];
-extern Vtx mario_000_offset_013_mesh_vtx_0[12];
-extern Gfx mario_000_offset_013_mesh_tri_0[];
-extern Vtx mario_000_displaylist_005_mesh_vtx_0[23];
-extern Gfx mario_000_displaylist_005_mesh_tri_0[];
-
-extern Gfx mario_000_offset_mesh[];
-extern Gfx mario_000_offset_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_001_mesh[];
-extern Gfx mario_000_offset_001_mesh_mat_override_metal_0[];
-extern Gfx mario_000_displaylist_mesh[];
-extern Gfx mario_000_displaylist_mesh_mat_override_metal_0[];
-extern Gfx mario_000_displaylist_mesh_mat_override_face_1___eye_half_1[];
-extern Gfx mario_000_displaylist_mesh_mat_override_face_2___eye_closed_2[];
-extern Gfx mario_000_displaylist_mesh_mat_override_face_7___eye_X_3[];
-extern Gfx mario_002_switch_option_head__no_cap__mesh[];
-extern Gfx mario_002_switch_option_head__no_cap__mesh_mat_override_metal_0[];
-extern Gfx mario_002_switch_option_head__no_cap__mesh_mat_override_face_1___eye_half_1[];
-extern Gfx mario_002_switch_option_head__no_cap__mesh_mat_override_face_2___eye_closed_2[];
-extern Gfx mario_002_switch_option_head__no_cap__mesh_mat_override_face_7___eye_X_3[];
-extern Gfx mario_000_displaylist_001_mesh[];
-extern Gfx mario_000_displaylist_001_mesh_mat_override_metal_0[];
-extern Gfx mario_000_displaylist_002_mesh[];
-extern Gfx mario_000_displaylist_002_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_003_mesh[];
-extern Gfx mario_000_offset_003_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_004_mesh[];
-extern Gfx mario_000_offset_004_mesh_mat_override_metal_0[];
-extern Gfx mario_000_displaylist_003_mesh[];
-extern Gfx mario_000_displaylist_003_mesh_mat_override_metal_0[];
-extern Gfx mario_002_switch_option_right_hand_open_mesh[];
-extern Gfx mario_002_switch_option_right_hand_open_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_006_mesh[];
-extern Gfx mario_000_offset_006_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_007_mesh[];
-extern Gfx mario_000_offset_007_mesh_mat_override_metal_0[];
-extern Gfx mario_000_displaylist_004_mesh[];
-extern Gfx mario_000_displaylist_004_mesh_mat_override_metal_0[];
-extern Gfx mario_002_switch_option_left_hand_open_mesh[];
-extern Gfx mario_002_switch_option_left_hand_open_mesh_mat_override_metal_0[];
-extern Gfx mario_004_switch_option_left_hand_peace_mesh[];
-extern Gfx mario_004_switch_option_left_hand_peace_mesh_mat_override_metal_0[];
-extern Gfx mario_005_switch_option_left_hand_cap_mesh[];
-extern Gfx mario_005_switch_option_left_hand_cap_mesh_mat_override_metal_0[];
-extern Gfx mario_006_switch_option_left_hand_wing_cap_mesh[];
-extern Gfx mario_006_switch_option_left_hand_wing_cap_mesh_mat_override_metal_0[];
-extern Gfx mario_006_switch_option_left_hand_wing_cap_wings_mesh[];
-extern Gfx mario_006_switch_option_left_hand_wing_cap_wings_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_009_mesh[];
-extern Gfx mario_000_offset_009_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_010_mesh[];
-extern Gfx mario_000_offset_010_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_011_mesh[];
-extern Gfx mario_000_offset_011_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_012_mesh[];
-extern Gfx mario_000_offset_012_mesh_mat_override_metal_0[];
-extern Gfx mario_000_offset_013_mesh[];
-extern Gfx mario_000_offset_013_mesh_mat_override_metal_0[];
-extern Gfx mario_000_displaylist_005_mesh[];
-extern Gfx mario_000_displaylist_005_mesh_mat_override_metal_0[];
-extern Gfx mario_material_revert_render_settings[];
-
--- a/actors/mario/model.inc.c
+++ b/actors/mario/model.inc.c
--- a/actors/mario_cap/model.inc.c
+++ b/actors/mario_cap/model.inc.c
@@ -271,8 +271,8 @@ const Gfx mario_cap_seg3_dl_03022FF8[] = {
    gsDPPipeSync(),
    gsSPSetGeometryMode(G_TEXTURE_GEN),
    gsDPSetCombineMode(G_CC_MODULATERGBFADE, G_CC_MODULATERGBFADE),
-    gsDPLoadTextureBlock(mario_cap_seg3_texture_0301CF50, 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),
-    gsSPTexture(0x07C0, 0x0F80, 0, G_TX_RENDERTILE, G_ON),
+    gsDPLoadTextureBlock(mario_cap_seg3_texture_0301CF50, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
    gsSPLightColor(LIGHT_1, 0xffffffff),
    gsSPLightColor(LIGHT_2, 0x7f7f7fff),
    gsSPDisplayList(mario_cap_seg3_dl_03022B30),
@@ -281,7 +281,7 @@ const Gfx mario_cap_seg3_dl_03022FF8[] = {
    gsDPPipeSync(),
    gsSPClearGeometryMode(G_TEXTURE_GEN),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPTexture(0x07C0, 0x0F80, 0, G_TX_RENDERTILE, G_OFF),
+    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
    gsDPSetAlphaCompare(G_AC_NONE),
    gsDPSetEnvColor(255, 255, 255, 255),
    gsSPEndDisplayList(),
@@ -365,8 +365,14 @@ const Gfx mario_cap_seg3_dl_03023298[] = {
    gsDPPipeSync(),
    gsSPSetGeometryMode(G_TEXTURE_GEN),
    gsDPSetCombineMode(G_CC_MODULATERGBFADE, G_CC_MODULATERGBFADE),
-    gsDPLoadTextureBlock(mario_cap_seg3_texture_0301CF50, 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),
-    gsSPTexture(0x07C0, 0x0F80, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_seg3_texture_0301CF50),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD),
+    gsDPLoadSync(),
+    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
+    gsDPPipeSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD),
+    gsDPSetTileSize(0, 0, 0, (64 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
    gsSPLightColor(LIGHT_1, 0xffffffff),
    gsSPLightColor(LIGHT_2, 0x7f7f7fff),
    gsSPDisplayList(mario_cap_seg3_dl_03022B30),
--- a/actors/snowman/model.inc.c
+++ b/actors/snowman/model.inc.c
@@ -48,6 +48,8 @@ static const Vtx snowman_seg5_vertex_0500C488[] = {

 // 0x0500C4C8 - 0x0500C500
 const Gfx snowman_seg5_dl_0500C4C8[] = {
+    gsSPLightColor(LIGHT_1, 0x381e0eff),
+    gsSPLightColor(LIGHT_2, 0x1c0f07ff),
    gsSPVertex(snowman_seg5_vertex_0500C488, 4, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSP1Triangle( 0,  3,  1, 0x0),
@@ -103,7 +105,8 @@ const Gfx snowman_seg5_dl_0500C5E8[] = {
 // 0x0500C620 - 0x0500C698
 const Gfx snowman_seg5_dl_0500C620[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
@@ -144,7 +147,8 @@ const Gfx snowman_seg5_dl_0500C718[] = {
 // 0x0500C760 - 0x0500C7D0
 const Gfx snowman_seg5_dl_0500C760[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
@@ -198,6 +202,8 @@ const Gfx snowman_seg5_dl_0500C978[] = {
    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snowman_seg5_texture_05008C70),
    gsDPLoadSync(),
    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsSPLightColor(LIGHT_1, 0xffffffff),
+    gsSPLightColor(LIGHT_2, 0x7f7f7fff),
    gsSPVertex(snowman_seg5_vertex_0500C7E8, 16, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  3,  4, 0x0),
    gsSP2Triangles( 4,  1,  0, 0x0,  5,  4,  3, 0x0),
@@ -221,7 +227,7 @@ const Gfx snowman_seg5_dl_0500C978[] = {
 // 0x0500CAA8 - 0x0500CB08
 const Gfx snowman_seg5_dl_0500CAA8[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEI, G_CC_MODULATEI),
+    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),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
    gsDPTileSync(),
@@ -273,7 +279,8 @@ const Gfx snowman_seg5_dl_0500CBC0[] = {
 // 0x0500CBF8 - 0x0500CC70
 const Gfx snowman_seg5_dl_0500CBF8[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
@@ -309,7 +316,8 @@ const Gfx snowman_seg5_dl_0500CCB0[] = {
 // 0x0500CCE8 - 0x0500CD58
 const Gfx snowman_seg5_dl_0500CCE8[] = {
    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_LIGHTING),
    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(),
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Arceveti	5d35022122	Clean up debug startup spawn parameters config defines	2022-09-29 15:00:26 -07:00
Arceveti	28869901ec	Clarify startup spawn config descriptions	2022-09-29 14:44:19 -07:00
Arceveti	83da778f24	Move sFirstWarp out of level_cmd_set_mario_start_pos	2022-09-29 14:41:27 -07:00
Arceveti	b3ee950f39	Move ENABLE_CREDITS_BENCHMARK ifdef to config_safeguards.h	2022-09-29 14:37:58 -07:00
Arceveti	956e9e53bb	Merge branch 'develop/2.1.0' of https://github.com/Reonu/HackerSM64 into develop/2.1.0-debug-startup-spawn-defines	2022-09-29 14:34:57 -07:00
Arceveti	bd79d6a45a	Add STARTUP_SPAWN defines	2022-08-12 19:41:22 -07:00