New crash screen

.gitignore

@@ -1354,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

.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,7 +254,7 @@ 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 ?= 1
 LIBPL_DIR := lib/libpl
 $(eval $(call validate-option,LIBPL,0 1))
 ifeq ($(LIBPL),1)
@@ -382,7 +379,7 @@ ACTOR_DIR      := actors
 LEVEL_DIRS     := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h)))
 
 # Directories containing source files
-SRC_DIRS += src src/boot src/game src/engine src/audio src/menu src/buffers 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)
@@ -429,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                                                             #
 #==============================================================================#
@@ -522,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                                                          #
 #==============================================================================#
@@ -639,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
@@ -649,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
@@ -847,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 [email protected] -o $@ $<
+	$(V)$(CPP) $(CPPFLAGS) -DBUILD_DIR=$(BUILD_DIR) -DULTRALIB=lib$(ULTRALIB) -MMD -MP -MT $@ -MF [email protected] -o $@ $<
 
 # Link libgoddard
 $(BUILD_DIR)/libgoddard.a: $(GODDARD_O_FILES)
@@ -860,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 [email protected] -o $@ $<
 
@@ -874,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))))
@@ -902,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

@@ -264,11 +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)))

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

asm/debug/map.s

@@ -1,17 +1,11 @@
 .include "macros.inc"
 .section .data
 .balign 16
-glabel gMapEntries
+glabel gMapSymbols
 .incbin "bin/addr.bin"
-glabel gMapEntryEnd
+glabel gMapSymbolsEnd
 
 .balign 16
 glabel gMapStrings
 .incbin "bin/name.bin"
 glabel gMapStringsEnd
-
-.balign 16
-glabel gMapEntrySize
-.word (gMapEntryEnd - gMapEntries) / 4
-glabel gMapStringSize
-.word (gMapStringsEnd - gMapStrings)

asm/n64_assert.s

@@ -1,6 +1,8 @@
 .include "macros.inc"
 
 .section .data
+glabel __n64Assert_Condition
+.skip 4
 glabel __n64Assert_Filename
 .skip 4
 glabel __n64Assert_LineNum
@@ -11,9 +13,10 @@ glabel __n64Assert_Message
 .section .text
 
 glabel __n64Assert
-sw $a0, __n64Assert_Filename
-sw $a1, __n64Assert_LineNum
-sw $a2, __n64Assert_Message
+sw $a0, __n64Assert_Condition
+sw $a1, __n64Assert_Filename
+sw $a2, __n64Assert_LineNum
+sw $a3, __n64Assert_Message
 syscall
 nop
 

asm/pj64_get_count_factor_asm.s

@@ -9,6 +9,8 @@
 .balign 32
 glabel pj64_get_count_factor_asm
 mfc0 $t0, $9 // $9 is the COUNT register
+NOP
 mfc0 $t1, $9 
-jr $ra
 subu $v0, $t1, $t0
+jr $ra
+srl $v0, $v0, 1

include/attributes.h

@@ -0,0 +1,122 @@
+#pragma once
+
+
+
+// Avoid compiler warnings for unused variables or functions.
+#ifdef __GNUC__
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
+// Avoid undefined behaviour for non-returning functions.
+#ifdef __GNUC__
+#define NORETURN __attribute__((noreturn))
+#else
+#define NORETURN
+#endif
+
+// Always inline a function.
+#ifdef __GNUC__
+#define ALWAYS_INLINE inline __attribute__((always_inline))
+#else
+#define ALWAYS_INLINE inline
+#endif
+
+// Never inline a function.
+#ifdef __GNUC__
+#define NEVER_INLINE __attribute__((noinline))
+#else
+#define NEVER_INLINE
+#endif
+
+// Fall through a switch case.
+#ifdef __GNUC__
+#define FALL_THROUGH __attribute__((fallthrough))
+#else
+#define FALL_THROUGH
+#endif
+
+// Hot (fequently used) code paths.
+#ifdef __GNUC__
+#define HOT __attribute__((hot))
+#else
+#define HOT
+#endif
+
+// Cold (infrequently used) code paths.
+#ifdef __GNUC__
+#define COLD __attribute__((cold))
+#else
+#define COLD
+#endif
+
+// Use Og when compiling the function.
+#ifdef __GNUC__
+#define OPTIMIZE_OG __attribute__((optimize("Og")))
+#else
+#define OPTIMIZE_OG
+#endif
+
+// Use Os when compiling the function.
+#ifdef __GNUC__
+#define OPTIMIZE_OS __attribute__((optimize("Os")))
+#else
+#define OPTIMIZE_OS
+#endif
+
+// Use Ofast when compiling the function.
+#ifdef __GNUC__
+#define OPTIMIZE_OFAST __attribute__((optimize("Ofast")))
+#else
+#define OPTIMIZE_OFAST
+#endif
+
+// Ignore 4-byte alignment in structs.
+#ifdef __GNUC__
+#define PACKED __attribute__((packed))
+#else
+#define PACKED
+#endif
+
+// Align to 4-byte boundary.
+#ifdef __GNUC__
+#define ALIGNED4 __attribute__((aligned(4)))
+#else
+#define ALIGNED4
+#endif
+
+// Align to 8-byte boundary (for DMA requirements).
+#ifdef __GNUC__
+#define ALIGNED8 __attribute__((aligned(8)))
+#else
+#define ALIGNED8
+#endif
+
+// Align to 16-byte boundary (for audio lib requirements).
+#ifdef __GNUC__
+#define ALIGNED16 __attribute__((aligned(16)))
+#else
+#define ALIGNED16
+#endif
+
+// Align to 32-byte boundary.
+#ifdef __GNUC__
+#define ALIGNED32 __attribute__((aligned(32)))
+#else
+#define ALIGNED32
+#endif
+
+// Align to 64-byte boundary.
+#ifdef __GNUC__
+#define ALIGNED64 __attribute__((aligned(64)))
+#else
+#define ALIGNED64
+#endif
+
+// Align to arbitrary byte boundary (must be a power of 2).
+#ifdef __GNUC__
+#define ALIGNED(__align__) __attribute__((aligned(__align__)))
+#else
+#define ALIGNED(__align__)
+#endif