Merge branch 'develop/2.1.0-new-crash-screen' of https://github.com/Reonu/HackerSM64 into develop/2.1.0-new-crash-screen

.gitignore

@@ -528,26 +528,21 @@ assets/demos/pss.bin
 assets/demos/unused.bin
 assets/demos/wf.bin
 levels/bbh/0.rgba16.png
-actors/vanilla_actors/bbh/0.rgba16.png
 levels/bbh/1.rgba16.png
 levels/bbh/2.rgba16.png
 levels/bbh/3.rgba16.png
-actors/vanilla_actors/bbh/4.rgba16.png
-actors/vanilla_actors/bbh/5.rgba16.png
-actors/vanilla_actors/bbh/6.rgba16.png
-actors/vanilla_actors/bitdw/0.rgba16.png
+levels/bbh/4.rgba16.png
+levels/bbh/5.rgba16.png
+levels/bbh/6.rgba16.png
 levels/bitdw/0.rgba16.png
 levels/bitdw/1.rgba16.png
 levels/bitdw/2.rgba16.png
 levels/bitdw/3.rgba16.png
-actors/vanilla_actors/bitfs/0.rgba16.png
 levels/bitfs/0.rgba16.png
-actors/vanilla_actors/bitfs/1.rgba16.png
 levels/bitfs/1.rgba16.png
 levels/bitfs/2.rgba16.png
 levels/bits/0.rgba16.png
 levels/bits/1.rgba16.png
-actors/vanilla_actors/bits/2.rgba16.png
 levels/bits/2.rgba16.png
 levels/bob/0.rgba16.png
 levels/bob/1.rgba16.png
@@ -564,9 +559,9 @@ levels/bowser_3/2.rgba16.png
 levels/castle_grounds/0.rgba16.png
 levels/castle_grounds/1.rgba16.png
 levels/castle_grounds/2.rgba16.png
-actors/vanilla_actors/castle_grounds/3.rgba16.png
-actors/vanilla_actors/castle_grounds/4.rgba16.png
-actors/vanilla_actors/castle_grounds/5.ia8.png
+levels/castle_grounds/3.rgba16.png
+levels/castle_grounds/4.rgba16.png
+levels/castle_grounds/5.ia8.png
 levels/castle_inside/1.rgba16.png
 levels/castle_inside/10.rgba16.png
 levels/castle_inside/11.rgba16.png
@@ -604,25 +599,22 @@ levels/castle_inside/38.rgba16.png
 levels/castle_inside/39.rgba16.png
 levels/castle_inside/4.rgba16.png
 levels/castle_inside/40.rgba16.png
-actors/vanilla_actors/castle_inside/5.rgba16.png
-actors/vanilla_actors/castle_inside/6.rgba16.png
-actors/vanilla_actors/castle_inside/7.rgba16.png
+levels/castle_inside/5.rgba16.png
+levels/castle_inside/6.rgba16.png
+levels/castle_inside/7.rgba16.png
 levels/castle_inside/8.rgba16.png
 levels/castle_inside/9.rgba16.png
-actors/vanilla_actors/castle_inside/castle_light.ia16.png
 levels/castle_inside/castle_light.ia16.png
 levels/ccm/0.rgba16.png
 levels/ccm/1.rgba16.png
-actors/vanilla_actors/ccm/1.rgba16.png
 levels/ccm/10.rgba16.png
 levels/ccm/11.rgba16.png
-actors/vanilla_actors/ccm/12.rgba16.png
+levels/ccm/12.rgba16.png
 levels/ccm/2.rgba16.png
-actors/vanilla_actors/ccm/2.rgba16.png
-actors/vanilla_actors/ccm/3.rgba16.png
+levels/ccm/3.rgba16.png
 levels/ccm/4.rgba16.png
-actors/vanilla_actors/ccm/5.rgba16.png
-actors/vanilla_actors/ccm/6.rgba16.png
+levels/ccm/5.rgba16.png
+levels/ccm/6.rgba16.png
 levels/ccm/7.rgba16.png
 levels/ccm/8.ia16.png
 levels/ccm/9.ia16.png
@@ -631,12 +623,11 @@ levels/cotmc/1.rgba16.png
 levels/cotmc/2.rgba16.png
 levels/cotmc/3.rgba16.png
 levels/cotmc/4.rgba16.png
-actors/vanilla_actors/ddd/0.rgba16.png
+levels/ddd/0.rgba16.png
 levels/ddd/1.rgba16.png
 levels/ddd/2.rgba16.png
-actors/vanilla_actors/ddd/2.rgba16.png
 levels/ddd/3.rgba16.png
-actors/vanilla_actors/ddd/4.rgba16.png
+levels/ddd/4.rgba16.png
 levels/ending/cake.png
 levels/ending/cake_eu.png
 levels/ending/eu_023000.rgba16.png
@@ -648,10 +639,10 @@ levels/ending/eu_028000.rgba16.png
 levels/hmc/0.rgba16.png
 levels/hmc/1.rgba16.png
 levels/hmc/2.rgba16.png
-actors/vanilla_actors/hmc/3.rgba16.png
-actors/vanilla_actors/hmc/4.rgba16.png
-actors/vanilla_actors/hmc/5.rgba16.png
-actors/vanilla_actors/hmc/6.rgba16.png
+levels/hmc/3.rgba16.png
+levels/hmc/4.rgba16.png
+levels/hmc/5.rgba16.png
+levels/hmc/6.rgba16.png
 levels/hmc/7.rgba16.png
 levels/intro/0.rgba16.png
 levels/intro/1.rgba16.png
@@ -662,41 +653,40 @@ levels/intro/3_sh_tm.rgba16.png
 levels/intro/3_tm.rgba16.png
 levels/jrb/0.rgba16.png
 levels/jrb/1.rgba16.png
-actors/vanilla_actors/jrb/2.rgba16.png
-actors/vanilla_actors/jrb/3.rgba16.png
-actors/vanilla_actors/lll/0.rgba16.png
-actors/vanilla_actors/lll/1.rgba16.png
-actors/vanilla_actors/lll/10.rgba16.png
-actors/vanilla_actors/lll/11.rgba16.png
-actors/vanilla_actors/lll/12.rgba16.png
-actors/vanilla_actors/lll/13.rgba16.png
-actors/vanilla_actors/lll/14.rgba16.png
-actors/vanilla_actors/lll/15.rgba16.png
-actors/vanilla_actors/lll/16.rgba16.png
-actors/vanilla_actors/lll/17.rgba16.png
-actors/vanilla_actors/lll/18.rgba16.png
-actors/vanilla_actors/lll/19.rgba16.png
-actors/vanilla_actors/lll/2.rgba16.png
-actors/vanilla_actors/lll/20.rgba16.png
-actors/vanilla_actors/lll/21.rgba16.png
-actors/vanilla_actors/lll/22.rgba16.png
-actors/vanilla_actors/lll/23.rgba16.png
-actors/vanilla_actors/lll/24.rgba16.png
-actors/vanilla_actors/lll/25.rgba16.png
+levels/jrb/2.rgba16.png
+levels/jrb/3.rgba16.png
+levels/lll/0.rgba16.png
+levels/lll/1.rgba16.png
+levels/lll/10.rgba16.png
+levels/lll/11.rgba16.png
+levels/lll/12.rgba16.png
+levels/lll/13.rgba16.png
+levels/lll/14.rgba16.png
+levels/lll/15.rgba16.png
+levels/lll/16.rgba16.png
+levels/lll/17.rgba16.png
+levels/lll/18.rgba16.png
+levels/lll/19.rgba16.png
+levels/lll/2.rgba16.png
+levels/lll/20.rgba16.png
+levels/lll/21.rgba16.png
+levels/lll/22.rgba16.png
+levels/lll/23.rgba16.png
+levels/lll/24.rgba16.png
+levels/lll/25.rgba16.png
 levels/lll/26.rgba16.png
 levels/lll/27.ia16.png
 levels/lll/28.rgba16.png
 levels/lll/29.rgba16.png
-actors/vanilla_actors/lll/29.rgba16.png
 levels/lll/3.rgba16.png
 levels/lll/30.rgba16.png
 levels/lll/31.rgba16.png
 levels/lll/32.rgba16.png
 levels/lll/4.rgba16.png
 levels/lll/5.rgba16.png
-actors/vanilla_actors/lll/6.rgba16.png
+levels/lll/6.rgba16.png
 levels/lll/7.rgba16.png
-actors/vanilla_actors/lll/8.rgba16.png
+levels/lll/8.rgba16.png
 levels/lll/9.rgba16.png
 levels/menu/main_menu_seg7.00018.rgba16.png
 levels/menu/main_menu_seg7.00818.rgba16.png
@@ -931,64 +921,59 @@ levels/menu/main_menu_seg7_us.0B800.ia8.png
 levels/pss/0.rgba16.png
 levels/pss/1.ia16.png
 levels/pss/2.rgba16.png
-actors/vanilla_actors/rr/1.rgba16.png
+levels/rr/1.rgba16.png
 levels/rr/2.rgba16.png
-actors/vanilla_actors/rr/quarter_flying_carpet.rgba16.png
+levels/rr/quarter_flying_carpet.rgba16.png
 levels/sl/0.rgba16.png
 levels/sl/1.rgba16.png
-actors/vanilla_actors/sl/2.rgba16.png
+levels/sl/2.rgba16.png
 levels/sl/3.rgba16.png
 levels/sl/4.rgba16.png
 levels/ssl/0.rgba16.png
 levels/ssl/1.ia16.png
-actors/vanilla_actors/ssl/10.rgba16.png
-actors/vanilla_actors/ssl/11.rgba16.png
+levels/ssl/10.rgba16.png
+levels/ssl/11.rgba16.png
 levels/ssl/2.rgba16.png
 levels/ssl/3.rgba16.png
 levels/ssl/4.rgba16.png
-actors/vanilla_actors/ssl/5.rgba16.png
-actors/vanilla_actors/ssl/6.rgba16.png
+levels/ssl/5.rgba16.png
+levels/ssl/6.rgba16.png
 levels/ssl/7.rgba16.png
-actors/vanilla_actors/ssl/8.rgba16.png
-actors/vanilla_actors/ssl/9.rgba16.png
+levels/ssl/8.rgba16.png
+levels/ssl/9.rgba16.png
 levels/thi/0.rgba16.png
 levels/thi/1.rgba16.png
-actors/vanilla_actors/thi/1.rgba16.png
 levels/totwc/0.rgba16.png
 levels/totwc/1.rgba16.png
 levels/totwc/2.rgba16.png
 levels/totwc/3.ia16.png
-actors/vanilla_actors/ttc/0.rgba16.png
-actors/vanilla_actors/ttc/1.rgba16.png
+levels/ttc/0.rgba16.png
 levels/ttc/1.rgba16.png
 levels/ttc/2.rgba16.png
 levels/ttm/0.ia16.png
 levels/ttm/1.rgba16.png
 levels/ttm/2.rgba16.png
 levels/ttm/3.rgba16.png
-actors/vanilla_actors/ttm/4.rgba16.png
+levels/ttm/4.rgba16.png
 levels/ttm/5.rgba16.png
 levels/ttm/6.rgba16.png
 levels/ttm/7.rgba16.png
-actors/vanilla_actors/ttm/8.rgba16.png
+levels/ttm/8.rgba16.png
 levels/vcutm/0.rgba16.png
 levels/vcutm/1.rgba16.png
-actors/vanilla_actors/vcutm/2.rgba16.png
+levels/vcutm/2.rgba16.png
 levels/vcutm/3.rgba16.png
 levels/wdw/0.rgba16.png
 levels/wdw/1.rgba16.png
-actors/vanilla_actors/wdw/1.rgba16.png
-actors/vanilla_actors/wdw/2.rgba16.png
-actors/vanilla_actors/wdw/3.rgba16.png
+levels/wdw/2.rgba16.png
+levels/wdw/3.rgba16.png
 levels/wdw/4.rgba16.png
-actors/vanilla_actors/wf/0.rgba16.png
 levels/wf/0.rgba16.png
 levels/wf/1.rgba16.png
-actors/vanilla_actors/wf/2.rgba16.png
 levels/wf/2.rgba16.png
-actors/vanilla_actors/wf/3.rgba16.png
-actors/vanilla_actors/wf/4.rgba16.png
-actors/vanilla_actors/wf/5.ia8.png
+levels/wf/3.rgba16.png
+levels/wf/4.rgba16.png
+levels/wf/5.ia8.png
 levels/wmotr/0.rgba16.png
 levels/wmotr/1.rgba16.png
 levels/wmotr/2.rgba16.png
@@ -1369,7 +1354,6 @@ textures/cave/hmc_textures.0A000.rgba16.png
 textures/cave/hmc_textures.0A800.rgba16.png
 textures/cave/hmc_textures.0B800.ia16.png
 textures/cave/hmc_textures.0C000.ia16.png
-textures/crash_screen/crash_screen_font.ia1.png
 textures/effect/bubble.06048.rgba16.png
 textures/effect/flower.00008.rgba16.png
 textures/effect/flower.00808.rgba16.png

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "lib/libpl2"]
-	path = lib/libpl2
-	url = https://gitlab.com/parallel-launcher/libpl2.git
+[submodule "lib/libpl"]
+	path = lib/libpl
+	url = https://gitlab.com/parallel-launcher/libpl.git

.vscode/c_cpp_properties.json

@@ -27,7 +27,8 @@
                 "F3DEX_GBI_2=1",
                 "F3DZEX_NON_GBI_2=1",
                 "F3DEX_GBI_SHARED=1",
-                "LIBPL=1"
+                "LIBPL=1",
+                "UNF=1"
             ],
             "compilerPath": "/usr/bin/mips-linux-gnu-gcc",
             "cStandard": "gnu17",

Makefile

@@ -87,13 +87,10 @@ else ifeq ($(VERSION),sh)
   DEFINES += VERSION_SH=1
 endif
 
+
 # FIXLIGHTS - converts light objects to light color commands for assets, needed for vanilla-style lighting
 FIXLIGHTS ?= 1
 
-DEBUG_MAP_STACKTRACE_FLAG := -D DEBUG_MAP_STACKTRACE
-
-TARGET := sm64
-
 
 # GRUCODE - selects which RSP microcode to use.
 #   f3dex   -
@@ -192,7 +189,7 @@ GCC_GRAPH_NODE_OPT_FLAGS = \
 
 ifeq ($(COMPILER),gcc)
   MIPSISET     := -mips3
-  OPT_FLAGS           := $(GCC_MAIN_OPT_FLAGS)
+  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)
@@ -257,8 +254,8 @@ endif
 # (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/libpl2
+LIBPL ?= 1
+LIBPL_DIR := lib/libpl
 $(eval $(call validate-option,LIBPL,0 1))
 ifeq ($(LIBPL),1)
   DEFINES += LIBPL=1
@@ -351,10 +348,10 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
   # Clone any needed submodules
   ifeq ($(LIBPL),1)
     ifeq ($(wildcard $(LIBPL_DIR)/*.h),)
-      $(info Cloning libpl2 submodule...)
+      $(info Cloning libpl submodule...)
       DUMMY != git submodule update --init $(LIBPL_DIR) > /dev/null || echo FAIL
       ifeq ($(DUMMY),FAIL)
-        $(error Failed to clone libpl2 submodule)
+        $(error Failed to clone libpl submodule)
       endif
     endif
   endif
@@ -380,10 +377,9 @@ SOUND_BIN_DIR  := $(BUILD_DIR)/sound
 TEXTURE_DIR    := textures
 ACTOR_DIR      := actors
 LEVEL_DIRS     := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h)))
-VNL_ACTRS_DIRS := $(patsubst actors/vanilla_actors/%,%,$(dir $(wildcard actors/vanilla_actors/*/header.h)))
 
 # Directories containing source files
-SRC_DIRS += src src/boot src/game src/engine src/audio src/menu src/buffers lib/librtc actors levels bin data assets asm lib sound
+SRC_DIRS += src src/boot src/game src/engine src/audio src/menu src/buffers src/images src/crash_screen src/crash_screen/pages src/crash_screen/popups src/crash_screen/util actors levels bin data assets asm lib sound
 LIBZ_SRC_DIRS := src/libz
 GODDARD_SRC_DIRS := src/goddard src/goddard/dynlists
 BIN_DIRS := bin bin/$(VERSION)
@@ -393,8 +389,7 @@ include Makefile.split
 
 # Source code files
 LEVEL_C_FILES     := $(wildcard levels/*/leveldata.c) $(wildcard levels/*/script.c) $(wildcard levels/*/geo.c)
-VNL_ACTRS_C_FILES := $(wildcard actors/vanilla_actors/*/data.c) $(wildcard actors/vanilla_actors/*/geo.c)
-C_FILES           := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES) $(VNL_ACTRS_C_FILES)
+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))
 GODDARD_C_FILES   := $(foreach dir,$(GODDARD_SRC_DIRS),$(wildcard $(dir)/*.c))
@@ -431,6 +426,21 @@ GODDARD_O_FILES := $(foreach file,$(GODDARD_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
 # Automatic dependency files
 DEP_FILES := $(O_FILES:.o=.d) $(LIBZ_O_FILES:.o=.d) $(GODDARD_O_FILES:.o=.d) $(BUILD_DIR)/$(LD_SCRIPT).d
 
+#==============================================================================#
+# Git Options                                                                  #
+#==============================================================================#
+
+# Set PACKAGE_VERSION define for printing commit hash
+ifeq ($(origin PACKAGE_VERSION), undefined)
+  PACKAGE_VERSION := $(shell git log -1 --pretty=%h | tr -d '\n')
+  ifeq ('$(PACKAGE_VERSION)', '')
+    PACKAGE_VERSION = Unknown version
+  endif
+endif
+
+# Make sure the build reports the correct version
+$(shell touch src/boot/build.c)
+
 #==============================================================================#
 # Compiler Options                                                             #
 #==============================================================================#
@@ -524,6 +534,13 @@ RSPASMFLAGS := $(foreach d,$(DEFINES),-definelabel $(subst =, ,$(d)))
 # C preprocessor flags
 CPPFLAGS := -P -Wno-trigraphs $(DEF_INC_CFLAGS)
 
+DEBUG_INFO_DEFINES := -DSAVETYPE='$(SAVETYPE)' -DREGION='$(VERSION)' -DGRUCODE='$(GRUCODE)' -DCOMPRESSION_FORMAT='$(COMPRESS)' -DPACKAGE_VERSION='$(PACKAGE_VERSION)'
+
+CFLAGS += $(DEBUG_INFO_DEFINES)
+CPPFLAGS += $(DEBUG_INFO_DEFINES)
+
+# SAVETYPE VERSION GRUCODE
+
 #==============================================================================#
 # Miscellaneous Tools                                                          #
 #==============================================================================#
@@ -641,7 +658,7 @@ patch: $(ROM)
 
 # Extra object file dependencies
 $(BUILD_DIR)/asm/ipl3.o:              $(IPL3_RAW_FILES)
-$(BUILD_DIR)/src/game/crash_screen.o: $(CRASH_TEXTURE_C_FILES)
+$(BUILD_DIR)/src/crash_screen/cs_draw.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
 $(SOUND_BIN_DIR)/sound_data.o:        $(SOUND_BIN_DIR)/sound_data.ctl $(SOUND_BIN_DIR)/sound_data.tbl $(SOUND_BIN_DIR)/sequences.bin $(SOUND_BIN_DIR)/bank_sets
@@ -651,8 +668,6 @@ ifeq ($(VERSION),sh)
   $(BUILD_DIR)/src/audio/load_sh.o: $(SOUND_BIN_DIR)/bank_sets.inc.c $(SOUND_BIN_DIR)/sequences_header.inc.c $(SOUND_BIN_DIR)/ctl_header.inc.c $(SOUND_BIN_DIR)/tbl_header.inc.c
 endif
 
-$(CRASH_TEXTURE_C_FILES): TEXTURE_ENCODING := u32
-
 ifeq ($(COMPILER),gcc)
 $(BUILD_DIR)/src/libz/%.o: OPT_FLAGS := -Os
 $(BUILD_DIR)/src/libz/%.o: CFLAGS += -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-pointer-sign
@@ -675,7 +690,7 @@ $(BUILD_DIR)/src/game/rendering_graph_node.o: OPT_FLAGS := $(GRAPH_NODE_OPT_FLAG
 # $(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) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) $(addprefix actors/vanilla_actors/,$(VNL_ACTRS_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION)
+ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION)
 
 # Make sure build directory exists before compiling anything
 DUMMY != mkdir -p $(ALL_DIRS)
@@ -724,11 +739,6 @@ $(LEVEL_ELF_FILES): $(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/l
 	$(call print,Linking ELF file:,$<,$@)
 	$(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map --just-symbols=$(BUILD_DIR)/bin/$(TEXTURE_BIN).elf -o $@ $<
 
-.SECONDEXPANSION:
-$(VANILLA_ACTORS_ELF_FILES): $(BUILD_DIR)/actors/vanilla_actors/%/data.elf: $(BUILD_DIR)/actors/vanilla_actors/%/data.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 $@ $<
-
 $(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf
 	$(call print,Extracting compressible data from:,$<,$@)
 	$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
@@ -854,7 +864,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) -DULTRALIB=lib$(ULTRALIB) -MMD -MP -MT $@ -MF $@.d -o $@ $<
 
 # Link libgoddard
 $(BUILD_DIR)/libgoddard.a: $(GODDARD_O_FILES)
@@ -867,7 +877,7 @@ $(BUILD_DIR)/libz.a: $(LIBZ_O_FILES)
 	$(V)$(AR) rcs -o $@ $(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
+$(BUILD_DIR)/sm64_prelim.ld: $(LD_SCRIPT) $(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 $@ $<
 
@@ -881,13 +891,13 @@ $(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.elf $(BUILD_DIR)/bin/addr.bin $(BUILD_DIR)/bin/name.bin $(BUILD_DIR)/debug_map.txt
 	$(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
 	@$(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 $(BUILD_DIR)/$(LD_SCRIPT) -T goddard.txt -T debug_map.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
 
 # Build ROM
 ifeq (n,$(findstring n,$(firstword -$(MAKEFLAGS))))
@@ -909,7 +919,7 @@ else ifeq ($(CONSOLE),bb)
 endif
 	$(V)$(N64CKSUM) $@
 
-$(BUILD_DIR)/$(TARGET).objdump: $(ELF)
+$(BUILD_DIR)/$(TARGET_STRING).objdump: $(ELF)
 	$(OBJDUMP) -D $< > $@
 
 .PHONY: all clean distclean default test load rebuildtools

Makefile.split

@@ -41,21 +41,15 @@ LEVEL_FILES := $(addsuffix leveldata,$(LEVEL_DIRS))
 
 LEVEL_ELF_FILES := $(foreach level_dir,$(LEVEL_DIRS),$(BUILD_DIR)/levels/$(level_dir)leveldata.elf)
 
-VANILLA_ACTORS_FILES := $(addsuffix data,$(VNL_ACTRS_DIRS))
-
-VANILLA_ACTORS_ELF_FILES := $(foreach level_dir,$(VNL_ACTRS_DIRS),$(BUILD_DIR)/actors/vanilla_actors/$(level_dir)data.elf)
-
 SEG_FILES := \
     $(SEGMENTS:%=$(BUILD_DIR)/bin/%.elf) \
     $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.elf) \
-    $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.elf) \
-    $(VANILLA_ACTORS_FILES:%=$(BUILD_DIR)/actors/vanilla_actors/%.elf)
+    $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.elf)
 
 YAY0_FILES := \
     $(SEGMENTS:%=$(BUILD_DIR)/bin/%.szp) \
     $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.szp) \
-    $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.szp) \
-    $(VANILLA_ACTORS_FILES:%=$(BUILD_DIR)/actors/vanilla_actors/%.szp)
+    $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.szp)
 
 YAY0_OBJ_FILES := $(YAY0_FILES:.szp=.szp.o)
 
@@ -249,11 +243,11 @@ $(BUILD_DIR)/bin/machine.elf:            SEGMENT_ADDRESS := 0x09000000
 $(BUILD_DIR)/bin/mountain.elf:           SEGMENT_ADDRESS := 0x09000000
 $(BUILD_DIR)/bin/grass.elf:              SEGMENT_ADDRESS := 0x09000000
 # EU segment 19 translations
-$(BUILD_DIR)/bin/translation_de.elf:  SEGMENT_ADDRESS := 0x1B000000
-$(BUILD_DIR)/bin/translation_en.elf:  SEGMENT_ADDRESS := 0x1B000000
-$(BUILD_DIR)/bin/translation_fr.elf:  SEGMENT_ADDRESS := 0x1B000000
-$(BUILD_DIR)/bin/translation_jp.elf:  SEGMENT_ADDRESS := 0x1B000000
-$(BUILD_DIR)/bin/translation_es.elf:  SEGMENT_ADDRESS := 0x1B000000
+$(BUILD_DIR)/bin/translation_de.elf:  SEGMENT_ADDRESS := 0x19000000
+$(BUILD_DIR)/bin/translation_en.elf:  SEGMENT_ADDRESS := 0x19000000
+$(BUILD_DIR)/bin/translation_fr.elf:  SEGMENT_ADDRESS := 0x19000000
+$(BUILD_DIR)/bin/translation_jp.elf:  SEGMENT_ADDRESS := 0x19000000
+$(BUILD_DIR)/bin/translation_es.elf:  SEGMENT_ADDRESS := 0x19000000
 
 # --------------------------------------
 # Skybox Rules
@@ -270,44 +264,11 @@ $(BUILD_DIR)/bin/%_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
 # --------------------------------------
 
 # intro and ipl3 textures are not compressed
-INTRO_RAW_FILES              := $(wildcard $(TEXTURE_DIR)/intro_raw/*.png)
+INTRO_RAW_FILES             := $(wildcard $(TEXTURE_DIR)/intro_raw/*.png)
 $(BUILD_DIR)/src/goddard/renderer.o: $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(INTRO_RAW_FILES)))
 
 IPL3_TEXTURE_FILES          := $(wildcard $(TEXTURE_DIR)/ipl3_raw/*.png)
 IPL3_RAW_FILES              := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%,$(IPL3_TEXTURE_FILES)))
 
-CRASH_TEXTURE_FILES         := $(wildcard $(TEXTURE_DIR)/crash_custom/*.png)
+CRASH_TEXTURE_FILES         := $(wildcard $(TEXTURE_DIR)/crash_screen/*.png)
 CRASH_TEXTURE_C_FILES       := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(CRASH_TEXTURE_FILES)))
-
-# --------------------------------------
-# Vanilla Objects Rules
-# --------------------------------------
-
-define vanilla_objects_rules =
-    VANILLA_ACTORS_$(1)_TEXTURE_FILES := $$(patsubst %.png,%.inc.c,$$(wildcard actors/vanilla_actors/$(1)/*.png))
-    $$(BUILD_DIR)/actors/vanilla_actors/$(1)/data.o: $$(addprefix $$(BUILD_DIR)/,$$(VANILLA_ACTORS_$(1)_TEXTURE_FILES))
-    $$(BUILD_DIR)/actors/vanilla_actors/$(1)/data.elf: SEGMENT_ADDRESS := 0x0e000000
-    $$(BUILD_DIR)/actors/vanilla_actors/$(1)/data.elf: TEXTURE_BIN := $(2)
-endef
-
-$(eval $(call vanilla_objects_rules,bob,generic))
-$(eval $(call vanilla_objects_rules,wf,grass))
-$(eval $(call vanilla_objects_rules,jrb,water))
-$(eval $(call vanilla_objects_rules,ccm,snow))
-$(eval $(call vanilla_objects_rules,bbh,spooky))
-$(eval $(call vanilla_objects_rules,hmc,cave))
-$(eval $(call vanilla_objects_rules,lll,fire))
-$(eval $(call vanilla_objects_rules,ssl,generic))
-$(eval $(call vanilla_objects_rules,ddd,water))
-$(eval $(call vanilla_objects_rules,sl,snow))
-$(eval $(call vanilla_objects_rules,wdw,grass))
-$(eval $(call vanilla_objects_rules,ttm,mountain))
-$(eval $(call vanilla_objects_rules,thi,grass))
-$(eval $(call vanilla_objects_rules,ttc,machine))
-$(eval $(call vanilla_objects_rules,rr,sky))
-$(eval $(call vanilla_objects_rules,bitdw,sky))
-$(eval $(call vanilla_objects_rules,bitfs,sky))
-$(eval $(call vanilla_objects_rules,bits,sky))
-$(eval $(call vanilla_objects_rules,vcutm,outside))
-$(eval $(call vanilla_objects_rules,castle_inside,inside))
-$(eval $(call vanilla_objects_rules,castle_grounds,outside))

README.md

@@ -21,7 +21,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - **Fazana**: PuppyLib, ucode swapping, audio load time optimisations (with Arctic), general hacker qol improvements, visual debug
 - **Reonu**: Starting the project + widescreen, reonucam, various defines for hacker QoL, and a custom Spanish (Spain) translation of the game.
 - **JoshDuMan**: Decomp guy, general assistance
-- **Arceveti**: Silhouette, shadow optimisation, better hanging, breath meter, 4 controller support
+- **Arceveti**: Naming unknown symbols, new crash screen, silhouette, shadow optimizations, breath meter, 4 controller support, implementations of rounded corners, slope fix, exposed ceiling fix, other bugfixes
 - **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

actors/group4.h

@@ -105,7 +105,4 @@ extern const struct Animation *const unagi_seg5_anims_05012824[];
 extern const Gfx whirlpool_seg5_dl_05013B58[];
 extern const Gfx whirlpool_seg5_dl_05013CB8[];
 
-extern const Trajectory jrb_seg7_trajectory_unagi_1[];
-extern const Trajectory jrb_seg7_trajectory_unagi_2[];
-
 #endif

actors/group4_geo.c

@@ -11,30 +11,3 @@
 #include "manta/geo.inc.c"
 #include "sushi/geo.inc.c"
 #include "unagi/geo.inc.c"
-
-#include "surface_terrains.h"
-
-// 0x0700D20C - 0x0700D23E
-const Trajectory jrb_seg7_trajectory_unagi_1[] = {
-    TRAJECTORY_POS(0, /*pos*/  5300, -3800,  1200),
-    TRAJECTORY_POS(1, /*pos*/  3700, -3600,  1700),
-    TRAJECTORY_POS(2, /*pos*/  3400, -3400,  3500),
-    TRAJECTORY_POS(3, /*pos*/  3900, -3600,  4400),
-    TRAJECTORY_POS(4, /*pos*/  5300, -3800,  4400),
-    TRAJECTORY_POS(5, /*pos*/  6200, -4000,  2700),
-    TRAJECTORY_END(),
-};
-
-// 0x0700D240 - 0x0700D28A
-const Trajectory jrb_seg7_trajectory_unagi_2[] = {
-    TRAJECTORY_POS(0, /*pos*/  5381,     0,  2758),
-    TRAJECTORY_POS(1, /*pos*/  5803, -3130,  3036),
-    TRAJECTORY_POS(2, /*pos*/  4876, -3045,  2706),
-    TRAJECTORY_POS(3, /*pos*/  4313, -3246,  2736),
-    TRAJECTORY_POS(4, /*pos*/  3792, -3413,  3668),
-    TRAJECTORY_POS(5, /*pos*/  4971, -3130,  3688),
-    TRAJECTORY_POS(6, /*pos*/  5392, -3130,  3326),
-    TRAJECTORY_POS(7, /*pos*/  6341, -3130,  2450),
-    TRAJECTORY_POS(8, /*pos*/  9431, -3130,  1400),
-    TRAJECTORY_END(),
-};

actors/vanilla_actors/bbh/data.c

@@ -1,27 +0,0 @@
-#include <ultra64.h>
-#include "sm64.h"
-#include "surface_terrains.h"
-#include "moving_texture_macros.h"
-#include "surface_terrains.h"
-#include "textures.h"
-#include "dialog_ids.h"
-
-#include "make_const_nonconst.h"
-
-#include "actors/vanilla_actors/bbh/texture.inc.c"
-
-#include "actors/vanilla_actors/bbh/staircase_step/model.inc.c"
-#include "actors/vanilla_actors/bbh/tilting_trap_platform/model.inc.c"
-#include "actors/vanilla_actors/bbh/tumbling_platform_far/model.inc.c"
-#include "actors/vanilla_actors/bbh/tumbling_platform_near/model.inc.c"
-#include "actors/vanilla_actors/bbh/moving_bookshelf/model.inc.c"
-#include "actors/vanilla_actors/bbh/mesh_elevator/model.inc.c"
-#include "actors/vanilla_actors/bbh/merry_go_round/model.inc.c"
-#include "actors/vanilla_actors/bbh/coffin/model.inc.c"
-#include "actors/vanilla_actors/bbh/staircase_step/collision.inc.c"
-#include "actors/vanilla_actors/bbh/tilting_trap_platform/collision.inc.c"
-#include "actors/vanilla_actors/bbh/tumbling_platform_near/collision.inc.c"
-#include "actors/vanilla_actors/bbh/moving_bookshelf/collision.inc.c"
-#include "actors/vanilla_actors/bbh/mesh_elevator/collision.inc.c"
-#include "actors/vanilla_actors/bbh/merry_go_round/collision.inc.c"
-#include "actors/vanilla_actors/bbh/coffin/collision.inc.c"

actors/vanilla_actors/bbh/geo.c

@@ -1,37 +0,0 @@
-#include <ultra64.h>
-#include "sm64.h"
-#include "geo_commands.h"
-
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
-
-#include "make_const_nonconst.h"
-
-#include "actors/vanilla_actors/bbh/header.h"
-
-#include "actors/vanilla_actors/bbh/staircase_step/geo.inc.c"
-#include "actors/vanilla_actors/bbh/tilting_trap_platform/geo.inc.c"
-#include "actors/vanilla_actors/bbh/tumbling_platform_far/geo.inc.c"
-#include "actors/vanilla_actors/bbh/tumbling_platform_near/geo.inc.c"
-#include "actors/vanilla_actors/bbh/moving_bookshelf/geo.inc.c"
-#include "actors/vanilla_actors/bbh/mesh_elevator/geo.inc.c"
-#include "actors/vanilla_actors/bbh/merry_go_round/geo.inc.c"
-#include "actors/vanilla_actors/bbh/coffin/geo.inc.c"
-
-#include "level_commands.h"
-
-const LevelScript script_func_vo_bbh[] = {
-    LOAD_MODEL_FROM_GEO(MODEL_BBH_STAIRCASE_STEP,         geo_bbh_0005B0),
-    LOAD_MODEL_FROM_GEO(MODEL_BBH_TILTING_FLOOR_PLATFORM, geo_bbh_0005C8),
-    LOAD_MODEL_FROM_GEO(MODEL_BBH_TUMBLING_PLATFORM,      geo_bbh_0005E0),
-    LOAD_MODEL_FROM_GEO(MODEL_BBH_TUMBLING_PLATFORM_PART, geo_bbh_0005F8),
-    LOAD_MODEL_FROM_GEO(MODEL_BBH_MOVING_BOOKSHELF,       geo_bbh_000610),
-    LOAD_MODEL_FROM_GEO(MODEL_BBH_MESH_ELEVATOR,          geo_bbh_000628),
-    LOAD_MODEL_FROM_GEO(MODEL_BBH_MERRY_GO_ROUND,         geo_bbh_000640),
-    LOAD_MODEL_FROM_GEO(MODEL_BBH_WOODEN_TOMB,            geo_bbh_000658),
-    RETURN(),
-};

actors/vanilla_actors/bbh/header.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-extern const GeoLayout geo_bbh_0005B0[];
-extern const GeoLayout geo_bbh_0005C8[];
-extern const GeoLayout geo_bbh_0005E0[];
-extern const GeoLayout geo_bbh_0005F8[];
-extern const GeoLayout geo_bbh_000610[];
-extern const GeoLayout geo_bbh_000628[];
-extern const GeoLayout geo_bbh_000640[];
-extern const GeoLayout geo_bbh_000658[];
-
-extern const Gfx bbh_seg7_dl_0701F2E8[];
-extern const Gfx bbh_seg7_dl_0701F5F8[];
-extern const Gfx bbh_seg7_dl_0701F7E8[];
-extern const Gfx bbh_seg7_dl_0701FAB0[];
-extern const Gfx bbh_seg7_dl_0701FD28[];
-extern const Gfx bbh_seg7_dl_0701FFE8[];
-extern const Gfx bbh_seg7_dl_070202F0[];
-extern const Gfx bbh_seg7_dl_070206F0[];
-
-extern const Collision bbh_seg7_collision_staircase_step[];
-extern const Collision bbh_seg7_collision_tilt_floor_platform[];
-extern const Collision bbh_seg7_collision_07026B1C[];
-extern const Collision bbh_seg7_collision_haunted_bookshelf[];
-extern const Collision bbh_seg7_collision_mesh_elevator[];
-extern const Collision bbh_seg7_collision_merry_go_round[];
-extern const Collision bbh_seg7_collision_coffin[];

actors/vanilla_actors/bbh/texture.inc.c

@@ -1,19 +0,0 @@
-// 0x07000000 - 0x07001000
-ALIGNED8 static const Texture bbh_seg7_texture_07000000[] = {
-#include "actors/vanilla_actors/bbh/0.rgba16.inc.c"
-};
-
-// 0x07003000 - 0x07003400
-ALIGNED8 static const Texture bbh_seg7_texture_07003000[] = {
-#include "actors/vanilla_actors/bbh/4.rgba16.inc.c"
-};
-
-// 0x07003400 - 0x07004400
-ALIGNED8 static const Texture bbh_seg7_texture_07003400[] = {
-#include "actors/vanilla_actors/bbh/5.rgba16.inc.c"
-};
-
-// 0x07004400 - 0x07004800
-ALIGNED8 static const Texture bbh_seg7_texture_07004400[] = {
-#include "actors/vanilla_actors/bbh/6.rgba16.inc.c"
-};

actors/vanilla_actors/bitdw/data.c

@@ -1,35 +0,0 @@
-#include <PR/ultratypes.h>
-#include <PR/gbi.h>
-
-#include "dialog_ids.h"
-#include "surface_terrains.h"
-#include "macros.h"
-#include "moving_texture_macros.h"
-#include "surface_terrains.h"
-#include "textures.h"
-#include "types.h"
-
-#include "make_const_nonconst.h"
-
-#include "actors/vanilla_actors/bitdw/texture.inc.c"
-
-#include "actors/vanilla_actors/bitdw/sliding_platform/model.inc.c"
-#include "actors/vanilla_actors/bitdw/seesaw_platform/model.inc.c"
-#include "actors/vanilla_actors/bitdw/square_platform/model.inc.c"
-#include "actors/vanilla_actors/bitdw/ferris_wheel_axle/model.inc.c"
-#include "actors/vanilla_actors/bitdw/ferris_platform/model.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_1/model.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_2/model.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_3/model.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_4/model.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_5/model.inc.c"
-#include "actors/vanilla_actors/bitdw/sliding_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/seesaw_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/square_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/ferris_wheel_axle/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/ferris_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_1/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_2/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_3/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_4/collision.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_5/collision.inc.c"

actors/vanilla_actors/bitdw/geo.c

@@ -1,41 +0,0 @@
-#include <ultra64.h>
-#include "sm64.h"
-#include "geo_commands.h"
-
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
-
-#include "make_const_nonconst.h"
-
-#include "actors/vanilla_actors/bitdw/header.h"
-
-#include "actors/vanilla_actors/bitdw/sliding_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/seesaw_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/square_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/ferris_wheel_axle/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/ferris_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_1/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_2/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_3/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_4/geo.inc.c"
-#include "actors/vanilla_actors/bitdw/collapsing_stairs_5/geo.inc.c"
-
-#include "level_commands.h"
-
-const LevelScript script_func_vo_bitdw[] = {
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_SQUARE_PLATFORM,   geo_bitdw_000558),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_SEESAW_PLATFORM,   geo_bitdw_000540),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_SLIDING_PLATFORM,  geo_bitdw_000528),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_FERRIS_WHEEL_AXLE, geo_bitdw_000570),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_BLUE_PLATFORM,     geo_bitdw_000588),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME4,  geo_bitdw_0005A0),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME3,  geo_bitdw_0005B8),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME2,  geo_bitdw_0005D0),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME1,  geo_bitdw_0005E8),
-    LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE,         geo_bitdw_000600),
-    RETURN(),
-};

actors/vanilla_actors/bitdw/header.h

@@ -1,36 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-extern const GeoLayout geo_bitdw_000528[];
-extern const GeoLayout geo_bitdw_000540[];
-extern const GeoLayout geo_bitdw_000558[];
-extern const GeoLayout geo_bitdw_000570[];
-extern const GeoLayout geo_bitdw_000588[];
-extern const GeoLayout geo_bitdw_0005A0[];
-extern const GeoLayout geo_bitdw_0005B8[];
-extern const GeoLayout geo_bitdw_0005D0[];
-extern const GeoLayout geo_bitdw_0005E8[];
-extern const GeoLayout geo_bitdw_000600[];
-
-extern const Gfx bitdw_seg7_dl_0700AFA0[];
-extern const Gfx bitdw_seg7_dl_0700B220[];
-extern const Gfx bitdw_seg7_dl_0700B480[];
-extern const Gfx bitdw_seg7_dl_0700B8D8[];
-extern const Gfx bitdw_seg7_dl_0700BB58[];
-extern const Gfx bitdw_seg7_dl_0700C0E0[];
-extern const Gfx bitdw_seg7_dl_0700C670[];
-extern const Gfx bitdw_seg7_dl_0700CC00[];
-extern const Gfx bitdw_seg7_dl_0700D190[];
-extern const Gfx bitdw_seg7_dl_0700D3E8[];
-
-extern const Collision bitdw_seg7_collision_0700F688[];
-extern const Collision bitdw_seg7_collision_0700F70C[];
-extern const Collision bitdw_seg7_collision_moving_pyramid[];
-extern const Collision bitdw_seg7_collision_0700F7F0[];
-extern const Collision bitdw_seg7_collision_0700F898[];
-extern const Collision bitdw_seg7_collision_0700F91C[];
-extern const Collision bitdw_seg7_collision_0700FA3C[];
-extern const Collision bitdw_seg7_collision_0700FB5C[];
-extern const Collision bitdw_seg7_collision_0700FC7C[];
-extern const Collision bitdw_seg7_collision_0700FD9C[];

actors/vanilla_actors/bitdw/texture.inc.c

@@ -1,4 +0,0 @@
-// 0x07000000 - 0x07000002
-ALIGNED8 static const Texture bitdw_seg7_texture_07000000[] = {
-#include "actors/vanilla_actors/bitdw/0.rgba16.inc.c"
-};

actors/vanilla_actors/bitfs/data.c

@@ -1,38 +0,0 @@
-#include <PR/ultratypes.h>
-#include <PR/gbi.h>
-
-#include "dialog_ids.h"
-#include "surface_terrains.h"
-#include "macros.h"
-#include "moving_texture_macros.h"
-#include "surface_terrains.h"
-#include "textures.h"
-#include "types.h"
-
-#include "make_const_nonconst.h"
-
-#include "actors/vanilla_actors/bitfs/texture.inc.c"
-
-#include "actors/vanilla_actors/bitfs/elevator/model.inc.c"
-#include "actors/vanilla_actors/bitfs/sinking_cage_platform/model.inc.c"
-#include "actors/vanilla_actors/bitfs/sinking_cage_pole/model.inc.c"
-#include "actors/vanilla_actors/bitfs/tilting_square_platform/model.inc.c"
-#include "actors/vanilla_actors/bitfs/tumbling_platform_near/model.inc.c"
-#include "actors/vanilla_actors/bitfs/tumbling_platform_far/model.inc.c"
-#include "actors/vanilla_actors/bitfs/stretching_platform/1.inc.c"
-#include "actors/vanilla_actors/bitfs/stretching_platform/2.inc.c"
-#include "actors/vanilla_actors/bitfs/moving_square_platform/model.inc.c"
-#include "actors/vanilla_actors/bitfs/sliding_platform/model.inc.c"
-#include "actors/vanilla_actors/bitfs/platform_on_track/model.inc.c"
-#include "actors/vanilla_actors/bitfs/sinking_platforms/model.inc.c"
-#include "actors/vanilla_actors/bitfs/seesaw_platform/model.inc.c"
-#include "actors/vanilla_actors/bitfs/elevator/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/sinking_cage_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/tilting_square_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/tumbling_platform_near/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/stretching_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/moving_square_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/sliding_platform/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/platform_on_track/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/sinking_platforms/collision.inc.c"
-#include "actors/vanilla_actors/bitfs/seesaw_platform/collision.inc.c"

actors/vanilla_actors/bitfs/geo.c

@@ -1,45 +0,0 @@
-#include <ultra64.h>
-#include "sm64.h"
-#include "geo_commands.h"
-
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
-
-#include "make_const_nonconst.h"
-
-#include "actors/vanilla_actors/bitfs/header.h"
-
-#include "actors/vanilla_actors/bitfs/elevator/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/sinking_cage_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/sinking_cage_pole/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/tilting_square_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/tumbling_platform_near/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/tumbling_platform_far/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/stretching_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/moving_square_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/sliding_platform/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/platform_on_track/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/sinking_platforms/geo.inc.c"
-#include "actors/vanilla_actors/bitfs/seesaw_platform/geo.inc.c"
-
-#include "level_commands.h"
-
-const LevelScript script_func_vo_bitfs[] = {
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_PLATFORM_ON_TRACK,       bitfs_geo_000758),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_TILTING_SQUARE_PLATFORM, bitfs_geo_0006C0),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_SINKING_PLATFORMS,       bitfs_geo_000770),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_BLUE_POLE,               bitfs_geo_0006A8),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_SINKING_CAGE_PLATFORM,   bitfs_geo_000690),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_ELEVATOR,                bitfs_geo_000678),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_STRETCHING_PLATFORMS,    bitfs_geo_000708),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_SEESAW_PLATFORM,         bitfs_geo_000788),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_MOVING_SQUARE_PLATFORM,  bitfs_geo_000728),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_SLIDING_PLATFORM,        bitfs_geo_000740),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_TUMBLING_PLATFORM_PART,  bitfs_geo_0006D8),
-    LOAD_MODEL_FROM_GEO(MODEL_BITFS_TUMBLING_PLATFORM,       bitfs_geo_0006F0),
-    RETURN(),
-};

actors/vanilla_actors/bitfs/header.h

@@ -1,42 +0,0 @@
-#pragma once
-
-#include "types.h"
-
-extern const GeoLayout bitfs_geo_000678[];
-extern const GeoLayout bitfs_geo_000690[];
-extern const GeoLayout bitfs_geo_0006A8[];
-extern const GeoLayout bitfs_geo_0006C0[];
-extern const GeoLayout bitfs_geo_0006D8[];
-extern const GeoLayout bitfs_geo_0006F0[];
-extern const GeoLayout bitfs_geo_000708[];
-extern const GeoLayout bitfs_geo_000728[];
-extern const GeoLayout bitfs_geo_000740[];
-extern const GeoLayout bitfs_geo_000758[];
-extern const GeoLayout bitfs_geo_000770[];
-extern const GeoLayout bitfs_geo_000788[];
-
-extern const Gfx bitfs_seg7_dl_0700F508[];
-extern const Gfx bitfs_seg7_dl_0700F6A8[];
-extern const Gfx bitfs_seg7_dl_0700FB38[];
-extern const Gfx bitfs_seg7_dl_0700FD08[];
-extern const Gfx bitfs_seg7_dl_0700FF90[];
-extern const Gfx bitfs_seg7_dl_07010168[];
-extern const Gfx bitfs_seg7_dl_07010340[];
-extern const Gfx bitfs_seg7_dl_07011138[];
-extern const Gfx bitfs_seg7_dl_07011318[];
-extern const Gfx bitfs_seg7_dl_07011568[];
-extern const Gfx bitfs_seg7_dl_07011798[];
-extern const Gfx bitfs_seg7_dl_07011BA0[];
-extern const Gfx bitfs_seg7_dl_07011D98[];
-extern const Gfx bitfs_seg7_dl_07011E28[];
-
-extern const Collision bitfs_seg7_collision_elevator[];
-extern const Collision bitfs_seg7_collision_sinking_cage_platform[];
-extern const Collision bitfs_seg7_collision_inverted_pyramid[];
-extern const Collision bitfs_seg7_collision_07015288[];
-extern const Collision bitfs_seg7_collision_squishable_platform[];
-extern const Collision bitfs_seg7_collision_07015714[];
-extern const Collision bitfs_seg7_collision_07015768[];
-extern const Collision bitfs_seg7_collision_platform_on_track[];
-extern const Collision bitfs_seg7_collision_sinking_platform[];
-extern const Collision bitfs_seg7_collision_07015928[];

actors/vanilla_actors/bitfs/texture.inc.c

@@ -1,9 +0,0 @@
-// 0x07000000 - 0x07001000
-ALIGNED8 static const Texture bitfs_seg7_texture_07000000[] = {
-#include "actors/vanilla_actors/bitfs/0.rgba16.inc.c"
-};
-
-// 0x07001000 - 0x07001800
-ALIGNED8 static const Texture bitfs_seg7_texture_07001000[] = {
-#include "actors/vanilla_actors/bitfs/1.rgba16.inc.c"
-};