Fix FIX_REFLECT_MTX and improve create_transformation_from_matrices()

Update spawn_star.inc.c

.gitignore

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

Makefile

@@ -6,9 +6,9 @@ include util.mk
 default: all
 
 # Preprocessor definitions
-DEFINES :=
+DEFINES   :=
 
-SRC_DIRS :=
+SRC_DIRS  :=
 USE_DEBUG := 0
 
 #==============================================================================#
@@ -22,7 +22,7 @@ USE_DEBUG := 0
 TARGET_N64 ?= 1
 
 # CONSOLE - selects the console to target
-#   bb - Targets the iQue Player (codenamed BB)
+#   bb  - Targets the iQue Player (codenamed BB)
 #   n64 - Targets the N64
 CONSOLE ?= n64
 $(eval $(call validate-option,CONSOLE,n64 bb))
@@ -37,24 +37,24 @@ else ifeq ($(CONSOLE),bb)
 endif
 
 # COMPILER - selects the C compiler to use
-#   gcc - uses the GNU C Compiler
+#   gcc   - uses the GNU C Compiler
 #   clang - uses clang C/C++ frontend for LLVM
 COMPILER ?= gcc
 $(eval $(call validate-option,COMPILER,gcc clang))
 
 
-# LIBGCCDIR - selects the libgcc configuration for checking for dividing by zero
-#   trap - GCC default behavior, uses teq instructions which some emulators don't like
+# LIBGCCDIR  - selects the libgcc configuration for checking for dividing by zero
+#   trap     - GCC default behavior, uses teq instructions which some emulators don't like
 #   divbreak - this is similar to IDO behavior, and is default.
-#   nocheck - never checks for dividing by 0. Technically fastest, but also UB so not recommended
+#   nocheck  - never checks for dividing by 0. Technically fastest, but also UB so not recommended
 LIBGCCDIR ?= divbreak
 $(eval $(call validate-option,LIBGCCDIR,trap divbreak nocheck))
 
 
 # SAVETYPE - selects the save type
-#   eep4k - uses EEPROM 4kbit
+#   eep4k  - uses EEPROM 4kbit
 #   eep16k - uses EEPROM 16kbit (There aren't any differences in syntax, but this is provided just in case)
-#   sram - uses SRAM 256Kbit
+#   sram   - uses SRAM 256Kbit
 SAVETYPE ?= eep4k
 $(eval $(call validate-option,SAVETYPE,eep4k eep16k sram))
 ifeq ($(SAVETYPE),eep4k)
@@ -106,7 +106,7 @@ endif
 
 DEBUG_MAP_STACKTRACE_FLAG := -D DEBUG_MAP_STACKTRACE
 
-TARGET := sm64.$(VERSION)
+TARGET := sm64
 
 
 # GRUCODE - selects which RSP microcode to use.
@@ -139,7 +139,7 @@ LIBRARIES := nustd hvqm2 z goddard
 #   s2dex_text_engine - Text Engine by someone2639
 TEXT_ENGINE := none
 ifeq ($(TEXT_ENGINE), s2dex_text_engine)
-  DEFINES += S2DEX_GBI_2=1 S2DEX_TEXT_ENGINE=1
+  DEFINES   += S2DEX_GBI_2=1 S2DEX_TEXT_ENGINE=1
   LIBRARIES += s2d_engine
   DUMMY != make -C src/s2d_engine COPY_DIR=$(shell pwd)/lib/
 endif
@@ -171,21 +171,10 @@ endif
 
 ifeq ($(NON_MATCHING),1)
   DEFINES += NON_MATCHING=1 AVOID_UB=1
-  COMPARE := 0
 endif
 
 
-# COMPARE - whether to verify the SHA-1 hash of the ROM after building
-#   1 - verifies the SHA-1 hash of the selected version of the game
-#   0 - does not verify the hash
-COMPARE ?= 0
-$(eval $(call validate-option,COMPARE,0 1))
-
-TARGET_STRING := sm64.$(VERSION).$(CONSOLE).$(GRUCODE)
-# If non-default settings were chosen, disable COMPARE
-ifeq ($(filter $(TARGET_STRING), sm64.jp.f3d_old sm64.us.f3d_old sm64.eu.f3d_new sm64.sh.f3d_new),)
-  COMPARE := 0
-endif
+TARGET_STRING := sm64
 
 # UNF - whether to use UNFLoader flashcart library
 #   1 - includes code in ROM
@@ -193,7 +182,7 @@ endif
 UNF ?= 0
 $(eval $(call validate-option,UNF,0 1))
 ifeq ($(UNF),1)
-  DEFINES += UNF=1
+  DEFINES  += UNF=1
   SRC_DIRS += src/usb
   USE_DEBUG := 1
 endif
@@ -223,7 +212,7 @@ endif
 HVQM ?= 0
 $(eval $(call validate-option,HVQM,0 1))
 ifeq ($(HVQM),1)
-  DEFINES += HVQM=1
+  DEFINES  += HVQM=1
   SRC_DIRS += src/hvqm
 endif
 
@@ -245,27 +234,6 @@ endif
 # Whether to colorize build messages
 COLOR ?= 1
 
-# display selected options unless 'make clean' or 'make distclean' is run
-ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
-  $(info ==== Build Options ====)
-  $(info Version:        $(VERSION))
-  $(info Microcode:      $(GRUCODE))
-  $(info Console:        $(CONSOLE))
-  $(info Target:         $(TARGET))
-  ifeq ($(COMPARE),1)
-    $(info Compare ROM:    yes)
-  else
-    $(info Compare ROM:    no)
-  endif
-  ifeq ($(NON_MATCHING),1)
-    $(info Build Matching: no)
-  else
-    $(info Build Matching: yes)
-  endif
-  $(info =======================)
-endif
-
-
 #==============================================================================#
 # Universal Dependencies                                                       #
 #==============================================================================#
@@ -311,7 +279,7 @@ endif
 
 BUILD_DIR_BASE := build
 # BUILD_DIR is the location where all build artifacts are placed
-BUILD_DIR      := $(BUILD_DIR_BASE)/$(VERSION)
+BUILD_DIR      := $(BUILD_DIR_BASE)/$(VERSION)_$(CONSOLE)
 ROM            := $(BUILD_DIR)/$(TARGET_STRING).z64
 ELF            := $(BUILD_DIR)/$(TARGET_STRING).elf
 LIBZ           := $(BUILD_DIR)/libz.a
@@ -334,7 +302,7 @@ include Makefile.split
 # Source code files
 LEVEL_C_FILES     := $(wildcard levels/*/leveldata.c) $(wildcard levels/*/script.c) $(wildcard levels/*/geo.c)
 C_FILES           := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES)
-LIBZ_C_FILES     := $(foreach dir,$(LIBZ_SRC_DIRS),$(wildcard $(dir)/*.c))
+LIBZ_C_FILES      := $(foreach dir,$(LIBZ_SRC_DIRS),$(wildcard $(dir)/*.c))
 GODDARD_C_FILES   := $(foreach dir,$(GODDARD_SRC_DIRS),$(wildcard $(dir)/*.c))
 S_FILES           := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.s))
 GENERATED_C_FILES := $(BUILD_DIR)/assets/mario_anim_data.c $(BUILD_DIR)/assets/demo_data.c
@@ -359,7 +327,7 @@ O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \
            $(foreach file,$(GENERATED_C_FILES),$(file:.c=.o)) \
            lib/PR/hvqm/hvqm2sp1.o lib/PR/hvqm/hvqm2sp2.o
 
-LIBZ_O_FILES := $(foreach file,$(LIBZ_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
+LIBZ_O_FILES    := $(foreach file,$(LIBZ_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
 GODDARD_O_FILES := $(foreach file,$(GODDARD_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
 
 # Automatic dependency files
@@ -485,7 +453,7 @@ RED     := \033[0;31m
 GREEN   := \033[0;32m
 BLUE    := \033[0;34m
 YELLOW  := \033[0;33m
-BLINK   := \033[33;5m
+BLINK   := \033[32;5m
 endif
 
 # For non-IDO, use objcopy instead of extract_data_for_mio
@@ -503,13 +471,12 @@ endef
 #==============================================================================#
 
 all: $(ROM)
-ifeq ($(COMPARE),1)
-	@$(PRINT) "$(GREEN)Checking if ROM matches.. $(NO_COL)\n"
-	@$(SHA1SUM) --quiet -c $(TARGET).sha1 && $(PRINT) "$(TARGET): $(GREEN)OK$(NO_COL)\n" || ($(PRINT) "$(YELLOW)Building the ROM file has succeeded, but does not match the original ROM.\nThis is expected, and not an error, if you are making modifications.\nTo silence this message, use 'make COMPARE=0.' $(NO_COL)\n" && false)
-else
 	@$(SHA1SUM) $(ROM)
-	@$(PRINT) "${GREEN}Build succeeded.$(NO_COL)\n"
-endif
+	@$(PRINT) "${BLINK}Build succeeded.\n$(NO_COL)"
+	@$(PRINT) "==== Build Options ====$(NO_COL)\n"
+	@$(PRINT) "${GREEN}Version:        $(BLUE)$(VERSION)$(NO_COL)\n"
+	@$(PRINT) "${GREEN}Microcode:      $(BLUE)$(GRUCODE)$(NO_COL)\n"
+	@$(PRINT) "${GREEN}Console:        $(BLUE)$(CONSOLE)$(NO_COL)\n"
 
 clean:
 	$(RM) -r $(BUILD_DIR_BASE)
@@ -572,12 +539,12 @@ else
   endif
 endif
 
-$(BUILD_DIR)/src/usb/usb.o: OPT_FLAGS := -O0
-$(BUILD_DIR)/src/usb/usb.o: CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wno-unused-function
-$(BUILD_DIR)/src/usb/debug.o: OPT_FLAGS := -O0
-$(BUILD_DIR)/src/usb/debug.o: CFLAGS += -Wno-unused-parameter -Wno-maybe-uninitialized
-$(BUILD_DIR)/src/audio/*.o: OPT_FLAGS := -Os -fno-jump-tables
-$(BUILD_DIR)/src/engine/math_util.o: OPT_FLAGS := -Ofast -fno-unroll-loops -fno-peel-loops --param case-values-threshold=20
+$(BUILD_DIR)/src/usb/usb.o:                   OPT_FLAGS := -O0
+$(BUILD_DIR)/src/usb/usb.o:                   CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wno-unused-function
+$(BUILD_DIR)/src/usb/debug.o:                 OPT_FLAGS := -O0
+$(BUILD_DIR)/src/usb/debug.o:                 CFLAGS += -Wno-unused-parameter -Wno-maybe-uninitialized
+$(BUILD_DIR)/src/audio/*.o:                   OPT_FLAGS := -Os -fno-jump-tables
+$(BUILD_DIR)/src/engine/math_util.o:          OPT_FLAGS := -Ofast -fno-unroll-loops -fno-peel-loops --param case-values-threshold=20
 $(BUILD_DIR)/src/game/rendering_graph_node.o: OPT_FLAGS := -Ofast --param case-values-threshold=20
 
 ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(TEXT_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION)
@@ -589,8 +556,7 @@ $(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_menu_strings.h
 $(BUILD_DIR)/src/menu/file_select.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/menu/star_select.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
-$(BUILD_DIR)/src/game/puppycam2.o: $(BUILD_DIR)/include/text_strings.h
-
+$(BUILD_DIR)/src/game/puppycam2.o:   $(BUILD_DIR)/include/text_strings.h
 
 
 #==============================================================================#
@@ -814,7 +780,7 @@ ifeq      ($(CONSOLE),n64)
 	$(V)$(OBJCOPY) --pad-to=0x101000 --gap-fill=0xFF $< $@ -O binary
 else ifeq ($(CONSOLE),bb)
 	$(V)$(OBJCOPY) --gap-fill=0x00 $< $@ -O binary
-	$(V)dd if=$@ of=tmp bs=16K conv=sync
+	$(V)dd if=$@ of=tmp bs=16K conv=sync status=none
 	$(V)mv tmp $@
 endif
 	$(V)$(N64CKSUM) $@

README.md

@@ -178,7 +178,9 @@ To switch to no compression, run make with the ``COMPRESS=uncomp`` argument.
 Q: Why in the hell are you bundling your own build of ``ld``?
 
 A: Newer binutils (Like the one bundled with Ubuntu, 2.34) break linking with libultra builds due to local asm symbols.
+
 This puts me at a crossroads of either touching leaked code and requiring GCC, or just using an older linker that works just fine.
+
 I went with the latter.
 Thanks to "someone2639" for this hacky-ass idea
 

actors/boo/geo.inc.c

@@ -4,7 +4,7 @@ const GeoLayout boo_geo[] = {
    GEO_OPEN_NODE(),
       GEO_SCALE(0x00, 26214),
       GEO_OPEN_NODE(),
-         GEO_ASM(0, geo_update_layer_transparency),
+         GEO_ASM(GEO_TRANSPARENCY_MODE_NORMAL, geo_update_layer_transparency),
          GEO_SWITCH_CASE(2, geo_switch_anim_state),
          GEO_OPEN_NODE(),
             GEO_DISPLAY_LIST(LAYER_OPAQUE, boo_seg5_dl_0500C1B0),

actors/boo_castle/geo.inc.c

@@ -4,7 +4,7 @@ const GeoLayout boo_castle_geo[] = {
    GEO_OPEN_NODE(),
       GEO_SCALE(0x00, 26214),
       GEO_OPEN_NODE(),
-         GEO_ASM(0, geo_update_layer_transparency),
+         GEO_ASM(GEO_TRANSPARENCY_MODE_NORMAL, geo_update_layer_transparency),
          GEO_SWITCH_CASE(2, geo_switch_anim_state),
          GEO_OPEN_NODE(),
             GEO_DISPLAY_LIST(LAYER_OPAQUE, boo_castle_seg6_dl_06017CE0),

actors/bowser/geo.inc.c

@@ -332,7 +332,7 @@ const GeoLayout bowser_shadow_geo[] = {
 const GeoLayout bowser_geo[] = {
    GEO_NODE_START(),
    GEO_OPEN_NODE(),
-      GEO_ASM(0, geo_update_layer_transparency),
+      GEO_ASM(GEO_TRANSPARENCY_MODE_NORMAL, geo_update_layer_transparency),
       GEO_SWITCH_CASE(3, geo_switch_anim_state),
       GEO_OPEN_NODE(),
          GEO_NODE_START(),
@@ -362,7 +362,7 @@ const GeoLayout bowser_geo[] = {
 const GeoLayout bowser_geo_no_shadow[] = {
    GEO_NODE_START(),
    GEO_OPEN_NODE(),
-      GEO_ASM(0, geo_update_layer_transparency),
+      GEO_ASM(GEO_TRANSPARENCY_MODE_NORMAL, geo_update_layer_transparency),
       GEO_SWITCH_CASE(3, geo_switch_anim_state),
       GEO_OPEN_NODE(),
          GEO_NODE_START(),

actors/breakable_box/model.inc.c

@@ -67,7 +67,7 @@ const Gfx breakable_box_seg8_sub_dl_end[] = {
 // 0x08012CD8 - 0x08012D20
 const Gfx breakable_box_seg8_sub_dl_begin[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB),
+    gsDPSetCombineMode(G_CC_MODULATERGBFADE, G_CC_MODULATERGBFADE),
     gsSPClearGeometryMode(G_SHADING_SMOOTH),
     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),

actors/burn_smoke/geo.inc.c

@@ -2,7 +2,10 @@
 const GeoLayout burn_smoke_geo[] = {
    GEO_NODE_START(),
    GEO_OPEN_NODE(),
-      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, burn_smoke_seg4_dl_04022070),
+#ifdef BURN_SMOKE_FIX
+      GEO_ASM(GEO_TRANSPARENCY_MODE_NORMAL, geo_update_layer_transparency),
+#endif
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, burn_smoke_seg4_dl),
    GEO_CLOSE_NODE(),
    GEO_END(),
 };

actors/burn_smoke/model.inc.c

@@ -1,7 +1,7 @@
 // Burn Smoke
 
 // 0x040217C0
-static const Vtx burn_smoke_seg4_vertex_040217C0[] = {
+static const Vtx burn_smoke_seg4_vertex[] = {
     {{{   -50,    -50,      0}, 0, {     0,    992}, {0x14, 0x0a, 0x0a, 0xff}}},
     {{{    50,    -50,      0}, 0, {   992,    992}, {0x14, 0x0a, 0x0a, 0xff}}},
     {{{    50,     50,      0}, 0, {   992,      0}, {0x14, 0x0a, 0x0a, 0xff}}},
@@ -12,15 +12,15 @@ static const Vtx burn_smoke_seg4_vertex_040217C0[] = {
 // as a transparent black burn smoke. Probably meant to show up as white-ish
 // burn smoke, but mistakened for being intended as black smoke.
 // 0x04021800
-ALIGNED8 static const Texture burn_smoke_seg4_texture_04021800[] = {
+ALIGNED8 static const Texture burn_smoke_seg4_sub_dl_texture[] = {
 #include "actors/burn_smoke/burn_smoke.ia16.inc.c"
 };
 
 // 0x04022000 - 0x04022028
-const Gfx burn_smoke_seg4_dl_04022000[] = {
+const Gfx burn_smoke_seg4_sub_dl_begin[] = {
     gsDPPipeSync(),
 #ifdef BURN_SMOKE_FIX
-    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetCombineMode(G_CC_MODULATEIFADEA, G_CC_MODULATEIFADEA),
 #else
     gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA),
 #endif
@@ -30,14 +30,14 @@ const Gfx burn_smoke_seg4_dl_04022000[] = {
 };
 
 // 0x04022028 - 0x04022048
-const Gfx burn_smoke_seg4_dl_04022028[] = {
-    gsSPVertex(burn_smoke_seg4_vertex_040217C0, 4, 0),
+const Gfx burn_smoke_seg4_sub_dl_model[] = {
+    gsSPVertex(burn_smoke_seg4_vertex, 4, 0),
     gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
     gsSPEndDisplayList(),
 };
 
 // 0x04022048 - 0x04022070
-const Gfx burn_smoke_seg4_dl_04022048[] = {
+const Gfx burn_smoke_seg4_sub_dl_end[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
@@ -46,14 +46,14 @@ const Gfx burn_smoke_seg4_dl_04022048[] = {
 };
 
 // 0x04022070 - 0x040220C8
-const Gfx burn_smoke_seg4_dl_04022070[] = {
-    gsSPDisplayList(burn_smoke_seg4_dl_04022000),
+const Gfx burn_smoke_seg4_dl[] = {
+    gsSPDisplayList(burn_smoke_seg4_sub_dl_begin),
 #ifdef BURN_SMOKE_FIX
-    gsDPLoadTextureBlock(burn_smoke_seg4_texture_04021800, G_IM_FMT_IA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(burn_smoke_seg4_sub_dl_texture, G_IM_FMT_IA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
 #else
-    gsDPLoadTextureBlock(burn_smoke_seg4_texture_04021800, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPLoadTextureBlock(burn_smoke_seg4_sub_dl_texture, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
 #endif
-    gsSPDisplayList(burn_smoke_seg4_dl_04022028),
-    gsSPDisplayList(burn_smoke_seg4_dl_04022048),
+    gsSPDisplayList(burn_smoke_seg4_sub_dl_model),
+    gsSPDisplayList(burn_smoke_seg4_sub_dl_end),
     gsSPEndDisplayList(),
 };

actors/common0.h

@@ -165,8 +165,8 @@ extern const Gfx heart_seg8_dl_0800DFE0[];
 
 // koopa_shell
 extern const GeoLayout koopa_shell_geo[];
-extern const GeoLayout koopa_shell2_geo[];
-extern const GeoLayout koopa_shell3_geo[];
+// extern const GeoLayout koopa_shell2_geo[];
+// extern const GeoLayout koopa_shell3_geo[];
 extern const Gfx koopa_shell_seg8_dl_08027108[];
 extern const Gfx koopa_shell_seg8_dl_08027170[];
 extern const Gfx koopa_shell_seg8_dl_08027258[];

actors/group0.h

@@ -11,10 +11,10 @@ extern const Gfx bubble_seg4_dl_0401DDE0[];
 
 // burn_smoke
 extern const GeoLayout burn_smoke_geo[];
-extern const Gfx burn_smoke_seg4_dl_04022000[];
-extern const Gfx burn_smoke_seg4_dl_04022028[];
-extern const Gfx burn_smoke_seg4_dl_04022048[];
-extern const Gfx burn_smoke_seg4_dl_04022070[];
+extern const Gfx burn_smoke_seg4_sub_dl_begin[];
+extern const Gfx burn_smoke_seg4_sub_dl_model[];
+extern const Gfx burn_smoke_seg4_sub_dl_end[];
+extern const Gfx burn_smoke_seg4_dl[];
 
 // mario
 extern const GeoLayout mario_geo_face_and_wings[];

actors/group7.h

@@ -5,16 +5,16 @@
 
 // penguin
 extern const GeoLayout penguin_geo[];
-extern const Gfx penguin_seg5_dl_05006188[];
-extern const Gfx penguin_seg5_dl_050061C8[];
-extern const Gfx penguin_seg5_dl_050061F8[];
-extern const Gfx penguin_seg5_dl_05006380[];
-extern const Gfx penguin_seg5_dl_050063C8[];
-extern const Gfx penguin_seg5_dl_05006428[];
-extern const Gfx penguin_seg5_dl_05006458[];
-extern const Gfx penguin_seg5_dl_05006488[];
-extern const Gfx penguin_seg5_dl_050064B8[];
-extern const Gfx penguin_seg5_dl_050064E8[];
+extern const Gfx penguin_seg5_sub_dl_eyes_model[];
+extern const Gfx penguin_seg5_sub_dl_beak_model[];
+extern const Gfx penguin_seg5_sub_dl_head_model[];
+extern const Gfx penguin_seg5_sub_dl_head_begin[];
+extern const Gfx penguin_seg5_dl_head[];
+extern const Gfx penguin_seg5_dl_head_eyes_open[];
+extern const Gfx penguin_seg5_dl_head_eyes_half_closed[];
+extern const Gfx penguin_seg5_dl_head_eyes_closed[];
+extern const Gfx penguin_seg5_dl_head_eyes_angry[];
+extern const Gfx penguin_seg5_dl_head_eyes_sad[];
 extern const Gfx penguin_seg5_dl_05007198[];
 extern const Gfx penguin_seg5_dl_050071E8[];
 extern const Gfx penguin_seg5_dl_05007238[];

actors/impact_ring/geo.inc.c

@@ -2,7 +2,7 @@
 const GeoLayout invisible_bowser_accessory_geo[] = {
    GEO_CULLING_RADIUS(10000),
    GEO_OPEN_NODE(),
-      GEO_ASM(20, geo_update_layer_transparency),
+      GEO_ASM(GEO_TRANSPARENCY_MODE_DECAL, geo_update_layer_transparency),
       GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, impact_ring_seg6_dl_0601EAC0),
    GEO_CLOSE_NODE(),
    GEO_END(),

actors/impact_smoke/geo.inc.c

@@ -2,7 +2,7 @@
 const GeoLayout bowser_impact_smoke_geo[] = {
    GEO_NODE_START(),
    GEO_OPEN_NODE(),
-      GEO_ASM(0, geo_update_layer_transparency),
+      GEO_ASM(GEO_TRANSPARENCY_MODE_NORMAL, geo_update_layer_transparency),
       GEO_SWITCH_CASE(5, geo_switch_anim_state),
       GEO_OPEN_NODE(),
          GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062B38),

actors/koopa_shell/geo.inc.c

@@ -4,32 +4,32 @@ const GeoLayout koopa_shell_geo[] = {
    GEO_OPEN_NODE(),
       GEO_SCALE(0x00, 65536),
       GEO_OPEN_NODE(),
-         GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, koopa_shell_seg8_dl_08028B78),
+         GEO_DISPLAY_LIST(LAYER_OPAQUE, koopa_shell_seg8_dl_08028B78),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
    GEO_END(),
 };
 
-// 0x0F000ADC
-const GeoLayout koopa_shell2_geo[] = {
-   GEO_SHADOW(SHADOW_CIRCLE_4_VERTS, 0xC8, 70),
-   GEO_OPEN_NODE(),
-      GEO_SCALE(0x00, 16384),
-      GEO_OPEN_NODE(),
-         GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, koopa_shell_seg8_dl_08027420),
-      GEO_CLOSE_NODE(),
-   GEO_CLOSE_NODE(),
-   GEO_END(),
-};
+// // 0x0F000ADC
+// const GeoLayout koopa_shell2_geo[] = {
+//    GEO_SHADOW(SHADOW_CIRCLE_4_VERTS, 0xC8, 70),
+//    GEO_OPEN_NODE(),
+//       GEO_SCALE(0x00, 16384),
+//       GEO_OPEN_NODE(),
+//          GEO_DISPLAY_LIST(LAYER_OPAQUE, koopa_shell_seg8_dl_08027420),
+//       GEO_CLOSE_NODE(),
+//    GEO_CLOSE_NODE(),
+//    GEO_END(),
+// };
 
-// 0x0F000B08
-const GeoLayout koopa_shell3_geo[] = {
-   GEO_SHADOW(SHADOW_CIRCLE_4_VERTS, 0xC8, 70),
-   GEO_OPEN_NODE(),
-      GEO_SCALE(0x00, 16384),
-      GEO_OPEN_NODE(),
-         GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, koopa_shell_seg8_dl_080273C8),
-      GEO_CLOSE_NODE(),
-   GEO_CLOSE_NODE(),
-   GEO_END(),
-};
+// // 0x0F000B08
+// const GeoLayout koopa_shell3_geo[] = {
+//    GEO_SHADOW(SHADOW_CIRCLE_4_VERTS, 0xC8, 70),
+//    GEO_OPEN_NODE(),
+//       GEO_SCALE(0x00, 16384),
+//       GEO_OPEN_NODE(),
+//          GEO_DISPLAY_LIST(LAYER_OPAQUE, koopa_shell_seg8_dl_080273C8),
+//       GEO_CLOSE_NODE(),
+//    GEO_CLOSE_NODE(),
+//    GEO_END(),
+// };

actors/koopa_shell/model.inc.c

@@ -577,7 +577,7 @@ const Gfx koopa_shell_seg8_dl_08028A20[] = {
 // 0x08028B78 - 0x08028BE8
 const Gfx koopa_shell_seg8_dl_08028B78[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB),
+    gsDPSetCombineMode(G_CC_MODULATERGBFADE, G_CC_MODULATERGBFADE),
     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(),
@@ -587,7 +587,8 @@ const Gfx koopa_shell_seg8_dl_08028B78[] = {
     gsSPDisplayList(koopa_shell_seg8_dl_08028978),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPDisplayList(koopa_shell_seg8_dl_08028A20),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPEndDisplayList(),
 };