kirsle/sm64pc
1
0
Fork 0
Code Releases Wiki Activity

refresh 4

Browse Source
This commit is contained in:
n64 2019-12-01 21:52:53 -05:00
parent a7c423cb43
commit 04732af90b
729 changed files with 21400 additions and 37110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CHANGES
View File

@ -1,3 +1,33 @@
Refresh #4
1.) Label screen_transition.c (#737)
2.) Revamp macros (#738)
3.) Simplify the cake makefile logic (#739)
4.) Move zbuffer to C (#742)
5.) Audio blob endian/64-bit fixes (#740)
6.) Ub fixes (#745)
7.) process_level_music_dynamics: slightly better stack and regalloc (#746)
8.) move level order specific definitions out to levels/level_defines.h (#743)
9.) Renamed some mislabelled sound effects (#748)
10.) Very minor white space fixes in Mario.c (#752)
11.) Renamed GRAVITY to OBJ_PHYSICS (#755)
12.) Use defined macros instead of literal values for interactions in behavior_data.c (#754)
13.) iQue Player console detection + full support (#756)
14.) Fix Goddard Mario head for little endian etc. (#757)
15.) Small bits of audio doc (#749)
16.) Update diff script (#750)
17.) Nicer format for course/dialog text, enum for dialog IDs (#753)
18.) first-diff: store most recent mtime during check (#759)
19.) Use Lights1 struct for light values (#760)
20.) Detect mips64-elf in diff.py (#761)
21.) Name display lists in gd renderer.c (#764)
22.) Document a variety of PU type crashes. (#765)
23.) Label object_behaviors. (#716)
24.) Update swoop.inc.c (#767)
25.) Label tilting_pyramid.inc.c (#768)
26.) Label red_coin.inc.c (#770)
27.) Use more level defines (#758)
28.) Named Mario actions 6, 7, and 8 and noted causes of hands-free holding glitch (#769)
Refresh #3
1.) Small bits of sound sample labelling
2.) Append 'b' to fopen calls in n64graphics to satisfy Windows

2
Doxyfile
View File

@ -2089,7 +2089,7 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = NON_MATCHING
PREDEFINED = NON_MATCHING AVOID_UB
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The

10
Jenkinsfile vendored
View File

@ -27,16 +27,6 @@ pipeline {
sh 'make -j4 VERSION=us'
}
}
stage('Build J Source, NON_MATCHING') {
steps {
sh 'make -j4 VERSION=jp NON_MATCHING=1'
}
}
stage('Build U Source, NON_MATCHING') {
steps {
sh 'make -j4 VERSION=us NON_MATCHING=1'
}
}
}
environment {
QEMU_IRIX = credentials('qemu-irix')

123
Makefile
View File

@ -6,29 +6,31 @@ default: all
### Build Options ###
# These options can either be changed by modifying the makefile, or
# by building with 'make SETTING=value'. 'make clean' may be required.
# Version of the game to build
VERSION ?= us
# Graphics microcode used
GRUCODE ?= f3d_old
# If COMPARE is 1, check the output sha1sum when building 'all'
COMPARE ?= 1
# If NON_MATCHING is 1, define the NON_MATCHING macro when building
# If NON_MATCHING is 1, define the NON_MATCHING and AVOID_UB macros when building (recommended)
NON_MATCHING ?= 0
# If ENDIAN_IND is 1, enable non-matching code changes that try to ensure
# endianness independence
ENDIAN_IND ?= 0
# Build for the N64 (turn this off for ports)
TARGET_N64 ?= 1
# Release
ifeq ($(VERSION),jp)
VERSION_CFLAGS := -DVERSION_JP=1
VERSION_CFLAGS := -DVERSION_JP
VERSION_ASFLAGS := --defsym VERSION_JP=1
GRUCODE_CFLAGS := -DF3D_OLD
GRUCODE_ASFLAGS := --defsym F3D_OLD=1
TARGET := sm64.jp
else
ifeq ($(VERSION),us)
VERSION_CFLAGS := -DVERSION_US=1
VERSION_CFLAGS := -DVERSION_US
VERSION_ASFLAGS := --defsym VERSION_US=1
GRUCODE_CFLAGS := -DF3D_OLD
GRUCODE_ASFLAGS := --defsym F3D_OLD=1
@ -36,7 +38,7 @@ ifeq ($(VERSION),us)
else
ifeq ($(VERSION),eu)
$(warning Building EU is experimental and is prone to breaking. Try at your own risk.)
VERSION_CFLAGS := -DVERSION_EU=1
VERSION_CFLAGS := -DVERSION_EU
VERSION_ASFLAGS := --defsym VERSION_EU=1
GRUCODE_CFLAGS := -DF3D_NEW
GRUCODE_ASFLAGS := --defsym F3D_NEW=1
@ -50,13 +52,13 @@ endif
# Microcode
ifeq ($(GRUCODE),f3dex) # Fast3DEX
GRUCODE_CFLAGS := -DF3DEX_GBI=1
GRUCODE_CFLAGS := -DF3DEX_GBI
GRUCODE_ASFLAGS := --defsym F3DEX_GBI_SHARED=1 --defsym F3DEX_GBI=1
TARGET := $(TARGET).f3dex
COMPARE := 0
else
ifeq ($(GRUCODE), f3dex2) # Fast3DEX2
GRUCODE_CFLAGS := -DF3DEX_GBI_2=1
GRUCODE_CFLAGS := -DF3DEX_GBI_2
GRUCODE_ASFLAGS := --defsym F3DEX_GBI_SHARED=1 --defsym F3DEX_GBI_2=1
TARGET := $(TARGET).f3dex2
COMPARE := 0
@ -69,7 +71,7 @@ ifeq ($(GRUCODE),f3d_new) # Fast3D 2.0H (Shindou)
else
ifeq ($(GRUCODE),f3dzex) # Fast3DZEX (2.0J / Animal Forest - Dōbutsu no Mori)
$(warning Fast3DZEX is experimental. Try at your own risk.)
GRUCODE_CFLAGS := -DF3DEX_GBI_2=1
GRUCODE_CFLAGS := -DF3DEX_GBI_2
GRUCODE_ASFLAGS := --defsym F3DEX_GBI_SHARED=1 --defsym F3DZEX_GBI=1
TARGET := $(TARGET).f3dzex
COMPARE := 0
@ -78,13 +80,12 @@ endif
endif
endif
ifeq ($(NON_MATCHING),1)
VERSION_CFLAGS := $(VERSION_CFLAGS) -DNON_MATCHING=1
COMPARE := 0
ifeq ($(TARGET_N64),0)
NON_MATCHING := 1
endif
ifeq ($(ENDIAN_IND),1)
VERSION_CFLAGS := $(VERSION_CFLAGS) -DENDIAN_IND=1
ifeq ($(NON_MATCHING),1)
VERSION_CFLAGS := $(VERSION_CFLAGS) -DNON_MATCHING -DAVOID_UB
COMPARE := 0
endif
@ -132,8 +133,8 @@ ACTOR_DIR := actors
LEVEL_DIRS := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h)))
# Directories containing source files
SRC_DIRS := src src/engine src/game src/audio src/menu src/buffers actors levels text bin data assets
ASM_DIRS := asm lib sound
SRC_DIRS := src src/engine src/game src/audio src/menu src/buffers actors levels bin data assets
ASM_DIRS := asm lib
BIN_DIRS := bin bin/$(VERSION)
ULTRA_SRC_DIRS := lib/src lib/src/math
@ -191,10 +192,10 @@ GODDARD_O_FILES := $(foreach file,$(GODDARD_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
# Automatic dependency files
DEP_FILES := $(O_FILES:.o=.d) $(ULTRA_O_FILES:.o=.d) $(GODDARD_O_FILES:.o=.d) $(BUILD_DIR)/$(LD_SCRIPT).d
# Files with NON_MATCHING ifdefs
NON_MATCHING_C_FILES != grep -rl NON_MATCHING $(wildcard src/audio/*.c) $(wildcard src/game/*.c)
NON_MATCHING_O_FILES = $(foreach file,$(NON_MATCHING_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
NON_MATCHING_DEP = $(BUILD_DIR)/src/audio/non_matching_dep
# Files with GLOBAL_ASM blocks
GLOBAL_ASM_C_FILES != grep -rl 'GLOBAL_ASM(' $(wildcard src/audio/*.c) $(wildcard src/game/*.c)
GLOBAL_ASM_O_FILES = $(foreach file,$(GLOBAL_ASM_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
GLOBAL_ASM_DEP = $(BUILD_DIR)/src/audio/non_matching_dep
# Segment elf files
SEG_FILES := $(SEGMENT_ELF_FILES) $(ACTOR_ELF_FILES) $(LEVEL_ELF_FILES)
@ -218,23 +219,29 @@ endif
AS := $(CROSS)as
CC := $(QEMU_IRIX) -silent -L $(IRIX_ROOT) $(IRIX_ROOT)/usr/bin/cc
CPP := cpp -P
CPP := cpp -P -Wno-trigraphs
LD := $(CROSS)ld
AR := $(CROSS)ar
OBJDUMP := $(CROSS)objdump
OBJCOPY := $(CROSS)objcopy
PYTHON := python3
INCLUDE_CFLAGS := -I include -I include/libc -I $(BUILD_DIR) -I $(BUILD_DIR)/include -I src -I .
ifeq ($(TARGET_N64),1)
TARGET_CFLAGS := -nostdinc -I include/libc -DTARGET_N64
CC_CFLAGS := -fno-builtin
endif
INCLUDE_CFLAGS := -I include -I $(BUILD_DIR) -I $(BUILD_DIR)/include -I src -I .
# Check code syntax with host compiler
CC_CHECK := gcc -fsyntax-only -fsigned-char -nostdinc -fno-builtin $(INCLUDE_CFLAGS) -std=gnu90 -Wall -Wextra -Wno-format-security -DNON_MATCHING $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -DTARGET_N64
CC_CHECK := gcc -fsyntax-only -fsigned-char $(CC_CFLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) -std=gnu90 -Wall -Wextra -Wno-format-security -DNON_MATCHING -DAVOID_UB $(VERSION_CFLAGS) $(GRUCODE_CFLAGS)
ASFLAGS := -march=vr4300 -mabi=32 -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS) $(GRUCODE_ASFLAGS)
CFLAGS = -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn $(OPT_FLAGS) -signed $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(MIPSISET) $(GRUCODE_CFLAGS) -DTARGET_N64
CFLAGS = -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed $(OPT_FLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(MIPSISET) $(GRUCODE_CFLAGS)
OBJCOPYFLAGS := --pad-to=0x800000 --gap-fill=0xFF
SYMBOL_LINKING_FLAGS := $(addprefix -R ,$(SEG_FILES))
LDFLAGS := -T undefined_syms.txt -T $(BUILD_DIR)/$(LD_SCRIPT) -Map $(BUILD_DIR)/sm64.$(VERSION).map --no-check-sections $(SYMBOL_LINKING_FLAGS)
ENDIAN_BITWIDTH := $(BUILD_DIR)/endian-and-bitwidth
ifeq ($(shell getconf LONG_BIT), 32)
# Work around memory allocation bug in QEMU
@ -306,21 +313,26 @@ $(BUILD_DIR)/include/text_strings.h: include/text_strings.h.in
$(BUILD_DIR)/include/text_menu_strings.h: include/text_menu_strings.h.in
$(TEXTCONV) charmap_menu.txt $< $@
$(BUILD_DIR)/text/%.inc.c: text/$(VERSION)/%.c.in
$(TEXTCONV) charmap.txt $< $@
ifeq ($(VERSION),eu)
SRC_DIRS += text/de text/en text/fr
TEXT_DIRS := text/de text/us text/fr
# EU encoded text inserted into individual segment 0x19 files
$(BUILD_DIR)/bin/$(VERSION)/translation_de.o: $(BUILD_DIR)/text/de/dialog.inc.c $(BUILD_DIR)/text/de/level.inc.c $(BUILD_DIR)/text/de/star.inc.c
$(BUILD_DIR)/bin/$(VERSION)/translation_en.o: $(BUILD_DIR)/text/en/dialog.inc.c $(BUILD_DIR)/text/en/level.inc.c $(BUILD_DIR)/text/en/star.inc.c
$(BUILD_DIR)/bin/$(VERSION)/translation_fr.o: $(BUILD_DIR)/text/fr/dialog.inc.c $(BUILD_DIR)/text/fr/level.inc.c $(BUILD_DIR)/text/fr/star.inc.c
$(BUILD_DIR)/bin/eu/translation_en.o: $(BUILD_DIR)/text/us/define_text.inc.c
$(BUILD_DIR)/bin/eu/translation_de.o: $(BUILD_DIR)/text/de/define_text.inc.c
$(BUILD_DIR)/bin/eu/translation_fr.o: $(BUILD_DIR)/text/fr/define_text.inc.c
else
TEXT_DIRS := text/$(VERSION)
# non-EU encoded text inserted into segment 0x02
$(BUILD_DIR)/bin/segment2.o: $(BUILD_DIR)/text/debug.inc.c $(BUILD_DIR)/text/dialog.inc.c $(BUILD_DIR)/text/level.inc.c $(BUILD_DIR)/text/star.inc.c
$(BUILD_DIR)/bin/segment2.o: $(BUILD_DIR)/text/$(VERSION)/define_text.inc.c
endif
ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS) $(GODDARD_SRC_DIRS) $(ULTRA_SRC_DIRS) $(ULTRA_ASM_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) include) $(MIO0_DIR) $(addprefix $(MIO0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION)
$(BUILD_DIR)/text/%/define_text.inc.c: text/define_text.inc.c text/%/courses.h text/%/dialogs.h
$(CPP) $(VERSION_CFLAGS) $< -o $@ -I text/$*/
$(TEXTCONV) charmap.txt $@ $@
ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS) $(GODDARD_SRC_DIRS) $(ULTRA_SRC_DIRS) $(ULTRA_ASM_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(TEXT_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) include) $(MIO0_DIR) $(addprefix $(MIO0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION)
# Make sure build directory exists before compiling anything
DUMMY != mkdir -p $(ALL_DIRS)
@ -390,17 +402,24 @@ $(BUILD_DIR)/%.table: %.aiff
$(BUILD_DIR)/%.aifc: $(BUILD_DIR)/%.table %.aiff
$(VADPCM_ENC) -c $^ $@
$(SOUND_BIN_DIR)/sound_data.ctl: sound/sound_banks/ $(SOUND_BANK_FILES) $(SOUND_SAMPLE_AIFCS)
$(PYTHON) tools/assemble_sound.py $(BUILD_DIR)/sound/samples/ sound/sound_banks/ $(SOUND_BIN_DIR)/sound_data.ctl $(SOUND_BIN_DIR)/sound_data.tbl $(VERSION_CFLAGS)
$(ENDIAN_BITWIDTH): tools/determine-endian-bitwidth.c
$(CC) -c $(CFLAGS) -o $@.dummy2 $< 2>$@.dummy1; true
grep -o 'msgbegin --endian .* --bitwidth .* msgend' $@.dummy1 > $@.dummy2
head -n1 <$@.dummy2 | cut -d' ' -f2-5 > $@
@rm $@.dummy1
@rm $@.dummy2
$(SOUND_BIN_DIR)/sound_data.ctl: sound/sound_banks/ $(SOUND_BANK_FILES) $(SOUND_SAMPLE_AIFCS) $(ENDIAN_BITWIDTH)
$(PYTHON) tools/assemble_sound.py $(BUILD_DIR)/sound/samples/ sound/sound_banks/ $(SOUND_BIN_DIR)/sound_data.ctl $(SOUND_BIN_DIR)/sound_data.tbl $(VERSION_CFLAGS) $$(cat $(ENDIAN_BITWIDTH))
$(SOUND_BIN_DIR)/sound_data.tbl: $(SOUND_BIN_DIR)/sound_data.ctl
touch $@
@true
$(SOUND_BIN_DIR)/sequences.bin: $(SOUND_BANK_FILES) sound/sequences.json sound/sequences/ sound/sequences/$(VERSION)/ $(SOUND_SEQUENCE_FILES)
$(PYTHON) tools/assemble_sound.py --sequences $@ $(SOUND_BIN_DIR)/bank_sets sound/sound_banks/ sound/sequences.json $(SOUND_SEQUENCE_FILES) $(VERSION_CFLAGS)
$(SOUND_BIN_DIR)/sequences.bin: $(SOUND_BANK_FILES) sound/sequences.json sound/sequences/ sound/sequences/$(VERSION)/ $(SOUND_SEQUENCE_FILES) $(ENDIAN_BITWIDTH)
$(PYTHON) tools/assemble_sound.py --sequences $@ $(SOUND_BIN_DIR)/bank_sets sound/sound_banks/ sound/sequences.json $(SOUND_SEQUENCE_FILES) $(VERSION_CFLAGS) $$(cat $(ENDIAN_BITWIDTH))
$(SOUND_BIN_DIR)/bank_sets: $(SOUND_BIN_DIR)/sequences.bin
touch $@
@true
$(SOUND_BIN_DIR)/%.m64: $(SOUND_BIN_DIR)/%.o
$(OBJCOPY) -j .rodata $< -O binary $@
@ -411,6 +430,11 @@ $(SOUND_BIN_DIR)/%.o: $(SOUND_BIN_DIR)/%.s
$(SOUND_BIN_DIR)/%.s: $(SOUND_BIN_DIR)/%
printf ".section .data\n\n.incbin \"$<\"\n" > $@
$(BUILD_DIR)/levels/scripts.o: $(BUILD_DIR)/include/level_headers.h
$(BUILD_DIR)/include/level_headers.h: levels/level_headers.h.in
$(CPP) -I . levels/level_headers.h.in | $(PYTHON) tools/output_level_headers.py > $(BUILD_DIR)/include/level_headers.h
$(BUILD_DIR)/assets/mario_anim_data.c: $(wildcard assets/anims/*.inc.c)
$(PYTHON) tools/mario_anims_converter.py > $@
@ -420,7 +444,6 @@ $(BUILD_DIR)/assets/demo_data.c: assets/demo_data.json $(wildcard assets/demos/*
# Source code
$(BUILD_DIR)/src/goddard/%.o: OPT_FLAGS := -g
$(BUILD_DIR)/src/goddard/%.o: MIPSISET := -mips1
$(NON_MATCHING_O_FILES): CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
$(BUILD_DIR)/src/audio/%.o: OPT_FLAGS := -O2 -Wo,-loopunroll,0
$(BUILD_DIR)/src/audio/load.o: OPT_FLAGS := -O2 -framepointer -Wo,-loopunroll,0
$(BUILD_DIR)/lib/src/%.o: OPT_FLAGS :=
@ -438,16 +461,20 @@ $(BUILD_DIR)/lib/src/_Ldtob.o: OPT_FLAGS := -O3
$(BUILD_DIR)/lib/src/_Printf.o: OPT_FLAGS := -O3
endif
# Rebuild files with '#ifdef NON_MATCHING' when that macro changes.
$(NON_MATCHING_O_FILES): $(NON_MATCHING_DEP).$(NON_MATCHING)
$(NON_MATCHING_DEP).$(NON_MATCHING):
@rm -f $(NON_MATCHING_DEP).*
ifeq ($(NON_MATCHING),0)
$(GLOBAL_ASM_O_FILES): CC := $(PYTHON) tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
endif
# Rebuild files with 'GLOBAL_ASM' if the NON_MATCHING flag changes.
$(GLOBAL_ASM_O_FILES): $(GLOBAL_ASM_DEP).$(NON_MATCHING)
$(GLOBAL_ASM_DEP).$(NON_MATCHING):
@rm -f $(GLOBAL_ASM_DEP).*
touch $@
$(BUILD_DIR)/lib/src/math/%.o: lib/src/math/%.c
@$(CC_CHECK) -MMD -MP -MT $@ -MF $(BUILD_DIR)/lib/src/math/$*.d $<
$(CC) -c $(CFLAGS) -o $@ $<
tools/patch_libultra_math $@ || rm $@
tools/patch_libultra_math $@
$(BUILD_DIR)/%.o: %.c
@$(CC_CHECK) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
@ -462,7 +489,7 @@ $(BUILD_DIR)/%.o: %.s
$(AS) $(ASFLAGS) -MD $(BUILD_DIR)/$*.d -o $@ $<
$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)
$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
$(BUILD_DIR)/libultra.a: $(ULTRA_O_FILES)
$(AR) rcs -o $@ $(ULTRA_O_FILES)
@ -483,7 +510,7 @@ $(BUILD_DIR)/$(TARGET).objdump: $(ELF)
.PHONY: all clean distclean default diff test load libultra
.PRECIOUS: $(BUILD_DIR)/bin/%.elf $(SOUND_BIN_DIR)/%.ctl $(SOUND_BIN_DIR)/%.tbl $(SOUND_SAMPLE_TABLES) $(SOUND_BIN_DIR)/%.s $(BUILD_DIR)/%
.PRECIOUS: $(BUILD_DIR)/bin/%.elf $(SOUND_BIN_DIR)/%.ctl $(SOUND_BIN_DIR)/%.tbl $(SOUND_SAMPLE_TABLES) $(SOUND_BIN_DIR)/%.s $(BUILD_DIR)/%
.DELETE_ON_ERROR:
# Remove built-in rules, to improve performance

81
Makefile.split
View File

@ -135,70 +135,39 @@ $(BUILD_DIR)/actors/common1.elf: SEGMENT_ADDRESS := 0x03000000
# Level Rules
# --------------------------------------
# Using these rules:
# When defining a level, define the 3 variables needed and copy the rules
# as-is.
$(BUILD_DIR)/levels/%/leveldata.elf: SEGMENT_ADDRESS := 0x07000000
# TODO: Generate these rules from the level configs?
define level_rules =
$(1)_SEG7_FILES := $$(patsubst %.png,%.inc.c,$$(notdir $$(wildcard levels/$(1)/*.png)))
$$(BUILD_DIR)/levels/$(1)/leveldata.o: $$(addprefix $$(BUILD_DIR)/levels/$(1)/,$$($(1)_SEG7_FILES))
$$(BUILD_DIR)/levels/$(1)/leveldata.elf: SEGMENT_ADDRESS := $(2)
$$(BUILD_DIR)/levels/$(1)/leveldata.elf: TEXTURE_BIN := $(3)
$(1)_SEG7_FILES := $$(patsubst %.png,%.inc.c,$$(wildcard levels/$(1)/*.png))
$$(BUILD_DIR)/levels/$(1)/leveldata.o: $$(addprefix $$(BUILD_DIR)/,$$($(1)_SEG7_FILES))
$$(BUILD_DIR)/levels/$(1)/leveldata.elf: TEXTURE_BIN := $(2)
endef
$(eval $(call level_rules,bbh,0x07000000,spooky)) # BBH (Big Boo's Haunt)
$(eval $(call level_rules,ccm,0x07000000,snow)) # CCM (Cool Cool Mountain)
$(eval $(call level_rules,castle_inside,0x07000000,inside)) # Castle Inside (Inside Princess Peach's Castle)
$(eval $(call level_rules,hmc,0x07000000,cave))# HMC (Hazy Maze Cave)
$(eval $(call level_rules,ssl,0x07000000,generic)) # SSL (Shifting Sand Land)
$(eval $(call level_rules,bob,0x07000000,generic)) # BOB (Bob-Omb Battlefield)
$(eval $(call level_rules,sl,0x07000000,snow)) # SL (Snowman's Land)
$(eval $(call level_rules,wdw,0x07000000,grass)) # WDW (Wet Dry World)
$(eval $(call level_rules,jrb,0x07000000,water)) # JRB (Jolly Roger Bay)
$(eval $(call level_rules,thi,0x07000000,grass)) # THI (Tiny Huge Island)
$(eval $(call level_rules,ttc,0x07000000,machine)) # TTC (Tick Tock Clock)
$(eval $(call level_rules,rr,0x07000000,sky)) # RR (Rainbow Ride)
$(eval $(call level_rules,castle_grounds,0x07000000,outside)) # Castle Grounds (Outside Princess Peach's Castle)
$(eval $(call level_rules,bitdw,0x07000000,sky)) # BitDW (Bowser in the Dark World)
$(eval $(call level_rules,vcutm,0x07000000,outside)) # VCUTM (Vanish Cap under the Moat)
$(eval $(call level_rules,bitfs,0x07000000,sky)) # BITFS (Bowser in the Fire Sea)
$(eval $(call level_rules,sa,0x07000000,inside)) # SA (The Secret Aquarium)
$(eval $(call level_rules,bits,0x07000000,sky)) # BITS (Bowser in the Sky)
$(eval $(call level_rules,lll,0x07000000,fire)) # LLL (Lethal Lava Land)
$(eval $(call level_rules,ddd,0x07000000,water)) # DDD (Dire Dire Docks)
$(eval $(call level_rules,wf,0x07000000,grass)) # WF (Whomp's Fortress)
$(eval $(call level_rules,castle_courtyard,0x07000000,outside)) # Castle Courtyard (The Courtyard of Princess Peach's Castle)
$(eval $(call level_rules,pss,0x07000000,mountain)) # PSS (The Princess's Secret Slide)
$(eval $(call level_rules,cotmc,0x07000000,cave)) # COTMC (Cavern of the Metal Cap)
$(eval $(call level_rules,totwc,0x07000000,sky)) # TOTWC (Tower of the Wing Cap)
$(eval $(call level_rules,bowser_1,0x07000000,generic)) # BOWSER_1 (Bowser in the Dark World [Boss Area])
$(eval $(call level_rules,wmotr,0x07000000,generic)) # WMOTR (Wing Mario over the Rainbow)
$(eval $(call level_rules,bowser_2,0x07000000,fire)) # BOWSER_2 (Bowser in the Fire Sea [Boss Area])
$(eval $(call level_rules,bowser_3,0x07000000,generic)) # BOWSER_3 (Bowser in the Sky [Boss Area])
$(eval $(call level_rules,totwc,0x07000000,sky)) # TOTWC (Tower of the Wing Cap)
$(eval $(call level_rules,ttm,0x07000000,mountain)) # TTM (Tall Tall Mountain)
$(eval $(call level_rules,intro,0x07000000,generic)) # Intro (Super Mario 64 Logo)
$(eval $(call level_rules,menu,0x07000000,generic)) # Menu (File Select)
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),distclean)
$(BUILD_DIR)/level_rules.mk: levels/level_rules.mk levels/level_defines.h
$(CPP) $(VERSION_CFLAGS) -I . -o $@ $<
include $(BUILD_DIR)/level_rules.mk
endif
endif
# Ending cake texture override
ifeq ($(VERSION),eu)
ending_SEG7_FILES := $(patsubst %.png,%.inc.c,$(notdir $(wildcard levels/ending/eu*.png levels/ending/*eu.png)))
$(BUILD_DIR)/levels/ending/leveldata.o: $(addprefix $(BUILD_DIR)/levels/ending/,$(ending_SEG7_FILES))
$(BUILD_DIR)/levels/ending/leveldata.elf: SEGMENT_ADDRESS := 0x07000000
$(BUILD_DIR)/levels/ending/leveldata.elf: TEXTURE_BIN := generic
# --------------------------------------
# Extra Level Rules
# --------------------------------------
$(eval $(call level_rules,intro,generic)) # Intro (Super Mario 64 Logo)
$(eval $(call level_rules,menu,generic)) # Menu (File Select)
# --------------------------------------
# Cake Texture Rules
# --------------------------------------
# Ending cake textures are generated in a special way
$(BUILD_DIR)/levels/ending/cake_eu.inc.c: levels/ending/cake_eu.png
$(SKYCONV) --type cake-eu --split $^ $(BUILD_DIR)/levels/ending
else
ending_SEG7_FILES := cake.inc.c
$(BUILD_DIR)/levels/ending/leveldata.o: $(BUILD_DIR)/levels/ending/cake.inc.c
$(BUILD_DIR)/levels/ending/leveldata.elf: SEGMENT_ADDRESS := 0x07000000
$(BUILD_DIR)/levels/ending/leveldata.elf: TEXTURE_BIN := generic
$(BUILD_DIR)/levels/ending/cake.inc.c: levels/ending/cake.png
$(SKYCONV) --type cake --split $^ $(BUILD_DIR)/levels/ending
endif
# --------------------------------------
# Texture Bin Rules
@ -257,9 +226,9 @@ $(BUILD_DIR)/bin/mountain.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/grass.elf: SEGMENT_ADDRESS := 0x09000000
# EU segment 19 translations
$(BUILD_DIR)/bin/$(VERSION)/translation_de.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/$(VERSION)/translation_en.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/$(VERSION)/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/eu/translation_de.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/eu/translation_en.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/eu/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
# --------------------------------------
# Skybox Rules

28
actors/amp/model.inc.c
View File

@ -166,14 +166,10 @@ const Gfx amp_seg8_dl_08002E58[] = {
};
// 0x08002EC8
static const Ambient amp_seg8_light_08002EC8 = {
{{0x33, 0x3f, 0x00}, 0, {0x33, 0x3f, 0x00}, 0}
};
// 0x08002ED0
static const Light amp_seg8_light_08002ED0 = {
{{0xcf, 0xff, 0x00}, 0, {0xcf, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 amp_seg8_lights_08002EC8 = gdSPDefLights1(
0x33, 0x3f, 0x00,
0xcf, 0xff, 0x00, 0x28, 0x28, 0x28
);
// //! Another malformed entry: Vertex interpreted as light
// 0x08002EE0
@ -401,8 +397,8 @@ static const Vtx amp_seg8_vertex_080038D0[] = {
// 0x08003910 - 0x08003940
const Gfx amp_seg8_dl_08003910[] = {
gsSPLight(&amp_seg8_light_08002ED0, 1),
gsSPLight(&amp_seg8_light_08002EC8, 2),
gsSPLight(&amp_seg8_lights_08002EC8.l, 1),
gsSPLight(&amp_seg8_lights_08002EC8.a, 2),
gsSPVertex(amp_seg8_vertex_08002EE0, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -410,8 +406,8 @@ const Gfx amp_seg8_dl_08003910[] = {
// 0x08003940 - 0x08003970
const Gfx amp_seg8_dl_08003940[] = {
gsSPLight(&amp_seg8_light_08002ED0, 1),
gsSPLight(&amp_seg8_light_08002EC8, 2),
gsSPLight(&amp_seg8_lights_08002EC8.l, 1),
gsSPLight(&amp_seg8_lights_08002EC8.a, 2),
gsSPVertex(amp_seg8_vertex_08002F40, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -419,8 +415,8 @@ const Gfx amp_seg8_dl_08003940[] = {
// 0x08003970 - 0x080039A0
const Gfx amp_seg8_dl_08003970[] = {
gsSPLight(&amp_seg8_light_08002ED0, 1),
gsSPLight(&amp_seg8_light_08002EC8, 2),
gsSPLight(&amp_seg8_lights_08002EC8.l, 1),
gsSPLight(&amp_seg8_lights_08002EC8.a, 2),
gsSPVertex(amp_seg8_vertex_08002FA0, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -428,8 +424,8 @@ const Gfx amp_seg8_dl_08003970[] = {
// 0x080039A0 - 0x080039D0
const Gfx amp_seg8_dl_080039A0[] = {
gsSPLight(&amp_seg8_light_08002ED0, 1),
gsSPLight(&amp_seg8_light_08002EC8, 2),
gsSPLight(&amp_seg8_lights_08002EC8.l, 1),
gsSPLight(&amp_seg8_lights_08002EC8.a, 2),
gsSPVertex(amp_seg8_vertex_08003000, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),

68
actors/bird/model.inc.c
View File

@ -1,34 +1,22 @@
// Birds
// 0x05000000
static const Ambient birds_seg5_light_05000000 = {
{{0x07, 0x24, 0x2c}, 0, {0x07, 0x24, 0x2c}, 0}
};
// 0x05000008
static const Light birds_seg5_light_05000008 = {
{{0x1d, 0x91, 0xb0}, 0, {0x1d, 0x91, 0xb0}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 birds_seg5_lights_05000000 = gdSPDefLights1(
0x07, 0x24, 0x2c,
0x1d, 0x91, 0xb0, 0x28, 0x28, 0x28
);
// 0x05000018
static const Ambient birds_seg5_light_05000018 = {
{{0x33, 0x27, 0x0d}, 0, {0x33, 0x27, 0x0d}, 0}
};
// 0x05000020
static const Light birds_seg5_light_05000020 = {
{{0xce, 0x9d, 0x34}, 0, {0xce, 0x9d, 0x34}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 birds_seg5_lights_05000018 = gdSPDefLights1(
0x33, 0x27, 0x0d,
0xce, 0x9d, 0x34, 0x28, 0x28, 0x28
);
// 0x05000030
static const Ambient birds_seg5_light_05000030 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05000038
static const Light birds_seg5_light_05000038 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 birds_seg5_lights_05000030 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05000048
static const Vtx birds_seg5_vertex_05000048[] = {
@ -150,8 +138,8 @@ static const Vtx birds_seg5_vertex_050004C8[] = {
// 0x05000528 - 0x05000598
const Gfx birds_seg5_dl_05000528[] = {
gsSPLight(&birds_seg5_light_05000008, 1),
gsSPLight(&birds_seg5_light_05000000, 2),
gsSPLight(&birds_seg5_lights_05000000.l, 1),
gsSPLight(&birds_seg5_lights_05000000.a, 2),
gsSPVertex(birds_seg5_vertex_05000048, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 4, 3, 2, 0x0, 5, 3, 6, 0x0),
@ -163,16 +151,16 @@ const Gfx birds_seg5_dl_05000528[] = {
// 0x05000598 - 0x05000600
const Gfx birds_seg5_dl_05000598[] = {
gsSPLight(&birds_seg5_light_05000008, 1),
gsSPLight(&birds_seg5_light_05000000, 2),
gsSPLight(&birds_seg5_lights_05000000.l, 1),
gsSPLight(&birds_seg5_lights_05000000.a, 2),
gsSPVertex(birds_seg5_vertex_050000D8, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPLight(&birds_seg5_light_05000008, 1),
gsSPLight(&birds_seg5_light_05000000, 2),
gsSPLight(&birds_seg5_lights_05000000.l, 1),
gsSPLight(&birds_seg5_lights_05000000.a, 2),
gsSPVertex(birds_seg5_vertex_05000108, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPLight(&birds_seg5_light_05000008, 1),
gsSPLight(&birds_seg5_light_05000000, 2),
gsSPLight(&birds_seg5_lights_05000000.l, 1),
gsSPLight(&birds_seg5_lights_05000000.a, 2),
gsSPVertex(birds_seg5_vertex_05000138, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPEndDisplayList(),
@ -180,8 +168,8 @@ const Gfx birds_seg5_dl_05000598[] = {
// 0x05000600 - 0x05000670
const Gfx birds_seg5_dl_05000600[] = {
gsSPLight(&birds_seg5_light_05000008, 1),
gsSPLight(&birds_seg5_light_05000000, 2),
gsSPLight(&birds_seg5_lights_05000000.l, 1),
gsSPLight(&birds_seg5_lights_05000000.a, 2),
gsSPVertex(birds_seg5_vertex_05000168, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 0, 3, 4, 0x0, 5, 3, 6, 0x0),
@ -193,8 +181,8 @@ const Gfx birds_seg5_dl_05000600[] = {
// 0x05000670 - 0x050007E0
const Gfx birds_seg5_dl_05000670[] = {
gsSPLight(&birds_seg5_light_05000008, 1),
gsSPLight(&birds_seg5_light_05000000, 2),
gsSPLight(&birds_seg5_lights_05000000.l, 1),
gsSPLight(&birds_seg5_lights_05000000.a, 2),
gsSPVertex(birds_seg5_vertex_050001F8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 1, 9, 10, 0x0),
@ -210,16 +198,16 @@ const Gfx birds_seg5_dl_05000670[] = {
gsSP1Triangle( 7, 6, 15, 0x0),
gsSPVertex(birds_seg5_vertex_050003F8, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPLight(&birds_seg5_light_05000038, 1),
gsSPLight(&birds_seg5_light_05000030, 2),
gsSPLight(&birds_seg5_lights_05000030.l, 1),
gsSPLight(&birds_seg5_lights_05000030.a, 2),
gsSPVertex(birds_seg5_vertex_05000428, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 0, 7, 0x0, 7, 8, 6, 0x0),
gsSP2Triangles( 9, 7, 2, 0x0, 2, 7, 0, 0x0),
gsSP2Triangles( 2, 3, 9, 0x0, 7, 9, 8, 0x0),
gsSP1Triangle( 5, 4, 1, 0x0),
gsSPLight(&birds_seg5_light_05000020, 1),
gsSPLight(&birds_seg5_light_05000018, 2),
gsSPLight(&birds_seg5_lights_05000018.l, 1),
gsSPLight(&birds_seg5_lights_05000018.a, 2),
gsSPVertex(birds_seg5_vertex_050004C8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP1Triangle( 1, 3, 5, 0x0),

82
actors/blargg/model.inc.c
View File

@ -1,54 +1,34 @@
// Blargg (Unused)
// Unreferenced light
UNUSED static const Ambient blargg_light_1 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light
UNUSED static const Light blargg_light_2 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 blargg_lights_unused = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004740
static const Ambient blargg_seg5_light_05004740 = {
{{0x3f, 0x0d, 0x05}, 0, {0x3f, 0x0d, 0x05}, 0}
};
// 0x05004748
static const Light blargg_seg5_light_05004748 = {
{{0xff, 0x36, 0x16}, 0, {0xff, 0x36, 0x16}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 blargg_seg5_lights_05004740 = gdSPDefLights1(
0x3f, 0x0d, 0x05,
0xff, 0x36, 0x16, 0x28, 0x28, 0x28
);
// 0x05004758
static const Ambient blargg_seg5_light_05004758 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
// 0x05004760
static const Light blargg_seg5_light_05004760 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 blargg_seg5_lights_05004758 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x05004770
static const Ambient blargg_seg5_light_05004770 = {
{{0x3f, 0x0a, 0x06}, 0, {0x3f, 0x0a, 0x06}, 0}
};
// 0x05004778
static const Light blargg_seg5_light_05004778 = {
{{0xff, 0x2a, 0x1a}, 0, {0xff, 0x2a, 0x1a}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 blargg_seg5_lights_05004770 = gdSPDefLights1(
0x3f, 0x0a, 0x06,
0xff, 0x2a, 0x1a, 0x28, 0x28, 0x28
);
// 0x05004788
static const Ambient blargg_seg5_light_05004788 = {
{{0x3f, 0x0b, 0x07}, 0, {0x3f, 0x0b, 0x07}, 0}
};
// 0x05004790
static const Light blargg_seg5_light_05004790 = {
{{0xff, 0x2e, 0x1f}, 0, {0xff, 0x2e, 0x1f}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 blargg_seg5_lights_05004788 = gdSPDefLights1(
0x3f, 0x0b, 0x07,
0xff, 0x2e, 0x1f, 0x28, 0x28, 0x28
);
// 0x050047A0
static const Vtx blargg_seg5_vertex_050047A0[] = {
@ -403,8 +383,8 @@ static const Vtx blargg_seg5_vertex_050057E0[] = {
// 0x050058D0 - 0x05005A60
const Gfx blargg_seg5_dl_050058D0[] = {
gsSPLight(&blargg_seg5_light_05004760, 1),
gsSPLight(&blargg_seg5_light_05004758, 2),
gsSPLight(&blargg_seg5_lights_05004758.l, 1),
gsSPLight(&blargg_seg5_lights_05004758.a, 2),
gsSPVertex(blargg_seg5_vertex_050047A0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -418,8 +398,8 @@ const Gfx blargg_seg5_dl_050058D0[] = {
gsSPVertex(blargg_seg5_vertex_050049A0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
gsSPLight(&blargg_seg5_light_05004748, 1),
gsSPLight(&blargg_seg5_light_05004740, 2),
gsSPLight(&blargg_seg5_lights_05004740.l, 1),
gsSPLight(&blargg_seg5_lights_05004740.a, 2),
gsSPVertex(blargg_seg5_vertex_05004A20, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -438,8 +418,8 @@ const Gfx blargg_seg5_dl_050058D0[] = {
// 0x05005A60 - 0x05005D00
const Gfx blargg_seg5_dl_05005A60[] = {
gsSPLight(&blargg_seg5_light_05004760, 1),
gsSPLight(&blargg_seg5_light_05004758, 2),
gsSPLight(&blargg_seg5_lights_05004758.l, 1),
gsSPLight(&blargg_seg5_lights_05004758.a, 2),
gsSPVertex(blargg_seg5_vertex_05004BE0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -453,8 +433,8 @@ const Gfx blargg_seg5_dl_05005A60[] = {
gsSPVertex(blargg_seg5_vertex_05004DE0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
gsSPLight(&blargg_seg5_light_05004778, 1),
gsSPLight(&blargg_seg5_light_05004770, 2),
gsSPLight(&blargg_seg5_lights_05004770.l, 1),
gsSPLight(&blargg_seg5_lights_05004770.a, 2),
gsSPVertex(blargg_seg5_vertex_05004E60, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 2, 6, 7, 0x0, 2, 7, 8, 0x0),
@ -492,8 +472,8 @@ const Gfx blargg_seg5_dl_05005A60[] = {
// 0x05005D00 - 0x05005EB8
const Gfx blargg_seg5_dl_05005D00[] = {
gsSPLight(&blargg_seg5_light_05004790, 1),
gsSPLight(&blargg_seg5_light_05004788, 2),
gsSPLight(&blargg_seg5_lights_05004788.l, 1),
gsSPLight(&blargg_seg5_lights_05004788.a, 2),
gsSPVertex(blargg_seg5_vertex_050053E0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

16
actors/blue_coin_switch/model.inc.c
View File

@ -1,14 +1,10 @@
// Blue Coin Switch
// 0x08000000
static const Ambient blue_coin_switch_seg8_light_08000000 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x08000008
static const Light blue_coin_switch_seg8_light_08000008 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 blue_coin_switch_seg8_lights_08000000 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08000018
ALIGNED8 static const u8 blue_coin_switch_seg8_texture_08000018[] = {
@ -53,8 +49,8 @@ const Gfx blue_coin_switch_seg8_dl_08000D58[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, blue_coin_switch_seg8_texture_08000018),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&blue_coin_switch_seg8_light_08000008, 1),
gsSPLight(&blue_coin_switch_seg8_light_08000000, 2),
gsSPLight(&blue_coin_switch_seg8_lights_08000000.l, 1),
gsSPLight(&blue_coin_switch_seg8_lights_08000000.a, 2),
gsSPVertex(blue_coin_switch_seg8_vertex_08000C18, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),

20
actors/blue_fish/model.inc.c
View File

@ -1,14 +1,10 @@
// Blue Fish
// 0x0301B5C8
static const Ambient blue_fish_seg3_light_0301B5C8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0301B5D0
static const Light blue_fish_seg3_light_0301B5D0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0301B5E0
ALIGNED8 static const u8 blue_fish_seg3_texture_0301B5E0[] = {
@ -38,8 +34,8 @@ const Gfx blue_fish_seg3_dl_0301BEC0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, blue_fish_seg3_texture_0301B5E0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&blue_fish_seg3_light_0301B5D0, 1),
gsSPLight(&blue_fish_seg3_light_0301B5C8, 2),
gsSPLight(&blue_fish_seg3_lights_0301B5C8.l, 1),
gsSPLight(&blue_fish_seg3_lights_0301B5C8.a, 2),
gsSPVertex(blue_fish_seg3_vertex_0301BDE0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 5, 0, 3, 0x0, 2, 6, 0, 0x0),
@ -90,8 +86,8 @@ const Gfx blue_fish_seg3_dl_0301C0A8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, blue_fish_seg3_texture_0301B5E0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&blue_fish_seg3_light_0301B5D0, 1),
gsSPLight(&blue_fish_seg3_light_0301B5C8, 2),
gsSPLight(&blue_fish_seg3_lights_0301B5C8.l, 1),
gsSPLight(&blue_fish_seg3_lights_0301B5C8.a, 2),
gsSPVertex(blue_fish_seg3_vertex_0301C018, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 4, 5, 2, 0x0, 2, 5, 6, 0x0),

50
actors/bobomb/model.inc.c
View File

@ -168,34 +168,22 @@ const Gfx bobomb_seg8_dl_08022D78[] = {
};
// 0x08022DE8
static const Ambient bobomb_seg8_light_08022DE8 = {
{{0x3f, 0x26, 0x04}, 0, {0x3f, 0x26, 0x04}, 0}
};
// 0x08022DF0
static const Light bobomb_seg8_light_08022DF0 = {
{{0xff, 0x99, 0x12}, 0, {0xff, 0x99, 0x12}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bobomb_seg8_lights_08022DE8 = gdSPDefLights1(
0x3f, 0x26, 0x04,
0xff, 0x99, 0x12, 0x28, 0x28, 0x28
);
// 0x08022E00
static const Ambient bobomb_seg8_light_08022E00 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
static const Lights1 bobomb_seg8_lights_08022E00 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x08022E08
static const Light bobomb_seg8_light_08022E08 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient bobomb_light_1 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light bobomb_light_2 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
static const Lights1 bobomb_lights_unused = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x08022E30
static const Vtx bobomb_seg8_vertex_08022E30[] = {
@ -291,8 +279,8 @@ static const Vtx bobomb_seg8_vertex_08023190[] = {
// 0x08023270 - 0x08023378
const Gfx bobomb_seg8_dl_08023270[] = {
gsSPLight(&bobomb_seg8_light_08022DF0, 1),
gsSPLight(&bobomb_seg8_light_08022DE8, 2),
gsSPLight(&bobomb_seg8_lights_08022DE8.l, 1),
gsSPLight(&bobomb_seg8_lights_08022DE8.a, 2),
gsSPVertex(bobomb_seg8_vertex_08022E30, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -314,8 +302,8 @@ const Gfx bobomb_seg8_dl_08023270[] = {
// 0x08023378 - 0x08023480
const Gfx bobomb_seg8_dl_08023378[] = {
gsSPLight(&bobomb_seg8_light_08022DF0, 1),
gsSPLight(&bobomb_seg8_light_08022DE8, 2),
gsSPLight(&bobomb_seg8_lights_08022DE8.l, 1),
gsSPLight(&bobomb_seg8_lights_08022DE8.a, 2),
gsSPVertex(bobomb_seg8_vertex_08022F70, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -337,8 +325,8 @@ const Gfx bobomb_seg8_dl_08023378[] = {
// 0x08023480 - 0x08023528
const Gfx bobomb_seg8_dl_08023480[] = {
gsSPLight(&bobomb_seg8_light_08022E08, 1),
gsSPLight(&bobomb_seg8_light_08022E00, 2),
gsSPLight(&bobomb_seg8_lights_08022E00.l, 1),
gsSPLight(&bobomb_seg8_lights_08022E00.a, 2),
gsSPVertex(bobomb_seg8_vertex_080230B0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 0, 3, 0x0, 4, 3, 5, 0x0),

16
actors/bomb/model.inc.c
View File

@ -1,14 +1,10 @@
// Bomb
// 0x06057AA8
static const Ambient bomb_seg6_light_06057AA8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x06057AB0
static const Light bomb_seg6_light_06057AB0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bomb_seg6_lights_06057AA8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06057AC0
ALIGNED8 static const u8 bomb_seg6_texture_06057AC0[] = {
@ -177,8 +173,8 @@ const Gfx bomb_seg6_dl_0605A8A8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bomb_seg6_texture_06059AC0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bomb_seg6_light_06057AB0, 1),
gsSPLight(&bomb_seg6_light_06057AA8, 2),
gsSPLight(&bomb_seg6_lights_06057AA8.l, 1),
gsSPLight(&bomb_seg6_lights_06057AA8.a, 2),
gsSPVertex(bomb_seg6_vertex_0605A340, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),

18
actors/boo/model.inc.c
View File

@ -1,14 +1,10 @@
// Boo
// 0x05009B28
static const Ambient boo_seg5_light_05009B28 = {
{{0x97, 0x9a, 0xff}, 0, {0x97, 0x9a, 0xff}, 0}
};
// 0x05009B30
static const Light boo_seg5_light_05009B30 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 boo_seg5_lights_05009B28 = gdSPDefLights1(
0x97, 0x9a, 0xff,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05009B40
ALIGNED8 static const u8 boo_seg5_texture_05009B40[] = {
@ -265,8 +261,8 @@ const Gfx boo_seg5_dl_0500BEE0[] = {
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),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&boo_seg5_light_05009B30, 1),
gsSPLight(&boo_seg5_light_05009B28, 2),
gsSPLight(&boo_seg5_lights_05009B28.l, 1),
gsSPLight(&boo_seg5_lights_05009B28.a, 2),
gsSPVertex(boo_seg5_vertex_0500B340, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -338,7 +334,7 @@ const Gfx boo_seg5_dl_0500BFA0[] = {
const Gfx boo_seg5_dl_0500C1B0[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_BLENDRGBFADEA, G_CC_BLENDRGBFADEA),
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPNumLights(NUMLIGHTS_1),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),

18
actors/boo_castle/model.inc.c
View File

@ -1,14 +1,10 @@
// Boo (Castle)
// 0x06015658
static const Ambient boo_castle_seg6_light_06015658 = {
{{0x97, 0x9a, 0xff}, 0, {0x97, 0x9a, 0xff}, 0}
};
// 0x06015660
static const Light boo_castle_seg6_light_06015660 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 boo_castle_seg6_lights_06015658 = gdSPDefLights1(
0x97, 0x9a, 0xff,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06015670
ALIGNED8 static const u8 boo_castle_seg6_texture_06015670[] = {
@ -265,8 +261,8 @@ const Gfx boo_castle_seg6_dl_06017A10[] = {
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),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&boo_castle_seg6_light_06015660, 1),
gsSPLight(&boo_castle_seg6_light_06015658, 2),
gsSPLight(&boo_castle_seg6_lights_06015658.l, 1),
gsSPLight(&boo_castle_seg6_lights_06015658.a, 2),
gsSPVertex(boo_castle_seg6_vertex_06016E70, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -338,7 +334,7 @@ const Gfx boo_castle_seg6_dl_06017AD0[] = {
const Gfx boo_castle_seg6_dl_06017CE0[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_BLENDRGBFADEA, G_CC_BLENDRGBFADEA),
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPNumLights(NUMLIGHTS_1),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),

16
actors/book/model.inc.c
View File

@ -3,14 +3,10 @@
// This actor file requires including actor bookend because of bookend_seg5_texture_05000C60
// 0x05002558
static const Ambient book_seg5_light_05002558 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05002560
static const Light book_seg5_light_05002560 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 book_seg5_lights_05002558 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05002570
ALIGNED8 static const u8 book_seg5_texture_05002570[] = {
@ -54,8 +50,8 @@ const Gfx book_seg5_dl_05002EF0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000C60),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&book_seg5_light_05002560, 1),
gsSPLight(&book_seg5_light_05002558, 2),
gsSPLight(&book_seg5_lights_05002558.l, 1),
gsSPLight(&book_seg5_lights_05002558.a, 2),
gsSPVertex(book_seg5_vertex_05002D70, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

152
actors/bookend/model.inc.c
View File

@ -1,44 +1,28 @@
// Bookend
// Unreferenced Light
UNUSED static const Ambient bookend_light_1 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 bookend_lights_unused1 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced Light
UNUSED static const Light bookend_light_2 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 bookend_lights_unused2 = gdSPDefLights1(
0x03, 0x19, 0x09,
0x0c, 0x66, 0x26, 0x28, 0x28, 0x28
);
// Unreferenced Light
UNUSED static const Ambient bookend_light_3 = {
{{0x03, 0x19, 0x09}, 0, {0x03, 0x19, 0x09}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 bookend_lights_unused3 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced Light
UNUSED static const Light bookend_light_4 = {
{{0x0c, 0x66, 0x26}, 0, {0x0c, 0x66, 0x26}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced Light
UNUSED static const Ambient bookend_light_5 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced Light
UNUSED static const Light bookend_light_6 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced Light
UNUSED static const Ambient bookend_light_7 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// Unreferenced Light
UNUSED static const Light bookend_light_8 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 bookend_lights_unused4 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x05000060
ALIGNED8 static const u8 bookend_seg5_texture_05000060[] = {
@ -66,14 +50,10 @@ ALIGNED8 static const u8 bookend_seg5_texture_05001060[] = {
};
// 0x05001860
static const Ambient bookend_seg5_light_05001860 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x05001868
static const Light bookend_seg5_light_05001868 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bookend_seg5_lights_05001860 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001878
static const Vtx bookend_seg5_vertex_05001878[] = {
@ -96,8 +76,8 @@ const Gfx bookend_seg5_dl_050018F8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000060),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bookend_seg5_light_05001868, 1),
gsSPLight(&bookend_seg5_light_05001860, 2),
gsSPLight(&bookend_seg5_lights_05001860.l, 1),
gsSPLight(&bookend_seg5_lights_05001860.a, 2),
gsSPVertex(bookend_seg5_vertex_05001878, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -136,14 +116,10 @@ const Gfx bookend_seg5_dl_05001978[] = {
};
// 0x05001A08
static const Ambient bookend_seg5_light_05001A08 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x05001A10
static const Light bookend_seg5_light_05001A10 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bookend_seg5_lights_05001A08 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001A20
static const Vtx bookend_seg5_vertex_05001A20[] = {
@ -166,8 +142,8 @@ const Gfx bookend_seg5_dl_05001AA0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000060),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bookend_seg5_light_05001A10, 1),
gsSPLight(&bookend_seg5_light_05001A08, 2),
gsSPLight(&bookend_seg5_lights_05001A08.l, 1),
gsSPLight(&bookend_seg5_lights_05001A08.a, 2),
gsSPVertex(bookend_seg5_vertex_05001A20, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -206,14 +182,10 @@ const Gfx bookend_seg5_dl_05001B20[] = {
};
// 0x05001BB0
static const Ambient bookend_seg5_light_05001BB0 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x05001BB8
static const Light bookend_seg5_light_05001BB8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bookend_seg5_lights_05001BB0 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001BC8
static const Vtx bookend_seg5_vertex_05001BC8[] = {
@ -244,8 +216,8 @@ const Gfx bookend_seg5_dl_05001CC8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000860),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bookend_seg5_light_05001BB8, 1),
gsSPLight(&bookend_seg5_light_05001BB0, 2),
gsSPLight(&bookend_seg5_lights_05001BB0.l, 1),
gsSPLight(&bookend_seg5_lights_05001BB0.a, 2),
gsSPVertex(bookend_seg5_vertex_05001BC8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -283,14 +255,10 @@ const Gfx bookend_seg5_dl_05001D68[] = {
};
// 0x05001DE0
static const Ambient bookend_seg5_light_05001DE0 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x05001DE8
static const Light bookend_seg5_light_05001DE8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bookend_seg5_lights_05001DE0 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001DF8
static const Vtx bookend_seg5_vertex_05001DF8[] = {
@ -321,8 +289,8 @@ const Gfx bookend_seg5_dl_05001EF8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000860),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bookend_seg5_light_05001DE8, 1),
gsSPLight(&bookend_seg5_light_05001DE0, 2),
gsSPLight(&bookend_seg5_lights_05001DE0.l, 1),
gsSPLight(&bookend_seg5_lights_05001DE0.a, 2),
gsSPVertex(bookend_seg5_vertex_05001DF8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -360,14 +328,10 @@ const Gfx bookend_seg5_dl_05001F98[] = {
};
// 0x05002010
static const Ambient bookend_seg5_light_05002010 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x05002018
static const Light bookend_seg5_light_05002018 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bookend_seg5_lights_05002010 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05002028
static const Vtx bookend_seg5_vertex_05002028[] = {
@ -390,8 +354,8 @@ const Gfx bookend_seg5_dl_050020E8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000460),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bookend_seg5_light_05002018, 1),
gsSPLight(&bookend_seg5_light_05002010, 2),
gsSPLight(&bookend_seg5_lights_05002010.l, 1),
gsSPLight(&bookend_seg5_lights_05002010.a, 2),
gsSPVertex(bookend_seg5_vertex_05002028, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -417,14 +381,10 @@ const Gfx bookend_seg5_dl_05002140[] = {
};
// 0x050021B0
static const Ambient bookend_seg5_light_050021B0 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x050021B8
static const Light bookend_seg5_light_050021B8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bookend_seg5_lights_050021B0 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050021C8
static const Vtx bookend_seg5_vertex_050021C8[] = {
@ -447,8 +407,8 @@ const Gfx bookend_seg5_dl_05002288[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000460),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bookend_seg5_light_050021B8, 1),
gsSPLight(&bookend_seg5_light_050021B0, 2),
gsSPLight(&bookend_seg5_lights_050021B0.l, 1),
gsSPLight(&bookend_seg5_lights_050021B0.a, 2),
gsSPVertex(bookend_seg5_vertex_050021C8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),

96
actors/bowser/model.inc.c
View File

@ -148,34 +148,22 @@ ALIGNED8 static const u8 bowser_seg6_texture_06037C38[] = {
};
// 0x06038C38
static const Ambient bowser_seg6_light_06038C38 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
static const Lights1 bowser_seg6_lights_06038C38 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06038C40
static const Light bowser_seg6_light_06038C40 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 bowser_lights_unused1 = gdSPDefLights1(
0x33, 0x31, 0x00,
0xce, 0xc7, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient bowser_light_1 = {
{{0x33, 0x31, 0x00}, 0, {0x33, 0x31, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light bowser_light_2 = {
{{0xce, 0xc7, 0x00}, 0, {0xce, 0xc7, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient bowser_light_3 = {
{{0x34, 0x34, 0x00}, 0, {0x34, 0x34, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light bowser_light_4 = {
{{0xd2, 0xd2, 0x00}, 0, {0xd2, 0xd2, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 bowser_lights_unused2 = gdSPDefLights1(
0x34, 0x34, 0x00,
0xd2, 0xd2, 0x00, 0x28, 0x28, 0x28
);
// 0x06038C80
static const Vtx bowser_seg6_vertex_06038C80[] = {
@ -279,8 +267,8 @@ const Gfx bowser_seg6_dl_06039110[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_06038C80, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@ -451,8 +439,8 @@ const Gfx bowser_seg6_dl_06039808[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06023C38),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_06039368, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@ -683,8 +671,8 @@ const Gfx bowser_seg6_dl_0603A210[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_06039A60, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 4, 0, 2, 0x0, 2, 1, 5, 0x0),
@ -959,8 +947,8 @@ const Gfx bowser_seg6_dl_0603AED8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_0603A568, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 5, 8, 0x0),
@ -1144,8 +1132,8 @@ const Gfx bowser_seg6_dl_0603B718[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_0603B288, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 1, 4, 3, 0x0, 5, 3, 4, 0x0),
@ -1322,8 +1310,8 @@ const Gfx bowser_seg6_dl_0603BDF8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06023C38),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_0603B948, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 3, 5, 0x0, 7, 6, 5, 0x0),
@ -1495,8 +1483,8 @@ const Gfx bowser_seg6_dl_0603C500[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06023C38),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_0603C050, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 7, 0x0, 3, 7, 4, 0x0),
@ -1730,8 +1718,8 @@ const Gfx bowser_seg6_dl_0603CF28[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_0603C758, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 5, 0, 4, 0x0, 0, 2, 6, 0x0),
@ -2021,8 +2009,8 @@ const Gfx bowser_seg6_dl_0603DC70[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_0603D280, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 8, 0x0),
@ -2211,8 +2199,8 @@ const Gfx bowser_seg6_dl_0603E500[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_0603E030, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@ -2690,8 +2678,8 @@ const Gfx bowser_seg6_dl_0603FBA8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06023C38),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_0603E718, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -3404,8 +3392,8 @@ const Gfx bowser_seg6_dl_06041A28[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06028438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_060402D8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -3961,8 +3949,8 @@ const Gfx bowser_seg6_dl_06042EE0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06020C38),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_06042660, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 6, 7, 3, 0x0),
@ -4119,8 +4107,8 @@ const Gfx bowser_seg6_dl_06043548[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bowser_seg6_light_06038C40, 1),
gsSPLight(&bowser_seg6_light_06038C38, 2),
gsSPLight(&bowser_seg6_lights_06038C38.l, 1),
gsSPLight(&bowser_seg6_lights_06038C38.a, 2),
gsSPVertex(bowser_seg6_vertex_06043278, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP2Triangles( 0, 2, 3, 0x0, 0, 5, 1, 0x0),

18
actors/bowser_key/model.inc.c
View File

@ -1,14 +1,10 @@
// Bowser Key
// 0x030156E0, solid color brown
static const Ambient bowser_key_amb_light = {
{{0x3f, 0x2c, 0x00}, 0, {0x3f, 0x2c, 0x00}, 0}
};
// 0x030156E8, solid color orange
static const Light bowser_key_diff_light = {
{{0xff, 0xb2, 0x00}, 0, {0xff, 0xb2, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x030156E0, ambient color brown - light color orange
static const Lights1 bowser_key_lights = gdSPDefLights1(
0x3f, 0x2c, 0x00,
0xff, 0xb2, 0x00, 0x28, 0x28, 0x28
);
// 0x030156F8
static const Vtx bowser_key_dl_vertex_group1[] = {
@ -236,8 +232,8 @@ static const Vtx bowser_key_dl_vertex_group12[] = {
// 0x030161F8 - 0x03016530
const Gfx bowser_key_dl[] = {
gsSPLight(&bowser_key_diff_light, 1),
gsSPLight(&bowser_key_amb_light, 2),
gsSPLight(&bowser_key_lights.l, 1),
gsSPLight(&bowser_key_lights.a, 2),
gsSPVertex(bowser_key_dl_vertex_group1, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

16
actors/breakable_box/model.inc.c
View File

@ -1,14 +1,10 @@
// Breakable Box
// 0x08011A78
static const Ambient breakable_box_seg8_light_08011A78 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x08011A80
static const Light breakable_box_seg8_light_08011A80 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 breakable_box_seg8_lights_08011A80 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08011A90
ALIGNED8 static const u8 breakable_box_seg8_texture_08011A90[] = {
@ -56,8 +52,8 @@ static const Vtx breakable_box_seg8_vertex_08012B80[] = {
// 0x08012C30 - 0x08012CD8
const Gfx breakable_box_seg8_dl_08012C30[] = {
gsSPLight(&breakable_box_seg8_light_08011A80, 1),
gsSPLight(&breakable_box_seg8_light_08011A78, 2),
gsSPLight(&breakable_box_seg8_lights_08011A80.l, 1),
gsSPLight(&breakable_box_seg8_lights_08011A80.a, 2),
gsSPVertex(breakable_box_seg8_vertex_08012A90, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),

48
actors/bub/model.inc.c
View File

@ -1,24 +1,16 @@
// Bub
// 0x0600E278
static const Ambient bub_seg6_light_0600E278 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0600E280
static const Light bub_seg6_light_0600E280 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bub_seg6_lights_0600E280 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600E290
static const Ambient bub_seg6_light_0600E290 = {
{{0x3f, 0x1d, 0x25}, 0, {0x3f, 0x1d, 0x25}, 0}
};
// 0x0600E298
static const Light bub_seg6_light_0600E298 = {
{{0xff, 0x75, 0x94}, 0, {0xff, 0x75, 0x94}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bub_seg6_lights_0600E290 = gdSPDefLights1(
0x3f, 0x1d, 0x25,
0xff, 0x75, 0x94, 0x28, 0x28, 0x28
);
// 0x0600E2A8
ALIGNED8 static const u8 bub_seg6_texture_0600E2A8[] = {
@ -171,8 +163,8 @@ const Gfx bub_seg6_dl_06011848[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bub_seg6_texture_0600E2A8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bub_seg6_light_0600E280, 1),
gsSPLight(&bub_seg6_light_0600E278, 2),
gsSPLight(&bub_seg6_lights_0600E280.l, 1),
gsSPLight(&bub_seg6_lights_0600E280.a, 2),
gsSPVertex(bub_seg6_vertex_060112A8, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0),
@ -230,8 +222,8 @@ const Gfx bub_seg6_dl_06011968[] = {
// 0x06011A50 - 0x06011B28
const Gfx bub_seg6_dl_06011A50[] = {
gsSPLight(&bub_seg6_light_0600E298, 1),
gsSPLight(&bub_seg6_light_0600E290, 2),
gsSPLight(&bub_seg6_lights_0600E290.l, 1),
gsSPLight(&bub_seg6_lights_0600E290.a, 2),
gsSPVertex(bub_seg6_vertex_06011718, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 1, 3, 4, 0x0),
@ -240,8 +232,8 @@ const Gfx bub_seg6_dl_06011A50[] = {
gsSP2Triangles( 8, 9, 10, 0x0, 8, 5, 0, 0x0),
gsSP2Triangles( 0, 11, 8, 0x0, 8, 10, 5, 0x0),
gsSP2Triangles( 5, 10, 6, 0x0, 10, 9, 6, 0x0),
gsSPLight(&bub_seg6_light_0600E280, 1),
gsSPLight(&bub_seg6_light_0600E278, 2),
gsSPLight(&bub_seg6_lights_0600E280.l, 1),
gsSPLight(&bub_seg6_lights_0600E280.a, 2),
gsSPVertex(bub_seg6_vertex_060117D8, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 2, 1, 5, 0x0, 2, 5, 6, 0x0),
@ -292,8 +284,8 @@ const Gfx bub_seg6_dl_06011C58[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bub_seg6_texture_0600EAA8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bub_seg6_light_0600E280, 1),
gsSPLight(&bub_seg6_light_0600E278, 2),
gsSPLight(&bub_seg6_lights_0600E280.l, 1),
gsSPLight(&bub_seg6_lights_0600E280.a, 2),
gsSPVertex(bub_seg6_vertex_06011BD8, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP2Triangles( 4, 5, 0, 0x0, 0, 5, 6, 0x0),
@ -336,8 +328,8 @@ const Gfx bub_seg6_dl_06011DC0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bub_seg6_texture_0600EAA8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bub_seg6_light_0600E280, 1),
gsSPLight(&bub_seg6_light_0600E278, 2),
gsSPLight(&bub_seg6_lights_0600E280.l, 1),
gsSPLight(&bub_seg6_lights_0600E280.a, 2),
gsSPVertex(bub_seg6_vertex_06011D50, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0),
gsSP2Triangles( 2, 4, 0, 0x0, 3, 2, 1, 0x0),
@ -379,8 +371,8 @@ const Gfx bub_seg6_dl_06011F18[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bub_seg6_texture_0600EAA8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bub_seg6_light_0600E280, 1),
gsSPLight(&bub_seg6_light_0600E278, 2),
gsSPLight(&bub_seg6_lights_0600E280.l, 1),
gsSPLight(&bub_seg6_lights_0600E280.a, 2),
gsSPVertex(bub_seg6_vertex_06011EA8, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 3, 0, 0x0, 0, 5, 6, 0x0),

112
actors/bubba/model.inc.c
View File

@ -34,34 +34,22 @@ ALIGNED8 static const u8 bubba_seg5_texture_05002408[] = {
};
// 0x05004408
static const Ambient bubba_seg5_light_05004408 = {
{{0x48, 0x31, 0x2a}, 0, {0x48, 0x31, 0x2a}, 0}
};
// 0x05004410
static const Light bubba_seg5_light_05004410 = {
{{0xf1, 0xa6, 0x8c}, 0, {0xf1, 0xa6, 0x8c}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bubba_seg5_lights_05004408 = gdSPDefLights1(
0x48, 0x31, 0x2a,
0xf1, 0xa6, 0x8c, 0x28, 0x28, 0x28
);
// 0x05004420
static const Ambient bubba_seg5_light_05004420 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x05004428
static const Light bubba_seg5_light_05004428 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bubba_seg5_lights_05004420 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004438
static const Ambient bubba_seg5_light_05004438 = {
{{0x10, 0x07, 0x08}, 0, {0x10, 0x07, 0x08}, 0}
};
// 0x05004440
static const Light bubba_seg5_light_05004440 = {
{{0x36, 0x1a, 0x1c}, 0, {0x36, 0x1a, 0x1c}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bubba_seg5_lights_05004438 = gdSPDefLights1(
0x10, 0x07, 0x08,
0x36, 0x1a, 0x1c, 0x28, 0x28, 0x28
);
// 0x05004450
static const Vtx bubba_seg5_vertex_05004450[] = {
@ -199,8 +187,8 @@ const Gfx bubba_seg5_dl_05004A40[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubba_seg5_texture_05000008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bubba_seg5_light_05004410, 1),
gsSPLight(&bubba_seg5_light_05004408, 2),
gsSPLight(&bubba_seg5_lights_05004408.l, 1),
gsSPLight(&bubba_seg5_lights_05004408.a, 2),
gsSPVertex(bubba_seg5_vertex_05004450, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 4, 1, 3, 0x0, 5, 1, 4, 0x0),
@ -213,8 +201,8 @@ const Gfx bubba_seg5_dl_05004AA8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubba_seg5_texture_05001408),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bubba_seg5_light_05004428, 1),
gsSPLight(&bubba_seg5_light_05004420, 2),
gsSPLight(&bubba_seg5_lights_05004420.l, 1),
gsSPLight(&bubba_seg5_lights_05004420.a, 2),
gsSPVertex(bubba_seg5_vertex_050044C0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP2Triangles( 0, 2, 3, 0x0, 5, 0, 4, 0x0),
@ -274,8 +262,8 @@ const Gfx bubba_seg5_dl_05004C40[] = {
// 0x05004D48 - 0x05004E80
const Gfx bubba_seg5_dl_05004D48[] = {
gsSPLight(&bubba_seg5_light_05004410, 1),
gsSPLight(&bubba_seg5_light_05004408, 2),
gsSPLight(&bubba_seg5_lights_05004408.l, 1),
gsSPLight(&bubba_seg5_lights_05004408.a, 2),
gsSPVertex(bubba_seg5_vertex_05004870, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 4, 6, 5, 0x0),
@ -284,16 +272,16 @@ const Gfx bubba_seg5_dl_05004D48[] = {
gsSP2Triangles(10, 11, 7, 0x0, 3, 7, 0, 0x0),
gsSP2Triangles( 0, 11, 1, 0x0, 6, 10, 9, 0x0),
gsSP2Triangles(12, 10, 6, 0x0, 12, 11, 10, 0x0),
gsSPLight(&bubba_seg5_light_05004440, 1),
gsSPLight(&bubba_seg5_light_05004438, 2),
gsSPLight(&bubba_seg5_lights_05004438.l, 1),
gsSPLight(&bubba_seg5_lights_05004438.a, 2),
gsSPVertex(bubba_seg5_vertex_05004940, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 7, 0x0, 5, 6, 3, 0x0),
gsSP2Triangles( 3, 8, 4, 0x0, 7, 6, 5, 0x0),
gsSP2Triangles( 8, 2, 1, 0x0, 8, 1, 0, 0x0),
gsSP1Triangle( 4, 8, 0, 0x0),
gsSPLight(&bubba_seg5_light_05004428, 1),
gsSPLight(&bubba_seg5_light_05004420, 2),
gsSPLight(&bubba_seg5_lights_05004420.l, 1),
gsSPLight(&bubba_seg5_lights_05004420.a, 2),
gsSPVertex(bubba_seg5_vertex_050049D0, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 0, 0x0, 0, 5, 3, 0x0),
@ -328,34 +316,22 @@ const Gfx bubba_seg5_dl_05004E80[] = {
};
// 0x05004F30
static const Ambient bubba_seg5_light_05004F30 = {
{{0x48, 0x31, 0x2a}, 0, {0x48, 0x31, 0x2a}, 0}
};
// 0x05004F38
static const Light bubba_seg5_light_05004F38 = {
{{0xf1, 0xa6, 0x8c}, 0, {0xf1, 0xa6, 0x8c}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bubba_seg5_lights_05004F30 = gdSPDefLights1(
0x48, 0x31, 0x2a,
0xf1, 0xa6, 0x8c, 0x28, 0x28, 0x28
);
// 0x05004F48
static const Ambient bubba_seg5_light_05004F48 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x05004F50
static const Light bubba_seg5_light_05004F50 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bubba_seg5_lights_05004F50 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004F60
static const Ambient bubba_seg5_light_05004F60 = {
{{0x0a, 0x07, 0x08}, 0, {0x0a, 0x07, 0x08}, 0}
};
// 0x05004F68
static const Light bubba_seg5_light_05004F68 = {
{{0x22, 0x1a, 0x1c}, 0, {0x22, 0x1a, 0x1c}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bubba_seg5_lights_05004F60 = gdSPDefLights1(
0x0a, 0x07, 0x08,
0x22, 0x1a, 0x1c, 0x28, 0x28, 0x28
);
// 0x05004F78
static const Vtx bubba_seg5_vertex_05004F78[] = {
@ -490,8 +466,8 @@ const Gfx bubba_seg5_dl_05005538[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubba_seg5_texture_05000008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bubba_seg5_light_05004F38, 1),
gsSPLight(&bubba_seg5_light_05004F30, 2),
gsSPLight(&bubba_seg5_lights_05004F30.l, 1),
gsSPLight(&bubba_seg5_lights_05004F30.a, 2),
gsSPVertex(bubba_seg5_vertex_05004F78, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 4, 0, 5, 0x0, 5, 0, 2, 0x0),
@ -504,8 +480,8 @@ const Gfx bubba_seg5_dl_050055A0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubba_seg5_texture_05001408),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bubba_seg5_light_05004F50, 1),
gsSPLight(&bubba_seg5_light_05004F48, 2),
gsSPLight(&bubba_seg5_lights_05004F50.l, 1),
gsSPLight(&bubba_seg5_lights_05004F50.a, 2),
gsSPVertex(bubba_seg5_vertex_05004FE8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 5, 3, 0x0, 6, 5, 0, 0x0),
@ -565,8 +541,8 @@ const Gfx bubba_seg5_dl_05005738[] = {
// 0x05005840 - 0x05005978
const Gfx bubba_seg5_dl_05005840[] = {
gsSPLight(&bubba_seg5_light_05004F38, 1),
gsSPLight(&bubba_seg5_light_05004F30, 2),
gsSPLight(&bubba_seg5_lights_05004F30.l, 1),
gsSPLight(&bubba_seg5_lights_05004F30.a, 2),
gsSPVertex(bubba_seg5_vertex_05005368, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 5, 2, 1, 0x0, 1, 6, 5, 0x0),
@ -575,16 +551,16 @@ const Gfx bubba_seg5_dl_05005840[] = {
gsSP2Triangles(11, 6, 1, 0x0, 9, 10, 8, 0x0),
gsSP2Triangles(12, 5, 9, 0x0, 7, 5, 12, 0x0),
gsSP2Triangles( 9, 8, 12, 0x0, 0, 11, 1, 0x0),
gsSPLight(&bubba_seg5_light_05004F68, 1),
gsSPLight(&bubba_seg5_light_05004F60, 2),
gsSPLight(&bubba_seg5_lights_05004F60.l, 1),
gsSPLight(&bubba_seg5_lights_05004F60.a, 2),
gsSPVertex(bubba_seg5_vertex_05005438, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 4, 6, 0x0, 6, 4, 3, 0x0),
gsSP2Triangles( 3, 7, 6, 0x0, 3, 8, 7, 0x0),
gsSP2Triangles( 7, 8, 0, 0x0, 8, 1, 0, 0x0),
gsSP1Triangle( 8, 2, 1, 0x0),
gsSPLight(&bubba_seg5_light_05004F50, 1),
gsSPLight(&bubba_seg5_light_05004F48, 2),
gsSPLight(&bubba_seg5_lights_05004F50.l, 1),
gsSPLight(&bubba_seg5_lights_05004F50.a, 2),
gsSPVertex(bubba_seg5_vertex_050054C8, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 0, 4, 1, 0x0, 5, 6, 0, 0x0),

18
actors/bullet_bill/model.inc.c
View File

@ -1,14 +1,10 @@
// Bullet Bill
// 0x0500BA90
static const Ambient bullet_bill_seg5_light_0500BA90 = {
{{0x06, 0x07, 0x14}, 0, {0x06, 0x07, 0x14}, 0}
};
// 0x0500BA98
static const Light bullet_bill_seg5_light_0500BA98 = {
{{0x19, 0x1c, 0x52}, 0, {0x19, 0x1c, 0x52}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bullet_bill_seg5_lights_0500BA90 = gdSPDefLights1(
0x06, 0x07, 0x14,
0x19, 0x1c, 0x52, 0x28, 0x28, 0x28
);
// 0x0500BAA8
ALIGNED8 static const u8 bullet_bill_seg5_texture_0500BAA8[] = {
@ -259,8 +255,8 @@ const Gfx bullet_bill_seg5_dl_0500E5E8[] = {
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),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bullet_bill_seg5_light_0500BA98, 1),
gsSPLight(&bullet_bill_seg5_light_0500BA90, 2),
gsSPLight(&bullet_bill_seg5_lights_0500BA90.l, 1),
gsSPLight(&bullet_bill_seg5_lights_0500BA90.a, 2),
gsSPVertex(bullet_bill_seg5_vertex_0500DAA8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -332,7 +328,7 @@ const Gfx bullet_bill_seg5_dl_0500E730[] = {
const Gfx bullet_bill_seg5_dl_0500E8A8[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_BLENDRGBA, G_CC_BLENDRGBA),
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPNumLights(NUMLIGHTS_1),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 6, G_TX_NOLOD),

64
actors/bully/model.inc.c
View File

@ -60,44 +60,28 @@ const Gfx bully_seg5_dl_05000398[] = {
};
// 0x05000408
static const Ambient bully_seg5_light_05000408 = {
{{0x00, 0x38, 0x00}, 0, {0x00, 0x38, 0x00}, 0}
};
// 0x05000410
static const Light bully_seg5_light_05000410 = {
{{0x00, 0xe3, 0x00}, 0, {0x00, 0xe3, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bully_seg5_lights_05000408 = gdSPDefLights1(
0x00, 0x38, 0x00,
0x00, 0xe3, 0x00, 0x28, 0x28, 0x28
);
// 0x05000420
static const Ambient bully_seg5_light_05000420 = {
{{0x00, 0x3f, 0x00}, 0, {0x00, 0x3f, 0x00}, 0}
};
static const Lights1 bully_seg5_lights_05000420 = gdSPDefLights1(
0x00, 0x3f, 0x00,
0x00, 0xff, 0x00, 0x28, 0x28, 0x28
);
// 0x05000428
static const Light bully_seg5_light_05000428 = {
{{0x00, 0xff, 0x00}, 0, {0x00, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient bully_light_1 = {
{{0x3f, 0x29, 0x00}, 0, {0x3f, 0x29, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light bully_light_2 = {
{{0xff, 0xa5, 0x00}, 0, {0xff, 0xa5, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 bully_lights_unused = gdSPDefLights1(
0x3f, 0x29, 0x00,
0xff, 0xa5, 0x00, 0x28, 0x28, 0x28
);
// 0x05000450
static const Ambient bully_seg5_light_05000450 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// 0x05000458
static const Light bully_seg5_light_05000458 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 bully_seg5_lights_05000450 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// //! There's another malformed light entry here.
// 0x05000468
@ -339,8 +323,8 @@ static const Vtx bully_seg5_vertex_05003608[] = {
// 0x05003708 - 0x050037A0
const Gfx bully_seg5_dl_05003708[] = {
gsSPLight(&bully_seg5_light_05000410, 1),
gsSPLight(&bully_seg5_light_05000408, 2),
gsSPLight(&bully_seg5_lights_05000408.l, 1),
gsSPLight(&bully_seg5_lights_05000408.a, 2),
gsSPVertex(bully_seg5_vertex_05002C68, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 2, 3, 4, 0x0, 1, 5, 6, 0x0),
@ -355,8 +339,8 @@ const Gfx bully_seg5_dl_05003708[] = {
// 0x050037A0 - 0x05003838
const Gfx bully_seg5_dl_050037A0[] = {
gsSPLight(&bully_seg5_light_05000428, 1),
gsSPLight(&bully_seg5_light_05000420, 2),
gsSPLight(&bully_seg5_lights_05000420.l, 1),
gsSPLight(&bully_seg5_lights_05000420.a, 2),
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),
@ -372,7 +356,7 @@ const Gfx bully_seg5_dl_050037A0[] = {
// 0x05003838 - 0x05003878
const Gfx bully_seg5_dl_05003838[] = {
gsSPLight(bully_seg5_texture_05000468 + 0x8, 1), // yet another malformed light...
gsSPLight(bully_seg5_texture_05000468 + 0x0, 2),
gsSPLight(bully_seg5_texture_05000468, 2),
gsSPVertex(bully_seg5_vertex_05002EA8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 3, 4, 5, 0x0, 3, 5, 0, 0x0),
@ -381,8 +365,8 @@ const Gfx bully_seg5_dl_05003838[] = {
// 0x05003878 - 0x05003C50
const Gfx bully_seg5_dl_05003878[] = {
gsSPLight(&bully_seg5_light_05000458, 1),
gsSPLight(&bully_seg5_light_05000450, 2),
gsSPLight(&bully_seg5_lights_05000450.l, 1),
gsSPLight(&bully_seg5_lights_05000450.a, 2),
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),

32
actors/cannon_barrel/model.inc.c
View File

@ -1,24 +1,16 @@
// Cannon Barrel
// 0x08005878
static const Ambient cannon_barrel_seg8_light_08005878 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x08005880
static const Light cannon_barrel_seg8_light_08005880 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 cannon_barrel_seg8_lights_08005878 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08005890
static const Ambient cannon_barrel_seg8_light_08005890 = {
{{0x00, 0x00, 0x0f}, 0, {0x00, 0x00, 0x0f}, 0}
};
// 0x08005898
static const Light cannon_barrel_seg8_light_08005898 = {
{{0x00, 0x00, 0x32}, 0, {0x00, 0x00, 0x32}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 cannon_barrel_seg8_lights_08005890 = gdSPDefLights1(
0x00, 0x00, 0x0f,
0x00, 0x00, 0x32, 0x28, 0x28, 0x28
);
// 0x080058A8
ALIGNED8 static const u8 cannon_barrel_seg8_texture_080058A8[] = {
@ -100,8 +92,8 @@ const Gfx cannon_barrel_seg8_dl_08006408[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cannon_barrel_seg8_texture_080058A8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&cannon_barrel_seg8_light_08005880, 1),
gsSPLight(&cannon_barrel_seg8_light_08005878, 2),
gsSPLight(&cannon_barrel_seg8_lights_08005878.l, 1),
gsSPLight(&cannon_barrel_seg8_lights_08005878.a, 2),
gsSPVertex(cannon_barrel_seg8_vertex_080060A8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 2, 1, 4, 0x0),
@ -116,8 +108,8 @@ const Gfx cannon_barrel_seg8_dl_08006408[] = {
// 0x080064C0 - 0x08006660
const Gfx cannon_barrel_seg8_dl_080064C0[] = {
gsSPLight(&cannon_barrel_seg8_light_08005898, 1),
gsSPLight(&cannon_barrel_seg8_light_08005890, 2),
gsSPLight(&cannon_barrel_seg8_lights_08005890.l, 1),
gsSPLight(&cannon_barrel_seg8_lights_08005890.a, 2),
gsSPVertex(cannon_barrel_seg8_vertex_080061A8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 4, 0x0, 6, 4, 3, 0x0),

32
actors/cannon_base/model.inc.c
View File

@ -1,24 +1,16 @@
// Cannon Base
// 0x08004988
static const Ambient cannon_base_seg8_light_08004988 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x08004990
static const Light cannon_base_seg8_light_08004990 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 cannon_base_seg8_lights_08004988 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x080049A0
static const Ambient cannon_base_seg8_light_080049A0 = {
{{0x0e, 0x10, 0x4c}, 0, {0x0e, 0x10, 0x4c}, 0}
};
// 0x080049A8
static const Light cannon_base_seg8_light_080049A8 = {
{{0x30, 0x37, 0xff}, 0, {0x30, 0x37, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 cannon_base_seg8_lights_080049A0 = gdSPDefLights1(
0x0e, 0x10, 0x4c,
0x30, 0x37, 0xff, 0x28, 0x28, 0x28
);
// 0x080049B8
ALIGNED8 static const u8 cannon_base_seg8_texture_080049B8[] = {
@ -124,8 +116,8 @@ const Gfx cannon_base_seg8_dl_08005658[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cannon_base_seg8_texture_080049B8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&cannon_base_seg8_light_08004990, 1),
gsSPLight(&cannon_base_seg8_light_08004988, 2),
gsSPLight(&cannon_base_seg8_lights_08004988.l, 1),
gsSPLight(&cannon_base_seg8_lights_08004988.a, 2),
gsSPVertex(cannon_base_seg8_vertex_080051B8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 2, 5, 0x0, 0, 5, 3, 0x0),
@ -136,8 +128,8 @@ const Gfx cannon_base_seg8_dl_08005658[] = {
// 0x080056D0 - 0x080057F8
const Gfx cannon_base_seg8_dl_080056D0[] = {
gsSPLight(&cannon_base_seg8_light_080049A8, 1),
gsSPLight(&cannon_base_seg8_light_080049A0, 2),
gsSPLight(&cannon_base_seg8_lights_080049A0.l, 1),
gsSPLight(&cannon_base_seg8_lights_080049A0.a, 2),
gsSPVertex(cannon_base_seg8_vertex_08005278, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

16
actors/cannon_lid/model.inc.c
View File

@ -1,14 +1,10 @@
// Cannon Lid
// 0x08004040
static const Ambient cannon_lid_seg8_light_08004040 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x08004048
static const Light cannon_lid_seg8_light_08004048 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 cannon_lid_seg8_lights_08004040 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08004058
ALIGNED8 static const u8 cannon_lid_seg8_texture_08004058[] = {
@ -28,8 +24,8 @@ const Gfx cannon_lid_seg8_dl_08004898[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cannon_lid_seg8_texture_08004058),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&cannon_lid_seg8_light_08004048, 1),
gsSPLight(&cannon_lid_seg8_light_08004040, 2),
gsSPLight(&cannon_lid_seg8_lights_08004040.l, 1),
gsSPLight(&cannon_lid_seg8_lights_08004040.a, 2),
gsSPVertex(cannon_lid_seg8_vertex_08004858, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),

96
actors/capswitch/model.inc.c
View File

@ -1,64 +1,40 @@
// Capswitch
// 0x05001BB8
static const Ambient capswitch_seg5_light_05001BB8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05001BC0
static const Light capswitch_seg5_light_05001BC0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 capswitch_seg5_lights_05001BB8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001BD0
static const Ambient capswitch_seg5_light_05001BD0 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05001BD8
static const Light capswitch_seg5_light_05001BD8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 capswitch_seg5_lights_05001BD0 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001BE8
static const Ambient capswitch_seg5_light_05001BE8 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// 0x05001BF0
static const Light capswitch_seg5_light_05001BF0 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 capswitch_seg5_lights_05001BE8 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x05001C00
static const Ambient capswitch_seg5_light_05001C00 = {
{{0x01, 0x2a, 0x09}, 0, {0x01, 0x2a, 0x09}, 0}
};
// 0x05001C08
static const Light capswitch_seg5_light_05001C08 = {
{{0x07, 0xa9, 0x25}, 0, {0x07, 0xa9, 0x25}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 capswitch_seg5_lights_05001C00 = gdSPDefLights1(
0x01, 0x2a, 0x09,
0x07, 0xa9, 0x25, 0x28, 0x28, 0x28
);
// 0x05001C18
static const Ambient capswitch_seg5_light_05001C18 = {
{{0x00, 0x00, 0x3f}, 0, {0x00, 0x00, 0x3f}, 0}
};
// 0x05001C20
static const Light capswitch_seg5_light_05001C20 = {
{{0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 capswitch_seg5_lights_05001C18 = gdSPDefLights1(
0x00, 0x00, 0x3f,
0x00, 0x00, 0xff, 0x28, 0x28, 0x28
);
// 0x05001C30
static const Ambient capswitch_seg5_light_05001C30 = {
{{0x3f, 0x25, 0x02}, 0, {0x3f, 0x25, 0x02}, 0}
};
// 0x05001C38
static const Light capswitch_seg5_light_05001C38 = {
{{0xff, 0x96, 0x08}, 0, {0xff, 0x96, 0x08}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 capswitch_seg5_lights_05001C30 = gdSPDefLights1(
0x3f, 0x25, 0x02,
0xff, 0x96, 0x08, 0x28, 0x28, 0x28
);
// 0x05001C48
ALIGNED8 static const u8 capswitch_seg5_texture_05001C48[] = {
@ -91,8 +67,8 @@ const Gfx capswitch_seg5_dl_05002D88[] = {
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, capswitch_seg5_texture_05001C48),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&capswitch_seg5_light_05001BC0, 1),
gsSPLight(&capswitch_seg5_light_05001BB8, 2),
gsSPLight(&capswitch_seg5_lights_05001BB8.l, 1),
gsSPLight(&capswitch_seg5_lights_05001BB8.a, 2),
gsSPVertex(capswitch_seg5_vertex_05002CC8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 4, 3, 0, 0x0, 5, 4, 0, 0x0),
@ -158,8 +134,8 @@ const Gfx capswitch_seg5_dl_05003020[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, capswitch_seg5_texture_05002C48),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 4 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&capswitch_seg5_light_05001BD8, 1),
gsSPLight(&capswitch_seg5_light_05001BD0, 2),
gsSPLight(&capswitch_seg5_lights_05001BD0.l, 1),
gsSPLight(&capswitch_seg5_lights_05001BD0.a, 2),
gsSPVertex(capswitch_seg5_vertex_05002E60, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 4, 7, 6, 0x0),
@ -234,32 +210,32 @@ const Gfx capswitch_seg5_dl_05003280[] = {
// 0x05003350 - 0x05003370
const Gfx capswitch_seg5_dl_05003350[] = {
gsSPLight(&capswitch_seg5_light_05001BF0, 1),
gsSPLight(&capswitch_seg5_light_05001BE8, 2),
gsSPLight(&capswitch_seg5_lights_05001BE8.l, 1),
gsSPLight(&capswitch_seg5_lights_05001BE8.a, 2),
gsSPDisplayList(capswitch_seg5_dl_05003280),
gsSPEndDisplayList(),
};
// 0x05003370 - 0x05003390
const Gfx capswitch_seg5_dl_05003370[] = {
gsSPLight(&capswitch_seg5_light_05001C08, 1),
gsSPLight(&capswitch_seg5_light_05001C00, 2),
gsSPLight(&capswitch_seg5_lights_05001C00.l, 1),
gsSPLight(&capswitch_seg5_lights_05001C00.a, 2),
gsSPDisplayList(capswitch_seg5_dl_05003280),
gsSPEndDisplayList(),
};
// 0x05003390 - 0x050033B0
const Gfx capswitch_seg5_dl_05003390[] = {
gsSPLight(&capswitch_seg5_light_05001C20, 1),
gsSPLight(&capswitch_seg5_light_05001C18, 2),
gsSPLight(&capswitch_seg5_lights_05001C18.l, 1),
gsSPLight(&capswitch_seg5_lights_05001C18.a, 2),
gsSPDisplayList(capswitch_seg5_dl_05003280),
gsSPEndDisplayList(),
};
// 0x050033B0 - 0x050033D0
const Gfx capswitch_seg5_dl_050033B0[] = {
gsSPLight(&capswitch_seg5_light_05001C38, 1),
gsSPLight(&capswitch_seg5_light_05001C30, 2),
gsSPLight(&capswitch_seg5_lights_05001C30.l, 1),
gsSPLight(&capswitch_seg5_lights_05001C30.a, 2),
gsSPDisplayList(capswitch_seg5_dl_05003280),
gsSPEndDisplayList(),
};

54
actors/chain_chomp/model.inc.c
View File

@ -1,36 +1,22 @@
// Chain Chomp
// These 6 lights are unreferenced.
// 0x06021388
static const Ambient chain_chomp_seg6_light_06021388 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x06021390
static const Light chain_chomp_seg6_light_06021390 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
UNUSED static const Lights1 chain_chomp_lights_unused1 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060213A0
static const Ambient chain_chomp_seg6_light_060213A0 = {
{{0x03, 0x03, 0x05}, 0, {0x03, 0x03, 0x05}, 0}
};
// 0x060213A8
static const Light chain_chomp_seg6_light_060213A8 = {
{{0x0d, 0x0f, 0x16}, 0, {0x0d, 0x0f, 0x16}, 0, {0x28, 0x28, 0x28}, 0}
};
UNUSED static const Lights1 chain_chomp_lights_unused2 = gdSPDefLights1(
0x03, 0x03, 0x05,
0x0d, 0x0f, 0x16, 0x28, 0x28, 0x28
);
// 0x060213B8
static const Ambient chain_chomp_seg6_light_060213B8 = {
{{0x25, 0x00, 0x00}, 0, {0x25, 0x00, 0x00}, 0}
};
// 0x060213C0
static const Light chain_chomp_seg6_light_060213C0 = {
{{0x96, 0x00, 0x00}, 0, {0x96, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
UNUSED static const Lights1 chain_chomp_lights_unused3 = gdSPDefLights1(
0x25, 0x00, 0x00,
0x96, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x060213D0
ALIGNED8 static const u8 chain_chomp_seg6_texture_060213D0[] = {
@ -380,14 +366,10 @@ const Gfx chain_chomp_seg6_dl_06024940[] = {
};
// 0x060249D0
static const Ambient chain_chomp_seg6_light_060249D0 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x060249D8
static const Light chain_chomp_seg6_light_060249D8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chain_chomp_seg6_lights_060249D0 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060249E8
static const Vtx chain_chomp_seg6_vertex_060249E8[] = {
@ -410,8 +392,8 @@ const Gfx chain_chomp_seg6_dl_06024AA8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chain_chomp_seg6_texture_060233D0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&chain_chomp_seg6_light_060249D8, 1),
gsSPLight(&chain_chomp_seg6_light_060249D0, 2),
gsSPLight(&chain_chomp_seg6_lights_060249D0.l, 1),
gsSPLight(&chain_chomp_seg6_lights_060249D0.a, 2),
gsSPVertex(chain_chomp_seg6_vertex_060249E8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),

78
actors/chair/model.inc.c
View File

@ -1,14 +1,10 @@
// Chair
// Unreferenced light
UNUSED static const Ambient chair_light_1 = {
{{0x19, 0x0d, 0x06}, 0, {0x19, 0x0d, 0x06}, 0}
};
// Unreferenced light
UNUSED static const Light chair_light_2 = {
{{0x64, 0x36, 0x1a}, 0, {0x64, 0x36, 0x1a}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chair_lights_unused = gdSPDefLights1(
0x19, 0x0d, 0x06,
0x64, 0x36, 0x1a, 0x28, 0x28, 0x28
);
// 0x05003060
ALIGNED8 static const u8 chair_seg5_texture_05003060[] = {
@ -32,14 +28,10 @@ ALIGNED8 static const u8 chair_seg5_texture_05004460[] = {
};
// 0x05004C60
static const Ambient chair_seg5_light_05004C60 = {
{{0x47, 0x47, 0x47}, 0, {0x47, 0x47, 0x47}, 0}
};
// 0x05004C68
static const Light chair_seg5_light_05004C68 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chair_seg5_lights_05004C60 = gdSPDefLights1(
0x47, 0x47, 0x47,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x05004C78
static const Vtx chair_seg5_vertex_05004C78[] = {
@ -82,8 +74,8 @@ const Gfx chair_seg5_dl_05004E38[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chair_seg5_texture_05003060),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&chair_seg5_light_05004C68, 1),
gsSPLight(&chair_seg5_light_05004C60, 2),
gsSPLight(&chair_seg5_lights_05004C60.l, 1),
gsSPLight(&chair_seg5_lights_05004C60.a, 2),
gsSPVertex(chair_seg5_vertex_05004C78, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@ -115,14 +107,10 @@ const Gfx chair_seg5_dl_05004EE8[] = {
};
// 0x05004F58
static const Ambient chair_seg5_light_05004F58 = {
{{0x47, 0x47, 0x47}, 0, {0x47, 0x47, 0x47}, 0}
};
// 0x05004F60
static const Light chair_seg5_light_05004F60 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chair_seg5_lights_05004F58 = gdSPDefLights1(
0x47, 0x47, 0x47,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x05004F70
static const Vtx chair_seg5_vertex_05004F70[] = {
@ -161,8 +149,8 @@ const Gfx chair_seg5_dl_050050F0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chair_seg5_texture_05004060),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&chair_seg5_light_05004F60, 1),
gsSPLight(&chair_seg5_light_05004F58, 2),
gsSPLight(&chair_seg5_lights_05004F58.l, 1),
gsSPLight(&chair_seg5_lights_05004F58.a, 2),
gsSPVertex(chair_seg5_vertex_05004F70, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@ -193,14 +181,10 @@ const Gfx chair_seg5_dl_05005190[] = {
};
// 0x05005200
static const Ambient chair_seg5_light_05005200 = {
{{0x47, 0x47, 0x47}, 0, {0x47, 0x47, 0x47}, 0}
};
// 0x05005208
static const Light chair_seg5_light_05005208 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chair_seg5_lights_05005200 = gdSPDefLights1(
0x47, 0x47, 0x47,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x05005218
static const Vtx chair_seg5_vertex_05005218[] = {
@ -237,8 +221,8 @@ const Gfx chair_seg5_dl_05005378[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chair_seg5_texture_05003860),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&chair_seg5_light_05005208, 1),
gsSPLight(&chair_seg5_light_05005200, 2),
gsSPLight(&chair_seg5_lights_05005200.l, 1),
gsSPLight(&chair_seg5_lights_05005200.a, 2),
gsSPVertex(chair_seg5_vertex_05005218, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@ -269,14 +253,10 @@ const Gfx chair_seg5_dl_05005408[] = {
};
// 0x05005478
static const Ambient chair_seg5_light_05005478 = {
{{0x47, 0x47, 0x47}, 0, {0x47, 0x47, 0x47}, 0}
};
// 0x05005480
static const Light chair_seg5_light_05005480 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chair_seg5_lights_05005478 = gdSPDefLights1(
0x47, 0x47, 0x47,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x05005490
static const Vtx chair_seg5_vertex_05005490[] = {
@ -313,8 +293,8 @@ const Gfx chair_seg5_dl_050055F0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chair_seg5_texture_05003860),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&chair_seg5_light_05005480, 1),
gsSPLight(&chair_seg5_light_05005478, 2),
gsSPLight(&chair_seg5_lights_05005478.l, 1),
gsSPLight(&chair_seg5_lights_05005478.a, 2),
gsSPVertex(chair_seg5_vertex_05005490, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

16
actors/checkerboard_platform/model.inc.c
View File

@ -1,14 +1,10 @@
// Checkerboard Platform
// 0x0800C828
static const Ambient checkerboard_platform_seg8_light_0800C828 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0800C830
static const Light checkerboard_platform_seg8_light_0800C830 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 checkerboard_platform_seg8_lights_0800C828 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0800C840
ALIGNED8 static const u8 checkerboard_platform_seg8_texture_0800C840[] = {
@ -57,8 +53,8 @@ const Gfx checkerboard_platform_seg8_dl_0800D5C0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, checkerboard_platform_seg8_texture_0800C840),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&checkerboard_platform_seg8_light_0800C830, 1),
gsSPLight(&checkerboard_platform_seg8_light_0800C828, 2),
gsSPLight(&checkerboard_platform_seg8_lights_0800C828.l, 1),
gsSPLight(&checkerboard_platform_seg8_lights_0800C828.a, 2),
gsSPVertex(checkerboard_platform_seg8_vertex_0800D440, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),

62
actors/chillychief/model.inc.c
View File

@ -1,44 +1,28 @@
// Chilly Chief (Chill Bully)
// 0x06000000
static const Ambient chilly_chief_seg6_light_06000000 = {
{{0x00, 0x38, 0x00}, 0, {0x00, 0x38, 0x00}, 0}
};
// 0x06000008
static const Light chilly_chief_seg6_light_06000008 = {
{{0x00, 0xe3, 0x00}, 0, {0x00, 0xe3, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chilly_chief_seg6_lights_06000000 = gdSPDefLights1(
0x00, 0x38, 0x00,
0x00, 0xe3, 0x00, 0x28, 0x28, 0x28
);
// 0x06000018
static const Ambient chilly_chief_seg6_light_06000018 = {
{{0x00, 0x3f, 0x00}, 0, {0x00, 0x3f, 0x00}, 0}
};
// 0x06000020
static const Light chilly_chief_seg6_light_06000020 = {
{{0x00, 0xff, 0x00}, 0, {0x00, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chilly_chief_seg6_lights_06000018 = gdSPDefLights1(
0x00, 0x3f, 0x00,
0x00, 0xff, 0x00, 0x28, 0x28, 0x28
);
// 0x06000030
static const Ambient chilly_chief_seg6_light_06000030 = {
{{0x3f, 0x29, 0x00}, 0, {0x3f, 0x29, 0x00}, 0}
};
static const Lights1 chilly_chief_seg6_lights_06000030 = gdSPDefLights1(
0x3f, 0x29, 0x00,
0xff, 0xa5, 0x00, 0x28, 0x28, 0x28
);
// 0x06000038
static const Light chilly_chief_seg6_light_06000038 = {
{{0xff, 0xa5, 0x00}, 0, {0xff, 0xa5, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient chillychief_light_1 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light chillychief_light_2 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chillychief_lights_unused = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x06000060
ALIGNED8 static const u8 chilly_chief_seg6_texture_06000060[] = {
@ -122,8 +106,8 @@ static const Vtx chilly_chief_seg6_vertex_06002AA0[] = {
// 0x06002B30 - 0x06002BC8
const Gfx chilly_chief_seg6_dl_06002B30[] = {
gsSPLight(&chilly_chief_seg6_light_06000008, 1),
gsSPLight(&chilly_chief_seg6_light_06000000, 2),
gsSPLight(&chilly_chief_seg6_lights_06000000.l, 1),
gsSPLight(&chilly_chief_seg6_lights_06000000.a, 2),
gsSPVertex(chilly_chief_seg6_vertex_06002860, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 2, 3, 4, 0x0, 1, 5, 6, 0x0),
@ -138,8 +122,8 @@ const Gfx chilly_chief_seg6_dl_06002B30[] = {
// 0x06002BC8 - 0x06002C60
const Gfx chilly_chief_seg6_dl_06002BC8[] = {
gsSPLight(&chilly_chief_seg6_light_06000020, 1),
gsSPLight(&chilly_chief_seg6_light_06000018, 2),
gsSPLight(&chilly_chief_seg6_lights_06000018.l, 1),
gsSPLight(&chilly_chief_seg6_lights_06000018.a, 2),
gsSPVertex(chilly_chief_seg6_vertex_06002980, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0),
gsSP2Triangles( 3, 1, 0, 0x0, 5, 6, 7, 0x0),
@ -154,8 +138,8 @@ const Gfx chilly_chief_seg6_dl_06002BC8[] = {
// 0x06002C60 - 0x06002C98
const Gfx chilly_chief_seg6_dl_06002C60[] = {
gsSPLight(&chilly_chief_seg6_light_06000038, 1),
gsSPLight(&chilly_chief_seg6_light_06000030, 2),
gsSPLight(&chilly_chief_seg6_lights_06000030.l, 1),
gsSPLight(&chilly_chief_seg6_lights_06000030.a, 2),
gsSPVertex(chilly_chief_seg6_vertex_06002AA0, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),

162
actors/chuckya/model.inc.c
View File

@ -1,74 +1,46 @@
// Chuckya
// Unreferenced light
UNUSED static const Ambient chuckya_light_1 = {
{{0x26, 0x00, 0x27}, 0, {0x26, 0x00, 0x27}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chuckya_lights_unused1 = gdSPDefLights1(
0x26, 0x00, 0x27,
0x9a, 0x00, 0x9c, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light chuckya_light_2 = {
{{0x9a, 0x00, 0x9c}, 0, {0x9a, 0x00, 0x9c}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chuckya_lights_unused2 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient chuckya_light_3 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chuckya_lights_unused3 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light chuckya_light_4 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chuckya_lights_unused4 = gdSPDefLights1(
0x0e, 0x0e, 0x0e,
0x39, 0x39, 0x39, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient chuckya_light_5 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chuckya_lights_unused5 = gdSPDefLights1(
0x39, 0x20, 0x00,
0xe4, 0x83, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light chuckya_light_6 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chuckya_lights_unused6 = gdSPDefLights1(
0x3f, 0x27, 0x00,
0xff, 0x9e, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient chuckya_light_7 = {
{{0x0e, 0x0e, 0x0e}, 0, {0x0e, 0x0e, 0x0e}, 0}
};
// Unreferenced light
UNUSED static const Light chuckya_light_8 = {
{{0x39, 0x39, 0x39}, 0, {0x39, 0x39, 0x39}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient chuckya_light_9 = {
{{0x39, 0x20, 0x00}, 0, {0x39, 0x20, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light chuckya_light_10 = {
{{0xe4, 0x83, 0x00}, 0, {0xe4, 0x83, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient chuckya_light_11 = {
{{0x3f, 0x27, 0x00}, 0, {0x3f, 0x27, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light chuckya_light_12 = {
{{0xff, 0x9e, 0x00}, 0, {0xff, 0x9e, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient chuckya_light_13 = {
{{0x15, 0x14, 0x16}, 0, {0x15, 0x14, 0x16}, 0}
};
// Unreferenced light
UNUSED static const Light chuckya_light_14 = {
{{0x57, 0x53, 0x58}, 0, {0x57, 0x53, 0x58}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 chuckya_lights_unused7 = gdSPDefLights1(
0x15, 0x14, 0x16,
0x57, 0x53, 0x58, 0x28, 0x28, 0x28
);
// 0x08006778
ALIGNED8 static const u8 chuckya_seg8_texture_08006778[] = {
@ -364,14 +336,10 @@ const Gfx chuckya_seg8_dl_0800A5F8[] = {
};
// 0x0800A668
static const Ambient chuckya_seg8_light_0800A668 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x0800A670
static const Light chuckya_seg8_light_0800A670 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chuckya_seg8_lights_0800A668 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0800A680
static const Vtx chuckya_seg8_vertex_0800A680[] = {
@ -390,8 +358,8 @@ const Gfx chuckya_seg8_dl_0800A700[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chuckya_seg8_texture_08006778),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&chuckya_seg8_light_0800A670, 1),
gsSPLight(&chuckya_seg8_light_0800A668, 2),
gsSPLight(&chuckya_seg8_lights_0800A668.l, 1),
gsSPLight(&chuckya_seg8_lights_0800A668.a, 2),
gsSPVertex(chuckya_seg8_vertex_0800A680, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
@ -417,14 +385,10 @@ const Gfx chuckya_seg8_dl_0800A758[] = {
};
// 0x0800A7C8
static const Ambient chuckya_seg8_light_0800A7C8 = {
{{0x29, 0x29, 0x29}, 0, {0x29, 0x29, 0x29}, 0}
};
// 0x0800A7D0
static const Light chuckya_seg8_light_0800A7D0 = {
{{0x89, 0x89, 0x8a}, 0, {0x89, 0x89, 0x8a}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chuckya_seg8_lights_0800A7C8 = gdSPDefLights1(
0x29, 0x29, 0x29,
0x89, 0x89, 0x8a, 0x28, 0x28, 0x28
);
// 0x0800A7E0
static const Vtx chuckya_seg8_vertex_0800A7E0[] = {
@ -441,8 +405,8 @@ static const Vtx chuckya_seg8_vertex_0800A7E0[] = {
// 0x0800A870 - 0x0800A8D0
const Gfx chuckya_seg8_dl_0800A870[] = {
gsSPLight(&chuckya_seg8_light_0800A7D0, 1),
gsSPLight(&chuckya_seg8_light_0800A7C8, 2),
gsSPLight(&chuckya_seg8_lights_0800A7C8.l, 1),
gsSPLight(&chuckya_seg8_lights_0800A7C8.a, 2),
gsSPVertex(chuckya_seg8_vertex_0800A7E0, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 5, 6, 2, 0x0),
@ -460,14 +424,10 @@ const Gfx chuckya_seg8_dl_0800A8D0[] = {
};
// 0x0800A8F0
static const Ambient chuckya_seg8_light_0800A8F0 = {
{{0x4c, 0x4c, 0x00}, 0, {0x4c, 0x4c, 0x00}, 0}
};
// 0x0800A8F8
static const Light chuckya_seg8_light_0800A8F8 = {
{{0xff, 0xff, 0x00}, 0, {0xff, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chuckya_seg8_lights_0800A8F0 = gdSPDefLights1(
0x4c, 0x4c, 0x00,
0xff, 0xff, 0x00, 0x28, 0x28, 0x28
);
// 0x0800A908
static const Vtx chuckya_seg8_vertex_0800A908[] = {
@ -480,8 +440,8 @@ static const Vtx chuckya_seg8_vertex_0800A908[] = {
// 0x0800A958 - 0x0800A998
const Gfx chuckya_seg8_dl_0800A958[] = {
gsSPLight(&chuckya_seg8_light_0800A8F8, 1),
gsSPLight(&chuckya_seg8_light_0800A8F0, 2),
gsSPLight(&chuckya_seg8_lights_0800A8F0.l, 1),
gsSPLight(&chuckya_seg8_lights_0800A8F0.a, 2),
gsSPVertex(chuckya_seg8_vertex_0800A908, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 2, 3, 0x0, 0, 4, 1, 0x0),
@ -497,14 +457,10 @@ const Gfx chuckya_seg8_dl_0800A998[] = {
};
// 0x0800A9B8
static const Ambient chuckya_seg8_light_0800A9B8 = {
{{0x0c, 0x0c, 0x0c}, 0, {0x0c, 0x0c, 0x0c}, 0}
};
// 0x0800A9C0
static const Light chuckya_seg8_light_0800A9C0 = {
{{0x32, 0x32, 0x32}, 0, {0x32, 0x32, 0x32}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 chuckya_seg8_lights_0800A9B8 = gdSPDefLights1(
0x0c, 0x0c, 0x0c,
0x32, 0x32, 0x32, 0x28, 0x28, 0x28
);
// 0x0800A9D0
static const Vtx chuckya_seg8_vertex_0800A9D0[] = {
@ -542,8 +498,8 @@ static const Vtx chuckya_seg8_vertex_0800AAC0[] = {
// 0x0800AB70 - 0x0800ABE8
const Gfx chuckya_seg8_dl_0800AB70[] = {
gsSPLight(&chuckya_seg8_light_0800A9C0, 1),
gsSPLight(&chuckya_seg8_light_0800A9B8, 2),
gsSPLight(&chuckya_seg8_lights_0800A9B8.l, 1),
gsSPLight(&chuckya_seg8_lights_0800A9B8.a, 2),
gsSPVertex(chuckya_seg8_vertex_0800A9D0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),

60
actors/clam_shell/model.inc.c
View File

@ -1,24 +1,16 @@
// Clam Shell
// Unreferenced light
UNUSED static const Ambient clam_shell_light_1 = {
{{0x1b, 0x23, 0x30}, 0, {0x1b, 0x23, 0x30}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 clam_shell_lights_unused1 = gdSPDefLights1(
0x1b, 0x23, 0x30,
0x6d, 0x8f, 0xc3, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light clam_shell_light_2 = {
{{0x6d, 0x8f, 0xc3}, 0, {0x6d, 0x8f, 0xc3}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient clam_shell_light_3 = {
{{0x18, 0x28, 0x38}, 0, {0x18, 0x28, 0x38}, 0}
};
// Unreferenced light
UNUSED static const Light clam_shell_light_4 = {
{{0x60, 0xa2, 0xe2}, 0, {0x60, 0xa2, 0xe2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 clam_shell_lights_unused2 = gdSPDefLights1(
0x18, 0x28, 0x38,
0x60, 0xa2, 0xe2, 0x28, 0x28, 0x28
);
// 0x05000030
ALIGNED8 static const u8 clam_shell_seg5_texture_05000030[] = {
@ -31,14 +23,10 @@ ALIGNED8 static const u8 clam_shell_seg5_texture_05000830[] = {
};
// 0x05001030
static const Ambient clam_shell_seg5_light_05001030 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x05001038
static const Light clam_shell_seg5_light_05001038 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 clam_shell_seg5_lights_05001030 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001048
static const Vtx clam_shell_seg5_vertex_05001048[] = {
@ -75,8 +63,8 @@ const Gfx clam_shell_seg5_dl_050011A8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, clam_shell_seg5_texture_05000030),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&clam_shell_seg5_light_05001038, 1),
gsSPLight(&clam_shell_seg5_light_05001030, 2),
gsSPLight(&clam_shell_seg5_lights_05001030.l, 1),
gsSPLight(&clam_shell_seg5_lights_05001030.a, 2),
gsSPVertex(clam_shell_seg5_vertex_05001048, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 4, 5, 3, 0x0, 4, 0, 6, 0x0),
@ -120,14 +108,10 @@ const Gfx clam_shell_seg5_dl_050012B8[] = {
};
// 0x05001320
static const Ambient clam_shell_seg5_light_05001320 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x05001328
static const Light clam_shell_seg5_light_05001328 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 clam_shell_seg5_lights_05001320 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001338
static const Vtx clam_shell_seg5_vertex_05001338[] = {
@ -162,8 +146,8 @@ const Gfx clam_shell_seg5_dl_05001478[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, clam_shell_seg5_texture_05000030),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&clam_shell_seg5_light_05001328, 1),
gsSPLight(&clam_shell_seg5_light_05001320, 2),
gsSPLight(&clam_shell_seg5_lights_05001320.l, 1),
gsSPLight(&clam_shell_seg5_lights_05001320.a, 2),
gsSPVertex(clam_shell_seg5_vertex_05001338, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP2Triangles( 4, 5, 0, 0x0, 0, 5, 6, 0x0),

49
actors/cyan_fish/model.inc.c
View File

@ -8,15 +8,10 @@ ALIGNED8 static const u8 cyan_fish_seg6_texture_0600D468[] = {
#include "actors/cyan_fish/cyan_fish.rgba16.inc.c"
};
// 0x0600DC68
static const Ambient cyan_fish_seg6_light_0600DC68 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600DC70
static const Light cyan_fish_seg6_light_0600DC70 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 cyan_fish_seg6_lights_0600DC68 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600DC80
static const Vtx cyan_fish_seg6_vertex_0600DC80[] = {
@ -37,8 +32,8 @@ const Gfx cyan_fish_seg6_dl_0600DD20[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cyan_fish_seg6_texture_0600D468),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&cyan_fish_seg6_light_0600DC70, 1),
gsSPLight(&cyan_fish_seg6_light_0600DC68, 2),
gsSPLight(&cyan_fish_seg6_lights_0600DC68.l, 1),
gsSPLight(&cyan_fish_seg6_lights_0600DC68.a, 2),
gsSPVertex(cyan_fish_seg6_vertex_0600DC80, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP2Triangles( 0, 4, 1, 0x0, 4, 0, 3, 0x0),
@ -68,14 +63,10 @@ const Gfx cyan_fish_seg6_dl_0600DDD8[] = {
};
// 0x0600DE38
static const Ambient cyan_fish_seg6_light_0600DE38 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600DE40
static const Light cyan_fish_seg6_light_0600DE40 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 cyan_fish_seg6_lights_0600DE38 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600DE50
static const Vtx cyan_fish_seg6_vertex_0600DE50[] = {
@ -90,8 +81,8 @@ const Gfx cyan_fish_seg6_dl_0600DE90[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cyan_fish_seg6_texture_0600D468),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&cyan_fish_seg6_light_0600DE40, 1),
gsSPLight(&cyan_fish_seg6_light_0600DE38, 2),
gsSPLight(&cyan_fish_seg6_lights_0600DE38.l, 1),
gsSPLight(&cyan_fish_seg6_lights_0600DE38.a, 2),
gsSPVertex(cyan_fish_seg6_vertex_0600DE50, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSPEndDisplayList(),
@ -116,14 +107,10 @@ const Gfx cyan_fish_seg6_dl_0600DED8[] = {
};
// 0x0600DF48
static const Ambient cyan_fish_seg6_light_0600DF48 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600DF50
static const Light cyan_fish_seg6_light_0600DF50 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 cyan_fish_seg6_lights_0600DF48 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600DF60
static const Vtx cyan_fish_seg6_vertex_0600DF60[] = {
@ -140,8 +127,8 @@ const Gfx cyan_fish_seg6_dl_0600DFC0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cyan_fish_seg6_texture_0600D468),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&cyan_fish_seg6_light_0600DF50, 1),
gsSPLight(&cyan_fish_seg6_light_0600DF48, 2),
gsSPLight(&cyan_fish_seg6_lights_0600DF48.l, 1),
gsSPLight(&cyan_fish_seg6_lights_0600DF48.a, 2),
gsSPVertex(cyan_fish_seg6_vertex_0600DF60, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 0, 3, 1, 0x0),

80
actors/dirt/model.inc.c
View File

@ -1,44 +1,28 @@
// Dirt
// 0x0302BD68
static const Ambient dirt_seg3_light_0302BD68 = {
{{0x3f, 0x19, 0x19}, 0, {0x3f, 0x19, 0x19}, 0}
};
// 0x0302BD70
static const Light dirt_seg3_light_0302BD70 = {
{{0xff, 0x64, 0x64}, 0, {0xff, 0x64, 0x64}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dirt_seg3_lights_0302BD68 = gdSPDefLights1(
0x3f, 0x19, 0x19,
0xff, 0x64, 0x64, 0x28, 0x28, 0x28
);
// 0x0302BD80
static const Ambient dirt_seg3_light_0302BD80 = {
{{0x19, 0x3f, 0x19}, 0, {0x19, 0x3f, 0x19}, 0}
};
// 0x0302BD88
static const Light dirt_seg3_light_0302BD88 = {
{{0x64, 0xff, 0x64}, 0, {0x64, 0xff, 0x64}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dirt_seg3_lights_0302BD80 = gdSPDefLights1(
0x19, 0x3f, 0x19,
0x64, 0xff, 0x64, 0x28, 0x28, 0x28
);
// 0x0302BD98
static const Ambient dirt_seg3_light_0302BD98 = {
{{0x19, 0x19, 0x3f}, 0, {0x19, 0x19, 0x3f}, 0}
};
// 0x0302BDA0
static const Light dirt_seg3_light_0302BDA0 = {
{{0x64, 0x64, 0xff}, 0, {0x64, 0x64, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dirt_seg3_lights_0302BD98 = gdSPDefLights1(
0x19, 0x19, 0x3f,
0x64, 0x64, 0xff, 0x28, 0x28, 0x28
);
// 0x0302BDB0
static const Ambient dirt_seg3_light_0302BDB0 = {
{{0x3f, 0x3f, 0x19}, 0, {0x3f, 0x3f, 0x19}, 0}
};
// 0x0302BDB8
static const Light dirt_seg3_light_0302BDB8 = {
{{0xff, 0xff, 0x64}, 0, {0xff, 0xff, 0x64}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dirt_seg3_lights_0302BDB0 = gdSPDefLights1(
0x3f, 0x3f, 0x19,
0xff, 0xff, 0x64, 0x28, 0x28, 0x28
);
// 0x0302BDC8
static const Vtx dirt_seg3_vertex_0302BDC8[] = {
@ -136,32 +120,32 @@ const Gfx dirt_seg3_dl_0302C238[] = {
// 0x0302C298 - 0x0302C2B8
const Gfx dirt_seg3_dl_0302C298[] = {
gsSPLight(&dirt_seg3_light_0302BD70, 1),
gsSPLight(&dirt_seg3_light_0302BD68, 2),
gsSPLight(&dirt_seg3_lights_0302BD68.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD68.a, 2),
gsSPDisplayList(dirt_seg3_dl_0302C238),
gsSPEndDisplayList(),
};
// 0x0302C2B8 - 0x0302C2D8
const Gfx dirt_seg3_dl_0302C2B8[] = {
gsSPLight(&dirt_seg3_light_0302BD88, 1),
gsSPLight(&dirt_seg3_light_0302BD80, 2),
gsSPLight(&dirt_seg3_lights_0302BD80.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD80.a, 2),
gsSPDisplayList(dirt_seg3_dl_0302C238),
gsSPEndDisplayList(),
};
// 0x0302C2D8 - 0x0302C2F8
const Gfx dirt_seg3_dl_0302C2D8[] = {
gsSPLight(&dirt_seg3_light_0302BDA0, 1),
gsSPLight(&dirt_seg3_light_0302BD98, 2),
gsSPLight(&dirt_seg3_lights_0302BD98.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD98.a, 2),
gsSPDisplayList(dirt_seg3_dl_0302C238),
gsSPEndDisplayList(),
};
// 0x0302C2F8 - 0x0302C318
const Gfx dirt_seg3_dl_0302C2F8[] = {
gsSPLight(&dirt_seg3_light_0302BDB8, 1),
gsSPLight(&dirt_seg3_light_0302BDB0, 2),
gsSPLight(&dirt_seg3_lights_0302BDB0.l, 1),
gsSPLight(&dirt_seg3_lights_0302BDB0.a, 2),
gsSPDisplayList(dirt_seg3_dl_0302C238),
gsSPEndDisplayList(),
};
@ -180,8 +164,8 @@ const Gfx dirt_seg3_dl_0302C318[] = {
// 0x0302C378 - 0x0302C3B0
const Gfx dirt_seg3_dl_0302C378[] = {
gsSPLight(&dirt_seg3_light_0302BD70, 1),
gsSPLight(&dirt_seg3_light_0302BD68, 2),
gsSPLight(&dirt_seg3_lights_0302BD68.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD68.a, 2),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C098, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
@ -191,8 +175,8 @@ const Gfx dirt_seg3_dl_0302C378[] = {
// 0x0302C3B0 - 0x0302C3E8
const Gfx dirt_seg3_dl_0302C3B0[] = {
gsSPLight(&dirt_seg3_light_0302BD88, 1),
gsSPLight(&dirt_seg3_light_0302BD80, 2),
gsSPLight(&dirt_seg3_lights_0302BD80.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD80.a, 2),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C098, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
@ -202,8 +186,8 @@ const Gfx dirt_seg3_dl_0302C3B0[] = {
// 0x0302C3E8 - 0x0302C420
const Gfx dirt_seg3_dl_0302C3E8[] = {
gsSPLight(&dirt_seg3_light_0302BDA0, 1),
gsSPLight(&dirt_seg3_light_0302BD98, 2),
gsSPLight(&dirt_seg3_lights_0302BD98.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD98.a, 2),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C098, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
@ -213,8 +197,8 @@ const Gfx dirt_seg3_dl_0302C3E8[] = {
// 0x0302C420 - 0x0302C458
const Gfx dirt_seg3_dl_0302C420[] = {
gsSPLight(&dirt_seg3_light_0302BDB8, 1),
gsSPLight(&dirt_seg3_light_0302BDB0, 2),
gsSPLight(&dirt_seg3_lights_0302BDB0.l, 1),
gsSPLight(&dirt_seg3_lights_0302BDB0.a, 2),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C098, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),

100
actors/door/model.inc.c
View File

@ -1,24 +1,16 @@
// Door
// 0x03009CE0
static const Ambient door_seg3_light_03009CE0 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x03009CE8
static const Light door_seg3_light_03009CE8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 door_seg3_lights_03009CE0 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x03009CF8
static const Ambient door_seg3_light_03009CF8 = {
{{0x3f, 0x3f, 0x00}, 0, {0x3f, 0x3f, 0x00}, 0}
};
// 0x03009D00
static const Light door_seg3_light_03009D00 = {
{{0xff, 0xff, 0x00}, 0, {0xff, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 door_seg3_lights_03009CF8 = gdSPDefLights1(
0x3f, 0x3f, 0x00,
0xff, 0xff, 0x00, 0x28, 0x28, 0x28
);
// 0x03009D10
ALIGNED8 static const u8 door_seg3_texture_03009D10[] = {
@ -159,8 +151,8 @@ const Gfx door_seg3_dl_03013C10[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, door_seg3_texture_0300AD10),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&door_seg3_light_03009CE8, 1),
gsSPLight(&door_seg3_light_03009CE0, 2),
gsSPLight(&door_seg3_lights_03009CE0.l, 1),
gsSPLight(&door_seg3_lights_03009CE0.a, 2),
gsSPVertex(door_seg3_vertex_03013910, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -177,8 +169,8 @@ const Gfx door_seg3_dl_03013C10[] = {
// 0x03013CC8 - 0x03013D78
const Gfx door_seg3_dl_03013CC8[] = {
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPVertex(door_seg3_vertex_03013A90, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 2, 1, 3, 0x0, 5, 2, 4, 0x0),
@ -194,8 +186,8 @@ const Gfx door_seg3_dl_03013CC8[] = {
// 0x03013D78 - 0x03013E28
const Gfx door_seg3_dl_03013D78[] = {
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPVertex(door_seg3_vertex_03013B50, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 0, 3, 4, 0x0, 0, 5, 1, 0x0),
@ -285,16 +277,16 @@ const Gfx door_seg3_dl_03014020[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, door_seg3_texture_03009D10),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&door_seg3_light_03009CE8, 1),
gsSPLight(&door_seg3_light_03009CE0, 2),
gsSPLight(&door_seg3_lights_03009CE0.l, 1),
gsSPLight(&door_seg3_lights_03009CE0.a, 2),
gsSPVertex(door_seg3_vertex_03013F20, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPVertex(door_seg3_vertex_03013FA0, 8, 0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPSetGeometryMode(G_SHADING_SMOOTH),
@ -342,8 +334,8 @@ const Gfx door_seg3_dl_030141C0[] = {
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&door_seg3_light_03009CE8, 1),
gsSPLight(&door_seg3_light_03009CE0, 2),
gsSPLight(&door_seg3_lights_03009CE0.l, 1),
gsSPLight(&door_seg3_lights_03009CE0.a, 2),
gsSPEndDisplayList(),
};
@ -454,8 +446,8 @@ const Gfx door_seg3_dl_03014470[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, door_seg3_texture_03013510),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&door_seg3_light_03009CE8, 1),
gsSPLight(&door_seg3_light_03009CE0, 2),
gsSPLight(&door_seg3_lights_03009CE0.l, 1),
gsSPLight(&door_seg3_lights_03009CE0.a, 2),
gsSPEndDisplayList(),
};
@ -579,8 +571,8 @@ const Gfx door_seg3_dl_03014888[] = {
// 0x030149C0 - 0x03014A20
const Gfx door_seg3_dl_030149C0[] = {
gsSPLight(&door_seg3_light_03009CE8, 1),
gsSPLight(&door_seg3_light_03009CE0, 2),
gsSPLight(&door_seg3_lights_03009CE0.l, 1),
gsSPLight(&door_seg3_lights_03009CE0.a, 2),
gsSPVertex(door_seg3_vertex_03014558, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -628,8 +620,8 @@ const Gfx door_seg3_dl_03014A80[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_SHADING_SMOOTH),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014888),
};
@ -654,8 +646,8 @@ const Gfx door_seg3_dl_03014B30[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_SHADING_SMOOTH),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014888),
};
@ -680,8 +672,8 @@ const Gfx door_seg3_dl_03014BE0[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_SHADING_SMOOTH),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014888),
};
@ -706,8 +698,8 @@ const Gfx door_seg3_dl_03014C90[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_SHADING_SMOOTH),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014888),
};
@ -732,8 +724,8 @@ const Gfx door_seg3_dl_03014D40[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_SHADING_SMOOTH),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014888),
};
@ -763,8 +755,8 @@ static const Vtx door_seg3_vertex_03014E70[] = {
// 0x03014EF0 - 0x03014F30
const Gfx door_seg3_dl_03014EF0[] = {
gsSPLight(&door_seg3_light_03009CE8, 1),
gsSPLight(&door_seg3_light_03009CE0, 2),
gsSPLight(&door_seg3_lights_03009CE0.l, 1),
gsSPLight(&door_seg3_lights_03009CE0.a, 2),
gsSPVertex(door_seg3_vertex_03014DF0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
@ -803,8 +795,8 @@ const Gfx door_seg3_dl_03014F98[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014F30),
};
@ -821,8 +813,8 @@ const Gfx door_seg3_dl_03015008[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014F30),
};
@ -839,8 +831,8 @@ const Gfx door_seg3_dl_03015078[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014F30),
};
@ -857,8 +849,8 @@ const Gfx door_seg3_dl_030150E8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014F30),
};
@ -875,7 +867,7 @@ const Gfx door_seg3_dl_03015158[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPLight(&door_seg3_light_03009D00, 1),
gsSPLight(&door_seg3_light_03009CF8, 2),
gsSPLight(&door_seg3_lights_03009CF8.l, 1),
gsSPLight(&door_seg3_lights_03009CF8.a, 2),
gsSPBranchList(door_seg3_dl_03014F30),
};

176
actors/dorrie/model.inc.c
View File

@ -16,14 +16,10 @@ ALIGNED8 static const u8 dorrie_seg6_texture_0600ADA0[] = {
};
// 0x0600B5A0
static const Ambient dorrie_seg6_light_0600B5A0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600B5A8
static const Light dorrie_seg6_light_0600B5A8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600B5A0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600B5B8
static const Vtx dorrie_seg6_vertex_0600B5B8[] = {
@ -97,8 +93,8 @@ const Gfx dorrie_seg6_dl_0600B8E8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_0600ADA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600B5A8, 1),
gsSPLight(&dorrie_seg6_light_0600B5A0, 2),
gsSPLight(&dorrie_seg6_lights_0600B5A0.l, 1),
gsSPLight(&dorrie_seg6_lights_0600B5A0.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600B5B8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 1, 3, 4, 0x0),
@ -171,14 +167,10 @@ const Gfx dorrie_seg6_dl_0600BAF8[] = {
};
// 0x0600BBC0
static const Ambient dorrie_seg6_light_0600BBC0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600BBC8
static const Light dorrie_seg6_light_0600BBC8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600BBC0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600BBD8
static const Vtx dorrie_seg6_vertex_0600BBD8[] = {
@ -238,8 +230,8 @@ const Gfx dorrie_seg6_dl_0600BE68[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_0600ADA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600BBC8, 1),
gsSPLight(&dorrie_seg6_light_0600BBC0, 2),
gsSPLight(&dorrie_seg6_lights_0600BBC0.l, 1),
gsSPLight(&dorrie_seg6_lights_0600BBC0.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600BBD8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 0, 3, 0x0, 0, 5, 1, 0x0),
@ -306,14 +298,10 @@ const Gfx dorrie_seg6_dl_0600C030[] = {
};
// 0x0600C0F8
static const Ambient dorrie_seg6_light_0600C0F8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600C100
static const Light dorrie_seg6_light_0600C100 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600C0F8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600C110
static const Vtx dorrie_seg6_vertex_0600C110[] = {
@ -360,8 +348,8 @@ const Gfx dorrie_seg6_dl_0600C310[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600C100, 1),
gsSPLight(&dorrie_seg6_light_0600C0F8, 2),
gsSPLight(&dorrie_seg6_lights_0600C0F8.l, 1),
gsSPLight(&dorrie_seg6_lights_0600C0F8.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600C110, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 4, 7, 0x0, 4, 8, 7, 0x0),
@ -411,14 +399,10 @@ const Gfx dorrie_seg6_dl_0600C468[] = {
};
// 0x0600C510
static const Ambient dorrie_seg6_light_0600C510 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600C518
static const Light dorrie_seg6_light_0600C518 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600C510 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600C528
static const Vtx dorrie_seg6_vertex_0600C528[] = {
@ -472,8 +456,8 @@ const Gfx dorrie_seg6_dl_0600C758[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600C518, 1),
gsSPLight(&dorrie_seg6_light_0600C510, 2),
gsSPLight(&dorrie_seg6_lights_0600C510.l, 1),
gsSPLight(&dorrie_seg6_lights_0600C510.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600C528, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 5, 4, 6, 0x0),
@ -524,14 +508,10 @@ const Gfx dorrie_seg6_dl_0600C8B8[] = {
};
// 0x0600C960
static const Ambient dorrie_seg6_light_0600C960 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600C968
static const Light dorrie_seg6_light_0600C968 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600C960 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600C978
static const Vtx dorrie_seg6_vertex_0600C978[] = {
@ -629,8 +609,8 @@ const Gfx dorrie_seg6_dl_0600CDE8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600C968, 1),
gsSPLight(&dorrie_seg6_light_0600C960, 2),
gsSPLight(&dorrie_seg6_lights_0600C960.l, 1),
gsSPLight(&dorrie_seg6_lights_0600C960.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600C978, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 0, 0x0),
@ -691,14 +671,10 @@ const Gfx dorrie_seg6_dl_0600CFD0[] = {
};
// 0x0600D078
static const Ambient dorrie_seg6_light_0600D078 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600D080
static const Light dorrie_seg6_light_0600D080 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600D078 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600D090
static const Vtx dorrie_seg6_vertex_0600D090[] = {
@ -756,8 +732,8 @@ const Gfx dorrie_seg6_dl_0600D300[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600D080, 1),
gsSPLight(&dorrie_seg6_light_0600D078, 2),
gsSPLight(&dorrie_seg6_lights_0600D078.l, 1),
gsSPLight(&dorrie_seg6_lights_0600D078.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600D090, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 0, 0x0),
@ -806,14 +782,10 @@ const Gfx dorrie_seg6_dl_0600D440[] = {
};
// 0x0600D4E8
static const Ambient dorrie_seg6_light_0600D4E8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600D4F0
static const Light dorrie_seg6_light_0600D4F0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600D4E8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600D500
static const Vtx dorrie_seg6_vertex_0600D500[] = {
@ -846,8 +818,8 @@ const Gfx dorrie_seg6_dl_0600D620[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600D4F0, 1),
gsSPLight(&dorrie_seg6_light_0600D4E8, 2),
gsSPLight(&dorrie_seg6_lights_0600D4E8.l, 1),
gsSPLight(&dorrie_seg6_lights_0600D4E8.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600D500, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 3, 4, 1, 0x0),
@ -887,14 +859,10 @@ const Gfx dorrie_seg6_dl_0600D6D8[] = {
};
// 0x0600D780
static const Ambient dorrie_seg6_light_0600D780 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600D788
static const Light dorrie_seg6_light_0600D788 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600D780 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600D798
static const Vtx dorrie_seg6_vertex_0600D798[] = {
@ -913,8 +881,8 @@ const Gfx dorrie_seg6_dl_0600D818[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600D788, 1),
gsSPLight(&dorrie_seg6_light_0600D780, 2),
gsSPLight(&dorrie_seg6_lights_0600D780.l, 1),
gsSPLight(&dorrie_seg6_lights_0600D780.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600D798, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0),
gsSP2Triangles( 2, 1, 5, 0x0, 2, 6, 3, 0x0),
@ -951,14 +919,10 @@ const Gfx dorrie_seg6_dl_0600D8B0[] = {
};
// 0x0600D958
static const Ambient dorrie_seg6_light_0600D958 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600D960
static const Light dorrie_seg6_light_0600D960 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600D958 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600D970
static const Vtx dorrie_seg6_vertex_0600D970[] = {
@ -977,8 +941,8 @@ const Gfx dorrie_seg6_dl_0600D9F0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600D960, 1),
gsSPLight(&dorrie_seg6_light_0600D958, 2),
gsSPLight(&dorrie_seg6_lights_0600D958.l, 1),
gsSPLight(&dorrie_seg6_lights_0600D958.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600D970, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0),
gsSP2Triangles( 1, 5, 3, 0x0, 2, 1, 4, 0x0),
@ -1015,14 +979,10 @@ const Gfx dorrie_seg6_dl_0600DA88[] = {
};
// 0x0600DB30
static const Ambient dorrie_seg6_light_0600DB30 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600DB38
static const Light dorrie_seg6_light_0600DB38 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600DB30 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600DB48
static const Vtx dorrie_seg6_vertex_0600DB48[] = {
@ -1041,8 +1001,8 @@ const Gfx dorrie_seg6_dl_0600DBC8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600DB38, 1),
gsSPLight(&dorrie_seg6_light_0600DB30, 2),
gsSPLight(&dorrie_seg6_lights_0600DB30.l, 1),
gsSPLight(&dorrie_seg6_lights_0600DB30.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600DB48, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 4, 2, 1, 0x0, 1, 3, 4, 0x0),
@ -1079,14 +1039,10 @@ const Gfx dorrie_seg6_dl_0600DC60[] = {
};
// 0x0600DD08
static const Ambient dorrie_seg6_light_0600DD08 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0600DD10
static const Light dorrie_seg6_light_0600DD10 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 dorrie_seg6_lights_0600DD08 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600DD20
static const Vtx dorrie_seg6_vertex_0600DD20[] = {
@ -1105,8 +1061,8 @@ const Gfx dorrie_seg6_dl_0600DDA0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&dorrie_seg6_light_0600DD10, 1),
gsSPLight(&dorrie_seg6_light_0600DD08, 2),
gsSPLight(&dorrie_seg6_lights_0600DD08.l, 1),
gsSPLight(&dorrie_seg6_lights_0600DD08.a, 2),
gsSPVertex(dorrie_seg6_vertex_0600DD20, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 0, 4, 5, 0x0, 0, 6, 3, 0x0),

20
actors/exclamation_box/model.inc.c
View File

@ -1,14 +1,10 @@
// Exclamation Box
// 0x08012E10
static const Ambient exclamation_box_seg8_light_08012E10 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x08012E18
static const Light exclamation_box_seg8_light_08012E18 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 exclamation_box_seg8_lights_08012E10 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08012E28
ALIGNED8 static const u8 exclamation_box_seg8_texture_08012E28[] = {
@ -84,8 +80,8 @@ static const Vtx exclamation_box_seg8_vertex_08018F28[] = {
// 0x08018FA8 - 0x08019008
const Gfx exclamation_box_seg8_dl_08018FA8[] = {
gsSPLight(&exclamation_box_seg8_light_08012E18, 1),
gsSPLight(&exclamation_box_seg8_light_08012E10, 2),
gsSPLight(&exclamation_box_seg8_lights_08012E10.l, 1),
gsSPLight(&exclamation_box_seg8_lights_08012E10.a, 2),
gsSPVertex(exclamation_box_seg8_vertex_08018E28, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -153,8 +149,8 @@ static const Vtx exclamation_box_seg8_vertex_080191A0[] = {
// 0x08019220 - 0x08019280
const Gfx exclamation_box_seg8_dl_08019220[] = {
gsSPLight(&exclamation_box_seg8_light_08012E18, 1),
gsSPLight(&exclamation_box_seg8_light_08012E10, 2),
gsSPLight(&exclamation_box_seg8_lights_08012E10.l, 1),
gsSPLight(&exclamation_box_seg8_lights_08012E10.a, 2),
gsSPVertex(exclamation_box_seg8_vertex_080190A0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),

80
actors/exclamation_box_outline/model.inc.c
View File

@ -1,44 +1,28 @@
// Exclamation Box Outline
// 0x08024CB8
static const Ambient exclamation_box_outline_seg8_light_08024CB8 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// 0x08024CC0
static const Light exclamation_box_outline_seg8_light_08024CC0 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 exclamation_box_outline_seg8_lights_08024CB8 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x08024CD0
static const Ambient exclamation_box_outline_seg8_light_08024CD0 = {
{{0x00, 0x7f, 0x00}, 0, {0x00, 0x7f, 0x00}, 0}
};
// 0x08024CD8
static const Light exclamation_box_outline_seg8_light_08024CD8 = {
{{0x00, 0xff, 0x00}, 0, {0x00, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 exclamation_box_outline_seg8_lights_08024CD0 = gdSPDefLights1(
0x00, 0x7f, 0x00,
0x00, 0xff, 0x00, 0x28, 0x28, 0x28
);
// 0x08024CE8
static const Ambient exclamation_box_outline_seg8_light_08024CE8 = {
{{0x00, 0x00, 0x7f}, 0, {0x00, 0x00, 0x7f}, 0}
};
// 0x08024CF0
static const Light exclamation_box_outline_seg8_light_08024CF0 = {
{{0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 exclamation_box_outline_seg8_lights_08024CE8 = gdSPDefLights1(
0x00, 0x00, 0x7f,
0x00, 0x00, 0xff, 0x28, 0x28, 0x28
);
// 0x08024D00
static const Ambient exclamation_box_outline_seg8_light_08024D00 = {
{{0x7f, 0x6a, 0x00}, 0, {0x7f, 0x6a, 0x00}, 0}
};
// 0x08024D08
static const Light exclamation_box_outline_seg8_light_08024D08 = {
{{0xff, 0xd4, 0x00}, 0, {0xff, 0xd4, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 exclamation_box_outline_seg8_lights_08024D00 = gdSPDefLights1(
0x7f, 0x6a, 0x00,
0xff, 0xd4, 0x00, 0x28, 0x28, 0x28
);
// 0x08024D18
static const Vtx exclamation_box_outline_seg8_vertex_08024D18[] = {
@ -110,32 +94,32 @@ const Gfx exclamation_box_outline_seg8_dl_08024F58[] = {
// 0x08024F88 - 0x08024FA8
const Gfx exclamation_box_outline_seg8_dl_08024F88[] = {
gsSPDisplayList(exclamation_box_outline_seg8_dl_08024F30),
gsSPLight(&exclamation_box_outline_seg8_light_08024CC0, 1),
gsSPLight(&exclamation_box_outline_seg8_light_08024CB8, 2),
gsSPLight(&exclamation_box_outline_seg8_lights_08024CB8.l, 1),
gsSPLight(&exclamation_box_outline_seg8_lights_08024CB8.a, 2),
gsSPBranchList(exclamation_box_outline_seg8_dl_08024F58),
};
// 0x08024FA8 - 0x08024FC8
const Gfx exclamation_box_outline_seg8_dl_08024FA8[] = {
gsSPDisplayList(exclamation_box_outline_seg8_dl_08024F30),
gsSPLight(&exclamation_box_outline_seg8_light_08024CD8, 1),
gsSPLight(&exclamation_box_outline_seg8_light_08024CD0, 2),
gsSPLight(&exclamation_box_outline_seg8_lights_08024CD0.l, 1),
gsSPLight(&exclamation_box_outline_seg8_lights_08024CD0.a, 2),
gsSPBranchList(exclamation_box_outline_seg8_dl_08024F58),
};
// 0x08024FC8 - 0x08024FE8
const Gfx exclamation_box_outline_seg8_dl_08024FC8[] = {
gsSPDisplayList(exclamation_box_outline_seg8_dl_08024F30),
gsSPLight(&exclamation_box_outline_seg8_light_08024CF0, 1),
gsSPLight(&exclamation_box_outline_seg8_light_08024CE8, 2),
gsSPLight(&exclamation_box_outline_seg8_lights_08024CE8.l, 1),
gsSPLight(&exclamation_box_outline_seg8_lights_08024CE8.a, 2),
gsSPBranchList(exclamation_box_outline_seg8_dl_08024F58),
};
// 0x08024FE8 - 0x08025008
const Gfx exclamation_box_outline_seg8_dl_08024FE8[] = {
gsSPDisplayList(exclamation_box_outline_seg8_dl_08024F30),
gsSPLight(&exclamation_box_outline_seg8_light_08024D08, 1),
gsSPLight(&exclamation_box_outline_seg8_light_08024D00, 2),
gsSPLight(&exclamation_box_outline_seg8_lights_08024D00.l, 1),
gsSPLight(&exclamation_box_outline_seg8_lights_08024D00.a, 2),
gsSPBranchList(exclamation_box_outline_seg8_dl_08024F58),
};
@ -209,14 +193,10 @@ const Gfx exclamation_box_outline_seg8_dl_080259F8[] = {
};
// 0x08025A68
static const Ambient exclamation_box_outline_seg8_light_08025A68 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x08025A70
static const Light exclamation_box_outline_seg8_light_08025A70 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 exclamation_box_outline_seg8_lights_08025A68 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08025A80
ALIGNED8 static const u8 exclamation_box_outline_seg8_texture_08025A80[] = {
@ -236,8 +216,8 @@ const Gfx exclamation_box_outline_seg8_dl_08025EC0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, exclamation_box_outline_seg8_texture_08025A80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&exclamation_box_outline_seg8_light_08025A70, 1),
gsSPLight(&exclamation_box_outline_seg8_light_08025A68, 2),
gsSPLight(&exclamation_box_outline_seg8_lights_08025A68.l, 1),
gsSPLight(&exclamation_box_outline_seg8_lights_08025A68.a, 2),
gsSPVertex(exclamation_box_outline_seg8_vertex_08025E80, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),

142
actors/eyerok/model.inc.c
View File

@ -1,14 +1,10 @@
// Eyerok
// Unreferenced light
UNUSED static const Ambient eyerok_light_1 = {
{{0x3f, 0x2a, 0x16}, 0, {0x3f, 0x2a, 0x16}, 0}
};
// Unreferenced light
UNUSED static const Light eyerok_light_2 = {
{{0xff, 0xa9, 0x5b}, 0, {0xff, 0xa9, 0x5b}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 eyerok_lights_unused = gdSPDefLights1(
0x3f, 0x2a, 0x16,
0xff, 0xa9, 0x5b, 0x28, 0x28, 0x28
);
// 0x05008D40
ALIGNED8 static const u8 eyerok_seg5_texture_05008D40[] = {
@ -36,14 +32,10 @@ ALIGNED8 static const u8 eyerok_seg5_texture_0500AD40[] = {
};
// 0x0500B540
static const Ambient eyerok_seg5_light_0500B540 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500B548
static const Light eyerok_seg5_light_0500B548 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 eyerok_seg5_lights_0500B540 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500B558
static const Vtx eyerok_seg5_vertex_0500B558[] = {
@ -80,8 +72,8 @@ const Gfx eyerok_seg5_dl_0500B6B8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&eyerok_seg5_light_0500B548, 1),
gsSPLight(&eyerok_seg5_light_0500B540, 2),
gsSPLight(&eyerok_seg5_lights_0500B540.l, 1),
gsSPLight(&eyerok_seg5_lights_0500B540.a, 2),
gsSPVertex(eyerok_seg5_vertex_0500B558, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0),
@ -112,14 +104,10 @@ const Gfx eyerok_seg5_dl_0500B748[] = {
};
// 0x0500B7B8
static const Ambient eyerok_seg5_light_0500B7B8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500B7C0
static const Light eyerok_seg5_light_0500B7C0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 eyerok_seg5_lights_0500B7B8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500B7D0
static const Vtx eyerok_seg5_vertex_0500B7D0[] = {
@ -156,8 +144,8 @@ const Gfx eyerok_seg5_dl_0500B930[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&eyerok_seg5_light_0500B7C0, 1),
gsSPLight(&eyerok_seg5_light_0500B7B8, 2),
gsSPLight(&eyerok_seg5_lights_0500B7B8.l, 1),
gsSPLight(&eyerok_seg5_lights_0500B7B8.a, 2),
gsSPVertex(eyerok_seg5_vertex_0500B7D0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@ -188,14 +176,10 @@ const Gfx eyerok_seg5_dl_0500B9C0[] = {
};
// 0x0500BA30
static const Ambient eyerok_seg5_light_0500BA30 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500BA38
static const Light eyerok_seg5_light_0500BA38 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 eyerok_seg5_lights_0500BA30 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500BA48
static const Vtx eyerok_seg5_vertex_0500BA48[] = {
@ -236,8 +220,8 @@ const Gfx eyerok_seg5_dl_0500BBE8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&eyerok_seg5_light_0500BA38, 1),
gsSPLight(&eyerok_seg5_light_0500BA30, 2),
gsSPLight(&eyerok_seg5_lights_0500BA30.l, 1),
gsSPLight(&eyerok_seg5_lights_0500BA30.a, 2),
gsSPVertex(eyerok_seg5_vertex_0500BA48, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@ -269,14 +253,10 @@ const Gfx eyerok_seg5_dl_0500BC88[] = {
};
// 0x0500BCF8
static const Ambient eyerok_seg5_light_0500BCF8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500BD00
static const Light eyerok_seg5_light_0500BD00 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 eyerok_seg5_lights_0500BCF8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500BD10
static const Vtx eyerok_seg5_vertex_0500BD10[] = {
@ -313,8 +293,8 @@ const Gfx eyerok_seg5_dl_0500BE70[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&eyerok_seg5_light_0500BD00, 1),
gsSPLight(&eyerok_seg5_light_0500BCF8, 2),
gsSPLight(&eyerok_seg5_lights_0500BCF8.l, 1),
gsSPLight(&eyerok_seg5_lights_0500BCF8.a, 2),
gsSPVertex(eyerok_seg5_vertex_0500BD10, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@ -345,14 +325,10 @@ const Gfx eyerok_seg5_dl_0500BF00[] = {
};
// 0x0500BF70
static const Ambient eyerok_seg5_light_0500BF70 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500BF78
static const Light eyerok_seg5_light_0500BF78 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 eyerok_seg5_lights_0500BF70 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500BF88
static const Vtx eyerok_seg5_vertex_0500BF88[] = {
@ -379,8 +355,8 @@ const Gfx eyerok_seg5_dl_0500C088[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&eyerok_seg5_light_0500BF78, 1),
gsSPLight(&eyerok_seg5_light_0500BF70, 2),
gsSPLight(&eyerok_seg5_lights_0500BF70.l, 1),
gsSPLight(&eyerok_seg5_lights_0500BF70.a, 2),
gsSPVertex(eyerok_seg5_vertex_0500BF88, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@ -408,14 +384,10 @@ const Gfx eyerok_seg5_dl_0500C100[] = {
};
// 0x0500C170
static const Ambient eyerok_seg5_light_0500C170 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C178
static const Light eyerok_seg5_light_0500C178 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 eyerok_seg5_lights_0500C170 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C188
static const Vtx eyerok_seg5_vertex_0500C188[] = {
@ -452,8 +424,8 @@ const Gfx eyerok_seg5_dl_0500C2E8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&eyerok_seg5_light_0500C178, 1),
gsSPLight(&eyerok_seg5_light_0500C170, 2),
gsSPLight(&eyerok_seg5_lights_0500C170.l, 1),
gsSPLight(&eyerok_seg5_lights_0500C170.a, 2),
gsSPVertex(eyerok_seg5_vertex_0500C188, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@ -484,14 +456,10 @@ const Gfx eyerok_seg5_dl_0500C378[] = {
};
// 0x0500C3E8
static const Ambient eyerok_seg5_light_0500C3E8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C3F0
static const Light eyerok_seg5_light_0500C3F0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 eyerok_seg5_lights_0500C3E8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C400
static const Vtx eyerok_seg5_vertex_0500C400[] = {
@ -532,8 +500,8 @@ const Gfx eyerok_seg5_dl_0500C5A0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&eyerok_seg5_light_0500C3F0, 1),
gsSPLight(&eyerok_seg5_light_0500C3E8, 2),
gsSPLight(&eyerok_seg5_lights_0500C3E8.l, 1),
gsSPLight(&eyerok_seg5_lights_0500C3E8.a, 2),
gsSPVertex(eyerok_seg5_vertex_0500C400, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@ -565,14 +533,10 @@ const Gfx eyerok_seg5_dl_0500C640[] = {
};
// 0x0500C6B0
static const Ambient eyerok_seg5_light_0500C6B0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C6B8
static const Light eyerok_seg5_light_0500C6B8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 eyerok_seg5_lights_0500C6B0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C6C8
static const Vtx eyerok_seg5_vertex_0500C6C8[] = {
@ -613,8 +577,8 @@ const Gfx eyerok_seg5_dl_0500C868[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&eyerok_seg5_light_0500C6B8, 1),
gsSPLight(&eyerok_seg5_light_0500C6B0, 2),
gsSPLight(&eyerok_seg5_lights_0500C6B0.l, 1),
gsSPLight(&eyerok_seg5_lights_0500C6B0.a, 2),
gsSPVertex(eyerok_seg5_vertex_0500C6C8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

174
actors/flyguy/model.inc.c
View File

@ -18,75 +18,47 @@ ALIGNED8 static const u8 flyguy_seg8_texture_0800F888[] = {
#include "actors/flyguy/flyguy_propeller.ia16.inc.c"
};
// Unreferenced light
UNUSED static const Ambient flyguy_light_1 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light
UNUSED static const Light flyguy_light_2 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 flyguy_lights_unused1 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x080100A0
static const Ambient flyguy_seg8_light_080100A0 = {
{{0x00, 0x1f, 0x33}, 0, {0x00, 0x1f, 0x33}, 0}
};
// 0x080100A8
static const Light flyguy_seg8_light_080100A8 = {
{{0x02, 0x7f, 0xcc}, 0, {0x02, 0x7f, 0xcc}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 flyguy_seg8_lights_080100A0 = gdSPDefLights1(
0x00, 0x1f, 0x33,
0x02, 0x7f, 0xcc, 0x28, 0x28, 0x28
);
// 0x080100B8
static const Ambient flyguy_seg8_light_080100B8 = {
{{0x3f, 0x32, 0x08}, 0, {0x3f, 0x32, 0x08}, 0}
};
static const Lights1 flyguy_seg8_lights_080100B8 = gdSPDefLights1(
0x3f, 0x32, 0x08,
0xff, 0xc8, 0x23, 0x28, 0x28, 0x28
);
// 0x080100C0
static const Light flyguy_seg8_light_080100C0 = {
{{0xff, 0xc8, 0x23}, 0, {0xff, 0xc8, 0x23}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 flyguy_lights_unused2 = gdSPDefLights1(
0x3a, 0x2f, 0x04,
0xe8, 0xbd, 0x13, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient flyguy_light_3 = {
{{0x3a, 0x2f, 0x04}, 0, {0x3a, 0x2f, 0x04}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 flyguy_lights_unused3 = gdSPDefLights1(
0x2c, 0x00, 0x00,
0xb2, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light flyguy_light_4 = {
{{0xe8, 0xbd, 0x13}, 0, {0xe8, 0xbd, 0x13}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 flyguy_lights_unused4 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient flyguy_light_5 = {
{{0x2c, 0x00, 0x00}, 0, {0x2c, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light flyguy_light_6 = {
{{0xb2, 0x00, 0x00}, 0, {0xb2, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient flyguy_light_7 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light
UNUSED static const Light flyguy_light_8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient flyguy_light_9 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light flyguy_light_10 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 flyguy_lights_unused5 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x08010130
static const Vtx flyguy_seg8_vertex_08010130[] = {
@ -239,8 +211,8 @@ static const Vtx flyguy_seg8_vertex_08010770[] = {
// 0x08010840 - 0x08010968
const Gfx flyguy_seg8_dl_08010840[] = {
gsSPLight(&flyguy_seg8_light_080100A8, 1),
gsSPLight(&flyguy_seg8_light_080100A0, 2),
gsSPLight(&flyguy_seg8_lights_080100A0.l, 1),
gsSPLight(&flyguy_seg8_lights_080100A0.a, 2),
gsSPVertex(flyguy_seg8_vertex_08010130, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0),
@ -266,8 +238,8 @@ const Gfx flyguy_seg8_dl_08010840[] = {
// 0x08010968 - 0x08010A90
const Gfx flyguy_seg8_dl_08010968[] = {
gsSPLight(&flyguy_seg8_light_080100A8, 1),
gsSPLight(&flyguy_seg8_light_080100A0, 2),
gsSPLight(&flyguy_seg8_lights_080100A0.l, 1),
gsSPLight(&flyguy_seg8_lights_080100A0.a, 2),
gsSPVertex(flyguy_seg8_vertex_08010460, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -293,8 +265,8 @@ const Gfx flyguy_seg8_dl_08010968[] = {
// 0x08010A90 - 0x08010AE0
const Gfx flyguy_seg8_dl_08010A90[] = {
gsSPLight(&flyguy_seg8_light_080100C0, 1),
gsSPLight(&flyguy_seg8_light_080100B8, 2),
gsSPLight(&flyguy_seg8_lights_080100B8.l, 1),
gsSPLight(&flyguy_seg8_lights_080100B8.a, 2),
gsSPVertex(flyguy_seg8_vertex_08010770, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 0, 2, 0x0, 7, 8, 9, 0x0),
@ -303,14 +275,10 @@ const Gfx flyguy_seg8_dl_08010A90[] = {
};
// 0x08010AE0
static const Ambient flyguy_seg8_light_08010AE0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x08010AE8
static const Light flyguy_seg8_light_08010AE8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 flyguy_seg8_lights_08010AE0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08010AF8
static const Vtx flyguy_seg8_vertex_08010AF8[] = {
@ -325,8 +293,8 @@ const Gfx flyguy_seg8_dl_08010B38[] = {
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, flyguy_seg8_texture_0800F888),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&flyguy_seg8_light_08010AE8, 1),
gsSPLight(&flyguy_seg8_light_08010AE0, 2),
gsSPLight(&flyguy_seg8_lights_08010AE0.l, 1),
gsSPLight(&flyguy_seg8_lights_08010AE0.a, 2),
gsSPVertex(flyguy_seg8_vertex_08010AF8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -351,34 +319,22 @@ const Gfx flyguy_seg8_dl_08010B80[] = {
};
// 0x08010BF0
static const Ambient flyguy_seg8_light_08010BF0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x08010BF8
static const Light flyguy_seg8_light_08010BF8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 flyguy_seg8_lights_08010BF0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08010C08
static const Ambient flyguy_seg8_light_08010C08 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// 0x08010C10
static const Light flyguy_seg8_light_08010C10 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 flyguy_seg8_lights_08010C08 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x08010C20
static const Ambient flyguy_seg8_light_08010C20 = {
{{0x62, 0x00, 0x13}, 0, {0x62, 0x00, 0x13}, 0}
};
// 0x08010C28
static const Light flyguy_seg8_light_08010C28 = {
{{0xc4, 0x00, 0x26}, 0, {0xc4, 0x00, 0x26}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 flyguy_seg8_lights_08010C20 = gdSPDefLights1(
0x62, 0x00, 0x13,
0xc4, 0x00, 0x26, 0x28, 0x28, 0x28
);
// 0x08010C38
static const Vtx flyguy_seg8_vertex_08010C38[] = {
@ -544,8 +500,8 @@ const Gfx flyguy_seg8_dl_080113A8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, flyguy_seg8_texture_0800F088),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&flyguy_seg8_light_08010BF8, 1),
gsSPLight(&flyguy_seg8_light_08010BF0, 2),
gsSPLight(&flyguy_seg8_lights_08010BF0.l, 1),
gsSPLight(&flyguy_seg8_lights_08010BF0.a, 2),
gsSPVertex(flyguy_seg8_vertex_08010C38, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 1, 0, 0x0, 2, 5, 0, 0x0),
@ -559,12 +515,12 @@ const Gfx flyguy_seg8_dl_08011420[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, flyguy_seg8_texture_0800E088),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&flyguy_seg8_light_08010C10, 1),
gsSPLight(&flyguy_seg8_light_08010C08, 2),
gsSPLight(&flyguy_seg8_lights_08010C08.l, 1),
gsSPLight(&flyguy_seg8_lights_08010C08.a, 2),
gsSPVertex(flyguy_seg8_vertex_08010CC8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPLight(&flyguy_seg8_light_08010C28, 1),
gsSPLight(&flyguy_seg8_light_08010C20, 2),
gsSPLight(&flyguy_seg8_lights_08010C20.l, 1),
gsSPLight(&flyguy_seg8_lights_08010C20.a, 2),
gsSPVertex(flyguy_seg8_vertex_08010D28, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0),
gsSP2Triangles( 1, 5, 3, 0x0, 1, 4, 2, 0x0),
@ -613,8 +569,8 @@ const Gfx flyguy_seg8_dl_08011420[] = {
// 0x080116D0 - 0x08011710
const Gfx flyguy_seg8_dl_080116D0[] = {
gsSPLight(&flyguy_seg8_light_08010C10, 1),
gsSPLight(&flyguy_seg8_light_08010C08, 2),
gsSPLight(&flyguy_seg8_lights_08010C08.l, 1),
gsSPLight(&flyguy_seg8_lights_08010C08.a, 2),
gsSPVertex(flyguy_seg8_vertex_08011348, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 1, 5, 4, 0x0),

110
actors/goomba/model.inc.c
View File

@ -1,64 +1,40 @@
// Goomba
// Unreferenced light
UNUSED static const Ambient goomba_light_1 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 goomba_lights_unused1 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light goomba_light_2 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient goomba_light_3 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
// Unreferenced light
UNUSED static const Light goomba_light_4 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 goomba_lights_unused2 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x080194D0
static const Ambient goomba_seg8_light_080194D0 = {
{{0x15, 0x0b, 0x04}, 0, {0x15, 0x0b, 0x04}, 0}
};
// 0x080194D8
static const Light goomba_seg8_light_080194D8 = {
{{0x54, 0x2e, 0x10}, 0, {0x54, 0x2e, 0x10}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 goomba_seg8_lights_080194D0 = gdSPDefLights1(
0x15, 0x0b, 0x04,
0x54, 0x2e, 0x10, 0x28, 0x28, 0x28
);
// 0x080194E8
static const Ambient goomba_seg8_light_080194E8 = {
{{0x18, 0x0d, 0x04}, 0, {0x18, 0x0d, 0x04}, 0}
};
// 0x080194F0
static const Light goomba_seg8_light_080194F0 = {
{{0x61, 0x34, 0x13}, 0, {0x61, 0x34, 0x13}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 goomba_seg8_lights_080194E8 = gdSPDefLights1(
0x18, 0x0d, 0x04,
0x61, 0x34, 0x13, 0x28, 0x28, 0x28
);
// 0x08019500
static const Ambient goomba_seg8_light_08019500 = {
{{0x1d, 0x10, 0x08}, 0, {0x1d, 0x10, 0x08}, 0}
};
// 0x08019508
static const Light goomba_seg8_light_08019508 = {
{{0x77, 0x42, 0x20}, 0, {0x77, 0x42, 0x20}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 goomba_seg8_lights_08019500 = gdSPDefLights1(
0x1d, 0x10, 0x08,
0x77, 0x42, 0x20, 0x28, 0x28, 0x28
);
// 0x08019518
static const Ambient goomba_seg8_light_08019518 = {
{{0x37, 0x2d, 0x13}, 0, {0x37, 0x2d, 0x13}, 0}
};
// 0x08019520
static const Light goomba_seg8_light_08019520 = {
{{0xde, 0xb4, 0x4e}, 0, {0xde, 0xb4, 0x4e}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 goomba_seg8_lights_08019518 = gdSPDefLights1(
0x37, 0x2d, 0x13,
0xde, 0xb4, 0x4e, 0x28, 0x28, 0x28
);
// 0x08019530
ALIGNED8 static const u8 goomba_seg8_texture_08019530[] = {
@ -76,14 +52,10 @@ ALIGNED8 static const u8 goomba_seg8_texture_0801A530[] = {
};
// 0x0801AD30
static const Ambient goomba_seg8_light_0801AD30 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0801AD38
static const Light goomba_seg8_light_0801AD38 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 goomba_seg8_lights_0801AD30 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0801AD48
static const Vtx goomba_seg8_vertex_0801AD48[] = {
@ -201,8 +173,8 @@ static const Vtx goomba_seg8_vertex_0801B238[] = {
// 0x0801B2E8 - 0x0801B560
const Gfx goomba_seg8_dl_0801B2E8[] = {
gsSPLight(&goomba_seg8_light_0801AD38, 1),
gsSPLight(&goomba_seg8_light_0801AD30, 2),
gsSPLight(&goomba_seg8_lights_0801AD30.l, 1),
gsSPLight(&goomba_seg8_lights_0801AD30.a, 2),
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),
@ -800,8 +772,8 @@ static const Vtx goomba_seg8_vertex_0801CDF0[] = {
// 0x0801CE20 - 0x0801CF78
const Gfx goomba_seg8_dl_0801CE20[] = {
gsSPLight(&goomba_seg8_light_080194D8, 1),
gsSPLight(&goomba_seg8_light_080194D0, 2),
gsSPLight(&goomba_seg8_lights_080194D0.l, 1),
gsSPLight(&goomba_seg8_lights_080194D0.a, 2),
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),
@ -829,8 +801,8 @@ const Gfx goomba_seg8_dl_0801CE20[] = {
// 0x0801CF78 - 0x0801D0D0
const Gfx goomba_seg8_dl_0801CF78[] = {
gsSPLight(&goomba_seg8_light_080194F0, 1),
gsSPLight(&goomba_seg8_light_080194E8, 2),
gsSPLight(&goomba_seg8_lights_080194E8.l, 1),
gsSPLight(&goomba_seg8_lights_080194E8.a, 2),
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),
@ -858,8 +830,8 @@ const Gfx goomba_seg8_dl_0801CF78[] = {
// 0x0801D0D0 - 0x0801D360
const Gfx goomba_seg8_dl_0801D0D0[] = {
gsSPLight(&goomba_seg8_light_08019508, 1),
gsSPLight(&goomba_seg8_light_08019500, 2),
gsSPLight(&goomba_seg8_lights_08019500.l, 1),
gsSPLight(&goomba_seg8_lights_08019500.a, 2),
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),
@ -910,8 +882,8 @@ const Gfx goomba_seg8_dl_0801D0D0[] = {
// 0x0801D360 - 0x0801D760
const Gfx goomba_seg8_dl_0801D360[] = {
gsSPLight(&goomba_seg8_light_08019520, 1),
gsSPLight(&goomba_seg8_light_08019518, 2),
gsSPLight(&goomba_seg8_lights_08019518.l, 1),
gsSPLight(&goomba_seg8_lights_08019518.a, 2),
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),
@ -985,6 +957,6 @@ const Gfx goomba_seg8_dl_0801D360[] = {
// 0x0801D760 - 0x0801D770
const Gfx goomba_seg8_dl_0801D760[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPNumLights(NUMLIGHTS_1),
gsSPEndDisplayList(),
};

64
actors/haunted_cage/model.inc.c
View File

@ -1,24 +1,16 @@
// Haunted Cage
// 0x0500C258
static const Ambient haunted_cage_seg5_light_0500C258 = {
{{0x39, 0x0c, 0x0e}, 0, {0x39, 0x0c, 0x0e}, 0}
};
// 0x0500C260
static const Light haunted_cage_seg5_light_0500C260 = {
{{0x90, 0x1e, 0x25}, 0, {0x90, 0x1e, 0x25}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 haunted_cage_seg5_lights_0500C258 = gdSPDefLights1(
0x39, 0x0c, 0x0e,
0x90, 0x1e, 0x25, 0x28, 0x28, 0x28
);
// 0x0500C270
static const Ambient haunted_cage_seg5_light_0500C270 = {
{{0x47, 0x47, 0x47}, 0, {0x47, 0x47, 0x47}, 0}
};
// 0x0500C278
static const Light haunted_cage_seg5_light_0500C278 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 haunted_cage_seg5_lights_0500C270 = gdSPDefLights1(
0x47, 0x47, 0x47,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x0500C288
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500C288[] = {
@ -270,8 +262,8 @@ const Gfx haunted_cage_seg5_dl_0500F4C8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, haunted_cage_seg5_texture_0500D288),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&haunted_cage_seg5_light_0500C260, 1),
gsSPLight(&haunted_cage_seg5_light_0500C258, 2),
gsSPLight(&haunted_cage_seg5_lights_0500C258.l, 1),
gsSPLight(&haunted_cage_seg5_lights_0500C258.a, 2),
gsSPVertex(haunted_cage_seg5_vertex_0500EA88, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -282,8 +274,8 @@ const Gfx haunted_cage_seg5_dl_0500F4C8[] = {
gsSP1Triangle(12, 13, 14, 0x0),
gsSPVertex(haunted_cage_seg5_vertex_0500EC68, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPLight(&haunted_cage_seg5_light_0500C278, 1),
gsSPLight(&haunted_cage_seg5_light_0500C270, 2),
gsSPLight(&haunted_cage_seg5_lights_0500C270.l, 1),
gsSPLight(&haunted_cage_seg5_lights_0500C270.a, 2),
gsSPVertex(haunted_cage_seg5_vertex_0500ECC8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 3, 9, 4, 0x0),
@ -369,14 +361,10 @@ const Gfx haunted_cage_seg5_dl_0500F7D8[] = {
};
// 0x0500F888
static const Ambient haunted_cage_seg5_light_0500F888 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x0500F890
static const Light haunted_cage_seg5_light_0500F890 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 haunted_cage_seg5_lights_0500F888 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500F8A0
static const Vtx haunted_cage_seg5_vertex_0500F8A0[] = {
@ -437,8 +425,8 @@ const Gfx haunted_cage_seg5_dl_0500FB40[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, haunted_cage_seg5_texture_0500D688),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&haunted_cage_seg5_light_0500F890, 1),
gsSPLight(&haunted_cage_seg5_light_0500F888, 2),
gsSPLight(&haunted_cage_seg5_lights_0500F888.l, 1),
gsSPLight(&haunted_cage_seg5_lights_0500F888.a, 2),
gsSPVertex(haunted_cage_seg5_vertex_0500F8A0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@ -475,14 +463,10 @@ const Gfx haunted_cage_seg5_dl_0500FC28[] = {
};
// 0x0500FC98
static const Ambient haunted_cage_seg5_light_0500FC98 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
// 0x0500FCA0
static const Light haunted_cage_seg5_light_0500FCA0 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 haunted_cage_seg5_lights_0500FC98 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x0500FCB0
static const Vtx haunted_cage_seg5_vertex_0500FCB0[] = {
@ -557,8 +541,8 @@ const Gfx haunted_cage_seg5_dl_0500FFF0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, haunted_cage_seg5_texture_0500DA88),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&haunted_cage_seg5_light_0500FCA0, 1),
gsSPLight(&haunted_cage_seg5_light_0500FC98, 2),
gsSPLight(&haunted_cage_seg5_lights_0500FC98.l, 1),
gsSPLight(&haunted_cage_seg5_lights_0500FC98.a, 2),
gsSPVertex(haunted_cage_seg5_vertex_0500FCB0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),

258
actors/heave_ho/model.inc.c
View File

@ -1,74 +1,46 @@
// Heave Ho
// Unreferenced light
UNUSED static const Ambient heave_ho_light_1 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
// Unreferenced light group
static const Lights1 heave_ho_lights_unused1 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light heave_ho_light_2 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
static const Lights1 heave_ho_lights_unused2 = gdSPDefLights1(
0x3f, 0x38, 0x00,
0xff, 0xe3, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient heave_ho_light_3 = {
{{0x3f, 0x38, 0x00}, 0, {0x3f, 0x38, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light heave_ho_light_4 = {
{{0xff, 0xe3, 0x00}, 0, {0xff, 0xe3, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient heave_ho_light_5 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light heave_ho_light_6 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
static const Lights1 heave_ho_lights_unused3 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0500E968
static const Ambient heave_ho_seg5_light_0500E968 = {
{{0x14, 0x14, 0x15}, 0, {0x14, 0x14, 0x15}, 0}
};
// 0x0500E970
static const Light heave_ho_seg5_light_0500E970 = {
{{0x50, 0x50, 0x54}, 0, {0x50, 0x50, 0x54}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_0500E968 = gdSPDefLights1(
0x14, 0x14, 0x15,
0x50, 0x50, 0x54, 0x28, 0x28, 0x28
);
// 0x0500E980
static const Ambient heave_ho_seg5_light_0500E980 = {
{{0x73, 0x3f, 0x32}, 0, {0x73, 0x3f, 0x32}, 0}
};
static const Lights1 heave_ho_seg5_lights_0500E980 = gdSPDefLights1(
0x73, 0x3f, 0x32,
0xff, 0xe0, 0x85, 0x28, 0x28, 0x28
);
// 0x0500E988
static const Light heave_ho_seg5_light_0500E988 = {
{{0xff, 0xe0, 0x85}, 0, {0xff, 0xe0, 0x85}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
static const Lights1 heave_ho_lights_unused4 = gdSPDefLights1(
0x3b, 0x38, 0x21,
0xec, 0xe3, 0x84, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient heave_ho_light_7 = {
{{0x3b, 0x38, 0x21}, 0, {0x3b, 0x38, 0x21}, 0}
};
// Unreferenced light
UNUSED static const Light heave_ho_light_8 = {
{{0xec, 0xe3, 0x84}, 0, {0xec, 0xe3, 0x84}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient heave_ho_light_9 = {
{{0x32, 0x32, 0x32}, 0, {0x32, 0x32, 0x32}, 0}
};
// Unreferenced light
UNUSED static const Light heave_ho_light_10 = {
{{0xc8, 0xc8, 0xc8}, 0, {0xc8, 0xc8, 0xc8}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
static const Lights1 heave_ho_lights_unused5 = gdSPDefLights1(
0x32, 0x32, 0x32,
0xc8, 0xc8, 0xc8, 0x28, 0x28, 0x28
);
// 0x0500E9C8
ALIGNED8 static const u8 heave_ho_seg5_texture_0500E9C8[] = {
@ -101,24 +73,16 @@ ALIGNED8 static const u8 heave_ho_seg5_texture_050113C8[] = {
};
// 0x05011BC8
static const Ambient heave_ho_seg5_light_05011BC8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05011BD0
static const Light heave_ho_seg5_light_05011BD0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_05011BC8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05011BE0
static const Ambient heave_ho_seg5_light_05011BE0 = {
{{0x40, 0x00, 0x0d}, 0, {0x40, 0x00, 0x0d}, 0}
};
// 0x05011BE8
static const Light heave_ho_seg5_light_05011BE8 = {
{{0x81, 0x01, 0x1a}, 0, {0x81, 0x01, 0x1a}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_05011BE0 = gdSPDefLights1(
0x40, 0x00, 0x0d,
0x81, 0x01, 0x1a, 0x28, 0x28, 0x28
);
// 0x05011BF8
static const Vtx heave_ho_seg5_vertex_05011BF8[] = {
@ -167,8 +131,8 @@ const Gfx heave_ho_seg5_dl_05011D98[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_0500E9C8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&heave_ho_seg5_light_05011BD0, 1),
gsSPLight(&heave_ho_seg5_light_05011BC8, 2),
gsSPLight(&heave_ho_seg5_lights_05011BC8.l, 1),
gsSPLight(&heave_ho_seg5_lights_05011BC8.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05011BF8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -199,8 +163,8 @@ const Gfx heave_ho_seg5_dl_05011E28[] = {
// 0x05011E80 - 0x05011EC0
const Gfx heave_ho_seg5_dl_05011E80[] = {
gsSPLight(&heave_ho_seg5_light_05011BE8, 1),
gsSPLight(&heave_ho_seg5_light_05011BE0, 2),
gsSPLight(&heave_ho_seg5_lights_05011BE0.l, 1),
gsSPLight(&heave_ho_seg5_lights_05011BE0.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05011D38, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 3, 4, 5, 0x0, 3, 5, 1, 0x0),
@ -230,24 +194,16 @@ const Gfx heave_ho_seg5_dl_05011EC0[] = {
};
// 0x05011F50
static const Ambient heave_ho_seg5_light_05011F50 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05011F58
static const Light heave_ho_seg5_light_05011F58 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_05011F50 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05011F68
static const Ambient heave_ho_seg5_light_05011F68 = {
{{0x4c, 0x00, 0x16}, 0, {0x4c, 0x00, 0x16}, 0}
};
// 0x05011F70
static const Light heave_ho_seg5_light_05011F70 = {
{{0x99, 0x00, 0x2d}, 0, {0x99, 0x00, 0x2d}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_05011F68 = gdSPDefLights1(
0x4c, 0x00, 0x16,
0x99, 0x00, 0x2d, 0x28, 0x28, 0x28
);
// 0x05011F80
static const Vtx heave_ho_seg5_vertex_05011F80[] = {
@ -280,8 +236,8 @@ const Gfx heave_ho_seg5_dl_050120A0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_050109C8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&heave_ho_seg5_light_05011F58, 1),
gsSPLight(&heave_ho_seg5_light_05011F50, 2),
gsSPLight(&heave_ho_seg5_lights_05011F50.l, 1),
gsSPLight(&heave_ho_seg5_lights_05011F50.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05011F80, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 3, 0x0, 7, 8, 9, 0x0),
@ -291,8 +247,8 @@ const Gfx heave_ho_seg5_dl_050120A0[] = {
// 0x05012100 - 0x05012148
const Gfx heave_ho_seg5_dl_05012100[] = {
gsSPLight(&heave_ho_seg5_light_05011F70, 1),
gsSPLight(&heave_ho_seg5_light_05011F68, 2),
gsSPLight(&heave_ho_seg5_lights_05011F68.l, 1),
gsSPLight(&heave_ho_seg5_lights_05011F68.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05012030, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 4, 0, 3, 0x0, 3, 5, 4, 0x0),
@ -318,24 +274,16 @@ const Gfx heave_ho_seg5_dl_05012148[] = {
};
// 0x050121B0
static const Ambient heave_ho_seg5_light_050121B0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x050121B8
static const Light heave_ho_seg5_light_050121B8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_050121B0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050121C8
static const Ambient heave_ho_seg5_light_050121C8 = {
{{0x4c, 0x00, 0x16}, 0, {0x4c, 0x00, 0x16}, 0}
};
// 0x050121D0
static const Light heave_ho_seg5_light_050121D0 = {
{{0x99, 0x00, 0x2d}, 0, {0x99, 0x00, 0x2d}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_050121C8 = gdSPDefLights1(
0x4c, 0x00, 0x16,
0x99, 0x00, 0x2d, 0x28, 0x28, 0x28
);
// 0x050121E0
static const Vtx heave_ho_seg5_vertex_050121E0[] = {
@ -368,8 +316,8 @@ const Gfx heave_ho_seg5_dl_05012300[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_050109C8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&heave_ho_seg5_light_050121B8, 1),
gsSPLight(&heave_ho_seg5_light_050121B0, 2),
gsSPLight(&heave_ho_seg5_lights_050121B0.l, 1),
gsSPLight(&heave_ho_seg5_lights_050121B0.a, 2),
gsSPVertex(heave_ho_seg5_vertex_050121E0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 3, 0x0, 7, 8, 9, 0x0),
@ -379,8 +327,8 @@ const Gfx heave_ho_seg5_dl_05012300[] = {
// 0x05012360 - 0x050123A8
const Gfx heave_ho_seg5_dl_05012360[] = {
gsSPLight(&heave_ho_seg5_light_050121D0, 1),
gsSPLight(&heave_ho_seg5_light_050121C8, 2),
gsSPLight(&heave_ho_seg5_lights_050121C8.l, 1),
gsSPLight(&heave_ho_seg5_lights_050121C8.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05012290, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 2, 4, 0x0, 4, 3, 6, 0x0),
@ -406,24 +354,16 @@ const Gfx heave_ho_seg5_dl_050123A8[] = {
};
// 0x05012410
static const Ambient heave_ho_seg5_light_05012410 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05012418
static const Light heave_ho_seg5_light_05012418 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_05012410 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05012428
static const Ambient heave_ho_seg5_light_05012428 = {
{{0x5d, 0x6d, 0x65}, 0, {0x5d, 0x6d, 0x65}, 0}
};
// 0x05012430
static const Light heave_ho_seg5_light_05012430 = {
{{0xbb, 0xda, 0xcb}, 0, {0xbb, 0xda, 0xcb}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_05012428 = gdSPDefLights1(
0x5d, 0x6d, 0x65,
0xbb, 0xda, 0xcb, 0x28, 0x28, 0x28
);
// 0x05012440
static const Vtx heave_ho_seg5_vertex_05012440[] = {
@ -456,8 +396,8 @@ const Gfx heave_ho_seg5_dl_05012560[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_0500F1C8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&heave_ho_seg5_light_05012418, 1),
gsSPLight(&heave_ho_seg5_light_05012410, 2),
gsSPLight(&heave_ho_seg5_lights_05012410.l, 1),
gsSPLight(&heave_ho_seg5_lights_05012410.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05012440, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -465,8 +405,8 @@ const Gfx heave_ho_seg5_dl_05012560[] = {
// 0x050125A8 - 0x050125F8
const Gfx heave_ho_seg5_dl_050125A8[] = {
gsSPLight(&heave_ho_seg5_light_05012430, 1),
gsSPLight(&heave_ho_seg5_light_05012428, 2),
gsSPLight(&heave_ho_seg5_lights_05012428.l, 1),
gsSPLight(&heave_ho_seg5_lights_05012428.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05012480, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0),
@ -530,14 +470,10 @@ const Gfx heave_ho_seg5_dl_050126E8[] = {
};
// 0x05012758
static const Ambient heave_ho_seg5_light_05012758 = {
{{0x93, 0x73, 0x7c}, 0, {0x93, 0x73, 0x7c}, 0}
};
// 0x05012760
static const Light heave_ho_seg5_light_05012760 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 heave_ho_seg5_lights_05012758 = gdSPDefLights1(
0x93, 0x73, 0x7c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05012770
static const Vtx heave_ho_seg5_vertex_05012770[] = {
@ -552,8 +488,8 @@ const Gfx heave_ho_seg5_dl_050127B0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_050113C8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&heave_ho_seg5_light_05012760, 1),
gsSPLight(&heave_ho_seg5_light_05012758, 2),
gsSPLight(&heave_ho_seg5_lights_05012758.l, 1),
gsSPLight(&heave_ho_seg5_lights_05012758.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05012770, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSPEndDisplayList(),
@ -1085,8 +1021,8 @@ static const Vtx heave_ho_seg5_vertex_05014128[] = {
// 0x05014188 - 0x05014560
const Gfx heave_ho_seg5_dl_05014188[] = {
gsSPLight(&heave_ho_seg5_light_0500E970, 1),
gsSPLight(&heave_ho_seg5_light_0500E968, 2),
gsSPLight(&heave_ho_seg5_lights_0500E968.l, 1),
gsSPLight(&heave_ho_seg5_lights_0500E968.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05012868, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
@ -1156,8 +1092,8 @@ const Gfx heave_ho_seg5_dl_05014188[] = {
// 0x05014560 - 0x050145D0
const Gfx heave_ho_seg5_dl_05014560[] = {
gsSPLight(&heave_ho_seg5_light_0500E988, 1),
gsSPLight(&heave_ho_seg5_light_0500E980, 2),
gsSPLight(&heave_ho_seg5_lights_0500E980.l, 1),
gsSPLight(&heave_ho_seg5_lights_0500E980.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05013068, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 3, 6, 0x0, 5, 7, 3, 0x0),
@ -1169,8 +1105,8 @@ const Gfx heave_ho_seg5_dl_05014560[] = {
// 0x050145D0 - 0x050149A8
const Gfx heave_ho_seg5_dl_050145D0[] = {
gsSPLight(&heave_ho_seg5_light_0500E970, 1),
gsSPLight(&heave_ho_seg5_light_0500E968, 2),
gsSPLight(&heave_ho_seg5_lights_0500E968.l, 1),
gsSPLight(&heave_ho_seg5_lights_0500E968.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05013128, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
@ -1240,8 +1176,8 @@ const Gfx heave_ho_seg5_dl_050145D0[] = {
// 0x050149A8 - 0x05014D80
const Gfx heave_ho_seg5_dl_050149A8[] = {
gsSPLight(&heave_ho_seg5_light_0500E970, 1),
gsSPLight(&heave_ho_seg5_light_0500E968, 2),
gsSPLight(&heave_ho_seg5_lights_0500E968.l, 1),
gsSPLight(&heave_ho_seg5_lights_0500E968.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05013928, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
@ -1311,8 +1247,8 @@ const Gfx heave_ho_seg5_dl_050149A8[] = {
// 0x05014D80 - 0x05014DD0
const Gfx heave_ho_seg5_dl_05014D80[] = {
gsSPLight(&heave_ho_seg5_light_0500E988, 1),
gsSPLight(&heave_ho_seg5_light_0500E980, 2),
gsSPLight(&heave_ho_seg5_lights_0500E980.l, 1),
gsSPLight(&heave_ho_seg5_lights_0500E980.a, 2),
gsSPVertex(heave_ho_seg5_vertex_05014128, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0),
gsSP2Triangles( 4, 3, 5, 0x0, 0, 2, 5, 0x0),

336
actors/hoot/model.inc.c
View File

@ -1,124 +1,76 @@
// Hoot
// 0x05000900
static const Ambient hoot_seg5_light_05000900 = {
{{0x30, 0x1b, 0x0f}, 0, {0x30, 0x1b, 0x0f}, 0}
};
static const Lights1 hoot_seg5_lights_05000900 = gdSPDefLights1(
0x30, 0x1b, 0x0f,
0xc0, 0x6e, 0x3d, 0x28, 0x28, 0x28
);
// 0x05000908
static const Light hoot_seg5_light_05000908 = {
{{0xc0, 0x6e, 0x3d}, 0, {0xc0, 0x6e, 0x3d}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient hoot_light_1 = {
{{0x37, 0x27, 0x0b}, 0, {0x37, 0x27, 0x0b}, 0}
};
// Unreferenced light
UNUSED static const Light hoot_light_2 = {
{{0xdd, 0x9d, 0x2d}, 0, {0xdd, 0x9d, 0x2d}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 hoot_lights_unused1 = gdSPDefLights1(
0x37, 0x27, 0x0b,
0xdd, 0x9d, 0x2d, 0x28, 0x28, 0x28
);
// 0x05000930
static const Ambient hoot_seg5_light_05000930 = {
{{0x36, 0x26, 0x11}, 0, {0x36, 0x26, 0x11}, 0}
};
// 0x05000938
static const Light hoot_seg5_light_05000938 = {
{{0xdb, 0x99, 0x46}, 0, {0xdb, 0x99, 0x46}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05000930 = gdSPDefLights1(
0x36, 0x26, 0x11,
0xdb, 0x99, 0x46, 0x28, 0x28, 0x28
);
// 0x05000948
static const Ambient hoot_seg5_light_05000948 = {
{{0x06, 0x06, 0x06}, 0, {0x06, 0x06, 0x06}, 0}
};
// 0x05000950
static const Light hoot_seg5_light_05000950 = {
{{0x19, 0x19, 0x19}, 0, {0x19, 0x19, 0x19}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05000948 = gdSPDefLights1(
0x06, 0x06, 0x06,
0x19, 0x19, 0x19, 0x28, 0x28, 0x28
);
// 0x05000960
static const Ambient hoot_seg5_light_05000960 = {
{{0x1d, 0x0a, 0x05}, 0, {0x1d, 0x0a, 0x05}, 0}
};
// 0x05000968
static const Light hoot_seg5_light_05000968 = {
{{0x77, 0x2a, 0x16}, 0, {0x77, 0x2a, 0x16}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05000960 = gdSPDefLights1(
0x1d, 0x0a, 0x05,
0x77, 0x2a, 0x16, 0x28, 0x28, 0x28
);
// 0x05000978
static const Ambient hoot_seg5_light_05000978 = {
{{0x06, 0x06, 0x06}, 0, {0x06, 0x06, 0x06}, 0}
};
static const Lights1 hoot_seg5_lights_05000978 = gdSPDefLights1(
0x06, 0x06, 0x06,
0x19, 0x19, 0x19, 0x28, 0x28, 0x28
);
// 0x05000980
static const Light hoot_seg5_light_05000980 = {
{{0x19, 0x19, 0x19}, 0, {0x19, 0x19, 0x19}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 hoot_lights_unused2 = gdSPDefLights1(
0x39, 0x27, 0x0a,
0xe6, 0x9d, 0x29, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient hoot_light_3 = {
{{0x39, 0x27, 0x0a}, 0, {0x39, 0x27, 0x0a}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 hoot_lights_unused3 = gdSPDefLights1(
0x1d, 0x06, 0x3b,
0x75, 0x18, 0xef, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light hoot_light_4 = {
{{0xe6, 0x9d, 0x29}, 0, {0xe6, 0x9d, 0x29}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient hoot_light_5 = {
{{0x1d, 0x06, 0x3b}, 0, {0x1d, 0x06, 0x3b}, 0}
};
// Unreferenced light
UNUSED static const Light hoot_light_6 = {
{{0x75, 0x18, 0xef}, 0, {0x75, 0x18, 0xef}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient hoot_light_7 = {
{{0x3a, 0x29, 0x09}, 0, {0x3a, 0x29, 0x09}, 0}
};
// Unreferenced light
UNUSED static const Light hoot_light_8 = {
{{0xeb, 0xa6, 0x27}, 0, {0xeb, 0xa6, 0x27}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 hoot_lights_unused4 = gdSPDefLights1(
0x3a, 0x29, 0x09,
0xeb, 0xa6, 0x27, 0x28, 0x28, 0x28
);
// 0x050009D8
static const Ambient hoot_seg5_light_050009D8 = {
{{0x18, 0x07, 0x03}, 0, {0x18, 0x07, 0x03}, 0}
};
// 0x050009E0
static const Light hoot_seg5_light_050009E0 = {
{{0x63, 0x1e, 0x0f}, 0, {0x63, 0x1e, 0x0f}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_050009D8 = gdSPDefLights1(
0x18, 0x07, 0x03,
0x63, 0x1e, 0x0f, 0x28, 0x28, 0x28
);
// 0x050009F0
static const Ambient hoot_seg5_light_050009F0 = {
{{0x3f, 0x3a, 0x09}, 0, {0x3f, 0x3a, 0x09}, 0}
};
// 0x050009F8
static const Light hoot_seg5_light_050009F8 = {
{{0xfe, 0xea, 0x26}, 0, {0xfe, 0xea, 0x26}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_050009F0 = gdSPDefLights1(
0x3f, 0x3a, 0x09,
0xfe, 0xea, 0x26, 0x28, 0x28, 0x28
);
// 0x05000A08
static const Ambient hoot_seg5_light_05000A08 = {
{{0x13, 0x0d, 0x0b}, 0, {0x13, 0x0d, 0x0b}, 0}
};
// 0x05000A10
static const Light hoot_seg5_light_05000A10 = {
{{0x4d, 0x35, 0x2e}, 0, {0x4d, 0x35, 0x2e}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05000A08 = gdSPDefLights1(
0x13, 0x0d, 0x0b,
0x4d, 0x35, 0x2e, 0x28, 0x28, 0x28
);
// 0x05000A20
ALIGNED8 static const u8 hoot_seg5_texture_05000A20[] = {
@ -322,8 +274,8 @@ static const Vtx hoot_seg5_vertex_05001A90[] = {
// 0x05001B80 - 0x05001C00
const Gfx hoot_seg5_dl_05001B80[] = {
gsDPLoadTextureBlock(hoot_seg5_texture_05000A20, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPLight(&hoot_seg5_light_050009E0, 1),
gsSPLight(&hoot_seg5_light_050009D8, 2),
gsSPLight(&hoot_seg5_lights_050009D8.l, 1),
gsSPLight(&hoot_seg5_lights_050009D8.a, 2),
gsSPVertex(hoot_seg5_vertex_05001220, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -333,17 +285,17 @@ const Gfx hoot_seg5_dl_05001B80[] = {
// 0x05001C00 - 0x05001DF0
const Gfx hoot_seg5_dl_05001C00[] = {
gsSPLight(&hoot_seg5_light_050009F8, 1),
gsSPLight(&hoot_seg5_light_050009F0, 2),
gsSPLight(&hoot_seg5_lights_050009F0.l, 1),
gsSPLight(&hoot_seg5_lights_050009F0.a, 2),
gsSPVertex(hoot_seg5_vertex_05001310, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
gsSPLight(&hoot_seg5_light_05000A10, 1),
gsSPLight(&hoot_seg5_light_05000A08, 2),
gsSPLight(&hoot_seg5_lights_05000A08.l, 1),
gsSPLight(&hoot_seg5_lights_05000A08.a, 2),
gsSPVertex(hoot_seg5_vertex_050013D0, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPLight(&hoot_seg5_light_050009E0, 1),
gsSPLight(&hoot_seg5_light_050009D8, 2),
gsSPLight(&hoot_seg5_lights_050009D8.l, 1),
gsSPLight(&hoot_seg5_lights_050009D8.a, 2),
gsSPVertex(hoot_seg5_vertex_05001400, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -393,14 +345,10 @@ const Gfx hoot_seg5_dl_05001DF0[] = {
};
// 0x05001E38
static const Ambient hoot_seg5_light_05001E38 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05001E40
static const Light hoot_seg5_light_05001E40 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05001E38 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05001E50
ALIGNED8 static const u8 hoot_seg5_texture_05001E50[] = {
@ -438,8 +386,8 @@ const Gfx hoot_seg5_dl_05002EB0[] = {
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 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),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_light_05001E40, 1),
gsSPLight(&hoot_seg5_light_05001E38, 2),
gsSPLight(&hoot_seg5_lights_05001E38.l, 1),
gsSPLight(&hoot_seg5_lights_05001E38.a, 2),
gsSPVertex(hoot_seg5_vertex_05002E50, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -460,14 +408,10 @@ const Gfx hoot_seg5_dl_05002F10[] = {
};
// 0x05002F60
static const Ambient hoot_seg5_light_05002F60 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05002F68
static const Light hoot_seg5_light_05002F68 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05002F60 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x05002F78
@ -495,8 +439,8 @@ const Gfx hoot_seg5_dl_05002FD8[] = {
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 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),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_light_05002F68, 1),
gsSPLight(&hoot_seg5_light_05002F60, 2),
gsSPLight(&hoot_seg5_lights_05002F60.l, 1),
gsSPLight(&hoot_seg5_lights_05002F60.a, 2),
gsSPVertex(hoot_seg5_vertex_05002F78, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -517,14 +461,10 @@ const Gfx hoot_seg5_dl_05003038[] = {
};
// 0x05003088
static const Ambient hoot_seg5_light_05003088 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05003090
static const Light hoot_seg5_light_05003090 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05003088 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x050030A0
@ -552,8 +492,8 @@ const Gfx hoot_seg5_dl_05003100[] = {
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 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),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_light_05003090, 1),
gsSPLight(&hoot_seg5_light_05003088, 2),
gsSPLight(&hoot_seg5_lights_05003088.l, 1),
gsSPLight(&hoot_seg5_lights_05003088.a, 2),
gsSPVertex(hoot_seg5_vertex_050030A0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -574,14 +514,10 @@ const Gfx hoot_seg5_dl_05003160[] = {
};
// 0x050031B0
static const Ambient hoot_seg5_light_050031B0 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x050031B8
static const Light hoot_seg5_light_050031B8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_050031B0 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x050031C8
@ -609,8 +545,8 @@ const Gfx hoot_seg5_dl_05003228[] = {
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 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),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_light_050031B8, 1),
gsSPLight(&hoot_seg5_light_050031B0, 2),
gsSPLight(&hoot_seg5_lights_050031B0.l, 1),
gsSPLight(&hoot_seg5_lights_050031B0.a, 2),
gsSPVertex(hoot_seg5_vertex_050031C8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -631,14 +567,10 @@ const Gfx hoot_seg5_dl_05003288[] = {
};
// 0x050032D8
static const Ambient hoot_seg5_light_050032D8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x050032E0
static const Light hoot_seg5_light_050032E0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_050032D8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x050032F0
@ -666,8 +598,8 @@ const Gfx hoot_seg5_dl_05003350[] = {
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 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),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_light_050032E0, 1),
gsSPLight(&hoot_seg5_light_050032D8, 2),
gsSPLight(&hoot_seg5_lights_050032D8.l, 1),
gsSPLight(&hoot_seg5_lights_050032D8.a, 2),
gsSPVertex(hoot_seg5_vertex_050032F0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -688,14 +620,10 @@ const Gfx hoot_seg5_dl_050033B0[] = {
};
// 0x05003400
static const Ambient hoot_seg5_light_05003400 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05003408
static const Light hoot_seg5_light_05003408 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05003400 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x05003418
@ -723,8 +651,8 @@ const Gfx hoot_seg5_dl_05003478[] = {
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 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),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_light_05003408, 1),
gsSPLight(&hoot_seg5_light_05003400, 2),
gsSPLight(&hoot_seg5_lights_05003400.l, 1),
gsSPLight(&hoot_seg5_lights_05003400.a, 2),
gsSPVertex(hoot_seg5_vertex_05003418, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -745,14 +673,10 @@ const Gfx hoot_seg5_dl_050034D8[] = {
};
// 0x05003528
static const Ambient hoot_seg5_light_05003528 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05003530
static const Light hoot_seg5_light_05003530 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05003528 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x05003540
@ -780,8 +704,8 @@ const Gfx hoot_seg5_dl_050035A0[] = {
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 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),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_light_05003530, 1),
gsSPLight(&hoot_seg5_light_05003528, 2),
gsSPLight(&hoot_seg5_lights_05003528.l, 1),
gsSPLight(&hoot_seg5_lights_05003528.a, 2),
gsSPVertex(hoot_seg5_vertex_05003540, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -802,14 +726,10 @@ const Gfx hoot_seg5_dl_05003600[] = {
};
// 0x05003650
static const Ambient hoot_seg5_light_05003650 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05003658
static const Light hoot_seg5_light_05003658 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 hoot_seg5_lights_05003650 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x05003668
@ -837,8 +757,8 @@ const Gfx hoot_seg5_dl_050036C8[] = {
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 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),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_light_05003658, 1),
gsSPLight(&hoot_seg5_light_05003650, 2),
gsSPLight(&hoot_seg5_lights_05003650.l, 1),
gsSPLight(&hoot_seg5_lights_05003650.a, 2),
gsSPVertex(hoot_seg5_vertex_05003668, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -1231,8 +1151,8 @@ static const Vtx hoot_seg5_vertex_05004828[] = {
// 0x05004928 - 0x05004A98
const Gfx hoot_seg5_dl_05004928[] = {
gsSPLight(&hoot_seg5_light_05000938, 1),
gsSPLight(&hoot_seg5_light_05000930, 2),
gsSPLight(&hoot_seg5_lights_05000930.l, 1),
gsSPLight(&hoot_seg5_lights_05000930.a, 2),
gsSPVertex(hoot_seg5_vertex_05003778, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -1252,8 +1172,8 @@ const Gfx hoot_seg5_dl_05004928[] = {
gsSP1Triangle(12, 13, 14, 0x0),
gsSPVertex(hoot_seg5_vertex_05003B48, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPLight(&hoot_seg5_light_05000950, 1),
gsSPLight(&hoot_seg5_light_05000948, 2),
gsSPLight(&hoot_seg5_lights_05000948.l, 1),
gsSPLight(&hoot_seg5_lights_05000948.a, 2),
gsSPVertex(hoot_seg5_vertex_05003BA8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -1266,8 +1186,8 @@ const Gfx hoot_seg5_dl_05004928[] = {
// 0x05004A98 - 0x05004B38
const Gfx hoot_seg5_dl_05004A98[] = {
gsSPLight(&hoot_seg5_light_05000968, 1),
gsSPLight(&hoot_seg5_light_05000960, 2),
gsSPLight(&hoot_seg5_lights_05000960.l, 1),
gsSPLight(&hoot_seg5_lights_05000960.a, 2),
gsSPVertex(hoot_seg5_vertex_05003D58, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -1275,8 +1195,8 @@ const Gfx hoot_seg5_dl_05004A98[] = {
gsSPVertex(hoot_seg5_vertex_05003E58, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
gsSPLight(&hoot_seg5_light_05000980, 1),
gsSPLight(&hoot_seg5_light_05000978, 2),
gsSPLight(&hoot_seg5_lights_05000978.l, 1),
gsSPLight(&hoot_seg5_lights_05000978.a, 2),
gsSPVertex(hoot_seg5_vertex_05003F18, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -1284,8 +1204,8 @@ const Gfx hoot_seg5_dl_05004A98[] = {
// 0x05004B38 - 0x05004CA8
const Gfx hoot_seg5_dl_05004B38[] = {
gsSPLight(&hoot_seg5_light_05000950, 1),
gsSPLight(&hoot_seg5_light_05000948, 2),
gsSPLight(&hoot_seg5_lights_05000948.l, 1),
gsSPLight(&hoot_seg5_lights_05000948.a, 2),
gsSPVertex(hoot_seg5_vertex_05003F58, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -1293,8 +1213,8 @@ const Gfx hoot_seg5_dl_05004B38[] = {
gsSPVertex(hoot_seg5_vertex_05004048, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
gsSPLight(&hoot_seg5_light_05000938, 1),
gsSPLight(&hoot_seg5_light_05000930, 2),
gsSPLight(&hoot_seg5_lights_05000930.l, 1),
gsSPLight(&hoot_seg5_lights_05000930.a, 2),
gsSPVertex(hoot_seg5_vertex_05004108, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -1319,8 +1239,8 @@ const Gfx hoot_seg5_dl_05004B38[] = {
// 0x05004CA8 - 0x05004D48
const Gfx hoot_seg5_dl_05004CA8[] = {
gsSPLight(&hoot_seg5_light_05000968, 1),
gsSPLight(&hoot_seg5_light_05000960, 2),
gsSPLight(&hoot_seg5_lights_05000960.l, 1),
gsSPLight(&hoot_seg5_lights_05000960.a, 2),
gsSPVertex(hoot_seg5_vertex_05004548, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -1328,8 +1248,8 @@ const Gfx hoot_seg5_dl_05004CA8[] = {
gsSPVertex(hoot_seg5_vertex_05004648, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
gsSPLight(&hoot_seg5_light_05000980, 1),
gsSPLight(&hoot_seg5_light_05000978, 2),
gsSPLight(&hoot_seg5_lights_05000978.l, 1),
gsSPLight(&hoot_seg5_lights_05000978.a, 2),
gsSPVertex(hoot_seg5_vertex_05004708, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSPEndDisplayList(),
@ -1337,8 +1257,8 @@ const Gfx hoot_seg5_dl_05004CA8[] = {
// 0x05004D48 - 0x05004EC0
const Gfx hoot_seg5_dl_05004D48[] = {
gsSPLight(&hoot_seg5_light_05000908, 1),
gsSPLight(&hoot_seg5_light_05000900, 2),
gsSPLight(&hoot_seg5_lights_05000900.l, 1),
gsSPLight(&hoot_seg5_lights_05000900.a, 2),
gsSPVertex(hoot_seg5_vertex_05004748, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 1, 4, 0x0, 7, 8, 9, 0x0),
@ -1350,8 +1270,8 @@ const Gfx hoot_seg5_dl_05004D48[] = {
gsSP2Triangles( 2, 10, 12, 0x0, 6, 9, 8, 0x0),
gsSP2Triangles(11, 13, 7, 0x0, 5, 4, 1, 0x0),
gsSP1Triangle( 1, 8, 2, 0x0),
gsSPLight(&hoot_seg5_light_05000968, 1),
gsSPLight(&hoot_seg5_light_05000960, 2),
gsSPLight(&hoot_seg5_lights_05000960.l, 1),
gsSPLight(&hoot_seg5_lights_05000960.a, 2),
gsSPVertex(hoot_seg5_vertex_05004828, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 4, 3, 0x0),

2
actors/impact_ring/model.inc.c
View File

@ -49,7 +49,7 @@ const Gfx impact_ring_seg6_dl_0601EA88[] = {
// 0x0601EAC0 - 0x0601EB40
const Gfx impact_ring_seg6_dl_0601EAC0[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
gsDPSetCombineMode(G_CC_MODULATEIFADEA, G_CC_MODULATEIFADEA),
gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
gsDPSetTile(G_IM_FMT_IA, 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),

150
actors/king_bobomb/model.inc.c
View File

@ -1,54 +1,34 @@
// King Bobomb
// Unreferenced light
UNUSED static const Ambient king_bobomb_light_1 = {
{{0x36, 0x1e, 0x00}, 0, {0x36, 0x1e, 0x00}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 king_bobomb_lights_unused1 = gdSPDefLights1(
0x36, 0x1e, 0x00,
0xd9, 0x7a, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light king_bobomb_light_2 = {
{{0xd9, 0x7a, 0x00}, 0, {0xd9, 0x7a, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 king_bobomb_lights_unused2 = gdSPDefLights1(
0x00, 0x00, 0x3f,
0x00, 0x00, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient king_bobomb_light_3 = {
{{0x00, 0x00, 0x3f}, 0, {0x00, 0x00, 0x3f}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 king_bobomb_lights_unused3 = gdSPDefLights1(
0x3c, 0x28, 0x00,
0xf1, 0xa2, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light king_bobomb_light_4 = {
{{0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 king_bobomb_lights_unused4 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient king_bobomb_light_5 = {
{{0x3c, 0x28, 0x00}, 0, {0x3c, 0x28, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light king_bobomb_light_6 = {
{{0xf1, 0xa2, 0x00}, 0, {0xf1, 0xa2, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient king_bobomb_light_7 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
// Unreferenced light
UNUSED static const Light king_bobomb_light_8 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient king_bobomb_light_9 = {
{{0x06, 0x06, 0x06}, 0, {0x06, 0x06, 0x06}, 0}
};
// Unreferenced light
UNUSED static const Light king_bobomb_light_10 = {
{{0x19, 0x19, 0x19}, 0, {0x19, 0x19, 0x19}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 king_bobomb_lights_unused5 = gdSPDefLights1(
0x06, 0x06, 0x06,
0x19, 0x19, 0x19, 0x28, 0x28, 0x28
);
// 0x05000078
ALIGNED8 static const u8 king_bobomb_seg5_texture_05000078[] = {
@ -317,14 +297,10 @@ const Gfx king_bobomb_seg5_dl_0500A978[] = {
};
// 0x0500A9E8
static const Ambient king_bobomb_seg5_light_0500A9E8 = {
{{0x6f, 0x56, 0x11}, 0, {0x6f, 0x56, 0x11}, 0}
};
// 0x0500A9F0
static const Light king_bobomb_seg5_light_0500A9F0 = {
{{0xde, 0xad, 0x23}, 0, {0xde, 0xad, 0x23}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 king_bobomb_seg5_lights_0500A9E8 = gdSPDefLights1(
0x6f, 0x56, 0x11,
0xde, 0xad, 0x23, 0x28, 0x28, 0x28
);
// 0x0500AA00
static const Vtx king_bobomb_seg5_vertex_0500AA00[] = {
@ -364,8 +340,8 @@ static const Vtx king_bobomb_seg5_vertex_0500AB00[] = {
// 0x0500ABC0 - 0x0500AD08
const Gfx king_bobomb_seg5_dl_0500ABC0[] = {
gsSPLight(&king_bobomb_seg5_light_0500A9F0, 1),
gsSPLight(&king_bobomb_seg5_light_0500A9E8, 2),
gsSPLight(&king_bobomb_seg5_lights_0500A9E8.l, 1),
gsSPLight(&king_bobomb_seg5_lights_0500A9E8.a, 2),
gsSPVertex(king_bobomb_seg5_vertex_0500AA00, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 6, 0x0),
@ -400,14 +376,10 @@ const Gfx king_bobomb_seg5_dl_0500AD08[] = {
};
// 0x0500AD38
static const Ambient king_bobomb_seg5_light_0500AD38 = {
{{0x6f, 0x4f, 0x10}, 0, {0x6f, 0x4f, 0x10}, 0}
};
// 0x0500AD40
static const Light king_bobomb_seg5_light_0500AD40 = {
{{0xde, 0x9e, 0x20}, 0, {0xde, 0x9e, 0x20}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 king_bobomb_seg5_lights_0500AD38 = gdSPDefLights1(
0x6f, 0x4f, 0x10,
0xde, 0x9e, 0x20, 0x28, 0x28, 0x28
);
// 0x0500AD50
static const Vtx king_bobomb_seg5_vertex_0500AD50[] = {
@ -448,8 +420,8 @@ static const Vtx king_bobomb_seg5_vertex_0500AE50[] = {
// 0x0500AF20 - 0x0500B068
const Gfx king_bobomb_seg5_dl_0500AF20[] = {
gsSPLight(&king_bobomb_seg5_light_0500AD40, 1),
gsSPLight(&king_bobomb_seg5_light_0500AD38, 2),
gsSPLight(&king_bobomb_seg5_lights_0500AD38.l, 1),
gsSPLight(&king_bobomb_seg5_lights_0500AD38.a, 2),
gsSPVertex(king_bobomb_seg5_vertex_0500AD50, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0),
@ -540,14 +512,10 @@ const Gfx king_bobomb_seg5_dl_0500B188[] = {
};
// 0x0500B200
static const Ambient king_bobomb_seg5_light_0500B200 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0500B208
static const Light king_bobomb_seg5_light_0500B208 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 king_bobomb_seg5_lights_0500B200 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500B218
static const Vtx king_bobomb_seg5_vertex_0500B218[] = {
@ -564,8 +532,8 @@ const Gfx king_bobomb_seg5_dl_0500B278[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, king_bobomb_seg5_texture_05004878),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&king_bobomb_seg5_light_0500B208, 1),
gsSPLight(&king_bobomb_seg5_light_0500B200, 2),
gsSPLight(&king_bobomb_seg5_lights_0500B200.l, 1),
gsSPLight(&king_bobomb_seg5_lights_0500B200.a, 2),
gsSPVertex(king_bobomb_seg5_vertex_0500B218, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0),
gsSP2Triangles( 2, 3, 0, 0x0, 4, 5, 3, 0x0),
@ -589,14 +557,10 @@ const Gfx king_bobomb_seg5_dl_0500B2D0[] = {
};
// 0x0500B330
static const Ambient king_bobomb_seg5_light_0500B330 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500B338
static const Light king_bobomb_seg5_light_0500B338 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 king_bobomb_seg5_lights_0500B330 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500B348
static const Vtx king_bobomb_seg5_vertex_0500B348[] = {
@ -612,8 +576,8 @@ static const Vtx king_bobomb_seg5_vertex_0500B348[] = {
// 0x0500B3C8 - 0x0500B418
const Gfx king_bobomb_seg5_dl_0500B3C8[] = {
gsSPLight(&king_bobomb_seg5_light_0500B338, 1),
gsSPLight(&king_bobomb_seg5_light_0500B330, 2),
gsSPLight(&king_bobomb_seg5_lights_0500B330.l, 1),
gsSPLight(&king_bobomb_seg5_lights_0500B330.a, 2),
gsSPVertex(king_bobomb_seg5_vertex_0500B348, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 0, 0x0),
@ -634,14 +598,10 @@ const Gfx king_bobomb_seg5_dl_0500B418[] = {
};
// 0x0500B458
static const Ambient king_bobomb_seg5_light_0500B458 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500B460
static const Light king_bobomb_seg5_light_0500B460 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 king_bobomb_seg5_lights_0500B458 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500B470
static const Vtx king_bobomb_seg5_vertex_0500B470[] = {
@ -680,8 +640,8 @@ const Gfx king_bobomb_seg5_dl_0500B5F0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, king_bobomb_seg5_texture_05006078),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&king_bobomb_seg5_light_0500B460, 1),
gsSPLight(&king_bobomb_seg5_light_0500B458, 2),
gsSPLight(&king_bobomb_seg5_lights_0500B458.l, 1),
gsSPLight(&king_bobomb_seg5_lights_0500B458.a, 2),
gsSPVertex(king_bobomb_seg5_vertex_0500B470, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP2Triangles( 0, 2, 3, 0x0, 5, 4, 3, 0x0),

288
actors/klepto/model.inc.c
View File

@ -31,24 +31,16 @@ ALIGNED8 static const u8 klepto_seg5_texture_05003008[] = {
};
// 0x05003808
static const Ambient klepto_seg5_light_05003808 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05003810
static const Light klepto_seg5_light_05003810 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05003808 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05003820
static const Ambient klepto_seg5_light_05003820 = {
{{0x3f, 0x1d, 0x08}, 0, {0x3f, 0x1d, 0x08}, 0}
};
// 0x05003828
static const Light klepto_seg5_light_05003828 = {
{{0xff, 0x75, 0x21}, 0, {0xff, 0x75, 0x21}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05003820 = gdSPDefLights1(
0x3f, 0x1d, 0x08,
0xff, 0x75, 0x21, 0x28, 0x28, 0x28
);
// 0x05003838
static const Vtx klepto_seg5_vertex_05003838[] = {
@ -106,8 +98,8 @@ const Gfx klepto_seg5_dl_05003A68[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05000808),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_05003810, 1),
gsSPLight(&klepto_seg5_light_05003808, 2),
gsSPLight(&klepto_seg5_lights_05003808.l, 1),
gsSPLight(&klepto_seg5_lights_05003808.a, 2),
gsSPVertex(klepto_seg5_vertex_05003838, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 4, 5, 2, 0x0),
@ -132,8 +124,8 @@ const Gfx klepto_seg5_dl_05003AC0[] = {
// 0x05003B40 - 0x05003BD0
const Gfx klepto_seg5_dl_05003B40[] = {
gsSPLight(&klepto_seg5_light_05003828, 1),
gsSPLight(&klepto_seg5_light_05003820, 2),
gsSPLight(&klepto_seg5_lights_05003820.l, 1),
gsSPLight(&klepto_seg5_lights_05003820.a, 2),
gsSPVertex(klepto_seg5_vertex_050039B8, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 5, 3, 0x0, 3, 6, 4, 0x0),
@ -167,14 +159,10 @@ const Gfx klepto_seg5_dl_05003BD0[] = {
};
// 0x05003C58
static const Ambient klepto_seg5_light_05003C58 = {
{{0x3f, 0x1d, 0x08}, 0, {0x3f, 0x1d, 0x08}, 0}
};
// 0x05003C60
static const Light klepto_seg5_light_05003C60 = {
{{0xff, 0x75, 0x21}, 0, {0xff, 0x75, 0x21}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05003C58 = gdSPDefLights1(
0x3f, 0x1d, 0x08,
0xff, 0x75, 0x21, 0x28, 0x28, 0x28
);
// 0x05003C70
static const Vtx klepto_seg5_vertex_05003C70[] = {
@ -191,8 +179,8 @@ static const Vtx klepto_seg5_vertex_05003C70[] = {
// 0x05003D00 - 0x05003D80
const Gfx klepto_seg5_dl_05003D00[] = {
gsSPLight(&klepto_seg5_light_05003C60, 1),
gsSPLight(&klepto_seg5_light_05003C58, 2),
gsSPLight(&klepto_seg5_lights_05003C58.l, 1),
gsSPLight(&klepto_seg5_lights_05003C58.a, 2),
gsSPVertex(klepto_seg5_vertex_05003C70, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 4, 2, 5, 0x0, 2, 4, 3, 0x0),
@ -214,14 +202,10 @@ const Gfx klepto_seg5_dl_05003D80[] = {
};
// 0x05003DB0
static const Ambient klepto_seg5_light_05003DB0 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05003DB8
static const Light klepto_seg5_light_05003DB8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05003DB0 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05003DC8
static const Vtx klepto_seg5_vertex_05003DC8[] = {
@ -242,8 +226,8 @@ const Gfx klepto_seg5_dl_05003E68[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05000008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_05003DB8, 1),
gsSPLight(&klepto_seg5_light_05003DB0, 2),
gsSPLight(&klepto_seg5_lights_05003DB0.l, 1),
gsSPLight(&klepto_seg5_lights_05003DB0.a, 2),
gsSPVertex(klepto_seg5_vertex_05003DC8, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0),
gsSP2Triangles( 5, 2, 1, 0x0, 2, 5, 3, 0x0),
@ -273,14 +257,10 @@ const Gfx klepto_seg5_dl_05003F20[] = {
};
// 0x05003F80
static const Ambient klepto_seg5_light_05003F80 = {
{{0x07, 0x01, 0x01}, 0, {0x07, 0x01, 0x01}, 0}
};
// 0x05003F88
static const Light klepto_seg5_light_05003F88 = {
{{0x1e, 0x05, 0x04}, 0, {0x1e, 0x05, 0x04}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05003F80 = gdSPDefLights1(
0x07, 0x01, 0x01,
0x1e, 0x05, 0x04, 0x28, 0x28, 0x28
);
// 0x05003F98
static const Vtx klepto_seg5_vertex_05003F98[] = {
@ -300,8 +280,8 @@ static const Vtx klepto_seg5_vertex_05003F98[] = {
// 0x05004058 - 0x05004118
const Gfx klepto_seg5_dl_05004058[] = {
gsSPLight(&klepto_seg5_light_05003F88, 1),
gsSPLight(&klepto_seg5_light_05003F80, 2),
gsSPLight(&klepto_seg5_lights_05003F80.l, 1),
gsSPLight(&klepto_seg5_lights_05003F80.a, 2),
gsSPVertex(klepto_seg5_vertex_05003F98, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 0, 0x0),
@ -327,14 +307,10 @@ const Gfx klepto_seg5_dl_05004118[] = {
};
// 0x05004148
static const Ambient klepto_seg5_light_05004148 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05004150
static const Light klepto_seg5_light_05004150 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004148 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004160
static const Vtx klepto_seg5_vertex_05004160[] = {
@ -349,8 +325,8 @@ const Gfx klepto_seg5_dl_050041A0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05003008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_05004150, 1),
gsSPLight(&klepto_seg5_light_05004148, 2),
gsSPLight(&klepto_seg5_lights_05004148.l, 1),
gsSPLight(&klepto_seg5_lights_05004148.a, 2),
gsSPVertex(klepto_seg5_vertex_05004160, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSPEndDisplayList(),
@ -375,14 +351,10 @@ const Gfx klepto_seg5_dl_050041E8[] = {
};
// 0x05004258
static const Ambient klepto_seg5_light_05004258 = {
{{0x3f, 0x1d, 0x08}, 0, {0x3f, 0x1d, 0x08}, 0}
};
// 0x05004260
static const Light klepto_seg5_light_05004260 = {
{{0xff, 0x75, 0x21}, 0, {0xff, 0x75, 0x21}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004258 = gdSPDefLights1(
0x3f, 0x1d, 0x08,
0xff, 0x75, 0x21, 0x28, 0x28, 0x28
);
// 0x05004270
static const Vtx klepto_seg5_vertex_05004270[] = {
@ -396,8 +368,8 @@ static const Vtx klepto_seg5_vertex_05004270[] = {
// 0x050042D0 - 0x05004330
const Gfx klepto_seg5_dl_050042D0[] = {
gsSPLight(&klepto_seg5_light_05004260, 1),
gsSPLight(&klepto_seg5_light_05004258, 2),
gsSPLight(&klepto_seg5_lights_05004258.l, 1),
gsSPLight(&klepto_seg5_lights_05004258.a, 2),
gsSPVertex(klepto_seg5_vertex_05004270, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 4, 0, 2, 0x0, 0, 4, 3, 0x0),
@ -417,14 +389,10 @@ const Gfx klepto_seg5_dl_05004330[] = {
};
// 0x05004360
static const Ambient klepto_seg5_light_05004360 = {
{{0x3f, 0x1d, 0x08}, 0, {0x3f, 0x1d, 0x08}, 0}
};
// 0x05004368
static const Light klepto_seg5_light_05004368 = {
{{0xff, 0x75, 0x21}, 0, {0xff, 0x75, 0x21}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004360 = gdSPDefLights1(
0x3f, 0x1d, 0x08,
0xff, 0x75, 0x21, 0x28, 0x28, 0x28
);
// 0x05004378
static const Vtx klepto_seg5_vertex_05004378[] = {
@ -438,8 +406,8 @@ static const Vtx klepto_seg5_vertex_05004378[] = {
// 0x050043D8 - 0x05004438
const Gfx klepto_seg5_dl_050043D8[] = {
gsSPLight(&klepto_seg5_light_05004368, 1),
gsSPLight(&klepto_seg5_light_05004360, 2),
gsSPLight(&klepto_seg5_lights_05004360.l, 1),
gsSPLight(&klepto_seg5_lights_05004360.a, 2),
gsSPVertex(klepto_seg5_vertex_05004378, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 4, 0, 2, 0x0, 0, 4, 3, 0x0),
@ -459,24 +427,16 @@ const Gfx klepto_seg5_dl_05004438[] = {
};
// 0x05004468
static const Ambient klepto_seg5_light_05004468 = {
{{0x02, 0x00, 0x00}, 0, {0x02, 0x00, 0x00}, 0}
};
// 0x05004470
static const Light klepto_seg5_light_05004470 = {
{{0x08, 0x00, 0x00}, 0, {0x08, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004468 = gdSPDefLights1(
0x02, 0x00, 0x00,
0x08, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x05004480
static const Ambient klepto_seg5_light_05004480 = {
{{0x3f, 0x1d, 0x08}, 0, {0x3f, 0x1d, 0x08}, 0}
};
// 0x05004488
static const Light klepto_seg5_light_05004488 = {
{{0xff, 0x75, 0x21}, 0, {0xff, 0x75, 0x21}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004480 = gdSPDefLights1(
0x3f, 0x1d, 0x08,
0xff, 0x75, 0x21, 0x28, 0x28, 0x28
);
// 0x05004498
static const Vtx klepto_seg5_vertex_05004498[] = {
@ -524,16 +484,16 @@ static const Vtx klepto_seg5_vertex_05004648[] = {
// 0x05004698 - 0x050047C8
const Gfx klepto_seg5_dl_05004698[] = {
gsSPLight(&klepto_seg5_light_05004470, 1),
gsSPLight(&klepto_seg5_light_05004468, 2),
gsSPLight(&klepto_seg5_lights_05004468.l, 1),
gsSPLight(&klepto_seg5_lights_05004468.a, 2),
gsSPVertex(klepto_seg5_vertex_05004498, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 3, 6, 0x0, 3, 5, 6, 0x0),
gsSP2Triangles( 7, 8, 9, 0x0, 8, 7, 10, 0x0),
gsSP2Triangles( 8, 10, 9, 0x0, 0, 11, 1, 0x0),
gsSP1Triangle(11, 0, 2, 0x0),
gsSPLight(&klepto_seg5_light_05004488, 1),
gsSPLight(&klepto_seg5_light_05004480, 2),
gsSPLight(&klepto_seg5_lights_05004480.l, 1),
gsSPLight(&klepto_seg5_lights_05004480.a, 2),
gsSPVertex(klepto_seg5_vertex_05004558, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 3, 0x0, 7, 4, 3, 0x0),
@ -561,24 +521,16 @@ const Gfx klepto_seg5_dl_050047C8[] = {
};
// 0x050047F8
static const Ambient klepto_seg5_light_050047F8 = {
{{0x02, 0x00, 0x00}, 0, {0x02, 0x00, 0x00}, 0}
};
// 0x05004800
static const Light klepto_seg5_light_05004800 = {
{{0x08, 0x00, 0x00}, 0, {0x08, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_050047F8 = gdSPDefLights1(
0x02, 0x00, 0x00,
0x08, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x05004810
static const Ambient klepto_seg5_light_05004810 = {
{{0x3f, 0x1d, 0x08}, 0, {0x3f, 0x1d, 0x08}, 0}
};
// 0x05004818
static const Light klepto_seg5_light_05004818 = {
{{0xff, 0x75, 0x21}, 0, {0xff, 0x75, 0x21}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004810 = gdSPDefLights1(
0x3f, 0x1d, 0x08,
0xff, 0x75, 0x21, 0x28, 0x28, 0x28
);
// 0x05004828
static const Vtx klepto_seg5_vertex_05004828[] = {
@ -626,16 +578,16 @@ static const Vtx klepto_seg5_vertex_050049D8[] = {
// 0x05004A28 - 0x05004B58
const Gfx klepto_seg5_dl_05004A28[] = {
gsSPLight(&klepto_seg5_light_05004800, 1),
gsSPLight(&klepto_seg5_light_050047F8, 2),
gsSPLight(&klepto_seg5_lights_050047F8.l, 1),
gsSPLight(&klepto_seg5_lights_050047F8.a, 2),
gsSPVertex(klepto_seg5_vertex_05004828, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 3, 6, 0x0, 3, 5, 6, 0x0),
gsSP2Triangles( 7, 8, 9, 0x0, 8, 7, 10, 0x0),
gsSP2Triangles( 8, 10, 9, 0x0, 0, 11, 1, 0x0),
gsSP1Triangle(11, 0, 2, 0x0),
gsSPLight(&klepto_seg5_light_05004818, 1),
gsSPLight(&klepto_seg5_light_05004810, 2),
gsSPLight(&klepto_seg5_lights_05004810.l, 1),
gsSPLight(&klepto_seg5_lights_05004810.a, 2),
gsSPVertex(klepto_seg5_vertex_050048E8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 3, 0x0, 7, 4, 3, 0x0),
@ -663,14 +615,10 @@ const Gfx klepto_seg5_dl_05004B58[] = {
};
// 0x05004B88
static const Ambient klepto_seg5_light_05004B88 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05004B90
static const Light klepto_seg5_light_05004B90 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004B88 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004BA0
static const Vtx klepto_seg5_vertex_05004BA0[] = {
@ -685,8 +633,8 @@ const Gfx klepto_seg5_dl_05004BE0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_05004B90, 1),
gsSPLight(&klepto_seg5_light_05004B88, 2),
gsSPLight(&klepto_seg5_lights_05004B88.l, 1),
gsSPLight(&klepto_seg5_lights_05004B88.a, 2),
gsSPVertex(klepto_seg5_vertex_05004BA0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -711,14 +659,10 @@ const Gfx klepto_seg5_dl_05004C28[] = {
};
// 0x05004C98
static const Ambient klepto_seg5_light_05004C98 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05004CA0
static const Light klepto_seg5_light_05004CA0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004C98 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004CB0
static const Vtx klepto_seg5_vertex_05004CB0[] = {
@ -733,8 +677,8 @@ const Gfx klepto_seg5_dl_05004CF0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_05004CA0, 1),
gsSPLight(&klepto_seg5_light_05004C98, 2),
gsSPLight(&klepto_seg5_lights_05004C98.l, 1),
gsSPLight(&klepto_seg5_lights_05004C98.a, 2),
gsSPVertex(klepto_seg5_vertex_05004CB0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSPEndDisplayList(),
@ -759,14 +703,10 @@ const Gfx klepto_seg5_dl_05004D38[] = {
};
// 0x05004DA8
static const Ambient klepto_seg5_light_05004DA8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05004DB0
static const Light klepto_seg5_light_05004DB0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004DA8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004DC0
static const Vtx klepto_seg5_vertex_05004DC0[] = {
@ -781,8 +721,8 @@ const Gfx klepto_seg5_dl_05004E00[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_05004DB0, 1),
gsSPLight(&klepto_seg5_light_05004DA8, 2),
gsSPLight(&klepto_seg5_lights_05004DA8.l, 1),
gsSPLight(&klepto_seg5_lights_05004DA8.a, 2),
gsSPVertex(klepto_seg5_vertex_05004DC0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -807,14 +747,10 @@ const Gfx klepto_seg5_dl_05004E48[] = {
};
// 0x05004EB8
static const Ambient klepto_seg5_light_05004EB8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05004EC0
static const Light klepto_seg5_light_05004EC0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004EB8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004ED0
static const Vtx klepto_seg5_vertex_05004ED0[] = {
@ -829,8 +765,8 @@ const Gfx klepto_seg5_dl_05004F10[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_05004EC0, 1),
gsSPLight(&klepto_seg5_light_05004EB8, 2),
gsSPLight(&klepto_seg5_lights_05004EB8.l, 1),
gsSPLight(&klepto_seg5_lights_05004EB8.a, 2),
gsSPVertex(klepto_seg5_vertex_05004ED0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSPEndDisplayList(),
@ -855,14 +791,10 @@ const Gfx klepto_seg5_dl_05004F58[] = {
};
// 0x05004FC8
static const Ambient klepto_seg5_light_05004FC8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05004FD0
static const Light klepto_seg5_light_05004FD0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_05004FC8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004FE0
static const Vtx klepto_seg5_vertex_05004FE0[] = {
@ -877,8 +809,8 @@ const Gfx klepto_seg5_dl_05005020[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_05004FD0, 1),
gsSPLight(&klepto_seg5_light_05004FC8, 2),
gsSPLight(&klepto_seg5_lights_05004FC8.l, 1),
gsSPLight(&klepto_seg5_lights_05004FC8.a, 2),
gsSPVertex(klepto_seg5_vertex_05004FE0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -903,14 +835,10 @@ const Gfx klepto_seg5_dl_05005068[] = {
};
// 0x050050D8
static const Ambient klepto_seg5_light_050050D8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x050050E0
static const Light klepto_seg5_light_050050E0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 klepto_seg5_lights_050050D8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050050F0
static const Vtx klepto_seg5_vertex_050050F0[] = {
@ -925,8 +853,8 @@ const Gfx klepto_seg5_dl_05005130[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&klepto_seg5_light_050050E0, 1),
gsSPLight(&klepto_seg5_light_050050D8, 2),
gsSPLight(&klepto_seg5_lights_050050D8.l, 1),
gsSPLight(&klepto_seg5_lights_050050D8.a, 2),
gsSPVertex(klepto_seg5_vertex_050050F0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSPEndDisplayList(),

292
actors/koopa/model.inc.c
View File

@ -1,85 +1,53 @@
// Koopa (Small Koopa, Big Koopa [Koopa the Quick])
// Unreferenced light
UNUSED static const Ambient koopa_light_1 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// Unreferenced light
UNUSED static const Light koopa_light_2 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 koopa_lights_unused1 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060025A0
static const Ambient koopa_seg6_light_060025A0 = {
{{0x00, 0x59, 0x00}, 0, {0x00, 0x59, 0x00}, 0}
};
// 0x060025A8
static const Light koopa_seg6_light_060025A8 = {
{{0x00, 0xb2, 0x00}, 0, {0x00, 0xb2, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_060025A0 = gdSPDefLights1(
0x00, 0x59, 0x00,
0x00, 0xb2, 0x00, 0x28, 0x28, 0x28
);
// 0x060025B8
static const Ambient koopa_seg6_light_060025B8 = {
{{0x70, 0x57, 0x00}, 0, {0x70, 0x57, 0x00}, 0}
};
// 0x060025C0
static const Light koopa_seg6_light_060025C0 = {
{{0xe0, 0xae, 0x00}, 0, {0xe0, 0xae, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_060025B8 = gdSPDefLights1(
0x70, 0x57, 0x00,
0xe0, 0xae, 0x00, 0x28, 0x28, 0x28
);
// 0x060025D0
static const Ambient koopa_seg6_light_060025D0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
static const Lights1 koopa_seg6_lights_060025D0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060025D8
static const Light koopa_seg6_light_060025D8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient koopa_light_3 = {
{{0x59, 0x59, 0x59}, 0, {0x59, 0x59, 0x59}, 0}
};
// Unreferenced light
UNUSED static const Light koopa_light_4 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 koopa_lights_unused2 = gdSPDefLights1(
0x59, 0x59, 0x59,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x06002600
static const Ambient koopa_seg6_light_06002600 = {
{{0x00, 0x54, 0x00}, 0, {0x00, 0x54, 0x00}, 0}
};
// 0x06002608
static const Light koopa_seg6_light_06002608 = {
{{0x00, 0xa9, 0x00}, 0, {0x00, 0xa9, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06002600 = gdSPDefLights1(
0x00, 0x54, 0x00,
0x00, 0xa9, 0x00, 0x28, 0x28, 0x28
);
// 0x06002618
static const Ambient koopa_seg6_light_06002618 = {
{{0x59, 0x59, 0x59}, 0, {0x59, 0x59, 0x59}, 0}
};
// 0x06002620
static const Light koopa_seg6_light_06002620 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06002618 = gdSPDefLights1(
0x59, 0x59, 0x59,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x06002630
static const Ambient koopa_seg6_light_06002630 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06002638
static const Light koopa_seg6_light_06002638 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06002630 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! There is a malformed light entry here pointing to this texture + 0x18.
// It results in the koopa actor 'wearing' what appears to be pink shorts
@ -127,24 +95,16 @@ ALIGNED8 static const u8 koopa_seg6_texture_06005E48[] = {
};
// 0x06006E48
static const Ambient koopa_seg6_light_06006E48 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06006E50
static const Light koopa_seg6_light_06006E50 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06006E48 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06006E60
static const Ambient koopa_seg6_light_06006E60 = {
{{0x67, 0x0b, 0x1a}, 0, {0x67, 0x0b, 0x1a}, 0}
};
// 0x06006E68
static const Light koopa_seg6_light_06006E68 = {
{{0xce, 0x16, 0x35}, 0, {0xce, 0x16, 0x35}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06006E60 = gdSPDefLights1(
0x67, 0x0b, 0x1a,
0xce, 0x16, 0x35, 0x28, 0x28, 0x28
);
// 0x06006E78
static const Vtx koopa_seg6_vertex_06006E78[] = {
@ -318,8 +278,8 @@ static const Vtx koopa_seg6_vertex_060075B8[] = {
// 0x06007658 - 0x060076B0
const Gfx koopa_seg6_dl_06007658[] = {
gsSPLight(&koopa_seg6_light_06006E50, 1),
gsSPLight(&koopa_seg6_light_06006E48, 2),
gsSPLight(&koopa_seg6_lights_06006E48.l, 1),
gsSPLight(&koopa_seg6_lights_06006E48.a, 2),
gsSPVertex(koopa_seg6_vertex_06006E78, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP2Triangles( 0, 5, 3, 0x0, 4, 6, 0, 0x0),
@ -392,12 +352,12 @@ const Gfx koopa_seg6_dl_06007850[] = {
// 0x06007970 - 0x06007A60
const Gfx koopa_seg6_dl_06007970[] = {
gsSPLight(&koopa_seg6_light_06006E68, 1),
gsSPLight(&koopa_seg6_light_06006E60, 2),
gsSPLight(&koopa_seg6_lights_06006E60.l, 1),
gsSPLight(&koopa_seg6_lights_06006E60.a, 2),
gsSPVertex(koopa_seg6_vertex_06007488, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPLight(&koopa_seg6_light_06006E50, 1),
gsSPLight(&koopa_seg6_light_06006E48, 2),
gsSPLight(&koopa_seg6_lights_06006E48.l, 1),
gsSPLight(&koopa_seg6_lights_06006E48.a, 2),
gsSPVertex(koopa_seg6_vertex_060074B8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 4, 7, 0x0, 4, 6, 5, 0x0),
@ -460,24 +420,16 @@ const Gfx koopa_seg6_dl_06007B20[] = {
};
// 0x06007B48
static const Ambient koopa_seg6_light_06007B48 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06007B50
static const Light koopa_seg6_light_06007B50 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06007B48 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06007B60
static const Ambient koopa_seg6_light_06007B60 = {
{{0x70, 0x57, 0x00}, 0, {0x70, 0x57, 0x00}, 0}
};
// 0x06007B68
static const Light koopa_seg6_light_06007B68 = {
{{0xe0, 0xae, 0x00}, 0, {0xe0, 0xae, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06007B60 = gdSPDefLights1(
0x70, 0x57, 0x00,
0xe0, 0xae, 0x00, 0x28, 0x28, 0x28
);
// 0x06007B78
static const Vtx koopa_seg6_vertex_06007B78[] = {
@ -576,8 +528,8 @@ const Gfx koopa_seg6_dl_06007FB8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, koopa_seg6_texture_06002E48),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&koopa_seg6_light_06007B50, 1),
gsSPLight(&koopa_seg6_light_06007B48, 2),
gsSPLight(&koopa_seg6_lights_06007B48.l, 1),
gsSPLight(&koopa_seg6_lights_06007B48.a, 2),
gsSPVertex(koopa_seg6_vertex_06007B78, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 0, 4, 1, 0x0, 0, 5, 4, 0x0),
@ -607,13 +559,13 @@ const Gfx koopa_seg6_dl_06008050[] = {
// 0x060080F8 - 0x06008250
const Gfx koopa_seg6_dl_060080F8[] = {
gsSPLight(&koopa_seg6_light_06007B68, 1),
gsSPLight(&koopa_seg6_light_06007B60, 2),
gsSPLight(&koopa_seg6_lights_06007B60.l, 1),
gsSPLight(&koopa_seg6_lights_06007B60.a, 2),
gsSPVertex(koopa_seg6_vertex_06007CF8, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP1Triangle( 2, 4, 3, 0x0),
gsSPLight(&koopa_seg6_light_06007B50, 1),
gsSPLight(&koopa_seg6_light_06007B48, 2),
gsSPLight(&koopa_seg6_lights_06007B48.l, 1),
gsSPLight(&koopa_seg6_lights_06007B48.a, 2),
gsSPVertex(koopa_seg6_vertex_06007D48, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 4, 1, 3, 0x0, 2, 1, 5, 0x0),
@ -655,24 +607,16 @@ const Gfx koopa_seg6_dl_06008250[] = {
};
// 0x060082C0
static const Ambient koopa_seg6_light_060082C0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x060082C8
static const Light koopa_seg6_light_060082C8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_060082C0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060082D8
static const Ambient koopa_seg6_light_060082D8 = {
{{0x00, 0x64, 0x00}, 0, {0x00, 0x64, 0x00}, 0}
};
// 0x060082E0
static const Light koopa_seg6_light_060082E0 = {
{{0x00, 0xc8, 0x00}, 0, {0x00, 0xc8, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_060082D8 = gdSPDefLights1(
0x00, 0x64, 0x00,
0x00, 0xc8, 0x00, 0x28, 0x28, 0x28
);
// 0x060082F0
static const Vtx koopa_seg6_vertex_060082F0[] = {
@ -727,8 +671,8 @@ const Gfx koopa_seg6_dl_06008530[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, koopa_seg6_texture_06003648),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&koopa_seg6_light_060082C8, 1),
gsSPLight(&koopa_seg6_light_060082C0, 2),
gsSPLight(&koopa_seg6_lights_060082C0.l, 1),
gsSPLight(&koopa_seg6_lights_060082C0.a, 2),
gsSPVertex(koopa_seg6_vertex_060082F0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 1, 4, 3, 0x0, 4, 5, 3, 0x0),
@ -755,8 +699,8 @@ const Gfx koopa_seg6_dl_060085E8[] = {
// 0x06008640 - 0x060086D0
const Gfx koopa_seg6_dl_06008640[] = {
gsSPLight(&koopa_seg6_light_060082E0, 1),
gsSPLight(&koopa_seg6_light_060082D8, 2),
gsSPLight(&koopa_seg6_lights_060082D8.l, 1),
gsSPLight(&koopa_seg6_lights_060082D8.a, 2),
gsSPVertex(koopa_seg6_vertex_06008470, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 3, 4, 0, 0x0, 1, 5, 2, 0x0),
@ -787,24 +731,16 @@ const Gfx koopa_seg6_dl_060086D0[] = {
};
// 0x06008740
static const Ambient koopa_seg6_light_06008740 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06008748
static const Light koopa_seg6_light_06008748 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06008740 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06008758
static const Ambient koopa_seg6_light_06008758 = {
{{0x00, 0x64, 0x00}, 0, {0x00, 0x64, 0x00}, 0}
};
// 0x06008760
static const Light koopa_seg6_light_06008760 = {
{{0x00, 0xc8, 0x00}, 0, {0x00, 0xc8, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_seg6_lights_06008758 = gdSPDefLights1(
0x00, 0x64, 0x00,
0x00, 0xc8, 0x00, 0x28, 0x28, 0x28
);
// 0x06008770
static const Vtx koopa_seg6_vertex_06008770[] = {
@ -859,8 +795,8 @@ const Gfx koopa_seg6_dl_060089B0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, koopa_seg6_texture_06003648),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&koopa_seg6_light_06008748, 1),
gsSPLight(&koopa_seg6_light_06008740, 2),
gsSPLight(&koopa_seg6_lights_06008740.l, 1),
gsSPLight(&koopa_seg6_lights_06008740.a, 2),
gsSPVertex(koopa_seg6_vertex_06008770, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 1, 4, 3, 0x0, 4, 5, 3, 0x0),
@ -887,8 +823,8 @@ const Gfx koopa_seg6_dl_06008A68[] = {
// 0x06008AC0 - 0x06008B50
const Gfx koopa_seg6_dl_06008AC0[] = {
gsSPLight(&koopa_seg6_light_06008760, 1),
gsSPLight(&koopa_seg6_light_06008758, 2),
gsSPLight(&koopa_seg6_lights_06008758.l, 1),
gsSPLight(&koopa_seg6_lights_06008758.a, 2),
gsSPVertex(koopa_seg6_vertex_060088F0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 0, 2, 4, 0x0, 5, 0, 6, 0x0),
@ -1806,8 +1742,8 @@ static const Vtx koopa_seg6_vertex_0600B5F0[] = {
// 0x0600B6E0 - 0x0600B838
const Gfx koopa_seg6_dl_0600B6E0[] = {
gsSPLight(&koopa_seg6_light_060025A8, 1),
gsSPLight(&koopa_seg6_light_060025A0, 2),
gsSPLight(&koopa_seg6_lights_060025A0.l, 1),
gsSPLight(&koopa_seg6_lights_060025A0.a, 2),
gsSPVertex(koopa_seg6_vertex_06008BC0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -1835,8 +1771,8 @@ const Gfx koopa_seg6_dl_0600B6E0[] = {
// 0x0600B838 - 0x0600B8B8
const Gfx koopa_seg6_dl_0600B838[] = {
gsSPLight(&koopa_seg6_light_060025C0, 1),
gsSPLight(&koopa_seg6_light_060025B8, 2),
gsSPLight(&koopa_seg6_lights_060025B8.l, 1),
gsSPLight(&koopa_seg6_lights_060025B8.a, 2),
gsSPVertex(koopa_seg6_vertex_06008F60, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -1849,8 +1785,8 @@ const Gfx koopa_seg6_dl_0600B838[] = {
// 0x0600B8B8 - 0x0600BA10
const Gfx koopa_seg6_dl_0600B8B8[] = {
gsSPLight(&koopa_seg6_light_060025A8, 1),
gsSPLight(&koopa_seg6_light_060025A0, 2),
gsSPLight(&koopa_seg6_lights_060025A0.l, 1),
gsSPLight(&koopa_seg6_lights_060025A0.a, 2),
gsSPVertex(koopa_seg6_vertex_06009040, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -1879,8 +1815,8 @@ const Gfx koopa_seg6_dl_0600B8B8[] = {
// 0x0600BA10 - 0x0600BA90
const Gfx koopa_seg6_dl_0600BA10[] = {
gsSPLight(&koopa_seg6_light_060025C0, 1),
gsSPLight(&koopa_seg6_light_060025B8, 2),
gsSPLight(&koopa_seg6_lights_060025B8.l, 1),
gsSPLight(&koopa_seg6_lights_060025B8.a, 2),
gsSPVertex(koopa_seg6_vertex_06009410, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -1893,8 +1829,8 @@ const Gfx koopa_seg6_dl_0600BA10[] = {
// 0x0600BA90 - 0x0600BC18
const Gfx koopa_seg6_dl_0600BA90[] = {
gsSPLight(&koopa_seg6_light_060025C0, 1),
gsSPLight(&koopa_seg6_light_060025B8, 2),
gsSPLight(&koopa_seg6_lights_060025B8.l, 1),
gsSPLight(&koopa_seg6_lights_060025B8.a, 2),
gsSPVertex(koopa_seg6_vertex_060094F0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -1928,8 +1864,8 @@ const Gfx koopa_seg6_dl_0600BA90[] = {
// 0x0600BC18 - 0x0600BC88
const Gfx koopa_seg6_dl_0600BC18[] = {
gsSPLight(&koopa_seg6_light_060025C0, 1),
gsSPLight(&koopa_seg6_light_060025B8, 2),
gsSPLight(&koopa_seg6_lights_060025B8.l, 1),
gsSPLight(&koopa_seg6_lights_060025B8.a, 2),
gsSPVertex(koopa_seg6_vertex_06009A30, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0),
@ -1941,8 +1877,8 @@ const Gfx koopa_seg6_dl_0600BC18[] = {
// 0x0600BC88 - 0x0600BE10
const Gfx koopa_seg6_dl_0600BC88[] = {
gsSPLight(&koopa_seg6_light_060025C0, 1),
gsSPLight(&koopa_seg6_light_060025B8, 2),
gsSPLight(&koopa_seg6_lights_060025B8.l, 1),
gsSPLight(&koopa_seg6_lights_060025B8.a, 2),
gsSPVertex(koopa_seg6_vertex_06009AD0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -1976,8 +1912,8 @@ const Gfx koopa_seg6_dl_0600BC88[] = {
// 0x0600BE10 - 0x0600BE80
const Gfx koopa_seg6_dl_0600BE10[] = {
gsSPLight(&koopa_seg6_light_060025C0, 1),
gsSPLight(&koopa_seg6_light_060025B8, 2),
gsSPLight(&koopa_seg6_lights_060025B8.l, 1),
gsSPLight(&koopa_seg6_lights_060025B8.a, 2),
gsSPVertex(koopa_seg6_vertex_0600A010, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0),
@ -1989,8 +1925,8 @@ const Gfx koopa_seg6_dl_0600BE10[] = {
// 0x0600BE80 - 0x0600C240
const Gfx koopa_seg6_dl_0600BE80[] = {
gsSPLight(&koopa_seg6_light_060025C0, 1),
gsSPLight(&koopa_seg6_light_060025B8, 2),
gsSPLight(&koopa_seg6_lights_060025B8.l, 1),
gsSPLight(&koopa_seg6_lights_060025B8.a, 2),
gsSPVertex(koopa_seg6_vertex_0600A0B0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 6, 7, 8, 0x0),
@ -2041,8 +1977,8 @@ const Gfx koopa_seg6_dl_0600BE80[] = {
gsSP1Triangle(13, 14, 15, 0x0),
gsSPVertex(koopa_seg6_vertex_0600A990, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPLight(&koopa_seg6_light_060025D8, 1),
gsSPLight(&koopa_seg6_light_060025D0, 2),
gsSPLight(&koopa_seg6_lights_060025D0.l, 1),
gsSPLight(&koopa_seg6_lights_060025D0.a, 2),
gsSPVertex(koopa_seg6_vertex_0600A9C0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 2, 9, 10, 0x0),
@ -2065,8 +2001,8 @@ const Gfx koopa_seg6_dl_0600BE80[] = {
// 0x0600C240 - 0x0600C498
const Gfx koopa_seg6_dl_0600C240[] = {
gsSPLight(&koopa_seg6_light_06002620, 1),
gsSPLight(&koopa_seg6_light_06002618, 2),
gsSPLight(&koopa_seg6_lights_06002618.l, 1),
gsSPLight(&koopa_seg6_lights_06002618.a, 2),
gsSPVertex(koopa_seg6_vertex_0600AC90, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 5, 4, 0x0),
@ -2087,8 +2023,8 @@ const Gfx koopa_seg6_dl_0600C240[] = {
gsSP2Triangles( 4, 7, 8, 0x0, 4, 8, 9, 0x0),
gsSP2Triangles( 3, 4, 9, 0x0, 0, 3, 10, 0x0),
gsSP1Triangle(11, 12, 7, 0x0),
gsSPLight(&koopa_seg6_light_06002608, 1),
gsSPLight(&koopa_seg6_light_06002600, 2),
gsSPLight(&koopa_seg6_lights_06002600.l, 1),
gsSPLight(&koopa_seg6_lights_06002600.a, 2),
gsSPVertex(koopa_seg6_vertex_0600AF60, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 3, 5, 0x0, 6, 5, 1, 0x0),
@ -2096,8 +2032,8 @@ const Gfx koopa_seg6_dl_0600C240[] = {
gsSP2Triangles( 3, 8, 9, 0x0, 4, 3, 9, 0x0),
gsSP2Triangles( 7, 2, 5, 0x0, 6, 0, 8, 0x0),
gsSP2Triangles( 8, 3, 6, 0x0, 6, 1, 0, 0x0),
gsSPLight(&koopa_seg6_light_060025C0, 1),
gsSPLight(&koopa_seg6_light_060025B8, 2),
gsSPLight(&koopa_seg6_lights_060025B8.l, 1),
gsSPLight(&koopa_seg6_lights_060025B8.a, 2),
gsSPVertex(koopa_seg6_vertex_0600B000, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 3, 6, 0x0, 7, 8, 9, 0x0),
@ -2115,8 +2051,8 @@ const Gfx koopa_seg6_dl_0600C240[] = {
// 0x0600C498 - 0x0600C6A0
const Gfx koopa_seg6_dl_0600C498[] = {
gsSPLight(&koopa_seg6_light_06002638, 1),
gsSPLight(&koopa_seg6_light_06002630, 2),
gsSPLight(&koopa_seg6_lights_06002630.l, 1),
gsSPLight(&koopa_seg6_lights_06002630.a, 2),
gsSPVertex(koopa_seg6_vertex_0600B190, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0),

68
actors/koopa_flag/model.inc.c
View File

@ -1,34 +1,22 @@
// Koopa Flag
// 0x06000000
static const Ambient koopa_flag_seg6_light_06000000 = {
{{0x00, 0x1b, 0x00}, 0, {0x00, 0x1b, 0x00}, 0}
};
// 0x06000008
static const Light koopa_flag_seg6_light_06000008 = {
{{0x00, 0x6e, 0x00}, 0, {0x00, 0x6e, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_flag_seg6_lights_06000000 = gdSPDefLights1(
0x00, 0x1b, 0x00,
0x00, 0x6e, 0x00, 0x28, 0x28, 0x28
);
// 0x06000018
static const Ambient koopa_flag_seg6_light_06000018 = {
{{0x3f, 0x39, 0x15}, 0, {0x3f, 0x39, 0x15}, 0}
};
// 0x06000020
static const Light koopa_flag_seg6_light_06000020 = {
{{0xff, 0xe6, 0x57}, 0, {0xff, 0xe6, 0x57}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_flag_seg6_lights_06000018 = gdSPDefLights1(
0x3f, 0x39, 0x15,
0xff, 0xe6, 0x57, 0x28, 0x28, 0x28
);
// 0x06000030
static const Ambient koopa_flag_seg6_light_06000030 = {
{{0x2b, 0x15, 0x01}, 0, {0x2b, 0x15, 0x01}, 0}
};
// 0x06000038
static const Light koopa_flag_seg6_light_06000038 = {
{{0xac, 0x54, 0x05}, 0, {0xac, 0x54, 0x05}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_flag_seg6_lights_06000030 = gdSPDefLights1(
0x2b, 0x15, 0x01,
0xac, 0x54, 0x05, 0x28, 0x28, 0x28
);
// 0x06000048
ALIGNED8 static const u8 koopa_flag_seg6_texture_06000048[] = {
@ -36,24 +24,16 @@ ALIGNED8 static const u8 koopa_flag_seg6_texture_06000048[] = {
};
// 0x06000848
static const Ambient koopa_flag_seg6_light_06000848 = {
{{0x37, 0x27, 0x07}, 0, {0x37, 0x27, 0x07}, 0}
};
// 0x06000850
static const Light koopa_flag_seg6_light_06000850 = {
{{0xdf, 0x9f, 0x1f}, 0, {0xdf, 0x9f, 0x1f}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_flag_seg6_lights_06000848 = gdSPDefLights1(
0x37, 0x27, 0x07,
0xdf, 0x9f, 0x1f, 0x28, 0x28, 0x28
);
// 0x06000860
static const Ambient koopa_flag_seg6_light_06000860 = {
{{0x14, 0x0a, 0x00}, 0, {0x14, 0x0a, 0x00}, 0}
};
// 0x06000868
static const Light koopa_flag_seg6_light_06000868 = {
{{0x50, 0x28, 0x00}, 0, {0x50, 0x28, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_flag_seg6_lights_06000860 = gdSPDefLights1(
0x14, 0x0a, 0x00,
0x50, 0x28, 0x00, 0x28, 0x28, 0x28
);
// 0x06000878
static const Vtx koopa_flag_seg6_vertex_06000878[] = {
@ -80,13 +60,13 @@ static const Vtx koopa_flag_seg6_vertex_060008C8[] = {
// 0x06000968 - 0x06000A08
const Gfx koopa_flag_seg6_dl_06000968[] = {
gsSPLight(&koopa_flag_seg6_light_06000850, 1),
gsSPLight(&koopa_flag_seg6_light_06000848, 2),
gsSPLight(&koopa_flag_seg6_lights_06000848.l, 1),
gsSPLight(&koopa_flag_seg6_lights_06000848.a, 2),
gsSPVertex(koopa_flag_seg6_vertex_06000878, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP1Triangle( 3, 0, 2, 0x0),
gsSPLight(&koopa_flag_seg6_light_06000868, 1),
gsSPLight(&koopa_flag_seg6_light_06000860, 2),
gsSPLight(&koopa_flag_seg6_lights_06000860.l, 1),
gsSPLight(&koopa_flag_seg6_lights_06000860.a, 2),
gsSPVertex(koopa_flag_seg6_vertex_060008C8, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 4, 2, 1, 0x0, 5, 0, 3, 0x0),

110
actors/koopa_shell/model.inc.c
View File

@ -1,44 +1,28 @@
// Koopa Shell
// 0x08026388
static const Ambient koopa_shell_seg8_light_08026388 = {
{{0x11, 0x33, 0x06}, 0, {0x11, 0x33, 0x06}, 0}
};
// 0x08026390
static const Light koopa_shell_seg8_light_08026390 = {
{{0x45, 0xcd, 0x1a}, 0, {0x45, 0xcd, 0x1a}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_shell_seg8_lights_08026388 = gdSPDefLights1(
0x11, 0x33, 0x06,
0x45, 0xcd, 0x1a, 0x28, 0x28, 0x28
);
// 0x080263A0
static const Ambient koopa_shell_seg8_light_080263A0 = {
{{0x39, 0x0a, 0x07}, 0, {0x39, 0x0a, 0x07}, 0}
};
// 0x080263A8
static const Light koopa_shell_seg8_light_080263A8 = {
{{0xe4, 0x29, 0x1d}, 0, {0xe4, 0x29, 0x1d}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_shell_seg8_lights_080263A0 = gdSPDefLights1(
0x39, 0x0a, 0x07,
0xe4, 0x29, 0x1d, 0x28, 0x28, 0x28
);
// 0x080263B8
static const Ambient koopa_shell_seg8_light_080263B8 = {
{{0x21, 0x30, 0x39}, 0, {0x21, 0x30, 0x39}, 0}
};
// 0x080263C0
static const Light koopa_shell_seg8_light_080263C0 = {
{{0x84, 0xc3, 0xe5}, 0, {0x84, 0xc3, 0xe5}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_shell_seg8_lights_080263B8 = gdSPDefLights1(
0x21, 0x30, 0x39,
0x84, 0xc3, 0xe5, 0x28, 0x28, 0x28
);
// 0x080263D0
static const Ambient koopa_shell_seg8_light_080263D0 = {
{{0x3e, 0x3f, 0x3e}, 0, {0x3e, 0x3f, 0x3e}, 0}
};
// 0x080263D8
static const Light koopa_shell_seg8_light_080263D8 = {
{{0xfa, 0xff, 0xf8}, 0, {0xfa, 0xff, 0xf8}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_shell_seg8_lights_080263D0 = gdSPDefLights1(
0x3e, 0x3f, 0x3e,
0xfa, 0xff, 0xf8, 0x28, 0x28, 0x28
);
// 0x080263E8
static const Vtx koopa_shell_seg8_vertex_080263E8[] = {
@ -385,51 +369,43 @@ const Gfx koopa_shell_seg8_dl_08027258[] = {
// 0x080273C8 - 0x08027420
const Gfx koopa_shell_seg8_dl_080273C8[] = {
gsDPPipeSync(),
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&koopa_shell_seg8_light_08026390, 1),
gsSPLight(&koopa_shell_seg8_light_08026388, 2),
gsSPNumLights(NUMLIGHTS_1),
gsSPLight(&koopa_shell_seg8_lights_08026388.l, 1),
gsSPLight(&koopa_shell_seg8_lights_08026388.a, 2),
gsSPDisplayList(koopa_shell_seg8_dl_08027108),
gsSPLight(&koopa_shell_seg8_light_080263C0, 1),
gsSPLight(&koopa_shell_seg8_light_080263B8, 2),
gsSPLight(&koopa_shell_seg8_lights_080263B8.l, 1),
gsSPLight(&koopa_shell_seg8_lights_080263B8.a, 2),
gsSPDisplayList(koopa_shell_seg8_dl_08027170),
gsSPLight(&koopa_shell_seg8_light_080263D8, 1),
gsSPLight(&koopa_shell_seg8_light_080263D0, 2),
gsSPLight(&koopa_shell_seg8_lights_080263D0.l, 1),
gsSPLight(&koopa_shell_seg8_lights_080263D0.a, 2),
gsSPBranchList(koopa_shell_seg8_dl_08027258),
};
// 0x08027420 - 0x08027470
const Gfx koopa_shell_seg8_dl_08027420[] = {
gsDPPipeSync(),
gsSPLight(&koopa_shell_seg8_light_080263A8, 1),
gsSPLight(&koopa_shell_seg8_light_080263A0, 2),
gsSPLight(&koopa_shell_seg8_lights_080263A0.l, 1),
gsSPLight(&koopa_shell_seg8_lights_080263A0.a, 2),
gsSPDisplayList(koopa_shell_seg8_dl_08027108),
gsSPLight(&koopa_shell_seg8_light_080263C0, 1),
gsSPLight(&koopa_shell_seg8_light_080263B8, 2),
gsSPLight(&koopa_shell_seg8_lights_080263B8.l, 1),
gsSPLight(&koopa_shell_seg8_lights_080263B8.a, 2),
gsSPDisplayList(koopa_shell_seg8_dl_08027170),
gsSPLight(&koopa_shell_seg8_light_080263D8, 1),
gsSPLight(&koopa_shell_seg8_light_080263D0, 2),
gsSPLight(&koopa_shell_seg8_lights_080263D0.l, 1),
gsSPLight(&koopa_shell_seg8_lights_080263D0.a, 2),
gsSPBranchList(koopa_shell_seg8_dl_08027258),
};
// 0x08027470
static const Ambient koopa_shell_seg8_light_08027470 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x08027478
static const Light koopa_shell_seg8_light_08027478 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_shell_seg8_lights_08027470 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08027488
static const Ambient koopa_shell_seg8_light_08027488 = {
{{0x38, 0x2b, 0x00}, 0, {0x38, 0x2b, 0x00}, 0}
};
// 0x08027490
static const Light koopa_shell_seg8_light_08027490 = {
{{0xe0, 0xae, 0x00}, 0, {0xe0, 0xae, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 koopa_shell_seg8_lights_08027488 = gdSPDefLights1(
0x38, 0x2b, 0x00,
0xe0, 0xae, 0x00, 0x28, 0x28, 0x28
);
// 0x080274A0
ALIGNED8 static const u8 koopa_shell_seg8_texture_080274A0[] = {
@ -538,8 +514,8 @@ const Gfx koopa_shell_seg8_dl_080288E0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, koopa_shell_seg8_texture_08027CA0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&koopa_shell_seg8_light_08027478, 1),
gsSPLight(&koopa_shell_seg8_light_08027470, 2),
gsSPLight(&koopa_shell_seg8_lights_08027470.l, 1),
gsSPLight(&koopa_shell_seg8_lights_08027470.a, 2),
gsSPVertex(koopa_shell_seg8_vertex_080284A0, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 0, 4, 1, 0x0, 0, 5, 4, 0x0),
@ -569,13 +545,13 @@ const Gfx koopa_shell_seg8_dl_08028978[] = {
// 0x08028A20 - 0x08028B78
const Gfx koopa_shell_seg8_dl_08028A20[] = {
gsSPLight(&koopa_shell_seg8_light_08027490, 1),
gsSPLight(&koopa_shell_seg8_light_08027488, 2),
gsSPLight(&koopa_shell_seg8_lights_08027488.l, 1),
gsSPLight(&koopa_shell_seg8_lights_08027488.a, 2),
gsSPVertex(koopa_shell_seg8_vertex_08028620, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP1Triangle( 2, 4, 3, 0x0),
gsSPLight(&koopa_shell_seg8_light_08027478, 1),
gsSPLight(&koopa_shell_seg8_light_08027470, 2),
gsSPLight(&koopa_shell_seg8_lights_08027470.l, 1),
gsSPLight(&koopa_shell_seg8_lights_08027470.a, 2),
gsSPVertex(koopa_shell_seg8_vertex_08028670, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 4, 1, 3, 0x0, 2, 1, 5, 0x0),

252
actors/lakitu_cameraman/model.inc.c
View File

@ -31,24 +31,16 @@ ALIGNED8 static const u8 lakitu_seg6_texture_06003800[] = {
};
// 0x06003A00
static const Ambient lakitu_seg6_light_06003A00 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06003A08
static const Light lakitu_seg6_light_06003A08 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_06003A00 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06003A18
static const Ambient lakitu_seg6_light_06003A18 = {
{{0x79, 0x55, 0x00}, 0, {0x79, 0x55, 0x00}, 0}
};
// 0x06003A20
static const Light lakitu_seg6_light_06003A20 = {
{{0xf2, 0xab, 0x00}, 0, {0xf2, 0xab, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_06003A18 = gdSPDefLights1(
0x79, 0x55, 0x00,
0xf2, 0xab, 0x00, 0x28, 0x28, 0x28
);
// 0x06003A30
static const Vtx lakitu_seg6_vertex_06003A30[] = {
@ -104,8 +96,8 @@ const Gfx lakitu_seg6_dl_06003C80[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_seg6_texture_06002800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&lakitu_seg6_light_06003A08, 1),
gsSPLight(&lakitu_seg6_light_06003A00, 2),
gsSPLight(&lakitu_seg6_lights_06003A00.l, 1),
gsSPLight(&lakitu_seg6_lights_06003A00.a, 2),
gsSPVertex(lakitu_seg6_vertex_06003A30, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0),
@ -128,8 +120,8 @@ const Gfx lakitu_seg6_dl_06003C80[] = {
// 0x06003DB0 - 0x06003E30
const Gfx lakitu_seg6_dl_06003DB0[] = {
gsSPLight(&lakitu_seg6_light_06003A20, 1),
gsSPLight(&lakitu_seg6_light_06003A18, 2),
gsSPLight(&lakitu_seg6_lights_06003A18.l, 1),
gsSPLight(&lakitu_seg6_lights_06003A18.a, 2),
gsSPVertex(lakitu_seg6_vertex_06003BD0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 1, 5, 2, 0x0, 4, 0, 2, 0x0),
@ -158,14 +150,10 @@ const Gfx lakitu_seg6_dl_06003E30[] = {
};
// 0x06003E98
static const Ambient lakitu_seg6_light_06003E98 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06003EA0
static const Light lakitu_seg6_light_06003EA0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_06003E98 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06003EB0
static const Vtx lakitu_seg6_vertex_06003EB0[] = {
@ -282,8 +270,8 @@ const Gfx lakitu_seg6_dl_06004410[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_seg6_texture_06003000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&lakitu_seg6_light_06003EA0, 1),
gsSPLight(&lakitu_seg6_light_06003E98, 2),
gsSPLight(&lakitu_seg6_lights_06003E98.l, 1),
gsSPLight(&lakitu_seg6_lights_06003E98.a, 2),
gsSPVertex(lakitu_seg6_vertex_06003EB0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0),
gsSP2Triangles( 3, 5, 1, 0x0, 1, 6, 7, 0x0),
@ -345,14 +333,10 @@ const Gfx lakitu_seg6_dl_06004680[] = {
};
// 0x060046E0
static const Ambient lakitu_seg6_light_060046E0 = {
{{0x79, 0x55, 0x00}, 0, {0x79, 0x55, 0x00}, 0}
};
// 0x060046E8
static const Light lakitu_seg6_light_060046E8 = {
{{0xf2, 0xab, 0x00}, 0, {0xf2, 0xab, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_060046E0 = gdSPDefLights1(
0x79, 0x55, 0x00,
0xf2, 0xab, 0x00, 0x28, 0x28, 0x28
);
// 0x060046F8
static const Vtx lakitu_seg6_vertex_060046F8[] = {
@ -375,8 +359,8 @@ static const Vtx lakitu_seg6_vertex_060046F8[] = {
// 0x060047E8 - 0x060048D8
const Gfx lakitu_seg6_dl_060047E8[] = {
gsSPLight(&lakitu_seg6_light_060046E8, 1),
gsSPLight(&lakitu_seg6_light_060046E0, 2),
gsSPLight(&lakitu_seg6_lights_060046E0.l, 1),
gsSPLight(&lakitu_seg6_lights_060046E0.a, 2),
gsSPVertex(lakitu_seg6_vertex_060046F8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0),
@ -395,14 +379,10 @@ const Gfx lakitu_seg6_dl_060047E8[] = {
};
// 0x060048D8
static const Ambient lakitu_seg6_light_060048D8 = {
{{0x79, 0x55, 0x00}, 0, {0x79, 0x55, 0x00}, 0}
};
// 0x060048E0
static const Light lakitu_seg6_light_060048E0 = {
{{0xf2, 0xab, 0x00}, 0, {0xf2, 0xab, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_060048D8 = gdSPDefLights1(
0x79, 0x55, 0x00,
0xf2, 0xab, 0x00, 0x28, 0x28, 0x28
);
// 0x060048F0
static const Vtx lakitu_seg6_vertex_060048F0[] = {
@ -425,8 +405,8 @@ static const Vtx lakitu_seg6_vertex_060048F0[] = {
// 0x060049E0 - 0x06004AD0
const Gfx lakitu_seg6_dl_060049E0[] = {
gsSPLight(&lakitu_seg6_light_060048E0, 1),
gsSPLight(&lakitu_seg6_light_060048D8, 2),
gsSPLight(&lakitu_seg6_lights_060048D8.l, 1),
gsSPLight(&lakitu_seg6_lights_060048D8.a, 2),
gsSPVertex(lakitu_seg6_vertex_060048F0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 3, 5, 0x0, 3, 7, 4, 0x0),
@ -445,14 +425,10 @@ const Gfx lakitu_seg6_dl_060049E0[] = {
};
// 0x06004AD0
static const Ambient lakitu_seg6_light_06004AD0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06004AD8
static const Light lakitu_seg6_light_06004AD8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_06004AD0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06004AE8
static const Vtx lakitu_seg6_vertex_06004AE8[] = {
@ -472,8 +448,8 @@ static const Vtx lakitu_seg6_vertex_06004AE8[] = {
// 0x06004BA8 - 0x06004BE8
const Gfx lakitu_seg6_dl_06004BA8[] = {
gsSPLight(&lakitu_seg6_light_06004AD8, 1),
gsSPLight(&lakitu_seg6_light_06004AD0, 2),
gsSPLight(&lakitu_seg6_lights_06004AD0.l, 1),
gsSPLight(&lakitu_seg6_lights_06004AD0.a, 2),
gsSPVertex(lakitu_seg6_vertex_06004AE8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -522,44 +498,28 @@ const Gfx lakitu_seg6_dl_06004C88[] = {
};
// 0x06004CB0
static const Ambient lakitu_seg6_light_06004CB0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06004CB8
static const Light lakitu_seg6_light_06004CB8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_06004CB0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06004CC8
static const Ambient lakitu_seg6_light_06004CC8 = {
{{0x0c, 0x0c, 0x0c}, 0, {0x0c, 0x0c, 0x0c}, 0}
};
// 0x06004CD0
static const Light lakitu_seg6_light_06004CD0 = {
{{0x19, 0x19, 0x19}, 0, {0x19, 0x19, 0x19}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_06004CC8 = gdSPDefLights1(
0x0c, 0x0c, 0x0c,
0x19, 0x19, 0x19, 0x28, 0x28, 0x28
);
// 0x06004CE0
static const Ambient lakitu_seg6_light_06004CE0 = {
{{0x19, 0x22, 0x20}, 0, {0x19, 0x22, 0x20}, 0}
};
// 0x06004CE8
static const Light lakitu_seg6_light_06004CE8 = {
{{0x32, 0x44, 0x40}, 0, {0x32, 0x44, 0x40}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_06004CE0 = gdSPDefLights1(
0x19, 0x22, 0x20,
0x32, 0x44, 0x40, 0x28, 0x28, 0x28
);
// 0x06004CF8
static const Ambient lakitu_seg6_light_06004CF8 = {
{{0x18, 0x18, 0x18}, 0, {0x18, 0x18, 0x18}, 0}
};
// 0x06004D00
static const Light lakitu_seg6_light_06004D00 = {
{{0x30, 0x30, 0x30}, 0, {0x30, 0x30, 0x30}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_seg6_lights_06004CF8 = gdSPDefLights1(
0x18, 0x18, 0x18,
0x30, 0x30, 0x30, 0x28, 0x28, 0x28
);
// 0x06004D10
static const Vtx lakitu_seg6_vertex_06004D10[] = {
@ -670,8 +630,8 @@ const Gfx lakitu_seg6_dl_060051D0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_seg6_texture_06003800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&lakitu_seg6_light_06004CB8, 1),
gsSPLight(&lakitu_seg6_light_06004CB0, 2),
gsSPLight(&lakitu_seg6_lights_06004CB0.l, 1),
gsSPLight(&lakitu_seg6_lights_06004CB0.a, 2),
gsSPVertex(lakitu_seg6_vertex_06004D10, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -679,8 +639,8 @@ const Gfx lakitu_seg6_dl_060051D0[] = {
// 0x06005218 - 0x06005360
const Gfx lakitu_seg6_dl_06005218[] = {
gsSPLight(&lakitu_seg6_light_06004CD0, 1),
gsSPLight(&lakitu_seg6_light_06004CC8, 2),
gsSPLight(&lakitu_seg6_lights_06004CC8.l, 1),
gsSPLight(&lakitu_seg6_lights_06004CC8.a, 2),
gsSPVertex(lakitu_seg6_vertex_06004D50, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -691,8 +651,8 @@ const Gfx lakitu_seg6_dl_06005218[] = {
gsSP1Triangle(12, 13, 14, 0x0),
gsSPVertex(lakitu_seg6_vertex_06004F30, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPLight(&lakitu_seg6_light_06004CE8, 1),
gsSPLight(&lakitu_seg6_light_06004CE0, 2),
gsSPLight(&lakitu_seg6_lights_06004CE0.l, 1),
gsSPLight(&lakitu_seg6_lights_06004CE0.a, 2),
gsSPVertex(lakitu_seg6_vertex_06004F90, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 0, 7, 1, 0x0),
@ -701,8 +661,8 @@ const Gfx lakitu_seg6_dl_06005218[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0),
gsSPLight(&lakitu_seg6_light_06004D00, 1),
gsSPLight(&lakitu_seg6_light_06004CF8, 2),
gsSPLight(&lakitu_seg6_lights_06004CF8.l, 1),
gsSPLight(&lakitu_seg6_lights_06004CF8.a, 2),
gsSPVertex(lakitu_seg6_vertex_06005150, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 1, 6, 0x0),
@ -728,65 +688,41 @@ const Gfx lakitu_seg6_dl_06005360[] = {
gsSPEndDisplayList(),
};
// unreferenced light?
UNUSED static const Ambient lakitu_cameraman_light_1 = {
{{0x33, 0x1f, 0x0c}, 0, {0x33, 0x1f, 0x0c}, 0}
};
// unreferenced light?
UNUSED static const Light lakitu_cameraman_light_2 = {
{{0xcc, 0x7f, 0x33}, 0, {0xcc, 0x7f, 0x33}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 lakitu_cameraman_lights_unused1 = gdSPDefLights1(
0x33, 0x1f, 0x0c,
0xcc, 0x7f, 0x33, 0x28, 0x28, 0x28
);
// 0x060053F0
static const Ambient lakitu_seg6_light_060053F0 = {
{{0x29, 0x13, 0x06}, 0, {0x29, 0x13, 0x06}, 0}
};
static const Lights1 lakitu_seg6_lights_060053F0 = gdSPDefLights1(
0x29, 0x13, 0x06,
0xa5, 0x4f, 0x1b, 0x28, 0x28, 0x28
);
// 0x060053F8
static const Light lakitu_seg6_light_060053F8 = {
{{0xa5, 0x4f, 0x1b}, 0, {0xa5, 0x4f, 0x1b}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 lakitu_cameraman_lights_unused2 = gdSPDefLights1(
0x06, 0x06, 0x06,
0x19, 0x19, 0x19, 0x28, 0x28, 0x28
);
// unreferenced light?
UNUSED static const Ambient lakitu_cameraman_light_3 = {
{{0x06, 0x06, 0x06}, 0, {0x06, 0x06, 0x06}, 0}
};
// unreferenced light?
UNUSED static const Light lakitu_cameraman_light_4 = {
{{0x19, 0x19, 0x19}, 0, {0x19, 0x19, 0x19}, 0, {0x28, 0x28, 0x28}, 0}
};
// unreferenced light?
UNUSED static const Ambient lakitu_cameraman_light_5 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
// unreferenced light?
UNUSED static const Light lakitu_cameraman_light_6 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 lakitu_cameraman_lights_unused3 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x06005438
static const Ambient lakitu_seg6_light_06005438 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
static const Lights1 lakitu_seg6_lights_06005438 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x06005440
static const Light lakitu_seg6_light_06005440 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// unreferenced light?
UNUSED static const Ambient lakitu_cameraman_light_7 = {
{{0x0d, 0x2c, 0x0b}, 0, {0x0d, 0x2c, 0x0b}, 0}
};
// unreferenced light?
UNUSED static const Light lakitu_cameraman_light_8 = {
{{0x34, 0xb2, 0x2c}, 0, {0x34, 0xb2, 0x2c}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 lakitu_cameraman_lights_unused4 = gdSPDefLights1(
0x0d, 0x2c, 0x0b,
0x34, 0xb2, 0x2c, 0x28, 0x28, 0x28
);
// 0x06005468
static const Vtx lakitu_seg6_vertex_06005468[] = {
@ -821,8 +757,8 @@ static const Vtx lakitu_seg6_vertex_06005568[] = {
// 0x06005598 - 0x060055E8
const Gfx lakitu_seg6_dl_06005598[] = {
gsSPLight(&lakitu_seg6_light_060053F8, 1),
gsSPLight(&lakitu_seg6_light_060053F0, 2),
gsSPLight(&lakitu_seg6_lights_060053F0.l, 1),
gsSPLight(&lakitu_seg6_lights_060053F0.a, 2),
gsSPVertex(lakitu_seg6_vertex_06005468, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 0, 2, 0x0, 7, 8, 9, 0x0),
@ -832,8 +768,8 @@ const Gfx lakitu_seg6_dl_06005598[] = {
// 0x060055E8 - 0x06005610
const Gfx lakitu_seg6_dl_060055E8[] = {
gsSPLight(&lakitu_seg6_light_06005440, 1),
gsSPLight(&lakitu_seg6_light_06005438, 2),
gsSPLight(&lakitu_seg6_lights_06005438.l, 1),
gsSPLight(&lakitu_seg6_lights_06005438.a, 2),
gsSPVertex(lakitu_seg6_vertex_06005538, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPEndDisplayList(),
@ -841,8 +777,8 @@ const Gfx lakitu_seg6_dl_060055E8[] = {
// 0x06005610 - 0x06005638
const Gfx lakitu_seg6_dl_06005610[] = {
gsSPLight(&lakitu_seg6_light_06005440, 1),
gsSPLight(&lakitu_seg6_light_06005438, 2),
gsSPLight(&lakitu_seg6_lights_06005438.l, 1),
gsSPLight(&lakitu_seg6_lights_06005438.a, 2),
gsSPVertex(lakitu_seg6_vertex_06005568, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPEndDisplayList(),

142
actors/lakitu_enemy/model.inc.c
View File

@ -1,34 +1,22 @@
// Lakitu Enemy
// Unreferenced light
UNUSED static const Ambient lakitu_enemy_light_1 = {
{{0x33, 0x1f, 0x0c}, 0, {0x33, 0x1f, 0x0c}, 0}
};
// Unreferenced light
UNUSED static const Light lakitu_enemy_light_2 = {
{{0xcc, 0x7f, 0x33}, 0, {0xcc, 0x7f, 0x33}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 lakitu_enemy_lights_unused1 = gdSPDefLights1(
0x33, 0x1f, 0x0c,
0xcc, 0x7f, 0x33, 0x28, 0x28, 0x28
);
// 0x0500ECB0
static const Ambient lakitu_enemy_seg5_light_0500ECB0 = {
{{0x29, 0x13, 0x06}, 0, {0x29, 0x13, 0x06}, 0}
};
static const Lights1 lakitu_enemy_seg5_lights_0500ECB0 = gdSPDefLights1(
0x29, 0x13, 0x06,
0xa5, 0x4f, 0x1b, 0x28, 0x28, 0x28
);
// 0x0500ECB8
static const Light lakitu_enemy_seg5_light_0500ECB8 = {
{{0xa5, 0x4f, 0x1b}, 0, {0xa5, 0x4f, 0x1b}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient lakitu_enemy_light_3 = {
{{0x0d, 0x2c, 0x0b}, 0, {0x0d, 0x2c, 0x0b}, 0}
};
// Unreferenced light
UNUSED static const Light lakitu_enemy_light_4 = {
{{0x34, 0xb2, 0x2c}, 0, {0x34, 0xb2, 0x2c}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 lakitu_enemy_lights_unused2 = gdSPDefLights1(
0x0d, 0x2c, 0x0b,
0x34, 0xb2, 0x2c, 0x28, 0x28, 0x28
);
// Unreferenced texture
// 0x0500ECE0
@ -57,24 +45,16 @@ ALIGNED8 static const u8 lakitu_enemy_seg5_texture_05011CE0[] = {
};
// 0x050124E0
static const Ambient lakitu_enemy_seg5_light_050124E0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x050124E8
static const Light lakitu_enemy_seg5_light_050124E8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_enemy_seg5_lights_050124E0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050124F8
static const Ambient lakitu_enemy_seg5_light_050124F8 = {
{{0x79, 0x55, 0x00}, 0, {0x79, 0x55, 0x00}, 0}
};
// 0x05012500
static const Light lakitu_enemy_seg5_light_05012500 = {
{{0xf2, 0xab, 0x00}, 0, {0xf2, 0xab, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_enemy_seg5_lights_050124F8 = gdSPDefLights1(
0x79, 0x55, 0x00,
0xf2, 0xab, 0x00, 0x28, 0x28, 0x28
);
// 0x05012510
static const Vtx lakitu_enemy_seg5_vertex_05012510[] = {
@ -130,8 +110,8 @@ const Gfx lakitu_enemy_seg5_dl_05012760[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_enemy_seg5_texture_050114E0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&lakitu_enemy_seg5_light_050124E8, 1),
gsSPLight(&lakitu_enemy_seg5_light_050124E0, 2),
gsSPLight(&lakitu_enemy_seg5_lights_050124E0.l, 1),
gsSPLight(&lakitu_enemy_seg5_lights_050124E0.a, 2),
gsSPVertex(lakitu_enemy_seg5_vertex_05012510, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0),
@ -154,8 +134,8 @@ const Gfx lakitu_enemy_seg5_dl_05012760[] = {
// 0x05012890 - 0x05012910
const Gfx lakitu_enemy_seg5_dl_05012890[] = {
gsSPLight(&lakitu_enemy_seg5_light_05012500, 1),
gsSPLight(&lakitu_enemy_seg5_light_050124F8, 2),
gsSPLight(&lakitu_enemy_seg5_lights_050124F8.l, 1),
gsSPLight(&lakitu_enemy_seg5_lights_050124F8.a, 2),
gsSPVertex(lakitu_enemy_seg5_vertex_050126B0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 1, 5, 2, 0x0, 4, 0, 2, 0x0),
@ -184,14 +164,10 @@ const Gfx lakitu_enemy_seg5_dl_05012910[] = {
};
// 0x05012978
static const Ambient lakitu_enemy_seg5_light_05012978 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05012980
static const Light lakitu_enemy_seg5_light_05012980 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_enemy_seg5_lights_05012978 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05012990
static const Vtx lakitu_enemy_seg5_vertex_05012990[] = {
@ -308,8 +284,8 @@ const Gfx lakitu_enemy_seg5_dl_05012EF0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_enemy_seg5_texture_05011CE0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&lakitu_enemy_seg5_light_05012980, 1),
gsSPLight(&lakitu_enemy_seg5_light_05012978, 2),
gsSPLight(&lakitu_enemy_seg5_lights_05012978.l, 1),
gsSPLight(&lakitu_enemy_seg5_lights_05012978.a, 2),
gsSPVertex(lakitu_enemy_seg5_vertex_05012990, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0),
gsSP2Triangles( 3, 5, 1, 0x0, 1, 6, 7, 0x0),
@ -371,14 +347,10 @@ const Gfx lakitu_enemy_seg5_dl_05013160[] = {
};
// 0x050131C0
static const Ambient lakitu_enemy_seg5_light_050131C0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x050131C8
static const Light lakitu_enemy_seg5_light_050131C8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_enemy_seg5_lights_050131C0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050131D8
static const Vtx lakitu_enemy_seg5_vertex_050131D8[] = {
@ -398,8 +370,8 @@ static const Vtx lakitu_enemy_seg5_vertex_050131D8[] = {
// 0x05013298 - 0x050132D8
const Gfx lakitu_enemy_seg5_dl_05013298[] = {
gsSPLight(&lakitu_enemy_seg5_light_050131C8, 1),
gsSPLight(&lakitu_enemy_seg5_light_050131C0, 2),
gsSPLight(&lakitu_enemy_seg5_lights_050131C0.l, 1),
gsSPLight(&lakitu_enemy_seg5_lights_050131C0.a, 2),
gsSPVertex(lakitu_enemy_seg5_vertex_050131D8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -448,14 +420,10 @@ const Gfx lakitu_enemy_seg5_dl_05013378[] = {
};
// 0x050133A0
static const Ambient lakitu_enemy_seg5_light_050133A0 = {
{{0x79, 0x55, 0x00}, 0, {0x79, 0x55, 0x00}, 0}
};
// 0x050133A8
static const Light lakitu_enemy_seg5_light_050133A8 = {
{{0xf2, 0xab, 0x00}, 0, {0xf2, 0xab, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_enemy_seg5_lights_050133A0 = gdSPDefLights1(
0x79, 0x55, 0x00,
0xf2, 0xab, 0x00, 0x28, 0x28, 0x28
);
// 0x050133B8
static const Vtx lakitu_enemy_seg5_vertex_050133B8[] = {
@ -478,8 +446,8 @@ static const Vtx lakitu_enemy_seg5_vertex_050133B8[] = {
// 0x050134A8 - 0x05013598
const Gfx lakitu_enemy_seg5_dl_050134A8[] = {
gsSPLight(&lakitu_enemy_seg5_light_050133A8, 1),
gsSPLight(&lakitu_enemy_seg5_light_050133A0, 2),
gsSPLight(&lakitu_enemy_seg5_lights_050133A0.l, 1),
gsSPLight(&lakitu_enemy_seg5_lights_050133A0.a, 2),
gsSPVertex(lakitu_enemy_seg5_vertex_050133B8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 3, 5, 0x0, 3, 7, 4, 0x0),
@ -498,14 +466,10 @@ const Gfx lakitu_enemy_seg5_dl_050134A8[] = {
};
// 0x05013598
static const Ambient lakitu_enemy_seg5_light_05013598 = {
{{0x79, 0x55, 0x00}, 0, {0x79, 0x55, 0x00}, 0}
};
// 0x050135A0
static const Light lakitu_enemy_seg5_light_050135A0 = {
{{0xf2, 0xab, 0x00}, 0, {0xf2, 0xab, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 lakitu_enemy_seg5_lights_05013598 = gdSPDefLights1(
0x79, 0x55, 0x00,
0xf2, 0xab, 0x00, 0x28, 0x28, 0x28
);
// 0x050135B0
static const Vtx lakitu_enemy_seg5_vertex_050135B0[] = {
@ -528,8 +492,8 @@ static const Vtx lakitu_enemy_seg5_vertex_050135B0[] = {
// 0x050136A0 - 0x05013790
const Gfx lakitu_enemy_seg5_dl_050136A0[] = {
gsSPLight(&lakitu_enemy_seg5_light_050135A0, 1),
gsSPLight(&lakitu_enemy_seg5_light_05013598, 2),
gsSPLight(&lakitu_enemy_seg5_lights_05013598.l, 1),
gsSPLight(&lakitu_enemy_seg5_lights_05013598.a, 2),
gsSPVertex(lakitu_enemy_seg5_vertex_050135B0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0),
@ -566,8 +530,8 @@ static const Vtx lakitu_enemy_seg5_vertex_05013790[] = {
// 0x05013860 - 0x050138B0
const Gfx lakitu_enemy_seg5_dl_05013860[] = {
gsSPLight(&lakitu_enemy_seg5_light_0500ECB8, 1),
gsSPLight(&lakitu_enemy_seg5_light_0500ECB0, 2),
gsSPLight(&lakitu_enemy_seg5_lights_0500ECB0.l, 1),
gsSPLight(&lakitu_enemy_seg5_lights_0500ECB0.a, 2),
gsSPVertex(lakitu_enemy_seg5_vertex_05013790, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 0, 2, 0x0, 7, 8, 9, 0x0),
@ -577,6 +541,6 @@ const Gfx lakitu_enemy_seg5_dl_05013860[] = {
// 0x050138B0 - 0x050138C0
const Gfx lakitu_enemy_seg5_dl_050138B0[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPNumLights(NUMLIGHTS_1),
gsSPEndDisplayList(),
};

140
actors/mad_piano/model.inc.c
View File

@ -1,44 +1,28 @@
// Mad Piano
// Unreferenced light
UNUSED static const Ambient mad_piano_light_1 = {
{{0x05, 0x04, 0x08}, 0, {0x05, 0x04, 0x08}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 mad_piano_lights_unused1 = gdSPDefLights1(
0x05, 0x04, 0x08,
0x14, 0x13, 0x20, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light mad_piano_light_2 = {
{{0x14, 0x13, 0x20}, 0, {0x14, 0x13, 0x20}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 mad_piano_lights_unused2 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient mad_piano_light_3 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 mad_piano_lights_unused3 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light mad_piano_light_4 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient mad_piano_light_5 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
// Unreferenced light
UNUSED static const Light mad_piano_light_6 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient mad_piano_light_7 = {
{{0x30, 0x00, 0x00}, 0, {0x30, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light mad_piano_light_8 = {
{{0xc3, 0x00, 0x00}, 0, {0xc3, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 mad_piano_lights_unused4 = gdSPDefLights1(
0x30, 0x00, 0x00,
0xc3, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x05006AF0
ALIGNED8 static const u8 mad_piano_seg5_texture_05006AF0[] = {
@ -71,14 +55,10 @@ ALIGNED8 static const u8 mad_piano_seg5_texture_050082F0[] = {
};
// 0x050086F0
static const Ambient mad_piano_seg5_light_050086F0 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x050086F8
static const Light mad_piano_seg5_light_050086F8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mad_piano_seg5_lights_050086F0 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05008708
static const Vtx mad_piano_seg5_vertex_05008708[] = {
@ -175,8 +155,8 @@ const Gfx mad_piano_seg5_dl_05008B68[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mad_piano_seg5_texture_050072F0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mad_piano_seg5_light_050086F8, 1),
gsSPLight(&mad_piano_seg5_light_050086F0, 2),
gsSPLight(&mad_piano_seg5_lights_050086F0.l, 1),
gsSPLight(&mad_piano_seg5_lights_050086F0.a, 2),
gsSPVertex(mad_piano_seg5_vertex_05008708, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 0, 2, 6, 0x0, 0, 7, 8, 0x0),
@ -231,44 +211,28 @@ const Gfx mad_piano_seg5_dl_05008CB0[] = {
};
// 0x05008D40
static const Ambient mad_piano_seg5_light_05008D40 = {
{{0x3d, 0x3d, 0x3d}, 0, {0x3d, 0x3d, 0x3d}, 0}
};
// 0x05008D48
static const Light mad_piano_seg5_light_05008D48 = {
{{0xcc, 0xcc, 0xcc}, 0, {0xcc, 0xcc, 0xcc}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mad_piano_seg5_lights_05008D40 = gdSPDefLights1(
0x3d, 0x3d, 0x3d,
0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28
);
// 0x05008D58
static const Ambient mad_piano_seg5_light_05008D58 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x05008D60
static const Light mad_piano_seg5_light_05008D60 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mad_piano_seg5_lights_05008D58 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05008D70
static const Ambient mad_piano_seg5_light_05008D70 = {
{{0x26, 0x26, 0x26}, 0, {0x26, 0x26, 0x26}, 0}
};
// 0x05008D78
static const Light mad_piano_seg5_light_05008D78 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mad_piano_seg5_lights_05008D70 = gdSPDefLights1(
0x26, 0x26, 0x26,
0x7f, 0x7f, 0x7f, 0x28, 0x28, 0x28
);
// 0x05008D88
static const Ambient mad_piano_seg5_light_05008D88 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// 0x05008D90
static const Light mad_piano_seg5_light_05008D90 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mad_piano_seg5_lights_05008D88 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x05008DA0
static const Vtx mad_piano_seg5_vertex_05008DA0[] = {
@ -446,16 +410,16 @@ const Gfx mad_piano_seg5_dl_05009590[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mad_piano_seg5_texture_050072F0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mad_piano_seg5_light_05008D48, 1),
gsSPLight(&mad_piano_seg5_light_05008D40, 2),
gsSPLight(&mad_piano_seg5_lights_05008D40.l, 1),
gsSPLight(&mad_piano_seg5_lights_05008D40.a, 2),
gsSPVertex(mad_piano_seg5_vertex_05008DA0, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
gsSP2Triangles( 7, 10, 8, 0x0, 11, 7, 9, 0x0),
gsSP2Triangles(11, 9, 1, 0x0, 0, 12, 11, 0x0),
gsSP1Triangle( 0, 11, 1, 0x0),
gsSPLight(&mad_piano_seg5_light_05008D60, 1),
gsSPLight(&mad_piano_seg5_light_05008D58, 2),
gsSPLight(&mad_piano_seg5_lights_05008D58.l, 1),
gsSPLight(&mad_piano_seg5_lights_05008D58.a, 2),
gsSPVertex(mad_piano_seg5_vertex_05008E70, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -500,8 +464,8 @@ const Gfx mad_piano_seg5_dl_050097B0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mad_piano_seg5_texture_050082F0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mad_piano_seg5_light_05008D78, 1),
gsSPLight(&mad_piano_seg5_light_05008D70, 2),
gsSPLight(&mad_piano_seg5_lights_05008D70.l, 1),
gsSPLight(&mad_piano_seg5_lights_05008D70.a, 2),
gsSPVertex(mad_piano_seg5_vertex_050093F0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -512,8 +476,8 @@ const Gfx mad_piano_seg5_dl_050097F8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mad_piano_seg5_texture_05007EF0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mad_piano_seg5_light_05008D48, 1),
gsSPLight(&mad_piano_seg5_light_05008D40, 2),
gsSPLight(&mad_piano_seg5_lights_05008D40.l, 1),
gsSPLight(&mad_piano_seg5_lights_05008D40.a, 2),
gsSPVertex(mad_piano_seg5_vertex_05009430, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -532,8 +496,8 @@ const Gfx mad_piano_seg5_dl_05009840[] = {
// 0x05009888 - 0x050098E8
const Gfx mad_piano_seg5_dl_05009888[] = {
gsSPLight(&mad_piano_seg5_light_05008D90, 1),
gsSPLight(&mad_piano_seg5_light_05008D88, 2),
gsSPLight(&mad_piano_seg5_lights_05008D88.l, 1),
gsSPLight(&mad_piano_seg5_lights_05008D88.a, 2),
gsSPVertex(mad_piano_seg5_vertex_050094F0, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 2, 4, 3, 0x0, 2, 5, 4, 0x0),

62
actors/manta/model.inc.c
View File

@ -1,34 +1,22 @@
// Manta Ray
// 0x05001758
static const Ambient manta_seg5_light_05001758 = {
{{0x31, 0x3b, 0x3b}, 0, {0x31, 0x3b, 0x3b}, 0}
};
// 0x05001760
static const Light manta_seg5_light_05001760 = {
{{0xc6, 0xee, 0xed}, 0, {0xc6, 0xee, 0xed}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 manta_seg5_lights_05001758 = gdSPDefLights1(
0x31, 0x3b, 0x3b,
0xc6, 0xee, 0xed, 0x28, 0x28, 0x28
);
// 0x05001770
static const Ambient manta_seg5_light_05001770 = {
{{0x00, 0x16, 0x18}, 0, {0x00, 0x16, 0x18}, 0}
};
static const Lights1 manta_seg5_lights_05001770 = gdSPDefLights1(
0x00, 0x16, 0x18,
0x03, 0x5b, 0x63, 0x28, 0x28, 0x28
);
// 0x05001778
static const Light manta_seg5_light_05001778 = {
{{0x03, 0x5b, 0x63}, 0, {0x03, 0x5b, 0x63}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient manta_light_1 = {
{{0x3f, 0x3f, 0x35}, 0, {0x3f, 0x3f, 0x35}, 0}
};
// Unreferenced light
UNUSED static const Light manta_light_2 = {
{{0xff, 0xff, 0xd7}, 0, {0xff, 0xff, 0xd7}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
static const Lights1 manta_lights_unused = gdSPDefLights1(
0x3f, 0x3f, 0x35,
0xff, 0xff, 0xd7, 0x28, 0x28, 0x28
);
// 0x050017A0
ALIGNED8 static const u8 manta_seg5_texture_050017A0[] = {
@ -1049,13 +1037,13 @@ static const Vtx manta_seg5_vertex_05006A88[] = {
// 0x05006B08 - 0x05006B70
const Gfx manta_seg5_dl_05006B08[] = {
gsSPLight(&manta_seg5_light_05001778, 1),
gsSPLight(&manta_seg5_light_05001770, 2),
gsSPLight(&manta_seg5_lights_05001770.l, 1),
gsSPLight(&manta_seg5_lights_05001770.a, 2),
gsSPVertex(manta_seg5_vertex_05006808, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 1, 0, 5, 0x0),
gsSPLight(&manta_seg5_light_05001760, 1),
gsSPLight(&manta_seg5_light_05001758, 2),
gsSPLight(&manta_seg5_lights_05001758.l, 1),
gsSPLight(&manta_seg5_lights_05001758.a, 2),
gsSPVertex(manta_seg5_vertex_05006868, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -1063,15 +1051,15 @@ const Gfx manta_seg5_dl_05006B08[] = {
// 0x05006B70 - 0x05006C08
const Gfx manta_seg5_dl_05006B70[] = {
gsSPLight(&manta_seg5_light_05001778, 1),
gsSPLight(&manta_seg5_light_05001770, 2),
gsSPLight(&manta_seg5_lights_05001770.l, 1),
gsSPLight(&manta_seg5_lights_05001770.a, 2),
gsSPVertex(manta_seg5_vertex_050068C8, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 4, 6, 0x0, 1, 7, 2, 0x0),
gsSP2Triangles( 5, 1, 0, 0x0, 5, 0, 3, 0x0),
gsSP2Triangles( 6, 7, 1, 0x0, 6, 1, 5, 0x0),
gsSPLight(&manta_seg5_light_05001760, 1),
gsSPLight(&manta_seg5_light_05001758, 2),
gsSPLight(&manta_seg5_lights_05001758.l, 1),
gsSPLight(&manta_seg5_lights_05001758.a, 2),
gsSPVertex(manta_seg5_vertex_05006948, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 3, 0x0),
@ -1080,15 +1068,15 @@ const Gfx manta_seg5_dl_05006B70[] = {
// 0x05006C08 - 0x05006CA0
const Gfx manta_seg5_dl_05006C08[] = {
gsSPLight(&manta_seg5_light_05001778, 1),
gsSPLight(&manta_seg5_light_05001770, 2),
gsSPLight(&manta_seg5_lights_05001770.l, 1),
gsSPLight(&manta_seg5_lights_05001770.a, 2),
gsSPVertex(manta_seg5_vertex_050069C8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 4, 6, 0x0, 1, 7, 2, 0x0),
gsSP2Triangles( 5, 8, 9, 0x0, 5, 9, 3, 0x0),
gsSP2Triangles( 6, 10, 11, 0x0, 6, 11, 5, 0x0),
gsSPLight(&manta_seg5_light_05001760, 1),
gsSPLight(&manta_seg5_light_05001758, 2),
gsSPLight(&manta_seg5_lights_05001758.l, 1),
gsSPLight(&manta_seg5_lights_05001758.a, 2),
gsSPVertex(manta_seg5_vertex_05006A88, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 3, 0x0),

460
actors/mario/model.inc.c
View File

@ -1,64 +1,40 @@
// Mario
// 0x04000000 # solid color dark blue - butt, left thigh, right thigh - all polys
static const Ambient mario_amb_light_group1 = {
{{0x00, 0x00, 0x7f}, 0, {0x00, 0x00, 0x7f}, 0}
};
// 0x04000000 # solid color blue - butt, left thigh, right thigh - all poly types
static const Lights1 mario_blue_lights_group = gdSPDefLights1(
0x00, 0x00, 0x7f,
0x00, 0x00, 0xff, 0x28, 0x28, 0x28
);
// 0x04000008 # solid color light blue - butt, left thigh, right thigh - all polys
static const Light mario_diff_light_group1 = {
{{0x00, 0x00, 0xff}, 0, {0x00, 0x00, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x04000018 # solid color red - left & right arm, torso (tshirt part), caps - all poly types
static const Lights1 mario_red_lights_group = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x04000018 # solid color dark red - left & right arm, torso (tshirt part), caps - all polys
static const Ambient mario_amb_light_group2 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// 0x04000030 # solid color white - metal butt & left thigh - normal left & right hand closed & open (with cap too) and all wings - all poly types
static const Lights1 mario_white_lights_group = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x04000020 # solid color light red - left & right arm, torso (tshirt part), caps - all polys
static const Light mario_diff_light_group2 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x04000048 # solid color brown 1 - foot - all poly types
static const Lights1 mario_brown1_lights_group = gdSPDefLights1(
0x39, 0x0e, 0x07,
0x72, 0x1c, 0x0e, 0x28, 0x28, 0x28
);
// 0x04000030 # solid color gray - metal butt & left thigh - normal left & right hand closed & open (with cap too) and all wings - all polys
static const Ambient mario_amb_light_group3 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x04000060 # solid color beige skin - face (cap on and off dls) - all poly types
static const Lights1 mario_beige_lights_group = gdSPDefLights1(
0x7f, 0x60, 0x3c,
0xfe, 0xc1, 0x79, 0x28, 0x28, 0x28
);
// 0x04000038 # solid color white - metal butt & left thigh - normal left & right hand closed & open (with cap too) and all wings - all polys
static const Light mario_diff_light_group3 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x04000048 # solid color dark brown 1 - foot - all polys
static const Ambient mario_amb_light_group4 = {
{{0x39, 0x0e, 0x07}, 0, {0x39, 0x0e, 0x07}, 0}
};
// 0x04000050 # solid color light brown 1 - foot - all polys
static const Light mario_diff_light_group4 = {
{{0x72, 0x1c, 0x0e}, 0, {0x72, 0x1c, 0x0e}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x04000060 # solid color dark skin - face (cap on and off dls) - all polys
static const Ambient mario_amb_light_group5 = {
{{0x7f, 0x60, 0x3c}, 0, {0x7f, 0x60, 0x3c}, 0}
};
// 0x04000068 # solid color light skin - face (cap on and off dls) - all polys
static const Light mario_diff_light_group5 = {
{{0xfe, 0xc1, 0x79}, 0, {0xfe, 0xc1, 0x79}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x04000078 # solid color dark brown 2 - hair - all polys
static const Ambient mario_amb_light_group6 = {
{{0x39, 0x03, 0x00}, 0, {0x39, 0x03, 0x00}, 0}
};
// 0x04000080 # solid color light brown 2 - hair - all polys
static const Light mario_diff_light_group6 = {
{{0x73, 0x06, 0x00}, 0, {0x73, 0x06, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x04000078 # solid color brown 2 - hair - all poly types
static const Lights1 mario_brown2_lights_group = gdSPDefLights1(
0x39, 0x03, 0x00,
0x73, 0x06, 0x00, 0x28, 0x28, 0x28
);
// 0x04000090
ALIGNED8 static const u8 mario_texture_metal[] = {
@ -405,8 +381,8 @@ const Gfx mario_butt_dl[] = {
const Gfx mario_butt[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_butt_dl),
gsSPEndDisplayList(),
};
@ -418,8 +394,8 @@ const Gfx mario_metal_butt[] = {
gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
gsDPLoadTextureBlock(mario_texture_metal, 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),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_butt_dl),
gsSPEndDisplayList(),
};
@ -523,8 +499,8 @@ const Gfx mario_left_arm_shared_dl[] = {
// 0x0400D1D8 - 0x0400D1F8
const Gfx mario_left_arm[] = {
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_left_arm_shared_dl),
gsSPEndDisplayList(),
};
@ -675,8 +651,8 @@ const Gfx mario_left_hand_closed_shared_dl[] = {
// 0x0400D8F0 - 0x0400D910
const Gfx mario_left_hand_closed[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_left_hand_closed_shared_dl),
gsSPEndDisplayList(),
};
@ -784,8 +760,8 @@ const Gfx mario_right_arm_shared_dl[] = {
// 0x0400DDE8 - 0x0400DE08
const Gfx mario_right_arm[] = {
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_right_arm_shared_dl),
gsSPEndDisplayList(),
};
@ -921,8 +897,8 @@ const Gfx mario_right_hand_closed_dl[] = {
// 0x0400E458 - 0x0400E478
const Gfx mario_right_hand_closed[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_right_hand_closed_dl),
gsSPEndDisplayList(),
};
@ -1003,8 +979,8 @@ const Gfx mario_left_thigh_dl[] = {
const Gfx mario_left_thigh[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_left_thigh_dl),
gsSPEndDisplayList(),
};
@ -1016,8 +992,8 @@ const Gfx mario_metal_left_thigh[] = {
gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
gsDPLoadTextureBlock(mario_texture_metal, 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),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_left_thigh_dl),
gsSPEndDisplayList(),
};
@ -1115,8 +1091,8 @@ const Gfx mario_left_foot_shared_dl[] = {
// 0x0400ECA0 - 0x0400ECC0
const Gfx mario_left_foot[] = {
gsSPLight(&mario_diff_light_group4, 1),
gsSPLight(&mario_amb_light_group4, 2),
gsSPLight(&mario_brown1_lights_group.l, 1),
gsSPLight(&mario_brown1_lights_group.a, 2),
gsSPDisplayList(mario_left_foot_shared_dl),
gsSPEndDisplayList(),
};
@ -1184,8 +1160,8 @@ const Gfx mario_right_thigh_shared_dl[] = {
// 0x0400EFB8 - 0x0400EFD8
const Gfx mario_right_thigh[] = {
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_right_thigh_shared_dl),
gsSPEndDisplayList(),
};
@ -1300,8 +1276,8 @@ const Gfx mario_right_foot_dl[] = {
// 0x0400F4E8 - 0x0400F528
const Gfx mario_right_foot[] = {
gsSPLight(&mario_diff_light_group4, 1),
gsSPLight(&mario_amb_light_group4, 2),
gsSPLight(&mario_brown1_lights_group.l, 1),
gsSPLight(&mario_brown1_lights_group.a, 2),
gsSPDisplayList(mario_right_foot_dl),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
@ -1613,8 +1589,8 @@ const Gfx mario_tshirt_shared_dl[] = {
// 0x04010348 - 0x04010370
const Gfx mario_torso_dl[] = {
gsSPDisplayList(mario_pants_overalls_shared_dl),
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_tshirt_shared_dl),
gsSPEndDisplayList(),
};
@ -2104,11 +2080,11 @@ const Gfx mario_face_back_hair_cap_on_dl[] = {
// 0x04011960 - 0x040119A0
const Gfx mario_face_cap_on_dl[] = {
gsSPDisplayList(mario_face_part_cap_on_dl),
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_face_cap_dl),
gsSPLight(&mario_diff_light_group6, 1),
gsSPLight(&mario_amb_light_group6, 2),
gsSPLight(&mario_brown2_lights_group.l, 1),
gsSPLight(&mario_brown2_lights_group.a, 2),
gsSPDisplayList(mario_face_back_hair_cap_on_dl),
gsSPEndDisplayList(),
};
@ -2129,8 +2105,8 @@ const Gfx mario_cap_on_eyes_front[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_front),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn),
gsDPLoadSync(),
@ -2163,8 +2139,8 @@ const Gfx mario_cap_on_eyes_half_closed[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_half_closed),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn),
gsDPLoadSync(),
@ -2197,8 +2173,8 @@ const Gfx mario_cap_on_eyes_closed[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_closed),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn),
gsDPLoadSync(),
@ -2231,8 +2207,8 @@ const Gfx mario_cap_on_eyes_right[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_right),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn),
gsDPLoadSync(),
@ -2265,8 +2241,8 @@ const Gfx mario_cap_on_eyes_left[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_left),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn),
gsDPLoadSync(),
@ -2299,8 +2275,8 @@ const Gfx mario_cap_on_eyes_up[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_up),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn),
gsDPLoadSync(),
@ -2333,8 +2309,8 @@ const Gfx mario_cap_on_eyes_down[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_down),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn),
gsDPLoadSync(),
@ -2367,8 +2343,8 @@ const Gfx mario_cap_on_eyes_dead[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_dead),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn),
gsDPLoadSync(),
@ -2397,25 +2373,17 @@ const Gfx mario_metal_cap_on_shared_dl[] = {
gsSPEndDisplayList(),
};
// Unreferenced light
UNUSED static const Ambient mario_light_1 = {
{{0x3f, 0x30, 0x1e}, 0, {0x3f, 0x30, 0x1e}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 mario_lights_unused1 = gdSPDefLights1(
0x3f, 0x30, 0x1e,
0xfe, 0xc1, 0x79, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light mario_light_2 = {
{{0xfe, 0xc1, 0x79}, 0, {0xfe, 0xc1, 0x79}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient mario_light_3 = {
{{0x1c, 0x01, 0x00}, 0, {0x1c, 0x01, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light mario_light_4 = {
{{0x73, 0x06, 0x00}, 0, {0x73, 0x06, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 mario_lights_unused2 = gdSPDefLights1(
0x1c, 0x01, 0x00,
0x73, 0x06, 0x00, 0x28, 0x28, 0x28
);
// 0x04012190
static const Vtx mario_eyes_cap_off_dl_vertex[] = {
@ -2924,8 +2892,8 @@ const Gfx mario_face_hair_cap_off_dl[] = {
// 0x040139C0 - 0x040139E8
const Gfx mario_face_cap_off_dl[] = {
gsSPDisplayList(mario_face_part_cap_off_dl),
gsSPLight(&mario_diff_light_group6, 1),
gsSPLight(&mario_amb_light_group6, 2),
gsSPLight(&mario_brown2_lights_group.l, 1),
gsSPLight(&mario_brown2_lights_group.a, 2),
gsSPDisplayList(mario_face_hair_cap_off_dl),
gsSPEndDisplayList(),
};
@ -2942,8 +2910,8 @@ const Gfx mario_cap_off_eyes_front[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_front),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -2972,8 +2940,8 @@ const Gfx mario_cap_off_eyes_half_closed[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_half_closed),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -3002,8 +2970,8 @@ const Gfx mario_cap_off_eyes_closed[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_closed),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -3032,8 +3000,8 @@ const Gfx mario_cap_off_eyes_right[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_right),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -3062,8 +3030,8 @@ const Gfx mario_cap_off_eyes_left[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_left),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -3092,8 +3060,8 @@ const Gfx mario_cap_off_eyes_up[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_up),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -3122,8 +3090,8 @@ const Gfx mario_cap_off_eyes_down[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_down),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -3152,8 +3120,8 @@ const Gfx mario_cap_off_eyes_dead[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_dead),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -3302,8 +3270,8 @@ const Gfx mario_medium_poly_butt_dl[] = {
const Gfx mario_medium_poly_butt[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_butt_dl),
gsSPEndDisplayList(),
};
@ -3315,8 +3283,8 @@ const Gfx mario_metal_medium_poly_butt[] = {
gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
gsDPLoadTextureBlock(mario_texture_metal, 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),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_butt_dl),
gsSPEndDisplayList(),
};
@ -3354,8 +3322,8 @@ const Gfx mario_medium_poly_left_arm_shared_dl[] = {
// 0x04014840 - 0x04014860
const Gfx mario_medium_poly_left_arm[] = {
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_left_arm_shared_dl),
gsSPEndDisplayList(),
};
@ -3476,8 +3444,8 @@ const Gfx mario_medium_poly_left_hand_closed_shared_dl[] = {
// 0x04014DC0 - 0x04014DE0
const Gfx mario_medium_poly_left_hand_closed[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_left_hand_closed_shared_dl),
gsSPEndDisplayList(),
};
@ -3515,8 +3483,8 @@ const Gfx mario_medium_poly_right_arm_shared_dl[] = {
// 0x04014F40 - 0x04014F60
const Gfx mario_medium_poly_right_arm[] = {
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_right_arm_shared_dl),
gsSPEndDisplayList(),
};
@ -3638,8 +3606,8 @@ const Gfx mario_medium_poly_right_hand_closed_dl[] = {
// 0x040154E0 - 0x04015500
const Gfx mario_medium_poly_right_hand_closed[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_right_hand_closed_dl),
gsSPEndDisplayList(),
};
@ -3691,8 +3659,8 @@ const Gfx mario_medium_poly_left_thigh_dl[] = {
const Gfx mario_medium_poly_left_thigh[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_left_thigh_dl),
gsSPEndDisplayList(),
};
@ -3704,8 +3672,8 @@ const Gfx mario_metal_medium_poly_left_thigh[] = {
gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
gsDPLoadTextureBlock(mario_texture_metal, 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),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_left_thigh_dl),
gsSPEndDisplayList(),
};
@ -3799,8 +3767,8 @@ const Gfx mario_medium_poly_left_foot_shared_dl[] = {
// 0x04015B60 - 0x04015B80
const Gfx mario_medium_poly_left_foot[] = {
gsSPLight(&mario_diff_light_group4, 1),
gsSPLight(&mario_amb_light_group4, 2),
gsSPLight(&mario_brown1_lights_group.l, 1),
gsSPLight(&mario_brown1_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_left_foot_shared_dl),
gsSPEndDisplayList(),
};
@ -3840,8 +3808,8 @@ const Gfx mario_medium_poly_right_thigh_shared_dl[] = {
// 0x04015D00 - 0x04015D20
const Gfx mario_medium_poly_right_thigh[] = {
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_right_thigh_shared_dl),
gsSPEndDisplayList(),
};
@ -3929,8 +3897,8 @@ const Gfx mario_medium_poly_right_foot_dl[] = {
// 0x040160C8 - 0x04016108
const Gfx mario_medium_poly_right_foot[] = {
gsSPLight(&mario_diff_light_group4, 1),
gsSPLight(&mario_amb_light_group4, 2),
gsSPLight(&mario_brown1_lights_group.l, 1),
gsSPLight(&mario_brown1_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_right_foot_dl),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
@ -4113,8 +4081,8 @@ const Gfx mario_medium_poly_tshirt_shared_dl[] = {
// 0x040168A0 - 0x040168C8
const Gfx mario_medium_poly_torso_dl[] = {
gsSPDisplayList(mario_medium_poly_pants_overalls_shared_dl),
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_medium_poly_tshirt_shared_dl),
gsSPEndDisplayList(),
};
@ -4181,8 +4149,8 @@ const Gfx mario_low_poly_butt_dl[] = {
const Gfx mario_low_poly_butt[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_butt_dl),
gsSPEndDisplayList(),
};
@ -4194,8 +4162,8 @@ const Gfx mario_metal_low_poly_butt[] = {
gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
gsDPLoadTextureBlock(mario_texture_metal, 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),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_butt_dl),
gsSPEndDisplayList(),
};
@ -4228,8 +4196,8 @@ const Gfx mario_low_poly_left_arm_shared_dl[] = {
// 0x04016C70 - 0x04016C90
const Gfx mario_low_poly_left_arm[] = {
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_left_arm_shared_dl),
gsSPEndDisplayList(),
};
@ -4285,8 +4253,8 @@ const Gfx mario_low_poly_left_hand_closed_shared_dl[] = {
// 0x04016E80 - 0x04016EA0
const Gfx mario_low_poly_left_hand_closed[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_left_hand_closed_shared_dl),
gsSPEndDisplayList(),
};
@ -4319,8 +4287,8 @@ const Gfx mario_low_poly_right_arm_shared_dl[] = {
// 0x04016FB0 - 0x04016FD0
const Gfx mario_low_poly_right_arm[] = {
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_right_arm_shared_dl),
gsSPEndDisplayList(),
};
@ -4376,8 +4344,8 @@ const Gfx mario_low_poly_right_hand_closed_dl[] = {
// 0x040171C0 - 0x040171E0
const Gfx mario_low_poly_right_hand_closed[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_right_hand_closed_dl),
gsSPEndDisplayList(),
};
@ -4426,8 +4394,8 @@ const Gfx mario_low_poly_left_thigh_dl[] = {
const Gfx mario_low_poly_left_thigh[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_left_thigh_dl),
gsSPEndDisplayList(),
};
@ -4439,8 +4407,8 @@ const Gfx mario_metal_low_poly_left_thigh[] = {
gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
gsDPLoadTextureBlock(mario_texture_metal, 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),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_left_thigh_dl),
gsSPEndDisplayList(),
};
@ -4507,8 +4475,8 @@ const Gfx mario_low_poly_left_foot_shared_dl[] = {
// 0x040176A8 - 0x040176C8
const Gfx mario_low_poly_left_foot[] = {
gsSPLight(&mario_diff_light_group4, 1),
gsSPLight(&mario_amb_light_group4, 2),
gsSPLight(&mario_brown1_lights_group.l, 1),
gsSPLight(&mario_brown1_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_left_foot_shared_dl),
gsSPEndDisplayList(),
};
@ -4545,8 +4513,8 @@ const Gfx mario_low_poly_right_thigh_shared_dl[] = {
// 0x04017818 - 0x04017838
const Gfx mario_low_poly_right_thigh[] = {
gsSPLight(&mario_diff_light_group1, 1),
gsSPLight(&mario_amb_light_group1, 2),
gsSPLight(&mario_blue_lights_group.l, 1),
gsSPLight(&mario_blue_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_right_thigh_shared_dl),
gsSPEndDisplayList(),
};
@ -4613,8 +4581,8 @@ const Gfx mario_low_poly_right_foot_dl[] = {
// 0x04017AD8 - 0x04017B18
const Gfx mario_low_poly_right_foot[] = {
gsSPLight(&mario_diff_light_group4, 1),
gsSPLight(&mario_amb_light_group4, 2),
gsSPLight(&mario_brown1_lights_group.l, 1),
gsSPLight(&mario_brown1_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_right_foot_dl),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
@ -4716,8 +4684,8 @@ const Gfx mario_low_poly_tshirt_shared_dl[] = {
// 0x04017E78 - 0x04017EA0
const Gfx mario_low_poly_torso_dl[] = {
gsSPDisplayList(mario_low_poly_pants_overalls_shared_dl),
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_tshirt_shared_dl),
gsSPEndDisplayList(),
};
@ -4886,11 +4854,11 @@ const Gfx mario_low_poly_face_back_hair_cap_on_dl[] = {
// 0x04018420 - 0x04018460
const Gfx mario_low_poly_face_cap_on_dl[] = {
gsSPDisplayList(mario_low_poly_face_part_cap_on_dl),
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_face_cap_dl),
gsSPLight(&mario_diff_light_group6, 1),
gsSPLight(&mario_amb_light_group6, 2),
gsSPLight(&mario_brown2_lights_group.l, 1),
gsSPLight(&mario_brown2_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_face_back_hair_cap_on_dl),
gsSPEndDisplayList(),
};
@ -4911,8 +4879,8 @@ const Gfx mario_low_poly_cap_on_eyes_front[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_front),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -4941,8 +4909,8 @@ const Gfx mario_low_poly_cap_on_eyes_half_closed[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_half_closed),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -4971,8 +4939,8 @@ const Gfx mario_low_poly_cap_on_eyes_closed[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_closed),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5001,8 +4969,8 @@ const Gfx mario_low_poly_cap_on_eyes_right[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_right),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5031,8 +4999,8 @@ const Gfx mario_low_poly_cap_on_eyes_left[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_left),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5061,8 +5029,8 @@ const Gfx mario_low_poly_cap_on_eyes_up[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_up),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5091,8 +5059,8 @@ const Gfx mario_low_poly_cap_on_eyes_down[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_down),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5121,8 +5089,8 @@ const Gfx mario_low_poly_cap_on_eyes_dead[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_dead),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_eyes_cap_on_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5255,8 +5223,8 @@ const Gfx mario_low_poly_face_hair_cap_off_dl[] = {
// 0x04018F68 - 0x04018F90
const Gfx mario_low_poly_face_cap_off_dl[] = {
gsSPDisplayList(mario_low_poly_face_part_cap_off_dl),
gsSPLight(&mario_diff_light_group6, 1),
gsSPLight(&mario_amb_light_group6, 2),
gsSPLight(&mario_brown2_lights_group.l, 1),
gsSPLight(&mario_brown2_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_face_hair_cap_off_dl),
gsSPEndDisplayList(),
};
@ -5273,8 +5241,8 @@ const Gfx mario_low_poly_cap_off_eyes_front[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_front),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5299,8 +5267,8 @@ const Gfx mario_low_poly_cap_off_eyes_half_closed[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_half_closed),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5325,8 +5293,8 @@ const Gfx mario_low_poly_cap_off_eyes_closed[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_closed),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5351,8 +5319,8 @@ const Gfx mario_low_poly_cap_off_eyes_right[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_right),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5377,8 +5345,8 @@ const Gfx mario_low_poly_cap_off_eyes_left[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_left),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5403,8 +5371,8 @@ const Gfx mario_low_poly_cap_off_eyes_up[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_up),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5429,8 +5397,8 @@ const Gfx mario_low_poly_cap_off_eyes_down[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_down),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5455,8 +5423,8 @@ const Gfx mario_low_poly_cap_off_eyes_dead[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_dead),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group5, 1),
gsSPLight(&mario_amb_light_group5, 2),
gsSPLight(&mario_beige_lights_group.l, 1),
gsSPLight(&mario_beige_lights_group.a, 2),
gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache),
gsDPLoadSync(),
@ -5631,8 +5599,8 @@ const Gfx mario_left_hand_open_shared_dl[] = {
// 0x04019CA0 - 0x04019CC0
const Gfx mario_left_hand_open[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_left_hand_open_shared_dl),
gsSPEndDisplayList(),
};
@ -5790,8 +5758,8 @@ const Gfx mario_right_hand_open_dl[] = {
// 0x0401A428 - 0x0401A448
const Gfx mario_right_hand_open[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_right_hand_open_dl),
gsSPEndDisplayList(),
};
@ -6040,11 +6008,11 @@ const Gfx mario_right_hand_cap_bottom_dl[] = {
// 0x0401AF20 - 0x0401AF60
const Gfx mario_right_hand_cap_dl[] = {
gsSPDisplayList(mario_right_hand_cap_top_dl),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_right_hand_cap_hand_position_dl),
gsSPLight(&mario_diff_light_group6, 1),
gsSPLight(&mario_amb_light_group6, 2),
gsSPLight(&mario_brown2_lights_group.l, 1),
gsSPLight(&mario_brown2_lights_group.a, 2),
gsSPDisplayList(mario_right_hand_cap_bottom_dl),
gsSPEndDisplayList(),
};
@ -6098,8 +6066,8 @@ const Gfx mario_right_hand_cap_wings_intial_dl[] = {
gsSPClearGeometryMode(G_CULL_BACK | 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),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
@ -6433,8 +6401,8 @@ const Gfx mario_right_hand_peace_shared_dl[] = {
// 0x0401BF30 - 0x0401BF50
const Gfx mario_right_hand_peace[] = {
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_right_hand_peace_shared_dl),
gsSPEndDisplayList(),
};
@ -6571,8 +6539,8 @@ const Gfx mario_cap_unused_base_bottom_dl[] = {
// 0x0401C510 - 0x0401C538
const Gfx mario_cap_unused_base_dl[] = {
gsSPDisplayList(mario_cap_unused_base_top_dl),
gsSPLight(&mario_diff_light_group6, 1),
gsSPLight(&mario_amb_light_group6, 2),
gsSPLight(&mario_brown2_lights_group.l, 1),
gsSPLight(&mario_brown2_lights_group.a, 2),
gsSPDisplayList(mario_cap_unused_base_bottom_dl),
gsSPEndDisplayList(),
};
@ -6631,8 +6599,8 @@ const Gfx mario_cap_wings_unused_intial_dl[] = {
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPEndDisplayList(),
};
@ -6657,8 +6625,8 @@ const Gfx mario_cap_unused_dl[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_m_logo),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_diff_light_group2, 1),
gsSPLight(&mario_amb_light_group2, 2),
gsSPLight(&mario_red_lights_group.l, 1),
gsSPLight(&mario_red_lights_group.a, 2),
gsSPDisplayList(mario_cap_unused_m_logo_dl),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
@ -6674,8 +6642,8 @@ const Gfx mario_metal_cap_unused_dl[] = {
gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB),
gsDPLoadTextureBlock(mario_texture_metal, 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),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsSPDisplayList(mario_cap_unused_m_logo_dl),
gsSPDisplayList(mario_cap_unused_base_top_dl),
gsSPDisplayList(mario_cap_unused_base_bottom_dl),
@ -6756,8 +6724,8 @@ const Gfx mario_cap_wings[] = {
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_wings_half_1),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
@ -6783,8 +6751,8 @@ const Gfx mario_cap_wings_transparent[] = {
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_wings_half_1),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
@ -6810,8 +6778,8 @@ const Gfx mario_metal_cap_wings[] = {
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&mario_diff_light_group3, 1),
gsSPLight(&mario_amb_light_group3, 2),
gsSPLight(&mario_white_lights_group.l, 1),
gsSPLight(&mario_white_lights_group.a, 2),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_1),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),

56
actors/mario_cap/model.inc.c
View File

@ -1,34 +1,22 @@
// Mario Cap (Normal Cap, Metal, Winged, etc)
// 0x0301CF08
static const Ambient mario_cap_seg3_light_0301CF08 = {
{{0x39, 0x03, 0x00}, 0, {0x39, 0x03, 0x00}, 0}
};
// 0x0301CF10
static const Light mario_cap_seg3_light_0301CF10 = {
{{0x73, 0x06, 0x00}, 0, {0x73, 0x06, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mario_cap_seg3_lights_0301CF08 = gdSPDefLights1(
0x39, 0x03, 0x00,
0x73, 0x06, 0x00, 0x28, 0x28, 0x28
);
// 0x0301CF20
static const Ambient mario_cap_seg3_light_0301CF20 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0301CF28
static const Light mario_cap_seg3_light_0301CF28 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mario_cap_seg3_lights_0301CF20 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0301CF38
static const Ambient mario_cap_seg3_light_0301CF38 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// 0x0301CF40
static const Light mario_cap_seg3_light_0301CF40 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mario_cap_seg3_lights_0301CF38 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0301CF50
ALIGNED8 static const u8 mario_cap_seg3_texture_0301CF50[] = {
@ -192,8 +180,8 @@ const Gfx mario_cap_seg3_dl_03022CC8[] = {
// 0x03022D10 - 0x03022D38
const Gfx mario_cap_seg3_dl_03022D10[] = {
gsSPDisplayList(mario_cap_seg3_dl_03022B68),
gsSPLight(&mario_cap_seg3_light_0301CF10, 1),
gsSPLight(&mario_cap_seg3_light_0301CF08, 2),
gsSPLight(&mario_cap_seg3_lights_0301CF08.l, 1),
gsSPLight(&mario_cap_seg3_lights_0301CF08.a, 2),
gsSPDisplayList(mario_cap_seg3_dl_03022CC8),
gsSPEndDisplayList(),
};
@ -276,8 +264,8 @@ const Gfx mario_cap_seg3_dl_03022F48[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_seg3_texture_0301DF50),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_cap_seg3_light_0301CF40, 1),
gsSPLight(&mario_cap_seg3_light_0301CF38, 2),
gsSPLight(&mario_cap_seg3_lights_0301CF38.l, 1),
gsSPLight(&mario_cap_seg3_lights_0301CF38.a, 2),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
@ -297,8 +285,8 @@ const Gfx mario_cap_seg3_dl_03022FF8[] = {
gsDPSetCombineMode(G_CC_MODULATERGBFADE, G_CC_MODULATERGBFADE),
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),
gsSPLight(&mario_cap_seg3_light_0301CF28, 1),
gsSPLight(&mario_cap_seg3_light_0301CF20, 2),
gsSPLight(&mario_cap_seg3_lights_0301CF20.l, 1),
gsSPLight(&mario_cap_seg3_lights_0301CF20.a, 2),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsSPDisplayList(mario_cap_seg3_dl_03022B68),
gsSPDisplayList(mario_cap_seg3_dl_03022CC8),
@ -353,8 +341,8 @@ const Gfx mario_cap_seg3_dl_03023160[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_seg3_texture_0301DF50),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mario_cap_seg3_light_0301CF40, 1),
gsSPLight(&mario_cap_seg3_light_0301CF38, 2),
gsSPLight(&mario_cap_seg3_lights_0301CF38.l, 1),
gsSPLight(&mario_cap_seg3_lights_0301CF38.a, 2),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
@ -397,8 +385,8 @@ const Gfx mario_cap_seg3_dl_03023298[] = {
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),
gsSPLight(&mario_cap_seg3_light_0301CF28, 1),
gsSPLight(&mario_cap_seg3_light_0301CF20, 2),
gsSPLight(&mario_cap_seg3_lights_0301CF20.l, 1),
gsSPLight(&mario_cap_seg3_lights_0301CF20.a, 2),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsSPDisplayList(mario_cap_seg3_dl_03022B68),
gsSPDisplayList(mario_cap_seg3_dl_03022CC8),

16
actors/metal_box/model.inc.c
View File

@ -1,14 +1,10 @@
// Metal Box
// 0x08023980
static const Ambient metal_box_seg8_light_08023980 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x08023988
static const Light metal_box_seg8_light_08023988 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 metal_box_seg8_lights_08023980 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x08023998
ALIGNED8 static const u8 metal_box_seg8_texture_08023998[] = {
@ -52,8 +48,8 @@ const Gfx metal_box_seg8_dl_08024B18[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, metal_box_seg8_texture_08023998),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&metal_box_seg8_light_08023988, 1),
gsSPLight(&metal_box_seg8_light_08023980, 2),
gsSPLight(&metal_box_seg8_lights_08023980.l, 1),
gsSPLight(&metal_box_seg8_lights_08023980.a, 2),
gsSPVertex(metal_box_seg8_vertex_08024998, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

356
actors/mips/model.inc.c
View File

@ -6,24 +6,16 @@ ALIGNED8 static const u8 mips_seg6_texture_0600FB80[] = {
};
// 0x06010380
static const Ambient mips_seg6_light_06010380 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06010388
static const Light mips_seg6_light_06010388 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06010380 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06010398
static const Ambient mips_seg6_light_06010398 = {
{{0x0f, 0x0d, 0x04}, 0, {0x0f, 0x0d, 0x04}, 0}
};
// 0x060103A0
static const Light mips_seg6_light_060103A0 = {
{{0x27, 0x21, 0x0b}, 0, {0x27, 0x21, 0x0b}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06010398 = gdSPDefLights1(
0x0f, 0x0d, 0x04,
0x27, 0x21, 0x0b, 0x28, 0x28, 0x28
);
// 0x060103B0
static const Vtx mips_seg6_vertex_060103B0[] = {
@ -83,8 +75,8 @@ const Gfx mips_seg6_dl_06010600[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_06010388, 1),
gsSPLight(&mips_seg6_light_06010380, 2),
gsSPLight(&mips_seg6_lights_06010380.l, 1),
gsSPLight(&mips_seg6_lights_06010380.a, 2),
gsSPVertex(mips_seg6_vertex_060103B0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 2, 5, 3, 0x0),
@ -109,13 +101,13 @@ const Gfx mips_seg6_dl_06010600[] = {
// 0x06010748 - 0x060107B8
const Gfx mips_seg6_dl_06010748[] = {
gsSPLight(&mips_seg6_light_060103A0, 1),
gsSPLight(&mips_seg6_light_06010398, 2),
gsSPLight(&mips_seg6_lights_06010398.l, 1),
gsSPLight(&mips_seg6_lights_06010398.a, 2),
gsSPVertex(mips_seg6_vertex_06010580, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP1Triangle( 3, 2, 1, 0x0),
gsSPLight(&mips_seg6_light_06010388, 1),
gsSPLight(&mips_seg6_light_06010380, 2),
gsSPLight(&mips_seg6_lights_06010380.l, 1),
gsSPLight(&mips_seg6_lights_06010380.a, 2),
gsSPVertex(mips_seg6_vertex_060105C0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 3, 2, 0, 0x0, 2, 1, 0, 0x0),
@ -140,14 +132,10 @@ const Gfx mips_seg6_dl_060107B8[] = {
};
// 0x06010820
static const Ambient mips_seg6_light_06010820 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06010828
static const Light mips_seg6_light_06010828 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06010820 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06010838
static const Vtx mips_seg6_vertex_06010838[] = {
@ -204,8 +192,8 @@ const Gfx mips_seg6_dl_06010A98[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_06010828, 1),
gsSPLight(&mips_seg6_light_06010820, 2),
gsSPLight(&mips_seg6_lights_06010820.l, 1),
gsSPLight(&mips_seg6_lights_06010820.a, 2),
gsSPVertex(mips_seg6_vertex_06010838, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0),
gsSP2Triangles( 0, 5, 1, 0x0, 1, 6, 3, 0x0),
@ -252,24 +240,16 @@ const Gfx mips_seg6_dl_06010C40[] = {
};
// 0x06010CA0
static const Ambient mips_seg6_light_06010CA0 = {
{{0x3c, 0x3c, 0x00}, 0, {0x3c, 0x3c, 0x00}, 0}
};
// 0x06010CA8
static const Light mips_seg6_light_06010CA8 = {
{{0x96, 0x96, 0x00}, 0, {0x96, 0x96, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06010CA0 = gdSPDefLights1(
0x3c, 0x3c, 0x00,
0x96, 0x96, 0x00, 0x28, 0x28, 0x28
);
// 0x06010CB8
static const Ambient mips_seg6_light_06010CB8 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06010CC0
static const Light mips_seg6_light_06010CC0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06010CB8 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06010CD0
static const Vtx mips_seg6_vertex_06010CD0[] = {
@ -298,13 +278,13 @@ const Gfx mips_seg6_dl_06010DB0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_06010CA8, 1),
gsSPLight(&mips_seg6_light_06010CA0, 2),
gsSPLight(&mips_seg6_lights_06010CA0.l, 1),
gsSPLight(&mips_seg6_lights_06010CA0.a, 2),
gsSPVertex(mips_seg6_vertex_06010CD0, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 0, 4, 1, 0x0, 4, 0, 5, 0x0),
gsSPLight(&mips_seg6_light_06010CC0, 1),
gsSPLight(&mips_seg6_light_06010CB8, 2),
gsSPLight(&mips_seg6_lights_06010CB8.l, 1),
gsSPLight(&mips_seg6_lights_06010CB8.a, 2),
gsSPVertex(mips_seg6_vertex_06010D30, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 0, 2, 4, 0x0, 5, 6, 0, 0x0),
@ -330,34 +310,22 @@ const Gfx mips_seg6_dl_06010E60[] = {
};
// 0x06010EC0
static const Ambient mips_seg6_light_06010EC0 = {
{{0x3c, 0x3c, 0x00}, 0, {0x3c, 0x3c, 0x00}, 0}
};
// 0x06010EC8
static const Light mips_seg6_light_06010EC8 = {
{{0x96, 0x96, 0x00}, 0, {0x96, 0x96, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06010EC0 = gdSPDefLights1(
0x3c, 0x3c, 0x00,
0x96, 0x96, 0x00, 0x28, 0x28, 0x28
);
// 0x06010ED8
static const Ambient mips_seg6_light_06010ED8 = {
{{0x35, 0x38, 0x00}, 0, {0x35, 0x38, 0x00}, 0}
};
// 0x06010EE0
static const Light mips_seg6_light_06010EE0 = {
{{0x85, 0x8e, 0x00}, 0, {0x85, 0x8e, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06010ED8 = gdSPDefLights1(
0x35, 0x38, 0x00,
0x85, 0x8e, 0x00, 0x28, 0x28, 0x28
);
// 0x06010EF0
static const Ambient mips_seg6_light_06010EF0 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06010EF8
static const Light mips_seg6_light_06010EF8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06010EF0 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06010F08
static const Vtx mips_seg6_vertex_06010F08[] = {
@ -391,17 +359,17 @@ const Gfx mips_seg6_dl_06010FF8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_06010EC8, 1),
gsSPLight(&mips_seg6_light_06010EC0, 2),
gsSPLight(&mips_seg6_lights_06010EC0.l, 1),
gsSPLight(&mips_seg6_lights_06010EC0.a, 2),
gsSPVertex(mips_seg6_vertex_06010F08, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP1Triangle( 3, 2, 4, 0x0),
gsSPLight(&mips_seg6_light_06010EE0, 1),
gsSPLight(&mips_seg6_light_06010ED8, 2),
gsSPLight(&mips_seg6_lights_06010ED8.l, 1),
gsSPLight(&mips_seg6_lights_06010ED8.a, 2),
gsSPVertex(mips_seg6_vertex_06010F58, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPLight(&mips_seg6_light_06010EF8, 1),
gsSPLight(&mips_seg6_light_06010EF0, 2),
gsSPLight(&mips_seg6_lights_06010EF0.l, 1),
gsSPLight(&mips_seg6_lights_06010EF0.a, 2),
gsSPVertex(mips_seg6_vertex_06010F88, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 3, 2, 4, 0x0, 2, 1, 4, 0x0),
@ -426,24 +394,16 @@ const Gfx mips_seg6_dl_060110B0[] = {
};
// 0x06011110
static const Ambient mips_seg6_light_06011110 = {
{{0x3c, 0x3c, 0x00}, 0, {0x3c, 0x3c, 0x00}, 0}
};
// 0x06011118
static const Light mips_seg6_light_06011118 = {
{{0x96, 0x96, 0x00}, 0, {0x96, 0x96, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011110 = gdSPDefLights1(
0x3c, 0x3c, 0x00,
0x96, 0x96, 0x00, 0x28, 0x28, 0x28
);
// 0x06011128
static const Ambient mips_seg6_light_06011128 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06011130
static const Light mips_seg6_light_06011130 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011128 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06011140
static const Vtx mips_seg6_vertex_06011140[] = {
@ -474,13 +434,13 @@ const Gfx mips_seg6_dl_06011240[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_06011118, 1),
gsSPLight(&mips_seg6_light_06011110, 2),
gsSPLight(&mips_seg6_lights_06011110.l, 1),
gsSPLight(&mips_seg6_lights_06011110.a, 2),
gsSPVertex(mips_seg6_vertex_06011140, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 2, 4, 3, 0x0, 3, 4, 5, 0x0),
gsSPLight(&mips_seg6_light_06011130, 1),
gsSPLight(&mips_seg6_light_06011128, 2),
gsSPLight(&mips_seg6_lights_06011128.l, 1),
gsSPLight(&mips_seg6_lights_06011128.a, 2),
gsSPVertex(mips_seg6_vertex_060111A0, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 0, 4, 3, 0x0, 5, 6, 1, 0x0),
@ -508,24 +468,16 @@ const Gfx mips_seg6_dl_06011310[] = {
};
// 0x06011370
static const Ambient mips_seg6_light_06011370 = {
{{0x3c, 0x3c, 0x00}, 0, {0x3c, 0x3c, 0x00}, 0}
};
// 0x06011378
static const Light mips_seg6_light_06011378 = {
{{0x96, 0x96, 0x00}, 0, {0x96, 0x96, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011370 = gdSPDefLights1(
0x3c, 0x3c, 0x00,
0x96, 0x96, 0x00, 0x28, 0x28, 0x28
);
// 0x06011388
static const Ambient mips_seg6_light_06011388 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06011390
static const Light mips_seg6_light_06011390 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011388 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060113A0
static const Vtx mips_seg6_vertex_060113A0[] = {
@ -553,13 +505,13 @@ const Gfx mips_seg6_dl_06011470[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_06011378, 1),
gsSPLight(&mips_seg6_light_06011370, 2),
gsSPLight(&mips_seg6_lights_06011370.l, 1),
gsSPLight(&mips_seg6_lights_06011370.a, 2),
gsSPVertex(mips_seg6_vertex_060113A0, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP1Triangle( 3, 4, 1, 0x0),
gsSPLight(&mips_seg6_light_06011390, 1),
gsSPLight(&mips_seg6_light_06011388, 2),
gsSPLight(&mips_seg6_lights_06011388.l, 1),
gsSPLight(&mips_seg6_lights_06011388.a, 2),
gsSPVertex(mips_seg6_vertex_060113F0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 3, 2, 1, 0x0, 3, 5, 6, 0x0),
@ -586,24 +538,16 @@ const Gfx mips_seg6_dl_06011520[] = {
};
// 0x06011580
static const Ambient mips_seg6_light_06011580 = {
{{0x3c, 0x3c, 0x00}, 0, {0x3c, 0x3c, 0x00}, 0}
};
// 0x06011588
static const Light mips_seg6_light_06011588 = {
{{0x96, 0x96, 0x00}, 0, {0x96, 0x96, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011580 = gdSPDefLights1(
0x3c, 0x3c, 0x00,
0x96, 0x96, 0x00, 0x28, 0x28, 0x28
);
// 0x06011598
static const Ambient mips_seg6_light_06011598 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x060115A0
static const Light mips_seg6_light_060115A0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011598 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060115B0
static const Vtx mips_seg6_vertex_060115B0[] = {
@ -634,13 +578,13 @@ const Gfx mips_seg6_dl_060116B0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_06011588, 1),
gsSPLight(&mips_seg6_light_06011580, 2),
gsSPLight(&mips_seg6_lights_06011580.l, 1),
gsSPLight(&mips_seg6_lights_06011580.a, 2),
gsSPVertex(mips_seg6_vertex_060115B0, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 3, 1, 0x0, 2, 5, 0, 0x0),
gsSPLight(&mips_seg6_light_060115A0, 1),
gsSPLight(&mips_seg6_light_06011598, 2),
gsSPLight(&mips_seg6_lights_06011598.l, 1),
gsSPLight(&mips_seg6_lights_06011598.a, 2),
gsSPVertex(mips_seg6_vertex_06011610, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 2, 3, 0, 0x0, 3, 2, 5, 0x0),
@ -668,24 +612,16 @@ const Gfx mips_seg6_dl_06011780[] = {
};
// 0x060117E0
static const Ambient mips_seg6_light_060117E0 = {
{{0x3c, 0x3c, 0x00}, 0, {0x3c, 0x3c, 0x00}, 0}
};
// 0x060117E8
static const Light mips_seg6_light_060117E8 = {
{{0x96, 0x96, 0x00}, 0, {0x96, 0x96, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_060117E0 = gdSPDefLights1(
0x3c, 0x3c, 0x00,
0x96, 0x96, 0x00, 0x28, 0x28, 0x28
);
// 0x060117F8
static const Ambient mips_seg6_light_060117F8 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06011800
static const Light mips_seg6_light_06011800 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_060117F8 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06011810
static const Vtx mips_seg6_vertex_06011810[] = {
@ -713,13 +649,13 @@ const Gfx mips_seg6_dl_060118E0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_060117E8, 1),
gsSPLight(&mips_seg6_light_060117E0, 2),
gsSPLight(&mips_seg6_lights_060117E0.l, 1),
gsSPLight(&mips_seg6_lights_060117E0.a, 2),
gsSPVertex(mips_seg6_vertex_06011810, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0),
gsSP1Triangle( 1, 4, 3, 0x0),
gsSPLight(&mips_seg6_light_06011800, 1),
gsSPLight(&mips_seg6_light_060117F8, 2),
gsSPLight(&mips_seg6_lights_060117F8.l, 1),
gsSPLight(&mips_seg6_lights_060117F8.a, 2),
gsSPVertex(mips_seg6_vertex_06011860, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 3, 0x0, 6, 7, 3, 0x0),
@ -746,24 +682,16 @@ const Gfx mips_seg6_dl_06011990[] = {
};
// 0x060119F0
static const Ambient mips_seg6_light_060119F0 = {
{{0x3c, 0x3c, 0x00}, 0, {0x3c, 0x3c, 0x00}, 0}
};
// 0x060119F8
static const Light mips_seg6_light_060119F8 = {
{{0x96, 0x96, 0x00}, 0, {0x96, 0x96, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_060119F0 = gdSPDefLights1(
0x3c, 0x3c, 0x00,
0x96, 0x96, 0x00, 0x28, 0x28, 0x28
);
// 0x06011A08
static const Ambient mips_seg6_light_06011A08 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06011A10
static const Light mips_seg6_light_06011A10 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011A08 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06011A20
static const Vtx mips_seg6_vertex_06011A20[] = {
@ -792,13 +720,13 @@ const Gfx mips_seg6_dl_06011B00[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_060119F8, 1),
gsSPLight(&mips_seg6_light_060119F0, 2),
gsSPLight(&mips_seg6_lights_060119F0.l, 1),
gsSPLight(&mips_seg6_lights_060119F0.a, 2),
gsSPVertex(mips_seg6_vertex_06011A20, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 5, 2, 4, 0x0),
gsSPLight(&mips_seg6_light_06011A10, 1),
gsSPLight(&mips_seg6_light_06011A08, 2),
gsSPLight(&mips_seg6_lights_06011A08.l, 1),
gsSPLight(&mips_seg6_lights_06011A08.a, 2),
gsSPVertex(mips_seg6_vertex_06011A80, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 1, 0x0, 1, 3, 6, 0x0),
@ -824,24 +752,16 @@ const Gfx mips_seg6_dl_06011BB0[] = {
};
// 0x06011C10
static const Ambient mips_seg6_light_06011C10 = {
{{0x3c, 0x3c, 0x00}, 0, {0x3c, 0x3c, 0x00}, 0}
};
// 0x06011C18
static const Light mips_seg6_light_06011C18 = {
{{0x96, 0x96, 0x00}, 0, {0x96, 0x96, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011C10 = gdSPDefLights1(
0x3c, 0x3c, 0x00,
0x96, 0x96, 0x00, 0x28, 0x28, 0x28
);
// 0x06011C28
static const Ambient mips_seg6_light_06011C28 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06011C30
static const Light mips_seg6_light_06011C30 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011C28 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06011C40
static const Vtx mips_seg6_vertex_06011C40[] = {
@ -869,13 +789,13 @@ const Gfx mips_seg6_dl_06011D10[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&mips_seg6_light_06011C18, 1),
gsSPLight(&mips_seg6_light_06011C10, 2),
gsSPLight(&mips_seg6_lights_06011C10.l, 1),
gsSPLight(&mips_seg6_lights_06011C10.a, 2),
gsSPVertex(mips_seg6_vertex_06011C40, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 1, 4, 3, 0x0, 3, 4, 5, 0x0),
gsSPLight(&mips_seg6_light_06011C30, 1),
gsSPLight(&mips_seg6_light_06011C28, 2),
gsSPLight(&mips_seg6_lights_06011C28.l, 1),
gsSPLight(&mips_seg6_lights_06011C28.a, 2),
gsSPVertex(mips_seg6_vertex_06011CA0, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 3, 4, 5, 0x0, 1, 3, 5, 0x0),
@ -900,14 +820,10 @@ const Gfx mips_seg6_dl_06011DB0[] = {
};
// 0x06011E10
static const Ambient mips_seg6_light_06011E10 = {
{{0x34, 0x2c, 0x0f}, 0, {0x34, 0x2c, 0x0f}, 0}
};
// 0x06011E18
static const Light mips_seg6_light_06011E18 = {
{{0x82, 0x6e, 0x26}, 0, {0x82, 0x6e, 0x26}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011E10 = gdSPDefLights1(
0x34, 0x2c, 0x0f,
0x82, 0x6e, 0x26, 0x28, 0x28, 0x28
);
// 0x06011E28
static const Vtx mips_seg6_vertex_06011E28[] = {
@ -921,8 +837,8 @@ static const Vtx mips_seg6_vertex_06011E28[] = {
// 0x06011E88 - 0x06011ED8
const Gfx mips_seg6_dl_06011E88[] = {
gsSPLight(&mips_seg6_light_06011E18, 1),
gsSPLight(&mips_seg6_light_06011E10, 2),
gsSPLight(&mips_seg6_lights_06011E10.l, 1),
gsSPLight(&mips_seg6_lights_06011E10.a, 2),
gsSPVertex(mips_seg6_vertex_06011E28, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 0, 2, 0x0, 2, 5, 4, 0x0),
@ -939,14 +855,10 @@ const Gfx mips_seg6_dl_06011ED8[] = {
};
// 0x06011EF8
static const Ambient mips_seg6_light_06011EF8 = {
{{0x34, 0x2c, 0x0f}, 0, {0x34, 0x2c, 0x0f}, 0}
};
// 0x06011F00
static const Light mips_seg6_light_06011F00 = {
{{0x82, 0x6e, 0x26}, 0, {0x82, 0x6e, 0x26}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 mips_seg6_lights_06011EF8 = gdSPDefLights1(
0x34, 0x2c, 0x0f,
0x82, 0x6e, 0x26, 0x28, 0x28, 0x28
);
// 0x06011F10
static const Vtx mips_seg6_vertex_06011F10[] = {
@ -960,8 +872,8 @@ static const Vtx mips_seg6_vertex_06011F10[] = {
// 0x06011F70 - 0x06011FC0
const Gfx mips_seg6_dl_06011F70[] = {
gsSPLight(&mips_seg6_light_06011F00, 1),
gsSPLight(&mips_seg6_light_06011EF8, 2),
gsSPLight(&mips_seg6_lights_06011EF8.l, 1),
gsSPLight(&mips_seg6_lights_06011EF8.a, 2),
gsSPVertex(mips_seg6_vertex_06011F10, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 2, 0x0, 2, 1, 4, 0x0),

4
actors/mist/model.inc.c
View File

@ -25,7 +25,7 @@ ALIGNED8 static const u8 mist_seg3_texture_03000080[] = {
const Gfx mist_seg3_dl_03000880[] = {
gsDPPipeSync(),
gsSPClearGeometryMode(G_LIGHTING),
gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
gsDPSetCombineMode(G_CC_MODULATEIFADEA, G_CC_MODULATEIFADEA),
gsDPLoadTextureBlock(mist_seg3_texture_03000080, 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),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(mist_seg3_vertex_03000000, 4, 0),
@ -42,7 +42,7 @@ const Gfx mist_seg3_dl_03000880[] = {
const Gfx mist_seg3_dl_03000920[] = {
gsDPPipeSync(),
gsSPClearGeometryMode(G_LIGHTING),
gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
gsDPSetCombineMode(G_CC_MODULATEIFADEA, G_CC_MODULATEIFADEA),
gsDPLoadTextureBlock(mist_seg3_texture_03000080, 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),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(mist_seg3_vertex_03000040, 4, 0),

110
actors/moneybag/model.inc.c
View File

@ -11,24 +11,16 @@ ALIGNED8 static const u8 moneybag_seg6_texture_060049B0[] = {
};
// 0x060051B0
static const Ambient moneybag_seg6_light_060051B0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x060051B8
static const Light moneybag_seg6_light_060051B8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 moneybag_seg6_lights_060051B0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060051C8
static const Ambient moneybag_seg6_light_060051C8 = {
{{0x00, 0x3f, 0x23}, 0, {0x00, 0x3f, 0x23}, 0}
};
// 0x060051D0
static const Light moneybag_seg6_light_060051D0 = {
{{0x00, 0x7f, 0x47}, 0, {0x00, 0x7f, 0x47}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 moneybag_seg6_lights_060051C8 = gdSPDefLights1(
0x00, 0x3f, 0x23,
0x00, 0x7f, 0x47, 0x28, 0x28, 0x28
);
// 0x060051E0
static const Vtx moneybag_seg6_vertex_060051E0[] = {
@ -61,8 +53,8 @@ const Gfx moneybag_seg6_dl_06005300[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, moneybag_seg6_texture_060039B0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&moneybag_seg6_light_060051B8, 1),
gsSPLight(&moneybag_seg6_light_060051B0, 2),
gsSPLight(&moneybag_seg6_lights_060051B0.l, 1),
gsSPLight(&moneybag_seg6_lights_060051B0.a, 2),
gsSPVertex(moneybag_seg6_vertex_060051E0, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 0, 0x0, 8, 4, 9, 0x0),
@ -71,8 +63,8 @@ const Gfx moneybag_seg6_dl_06005300[] = {
// 0x06005358 - 0x060053B8
const Gfx moneybag_seg6_dl_06005358[] = {
gsSPLight(&moneybag_seg6_light_060051D0, 1),
gsSPLight(&moneybag_seg6_light_060051C8, 2),
gsSPLight(&moneybag_seg6_lights_060051C8.l, 1),
gsSPLight(&moneybag_seg6_lights_060051C8.a, 2),
gsSPVertex(moneybag_seg6_vertex_06005280, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 3, 0, 4, 0x0, 3, 5, 1, 0x0),
@ -100,14 +92,10 @@ const Gfx moneybag_seg6_dl_060053B8[] = {
};
// 0x06005428
static const Ambient moneybag_seg6_light_06005428 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06005430
static const Light moneybag_seg6_light_06005430 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 moneybag_seg6_lights_06005428 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06005440
static const Vtx moneybag_seg6_vertex_06005440[] = {
@ -143,8 +131,8 @@ const Gfx moneybag_seg6_dl_06005590[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, moneybag_seg6_texture_060039B0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&moneybag_seg6_light_06005430, 1),
gsSPLight(&moneybag_seg6_light_06005428, 2),
gsSPLight(&moneybag_seg6_lights_06005428.l, 1),
gsSPLight(&moneybag_seg6_lights_06005428.a, 2),
gsSPVertex(moneybag_seg6_vertex_06005440, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 7, 0x0),
@ -220,45 +208,29 @@ const Gfx moneybag_seg6_dl_06005750[] = {
gsSPEndDisplayList(),
};
// Unreferenced light
UNUSED static const Ambient moneybag_light_1 = {
{{0x0c, 0x20, 0x06}, 0, {0x0c, 0x20, 0x06}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 moneybag_lights_unused1 = gdSPDefLights1(
0x0c, 0x20, 0x06,
0x30, 0x83, 0x1a, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light moneybag_light_2 = {
{{0x30, 0x83, 0x1a}, 0, {0x30, 0x83, 0x1a}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient moneybag_light_3 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light moneybag_light_4 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 moneybag_lights_unused2 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x060057F0
static const Ambient moneybag_seg6_light_060057F0 = {
{{0x3f, 0x3f, 0x00}, 0, {0x3f, 0x3f, 0x00}, 0}
};
static const Lights1 moneybag_seg6_lights_060057F0 = gdSPDefLights1(
0x3f, 0x3f, 0x00,
0xff, 0xff, 0x00, 0x28, 0x28, 0x28
);
// 0x060057F8
static const Light moneybag_seg6_light_060057F8 = {
{{0xff, 0xff, 0x00}, 0, {0xff, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient moneybag_light_5 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light moneybag_light_6 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 moneybag_lights_unused3 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x06005820
static const Vtx moneybag_seg6_vertex_06005820[] = {
@ -293,8 +265,8 @@ static const Vtx moneybag_seg6_vertex_060058D0[] = {
// 0x06005980 - 0x060059F0
const Gfx moneybag_seg6_dl_06005980[] = {
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPLight(&moneybag_seg6_light_060057F8, 1),
gsSPLight(&moneybag_seg6_light_060057F0, 2),
gsSPLight(&moneybag_seg6_lights_060057F0.l, 1),
gsSPLight(&moneybag_seg6_lights_060057F0.a, 2),
gsSPVertex(moneybag_seg6_vertex_06005820, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 8, 0x0),
@ -307,8 +279,8 @@ const Gfx moneybag_seg6_dl_06005980[] = {
// 0x060059F0 - 0x06005A60
const Gfx moneybag_seg6_dl_060059F0[] = {
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPLight(&moneybag_seg6_light_060057F8, 1),
gsSPLight(&moneybag_seg6_light_060057F0, 2),
gsSPLight(&moneybag_seg6_lights_060057F0.l, 1),
gsSPLight(&moneybag_seg6_lights_060057F0.a, 2),
gsSPVertex(moneybag_seg6_vertex_060058D0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 8, 5, 7, 0x0),

228
actors/monty_mole/model.inc.c
View File

@ -1,64 +1,40 @@
// Monty Mole
// Unreferenced light
UNUSED static const Ambient monty_mole_light_1 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 monty_mole_lights_unused1 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light monty_mole_light_2 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 monty_mole_lights_unused2 = gdSPDefLights1(
0x30, 0x1f, 0x00,
0xc3, 0x7e, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient monty_mole_light_3 = {
{{0x30, 0x1f, 0x00}, 0, {0x30, 0x1f, 0x00}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 monty_mole_lights_unused3 = gdSPDefLights1(
0x05, 0x04, 0x05,
0x16, 0x13, 0x14, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light monty_mole_light_4 = {
{{0xc3, 0x7e, 0x00}, 0, {0xc3, 0x7e, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 monty_mole_lights_unused4 = gdSPDefLights1(
0x07, 0x08, 0x07,
0x1f, 0x20, 0x1f, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient monty_mole_light_5 = {
{{0x05, 0x04, 0x05}, 0, {0x05, 0x04, 0x05}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 monty_mole_lights_unused5 = gdSPDefLights1(
0x14, 0x0b, 0x0a,
0x53, 0x2e, 0x28, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light monty_mole_light_6 = {
{{0x16, 0x13, 0x14}, 0, {0x16, 0x13, 0x14}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient monty_mole_light_7 = {
{{0x07, 0x08, 0x07}, 0, {0x07, 0x08, 0x07}, 0}
};
// Unreferenced light
UNUSED static const Light monty_mole_light_8 = {
{{0x1f, 0x20, 0x1f}, 0, {0x1f, 0x20, 0x1f}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient monty_mole_light_9 = {
{{0x14, 0x0b, 0x0a}, 0, {0x14, 0x0b, 0x0a}, 0}
};
// Unreferenced light
UNUSED static const Light monty_mole_light_10 = {
{{0x53, 0x2e, 0x28}, 0, {0x53, 0x2e, 0x28}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient monty_mole_light_11 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light
UNUSED static const Light monty_mole_light_12 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 monty_mole_lights_unused6 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05000970
ALIGNED8 static const u8 monty_mole_seg5_texture_05000970[] = {
@ -86,14 +62,10 @@ ALIGNED8 static const u8 monty_mole_seg5_texture_05002970[] = {
};
// 0x05003170
static const Ambient monty_mole_seg5_light_05003170 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05003178
static const Light monty_mole_seg5_light_05003178 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_05003170 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05003188
static const Vtx monty_mole_seg5_vertex_05003188[] = {
@ -112,8 +84,8 @@ const Gfx monty_mole_seg5_dl_05003208[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05001170),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_05003178, 1),
gsSPLight(&monty_mole_seg5_light_05003170, 2),
gsSPLight(&monty_mole_seg5_lights_05003170.l, 1),
gsSPLight(&monty_mole_seg5_lights_05003170.a, 2),
gsSPVertex(monty_mole_seg5_vertex_05003188, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 2, 1, 3, 0x0, 5, 2, 4, 0x0),
@ -141,14 +113,10 @@ const Gfx monty_mole_seg5_dl_050032A0[] = {
};
// 0x05003300
static const Ambient monty_mole_seg5_light_05003300 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05003308
static const Light monty_mole_seg5_light_05003308 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_05003300 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05003318
static const Vtx monty_mole_seg5_vertex_05003318[] = {
@ -181,8 +149,8 @@ const Gfx monty_mole_seg5_dl_05003438[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002970),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_05003308, 1),
gsSPLight(&monty_mole_seg5_light_05003300, 2),
gsSPLight(&monty_mole_seg5_lights_05003300.l, 1),
gsSPLight(&monty_mole_seg5_lights_05003300.a, 2),
gsSPVertex(monty_mole_seg5_vertex_05003318, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
@ -225,14 +193,10 @@ const Gfx monty_mole_seg5_dl_05003518[] = {
};
// 0x05003598
static const Ambient monty_mole_seg5_light_05003598 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x050035A0
static const Light monty_mole_seg5_light_050035A0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_05003598 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050035B0
static const Vtx monty_mole_seg5_vertex_050035B0[] = {
@ -271,8 +235,8 @@ const Gfx monty_mole_seg5_dl_05003730[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002970),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_050035A0, 1),
gsSPLight(&monty_mole_seg5_light_05003598, 2),
gsSPLight(&monty_mole_seg5_lights_05003598.l, 1),
gsSPLight(&monty_mole_seg5_lights_05003598.a, 2),
gsSPVertex(monty_mole_seg5_vertex_050035B0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 1, 4, 5, 0x0),
@ -316,14 +280,10 @@ const Gfx monty_mole_seg5_dl_05003820[] = {
};
// 0x050038A0
static const Ambient monty_mole_seg5_light_050038A0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x050038A8
static const Light monty_mole_seg5_light_050038A8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_050038A0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050038B8
static const Vtx monty_mole_seg5_vertex_050038B8[] = {
@ -342,8 +302,8 @@ const Gfx monty_mole_seg5_dl_05003938[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05001170),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_050038A8, 1),
gsSPLight(&monty_mole_seg5_light_050038A0, 2),
gsSPLight(&monty_mole_seg5_lights_050038A0.l, 1),
gsSPLight(&monty_mole_seg5_lights_050038A0.a, 2),
gsSPVertex(monty_mole_seg5_vertex_050038B8, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0),
gsSP2Triangles( 1, 0, 3, 0x0, 1, 5, 2, 0x0),
@ -371,14 +331,10 @@ const Gfx monty_mole_seg5_dl_050039D0[] = {
};
// 0x05003A30
static const Ambient monty_mole_seg5_light_05003A30 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05003A38
static const Light monty_mole_seg5_light_05003A38 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_05003A30 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05003A48
static const Vtx monty_mole_seg5_vertex_05003A48[] = {
@ -411,8 +367,8 @@ const Gfx monty_mole_seg5_dl_05003B68[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002970),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_05003A38, 1),
gsSPLight(&monty_mole_seg5_light_05003A30, 2),
gsSPLight(&monty_mole_seg5_lights_05003A30.l, 1),
gsSPLight(&monty_mole_seg5_lights_05003A30.a, 2),
gsSPVertex(monty_mole_seg5_vertex_05003A48, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
@ -455,14 +411,10 @@ const Gfx monty_mole_seg5_dl_05003C48[] = {
};
// 0x05003CC8
static const Ambient monty_mole_seg5_light_05003CC8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05003CD0
static const Light monty_mole_seg5_light_05003CD0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_05003CC8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05003CE0
static const Vtx monty_mole_seg5_vertex_05003CE0[] = {
@ -501,8 +453,8 @@ const Gfx monty_mole_seg5_dl_05003E60[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002970),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_05003CD0, 1),
gsSPLight(&monty_mole_seg5_light_05003CC8, 2),
gsSPLight(&monty_mole_seg5_lights_05003CC8.l, 1),
gsSPLight(&monty_mole_seg5_lights_05003CC8.a, 2),
gsSPVertex(monty_mole_seg5_vertex_05003CE0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 2, 5, 0x0, 2, 3, 5, 0x0),
@ -546,14 +498,10 @@ const Gfx monty_mole_seg5_dl_05003F50[] = {
};
// 0x05003FD0
static const Ambient monty_mole_seg5_light_05003FD0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05003FD8
static const Light monty_mole_seg5_light_05003FD8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_05003FD0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05003FE8
static const Vtx monty_mole_seg5_vertex_05003FE8[] = {
@ -617,8 +565,8 @@ const Gfx monty_mole_seg5_dl_050042B8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05000970),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_05003FD8, 1),
gsSPLight(&monty_mole_seg5_light_05003FD0, 2),
gsSPLight(&monty_mole_seg5_lights_05003FD0.l, 1),
gsSPLight(&monty_mole_seg5_lights_05003FD0.a, 2),
gsSPVertex(monty_mole_seg5_vertex_05003FE8, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 3, 0x0, 7, 5, 4, 0x0),
@ -677,14 +625,10 @@ const Gfx monty_mole_seg5_dl_050044B0[] = {
};
// 0x05004518
static const Ambient monty_mole_seg5_light_05004518 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05004520
static const Light monty_mole_seg5_light_05004520 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_05004518 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004530
static const Vtx monty_mole_seg5_vertex_05004530[] = {
@ -791,8 +735,8 @@ const Gfx monty_mole_seg5_dl_050049B0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05001970),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_05004520, 1),
gsSPLight(&monty_mole_seg5_light_05004518, 2),
gsSPLight(&monty_mole_seg5_lights_05004518.l, 1),
gsSPLight(&monty_mole_seg5_lights_05004518.a, 2),
gsSPVertex(monty_mole_seg5_vertex_05004530, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 0, 3, 5, 0x0, 5, 1, 0, 0x0),
@ -874,14 +818,10 @@ const Gfx monty_mole_seg5_dl_05004C00[] = {
};
// 0x05004C90
static const Ambient monty_mole_seg5_light_05004C90 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05004C98
static const Light monty_mole_seg5_light_05004C98 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 monty_mole_seg5_lights_05004C90 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05004CA8
static const Vtx monty_mole_seg5_vertex_05004CA8[] = {
@ -896,8 +836,8 @@ const Gfx monty_mole_seg5_dl_05004CE8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002170),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&monty_mole_seg5_light_05004C98, 1),
gsSPLight(&monty_mole_seg5_light_05004C90, 2),
gsSPLight(&monty_mole_seg5_lights_05004C90.l, 1),
gsSPLight(&monty_mole_seg5_lights_05004C90.a, 2),
gsSPVertex(monty_mole_seg5_vertex_05004CA8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),

292
actors/peach/model.inc.c
View File

@ -1,24 +1,16 @@
// Peach
// 0x050009F8
static const Ambient peach_seg5_light_050009F8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05000A00
static const Light peach_seg5_light_05000A00 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_050009F8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05000A10
static const Ambient peach_seg5_light_05000A10 = {
{{0x7f, 0x5f, 0x0c}, 0, {0x7f, 0x5f, 0x0c}, 0}
};
// 0x05000A18
static const Light peach_seg5_light_05000A18 = {
{{0xff, 0xbf, 0x18}, 0, {0xff, 0xbf, 0x18}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05000A10 = gdSPDefLights1(
0x7f, 0x5f, 0x0c,
0xff, 0xbf, 0x18, 0x28, 0x28, 0x28
);
// 0x05000A28
ALIGNED8 static const u8 peach_seg5_texture_05000A28[] = {
@ -369,8 +361,8 @@ const Gfx peach_seg5_dl_05005648[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05002A28),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05000A00, 1),
gsSPLight(&peach_seg5_light_050009F8, 2),
gsSPLight(&peach_seg5_lights_050009F8.l, 1),
gsSPLight(&peach_seg5_lights_050009F8.a, 2),
gsSPVertex(peach_seg5_vertex_05004828, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 4, 1, 5, 0x0, 5, 1, 6, 0x0),
@ -437,8 +429,8 @@ const Gfx peach_seg5_dl_050058B8[] = {
// 0x050058E0 - 0x05005C48
const Gfx peach_seg5_dl_050058E0[] = {
gsSPLight(&peach_seg5_light_05000A18, 1),
gsSPLight(&peach_seg5_light_05000A10, 2),
gsSPLight(&peach_seg5_lights_05000A10.l, 1),
gsSPLight(&peach_seg5_lights_05000A10.a, 2),
gsSPVertex(peach_seg5_vertex_05004E88, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 3, 5, 0, 0x0, 6, 4, 0, 0x0),
@ -649,14 +641,10 @@ const Gfx peach_seg5_dl_05005F48[] = {
};
// 0x05005FA0
static const Ambient peach_seg5_light_05005FA0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05005FA8
static const Light peach_seg5_light_05005FA8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05005FA0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05005FB8
static const Vtx peach_seg5_vertex_05005FB8[] = {
@ -677,8 +665,8 @@ const Gfx peach_seg5_dl_05006058[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05000A28),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05005FA8, 1),
gsSPLight(&peach_seg5_light_05005FA0, 2),
gsSPLight(&peach_seg5_lights_05005FA0.l, 1),
gsSPLight(&peach_seg5_lights_05005FA0.a, 2),
gsSPVertex(peach_seg5_vertex_05005FB8, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 1, 4, 3, 0x0, 4, 5, 3, 0x0),
@ -704,24 +692,16 @@ const Gfx peach_seg5_dl_050060E0[] = {
};
// 0x05006138
static const Ambient peach_seg5_light_05006138 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05006140
static const Light peach_seg5_light_05006140 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05006138 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05006150
static const Ambient peach_seg5_light_05006150 = {
{{0x6c, 0x54, 0x5f}, 0, {0x6c, 0x54, 0x5f}, 0}
};
// 0x05006158
static const Light peach_seg5_light_05006158 = {
{{0xd9, 0xa9, 0xbe}, 0, {0xd9, 0xa9, 0xbe}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05006150 = gdSPDefLights1(
0x6c, 0x54, 0x5f,
0xd9, 0xa9, 0xbe, 0x28, 0x28, 0x28
);
// 0x05006168
static const Vtx peach_seg5_vertex_05006168[] = {
@ -852,8 +832,8 @@ const Gfx peach_seg5_dl_05006728[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05002C28),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05006140, 1),
gsSPLight(&peach_seg5_light_05006138, 2),
gsSPLight(&peach_seg5_lights_05006138.l, 1),
gsSPLight(&peach_seg5_lights_05006138.a, 2),
gsSPVertex(peach_seg5_vertex_05006168, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0),
gsSP2Triangles( 4, 1, 5, 0x0, 6, 1, 3, 0x0),
@ -867,13 +847,13 @@ const Gfx peach_seg5_dl_05006798[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05006158, 1),
gsSPLight(&peach_seg5_light_05006150, 2),
gsSPLight(&peach_seg5_lights_05006150.l, 1),
gsSPLight(&peach_seg5_lights_05006150.a, 2),
gsSPVertex(peach_seg5_vertex_050061E8, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP1Triangle( 3, 0, 2, 0x0),
gsSPLight(&peach_seg5_light_05006140, 1),
gsSPLight(&peach_seg5_light_05006138, 2),
gsSPLight(&peach_seg5_lights_05006138.l, 1),
gsSPLight(&peach_seg5_lights_05006138.a, 2),
gsSPVertex(peach_seg5_vertex_05006238, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 0, 0x0, 0, 6, 7, 0x0),
@ -936,14 +916,10 @@ const Gfx peach_seg5_dl_05006A18[] = {
};
// 0x05006A90
static const Ambient peach_seg5_light_05006A90 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05006A98
static const Light peach_seg5_light_05006A98 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05006A90 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05006AA8
static const Vtx peach_seg5_vertex_05006AA8[] = {
@ -1050,8 +1026,8 @@ const Gfx peach_seg5_dl_05006FA8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05006A98, 1),
gsSPLight(&peach_seg5_light_05006A90, 2),
gsSPLight(&peach_seg5_lights_05006A90.l, 1),
gsSPLight(&peach_seg5_lights_05006A90.a, 2),
gsSPVertex(peach_seg5_vertex_05006AA8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 3, 7, 0x0, 3, 8, 9, 0x0),
@ -1130,14 +1106,10 @@ const Gfx peach_seg5_us_dl_05007288[] = {
#endif
// 0x05007288
static const Ambient peach_seg5_light_05007288 = {
{{0x7f, 0x5f, 0x0c}, 0, {0x7f, 0x5f, 0x0c}, 0}
};
// 0x05007290
static const Light peach_seg5_light_05007290 = {
{{0xff, 0xbf, 0x18}, 0, {0xff, 0xbf, 0x18}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05007288 = gdSPDefLights1(
0x7f, 0x5f, 0x0c,
0xff, 0xbf, 0x18, 0x28, 0x28, 0x28
);
// 0x050072A0
static const Vtx peach_seg5_vertex_050072A0[] = {
@ -1252,8 +1224,8 @@ static const Vtx peach_seg5_vertex_05007780[] = {
// 0x05007810 - 0x05007AB8
const Gfx peach_seg5_dl_05007810[] = {
gsSPLight(&peach_seg5_light_05007290, 1),
gsSPLight(&peach_seg5_light_05007288, 2),
gsSPLight(&peach_seg5_lights_05007288.l, 1),
gsSPLight(&peach_seg5_lights_05007288.a, 2),
gsSPVertex(peach_seg5_vertex_050072A0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 2, 3, 0, 0x0),
@ -1312,14 +1284,10 @@ const Gfx peach_seg5_dl_05007AB8[] = {
};
// 0x05007AE0
static const Ambient peach_seg5_light_05007AE0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05007AE8
static const Light peach_seg5_light_05007AE8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05007AE0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05007AF8
static const Vtx peach_seg5_vertex_05007AF8[] = {
@ -1365,8 +1333,8 @@ const Gfx peach_seg5_dl_05007CE8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05007AE8, 1),
gsSPLight(&peach_seg5_light_05007AE0, 2),
gsSPLight(&peach_seg5_lights_05007AE0.l, 1),
gsSPLight(&peach_seg5_lights_05007AE0.a, 2),
gsSPVertex(peach_seg5_vertex_05007AF8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP2Triangles( 5, 3, 0, 0x0, 4, 6, 0, 0x0),
@ -1407,14 +1375,10 @@ const Gfx peach_seg5_dl_05007E58[] = {
};
// 0x05007EB0
static const Ambient peach_seg5_light_05007EB0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05007EB8
static const Light peach_seg5_light_05007EB8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05007EB0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05007EC8
static const Vtx peach_seg5_vertex_05007EC8[] = {
@ -1460,8 +1424,8 @@ const Gfx peach_seg5_dl_050080B8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05007EB8, 1),
gsSPLight(&peach_seg5_light_05007EB0, 2),
gsSPLight(&peach_seg5_lights_05007EB0.l, 1),
gsSPLight(&peach_seg5_lights_05007EB0.a, 2),
gsSPVertex(peach_seg5_vertex_05007EC8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 4, 3, 2, 0x0),
@ -1503,14 +1467,10 @@ const Gfx peach_seg5_dl_05008228[] = {
};
// 0x05008280
static const Ambient peach_seg5_light_05008280 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05008288
static const Light peach_seg5_light_05008288 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05008280 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05008298
static const Vtx peach_seg5_vertex_05008298[] = {
@ -1550,8 +1510,8 @@ const Gfx peach_seg5_dl_05008428[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05000A28),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05008288, 1),
gsSPLight(&peach_seg5_light_05008280, 2),
gsSPLight(&peach_seg5_lights_05008280.l, 1),
gsSPLight(&peach_seg5_lights_05008280.a, 2),
gsSPVertex(peach_seg5_vertex_05008298, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 3, 0, 0x0, 1, 5, 6, 0x0),
@ -1596,14 +1556,10 @@ const Gfx peach_seg5_dl_05008560[] = {
};
// 0x050085D0
static const Ambient peach_seg5_light_050085D0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x050085D8
static const Light peach_seg5_light_050085D8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_050085D0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050085E8
static const Vtx peach_seg5_vertex_050085E8[] = {
@ -1625,8 +1581,8 @@ static const Vtx peach_seg5_vertex_050085E8[] = {
// 0x050086C8 - 0x050087A8
const Gfx peach_seg5_dl_050086C8[] = {
gsSPLight(&peach_seg5_light_050085D8, 1),
gsSPLight(&peach_seg5_light_050085D0, 2),
gsSPLight(&peach_seg5_lights_050085D0.l, 1),
gsSPLight(&peach_seg5_lights_050085D0.a, 2),
gsSPVertex(peach_seg5_vertex_050085E8, 14, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSP2Triangles( 3, 4, 2, 0x0, 2, 5, 3, 0x0),
@ -1654,14 +1610,10 @@ const Gfx peach_seg5_dl_050087A8[] = {
};
// 0x050087D0
static const Ambient peach_seg5_light_050087D0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x050087D8
static const Light peach_seg5_light_050087D8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_050087D0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050087E8
static const Vtx peach_seg5_vertex_050087E8[] = {
@ -1701,8 +1653,8 @@ const Gfx peach_seg5_dl_05008978[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05000A28),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_050087D8, 1),
gsSPLight(&peach_seg5_light_050087D0, 2),
gsSPLight(&peach_seg5_lights_050087D0.l, 1),
gsSPLight(&peach_seg5_lights_050087D0.a, 2),
gsSPVertex(peach_seg5_vertex_050087E8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 2, 4, 0, 0x0, 0, 5, 3, 0x0),
@ -1747,14 +1699,10 @@ const Gfx peach_seg5_dl_05008AB0[] = {
};
// 0x05008B20
static const Ambient peach_seg5_light_05008B20 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05008B28
static const Light peach_seg5_light_05008B28 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05008B20 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05008B38
static const Vtx peach_seg5_vertex_05008B38[] = {
@ -1776,8 +1724,8 @@ static const Vtx peach_seg5_vertex_05008B38[] = {
// 0x05008C18 - 0x05008CF8
const Gfx peach_seg5_dl_05008C18[] = {
gsSPLight(&peach_seg5_light_05008B28, 1),
gsSPLight(&peach_seg5_light_05008B20, 2),
gsSPLight(&peach_seg5_lights_05008B20.l, 1),
gsSPLight(&peach_seg5_lights_05008B20.a, 2),
gsSPVertex(peach_seg5_vertex_05008B38, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 2, 5, 0, 0x0, 5, 2, 6, 0x0),
@ -1804,14 +1752,10 @@ const Gfx peach_seg5_dl_05008CF8[] = {
};
// 0x05008D20
static const Ambient peach_seg5_light_05008D20 = {
{{0x0b, 0x1a, 0x67}, 0, {0x0b, 0x1a, 0x67}, 0}
};
// 0x05008D28
static const Light peach_seg5_light_05008D28 = {
{{0x16, 0x35, 0xce}, 0, {0x16, 0x35, 0xce}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05008D20 = gdSPDefLights1(
0x0b, 0x1a, 0x67,
0x16, 0x35, 0xce, 0x28, 0x28, 0x28
);
// 0x05008D38
static const Vtx peach_seg5_vertex_05008D38[] = {
@ -1835,8 +1779,8 @@ static const Vtx peach_seg5_vertex_05008D38[] = {
// 0x05008E38 - 0x05008F20
const Gfx peach_seg5_dl_05008E38[] = {
gsSPLight(&peach_seg5_light_05008D28, 1),
gsSPLight(&peach_seg5_light_05008D20, 2),
gsSPLight(&peach_seg5_lights_05008D20.l, 1),
gsSPLight(&peach_seg5_lights_05008D20.a, 2),
gsSPVertex(peach_seg5_vertex_05008D38, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 3, 4, 5, 0x0, 3, 0, 4, 0x0),
@ -1864,14 +1808,10 @@ const Gfx peach_seg5_dl_05008F20[] = {
};
// 0x05008F48
static const Ambient peach_seg5_light_05008F48 = {
{{0x0b, 0x1a, 0x67}, 0, {0x0b, 0x1a, 0x67}, 0}
};
// 0x05008F50
static const Light peach_seg5_light_05008F50 = {
{{0x16, 0x35, 0xce}, 0, {0x16, 0x35, 0xce}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05008F48 = gdSPDefLights1(
0x0b, 0x1a, 0x67,
0x16, 0x35, 0xce, 0x28, 0x28, 0x28
);
// 0x05008F60
static const Vtx peach_seg5_vertex_05008F60[] = {
@ -1895,8 +1835,8 @@ static const Vtx peach_seg5_vertex_05008F60[] = {
// 0x05009060 - 0x05009148
const Gfx peach_seg5_dl_05009060[] = {
gsSPLight(&peach_seg5_light_05008F50, 1),
gsSPLight(&peach_seg5_light_05008F48, 2),
gsSPLight(&peach_seg5_lights_05008F48.l, 1),
gsSPLight(&peach_seg5_lights_05008F48.a, 2),
gsSPVertex(peach_seg5_vertex_05008F60, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 4, 6, 0x0, 7, 3, 5, 0x0),
@ -1924,14 +1864,10 @@ const Gfx peach_seg5_dl_05009148[] = {
};
// 0x05009170
static const Ambient peach_seg5_light_05009170 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05009178
static const Light peach_seg5_light_05009178 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05009170 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05009188
static const Vtx peach_seg5_vertex_05009188[] = {
@ -1975,8 +1911,8 @@ static const Vtx peach_seg5_vertex_05009288[] = {
// 0x05009388 - 0x05009500
const Gfx peach_seg5_dl_05009388[] = {
gsSPLight(&peach_seg5_light_05009178, 1),
gsSPLight(&peach_seg5_light_05009170, 2),
gsSPLight(&peach_seg5_lights_05009170.l, 1),
gsSPLight(&peach_seg5_lights_05009170.a, 2),
gsSPVertex(peach_seg5_vertex_05009188, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP2Triangles( 4, 5, 0, 0x0, 0, 5, 6, 0x0),
@ -2014,14 +1950,10 @@ const Gfx peach_seg5_dl_05009500[] = {
};
// 0x05009528
static const Ambient peach_seg5_light_05009528 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05009530
static const Light peach_seg5_light_05009530 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05009528 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05009540
static const Vtx peach_seg5_vertex_05009540[] = {
@ -2077,8 +2009,8 @@ static const Vtx peach_seg5_vertex_05009740[] = {
// 0x050097C0 - 0x05009940
const Gfx peach_seg5_dl_050097C0[] = {
gsSPLight(&peach_seg5_light_05009530, 1),
gsSPLight(&peach_seg5_light_05009528, 2),
gsSPLight(&peach_seg5_lights_05009528.l, 1),
gsSPLight(&peach_seg5_lights_05009528.a, 2),
gsSPVertex(peach_seg5_vertex_05009540, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0),
gsSP2Triangles( 5, 0, 2, 0x0, 2, 3, 5, 0x0),
@ -2117,14 +2049,10 @@ const Gfx peach_seg5_dl_05009940[] = {
};
// 0x05009968
static const Ambient peach_seg5_light_05009968 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05009970
static const Light peach_seg5_light_05009970 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 peach_seg5_lights_05009968 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05009980
static const Vtx peach_seg5_vertex_05009980[] = {
@ -2225,8 +2153,8 @@ const Gfx peach_seg5_dl_05009E20[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&peach_seg5_light_05009970, 1),
gsSPLight(&peach_seg5_light_05009968, 2),
gsSPLight(&peach_seg5_lights_05009968.l, 1),
gsSPLight(&peach_seg5_lights_05009968.a, 2),
gsSPVertex(peach_seg5_vertex_05009980, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 4, 2, 1, 0x0, 5, 2, 4, 0x0),

136
actors/penguin/model.inc.c
View File

@ -1,44 +1,28 @@
// Penguin
// 0x05002D80
static const Ambient penguin_seg5_light_05002D80 = {
{{0x06, 0x06, 0x39}, 0, {0x06, 0x06, 0x39}, 0}
};
// 0x05002D88
static const Light penguin_seg5_light_05002D88 = {
{{0x0f, 0x0f, 0x90}, 0, {0x0f, 0x0f, 0x90}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 penguin_seg5_lights_05002D80 = gdSPDefLights1(
0x06, 0x06, 0x39,
0x0f, 0x0f, 0x90, 0x28, 0x28, 0x28
);
// 0x05002D98
static const Ambient penguin_seg5_light_05002D98 = {
{{0x52, 0x34, 0x0a}, 0, {0x52, 0x34, 0x0a}, 0}
};
// 0x05002DA0
static const Light penguin_seg5_light_05002DA0 = {
{{0xce, 0x84, 0x1a}, 0, {0xce, 0x84, 0x1a}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 penguin_seg5_lights_05002D98 = gdSPDefLights1(
0x52, 0x34, 0x0a,
0xce, 0x84, 0x1a, 0x28, 0x28, 0x28
);
// 0x05002DB0
static const Ambient penguin_seg5_light_05002DB0 = {
{{0x59, 0x42, 0x14}, 0, {0x59, 0x42, 0x14}, 0}
};
// 0x05002DB8
static const Light penguin_seg5_light_05002DB8 = {
{{0xdf, 0xa7, 0x34}, 0, {0xdf, 0xa7, 0x34}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 penguin_seg5_lights_05002DB0 = gdSPDefLights1(
0x59, 0x42, 0x14,
0xdf, 0xa7, 0x34, 0x28, 0x28, 0x28
);
// 0x05002DC8
static const Ambient penguin_seg5_light_05002DC8 = {
{{0x66, 0x66, 0x65}, 0, {0x66, 0x66, 0x65}, 0}
};
// 0x05002DD0
static const Light penguin_seg5_light_05002DD0 = {
{{0xff, 0xff, 0xfd}, 0, {0xff, 0xff, 0xfd}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 penguin_seg5_lights_05002DC8 = gdSPDefLights1(
0x66, 0x66, 0x65,
0xff, 0xff, 0xfd, 0x28, 0x28, 0x28
);
// 0x05002DE0
ALIGNED8 static const u8 penguin_seg5_texture_05002DE0[] = {
@ -71,34 +55,22 @@ ALIGNED8 static const u8 penguin_seg5_texture_050055E0[] = {
};
// 0x05005DE0
static const Ambient penguin_seg5_light_05005DE0 = {
{{0x04, 0x0f, 0x41}, 0, {0x04, 0x0f, 0x41}, 0}
};
// 0x05005DE8
static const Light penguin_seg5_light_05005DE8 = {
{{0x0b, 0x26, 0xa4}, 0, {0x0b, 0x26, 0xa4}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 penguin_seg5_lights_05005DE0 = gdSPDefLights1(
0x04, 0x0f, 0x41,
0x0b, 0x26, 0xa4, 0x28, 0x28, 0x28
);
// 0x05005DF8
static const Ambient penguin_seg5_light_05005DF8 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x05005E00
static const Light penguin_seg5_light_05005E00 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 penguin_seg5_lights_05005DF8 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05005E10
static const Ambient penguin_seg5_light_05005E10 = {
{{0x60, 0x55, 0x0b}, 0, {0x60, 0x55, 0x0b}, 0}
};
// 0x05005E18
static const Light penguin_seg5_light_05005E18 = {
{{0xf2, 0xd5, 0x1c}, 0, {0xf2, 0xd5, 0x1c}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 penguin_seg5_lights_05005E10 = gdSPDefLights1(
0x60, 0x55, 0x0b,
0xf2, 0xd5, 0x1c, 0x28, 0x28, 0x28
);
// 0x05005E28
static const Vtx penguin_seg5_vertex_05005E28[] = {
@ -180,8 +152,8 @@ static const Vtx penguin_seg5_vertex_05006158[] = {
// 0x05006188 - 0x050061C8
const Gfx penguin_seg5_dl_05006188[] = {
gsSPLight(&penguin_seg5_light_05005DE8, 1),
gsSPLight(&penguin_seg5_light_05005DE0, 2),
gsSPLight(&penguin_seg5_lights_05005DE0.l, 1),
gsSPLight(&penguin_seg5_lights_05005DE0.a, 2),
gsSPVertex(penguin_seg5_vertex_05005E28, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 6, 5, 0x0),
@ -190,8 +162,8 @@ const Gfx penguin_seg5_dl_05006188[] = {
// 0x050061C8 - 0x050061F8
const Gfx penguin_seg5_dl_050061C8[] = {
gsSPLight(&penguin_seg5_light_05005E00, 1),
gsSPLight(&penguin_seg5_light_05005DF8, 2),
gsSPLight(&penguin_seg5_lights_05005DF8.l, 1),
gsSPLight(&penguin_seg5_lights_05005DF8.a, 2),
gsSPVertex(penguin_seg5_vertex_05005EA8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSPEndDisplayList(),
@ -199,8 +171,8 @@ const Gfx penguin_seg5_dl_050061C8[] = {
// 0x050061F8 - 0x05006380
const Gfx penguin_seg5_dl_050061F8[] = {
gsSPLight(&penguin_seg5_light_05005DE8, 1),
gsSPLight(&penguin_seg5_light_05005DE0, 2),
gsSPLight(&penguin_seg5_lights_05005DE0.l, 1),
gsSPLight(&penguin_seg5_lights_05005DE0.a, 2),
gsSPVertex(penguin_seg5_vertex_05005EE8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 1, 5, 0x0, 1, 4, 6, 0x0),
@ -224,8 +196,8 @@ const Gfx penguin_seg5_dl_050061F8[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 0, 2, 0x0, 5, 2, 3, 0x0),
gsSP2Triangles( 2, 5, 4, 0x0, 4, 5, 6, 0x0),
gsSPLight(&penguin_seg5_light_05005E18, 1),
gsSPLight(&penguin_seg5_light_05005E10, 2),
gsSPLight(&penguin_seg5_lights_05005E10.l, 1),
gsSPLight(&penguin_seg5_lights_05005E10.a, 2),
gsSPVertex(penguin_seg5_vertex_05006158, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPEndDisplayList(),
@ -576,8 +548,8 @@ static const Vtx penguin_seg5_vertex_050070A8[] = {
// 0x05007198 - 0x050071E8
const Gfx penguin_seg5_dl_05007198[] = {
gsSPLight(&penguin_seg5_light_05002D88, 1),
gsSPLight(&penguin_seg5_light_05002D80, 2),
gsSPLight(&penguin_seg5_lights_05002D80.l, 1),
gsSPLight(&penguin_seg5_lights_05002D80.a, 2),
gsSPVertex(penguin_seg5_vertex_05006518, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 3, 0x0, 3, 6, 7, 0x0),
@ -587,8 +559,8 @@ const Gfx penguin_seg5_dl_05007198[] = {
// 0x050071E8 - 0x05007238
const Gfx penguin_seg5_dl_050071E8[] = {
gsSPLight(&penguin_seg5_light_05002D88, 1),
gsSPLight(&penguin_seg5_light_05002D80, 2),
gsSPLight(&penguin_seg5_lights_05002D80.l, 1),
gsSPLight(&penguin_seg5_lights_05002D80.a, 2),
gsSPVertex(penguin_seg5_vertex_050065B8, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 7, 6, 8, 0x0),
@ -598,8 +570,8 @@ const Gfx penguin_seg5_dl_050071E8[] = {
// 0x05007238 - 0x050072C8
const Gfx penguin_seg5_dl_05007238[] = {
gsSPLight(&penguin_seg5_light_05002DA0, 1),
gsSPLight(&penguin_seg5_light_05002D98, 2),
gsSPLight(&penguin_seg5_lights_05002D98.l, 1),
gsSPLight(&penguin_seg5_lights_05002D98.a, 2),
gsSPVertex(penguin_seg5_vertex_05006658, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 7, 2, 0x0),
@ -613,8 +585,8 @@ const Gfx penguin_seg5_dl_05007238[] = {
// 0x050072C8 - 0x05007358
const Gfx penguin_seg5_dl_050072C8[] = {
gsSPLight(&penguin_seg5_light_05002DA0, 1),
gsSPLight(&penguin_seg5_light_05002D98, 2),
gsSPLight(&penguin_seg5_lights_05002D98.l, 1),
gsSPLight(&penguin_seg5_lights_05002D98.a, 2),
gsSPVertex(penguin_seg5_vertex_05006748, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 4, 6, 0x0, 7, 8, 9, 0x0),
@ -628,13 +600,13 @@ const Gfx penguin_seg5_dl_050072C8[] = {
// 0x05007358 - 0x05007540
const Gfx penguin_seg5_dl_05007358[] = {
gsSPLight(&penguin_seg5_light_05002DB8, 1),
gsSPLight(&penguin_seg5_light_05002DB0, 2),
gsSPLight(&penguin_seg5_lights_05002DB0.l, 1),
gsSPLight(&penguin_seg5_lights_05002DB0.a, 2),
gsSPVertex(penguin_seg5_vertex_05006838, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP1Triangle( 1, 4, 3, 0x0),
gsSPLight(&penguin_seg5_light_05002D88, 1),
gsSPLight(&penguin_seg5_light_05002D80, 2),
gsSPLight(&penguin_seg5_lights_05002D80.l, 1),
gsSPLight(&penguin_seg5_lights_05002D80.a, 2),
gsSPVertex(penguin_seg5_vertex_05006888, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 0, 0x0),
@ -662,8 +634,8 @@ const Gfx penguin_seg5_dl_05007358[] = {
gsSPVertex(penguin_seg5_vertex_05006D68, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 7, 4, 0x0),
gsSPLight(&penguin_seg5_light_05002D88, 1),
gsSPLight(&penguin_seg5_light_05002D80, 2),
gsSPLight(&penguin_seg5_lights_05002D80.l, 1),
gsSPLight(&penguin_seg5_lights_05002D80.a, 2),
gsSPVertex(penguin_seg5_vertex_05006DE8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSPEndDisplayList(),
@ -671,8 +643,8 @@ const Gfx penguin_seg5_dl_05007358[] = {
// 0x05007540 - 0x05007708
const Gfx penguin_seg5_dl_05007540[] = {
gsSPLight(&penguin_seg5_light_05002D88, 1),
gsSPLight(&penguin_seg5_light_05002D80, 2),
gsSPLight(&penguin_seg5_lights_05002D80.l, 1),
gsSPLight(&penguin_seg5_lights_05002D80.a, 2),
gsSPVertex(penguin_seg5_vertex_05006E28, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 2, 9, 6, 0x0),
@ -691,8 +663,8 @@ const Gfx penguin_seg5_dl_05007540[] = {
gsSPVertex(penguin_seg5_vertex_05007018, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 2, 8, 0x0),
gsSPLight(&penguin_seg5_light_05002DD0, 1),
gsSPLight(&penguin_seg5_light_05002DC8, 2),
gsSPLight(&penguin_seg5_lights_05002DC8.l, 1),
gsSPLight(&penguin_seg5_lights_05002DC8.a, 2),
gsSPVertex(penguin_seg5_vertex_050070A8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0),
gsSP2Triangles( 5, 2, 6, 0x0, 7, 8, 9, 0x0),

93
actors/piranha_plant/model.inc.c
View File

@ -1,35 +1,22 @@
// Piranha Plant
// 0x060113B0
static const Ambient piranha_plant_seg6_light_060113B0 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x060113B8
static const Light piranha_plant_seg6_light_060113B8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 piranha_plant_seg6_lights_060113B0 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060113C8
static const Ambient piranha_plant_seg6_light_060113C8 = {
{{0x0a, 0x2b, 0x02}, 0, {0x0a, 0x2b, 0x02}, 0}
};
// 0x060113D0
static const Light piranha_plant_seg6_light_060113D0 = {
{{0x2b, 0xae, 0x0a}, 0, {0x2b, 0xae, 0x0a}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 piranha_plant_seg6_lights_060113C8 = gdSPDefLights1(
0x0a, 0x2b, 0x02,
0x2b, 0xae, 0x0a, 0x28, 0x28, 0x28
);
// 0x060113E0
static const Ambient piranha_plant_seg6_light_060113E0 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// 0x060113E8
static const Light piranha_plant_seg6_light_060113E8 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 piranha_plant_seg6_lights_060113E0 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x060113F8
ALIGNED8 static const u8 piranha_plant_seg6_texture_060113F8[] = {
@ -74,8 +61,8 @@ const Gfx piranha_plant_seg6_dl_06015438[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060143F8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_060153F8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -112,8 +99,8 @@ const Gfx piranha_plant_seg6_dl_06015530[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060143F8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_060154F0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -177,8 +164,8 @@ const Gfx piranha_plant_seg6_dl_06015798[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06012BF8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_060155E8, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 3, 4, 1, 0x0, 5, 6, 7, 0x0),
@ -330,8 +317,8 @@ const Gfx piranha_plant_seg6_dl_06015E40[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06013BF8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_060158B0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0),
@ -344,8 +331,8 @@ const Gfx piranha_plant_seg6_dl_06015EA8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060133F8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113D0, 1),
gsSPLight(&piranha_plant_seg6_light_060113C8, 2),
gsSPLight(&piranha_plant_seg6_lights_060113C8.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113C8.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06015990, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 3, 0x0, 3, 5, 8, 0x0),
@ -365,8 +352,8 @@ const Gfx piranha_plant_seg6_dl_06015F68[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060123F8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06015B40, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 7, 0x0, 3, 7, 8, 0x0),
@ -386,8 +373,8 @@ const Gfx piranha_plant_seg6_dl_06015F68[] = {
// 0x06016060 - 0x060160B0
const Gfx piranha_plant_seg6_dl_06016060[] = {
gsSPLight(&piranha_plant_seg6_light_060113E8, 1),
gsSPLight(&piranha_plant_seg6_light_060113E0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113E0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113E0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06015DC0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 5, 3, 0x0, 0, 4, 1, 0x0),
@ -560,8 +547,8 @@ const Gfx piranha_plant_seg6_dl_06016750[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06013BF8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06016190, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0),
@ -574,8 +561,8 @@ const Gfx piranha_plant_seg6_dl_060167B8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060133F8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113D0, 1),
gsSPLight(&piranha_plant_seg6_light_060113C8, 2),
gsSPLight(&piranha_plant_seg6_lights_060113C8.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113C8.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06016270, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 3, 0x0, 7, 6, 5, 0x0),
@ -597,8 +584,8 @@ const Gfx piranha_plant_seg6_dl_06016890[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060123F8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06016490, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 0, 4, 5, 0x0, 0, 3, 4, 0x0),
@ -626,8 +613,8 @@ const Gfx piranha_plant_seg6_dl_06016960[] = {
// 0x060169A8 - 0x060169E8
const Gfx piranha_plant_seg6_dl_060169A8[] = {
gsSPLight(&piranha_plant_seg6_light_060113D0, 1),
gsSPLight(&piranha_plant_seg6_light_060113C8, 2),
gsSPLight(&piranha_plant_seg6_lights_060113C8.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113C8.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_060166E0, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 3, 4, 5, 0x0, 5, 4, 6, 0x0),
@ -695,8 +682,8 @@ const Gfx piranha_plant_seg6_dl_06016BA8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06012BF8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06016AE8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -741,8 +728,8 @@ const Gfx piranha_plant_seg6_dl_06016D30[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06012BF8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06016C70, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -787,8 +774,8 @@ const Gfx piranha_plant_seg6_dl_06016EB8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06012BF8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&piranha_plant_seg6_light_060113B8, 1),
gsSPLight(&piranha_plant_seg6_light_060113B0, 2),
gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1),
gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2),
gsSPVertex(piranha_plant_seg6_vertex_06016DF8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

16
actors/poundable_pole/model.inc.c
View File

@ -1,14 +1,10 @@
// Poundable Pole
// 0x06001038
static const Ambient poundable_pole_seg6_light_06001038 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06001040
static const Light poundable_pole_seg6_light_06001040 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 poundable_pole_seg6_lights_06001038 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06001050
ALIGNED8 static const u8 poundable_pole_seg6_texture_06001050[] = {
@ -83,8 +79,8 @@ const Gfx poundable_pole_seg6_dl_060022F0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, poundable_pole_seg6_texture_06001050),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&poundable_pole_seg6_light_06001040, 1),
gsSPLight(&poundable_pole_seg6_light_06001038, 2),
gsSPLight(&poundable_pole_seg6_lights_06001038.l, 1),
gsSPLight(&poundable_pole_seg6_lights_06001038.a, 2),
gsSPVertex(poundable_pole_seg6_vertex_06002050, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 2, 3, 0x0, 2, 1, 5, 0x0),

16
actors/purple_switch/model.inc.c
View File

@ -1,14 +1,10 @@
// Purple Switch
// 0x0800C090
static const Ambient purple_switch_seg8_light_0800C090 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0800C098
static const Light purple_switch_seg8_light_0800C098 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 purple_switch_seg8_lights_0800C090 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0800C0A8
ALIGNED8 static const u8 purple_switch_seg8_texture_0800C0A8[] = {
@ -53,8 +49,8 @@ const Gfx purple_switch_seg8_dl_0800C668[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, purple_switch_seg8_texture_0800C0A8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 4 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&purple_switch_seg8_light_0800C098, 1),
gsSPLight(&purple_switch_seg8_light_0800C090, 2),
gsSPLight(&purple_switch_seg8_lights_0800C090.l, 1),
gsSPLight(&purple_switch_seg8_lights_0800C090.a, 2),
gsSPVertex(purple_switch_seg8_vertex_0800C528, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

60
actors/scuttlebug/model.inc.c
View File

@ -1,24 +1,16 @@
// Scuttlebug
// Unreferenced light
UNUSED static const Ambient scuttlebug_light_1 = {
{{0x2c, 0x00, 0x00}, 0, {0x2c, 0x00, 0x00}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 scuttlebug_lights_unused1 = gdSPDefLights1(
0x2c, 0x00, 0x00,
0xb2, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light scuttlebug_light_2 = {
{{0xb2, 0x00, 0x00}, 0, {0xb2, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient scuttlebug_light_3 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light scuttlebug_light_4 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 scuttlebug_lights_unused2 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x06010108
ALIGNED8 static const u8 scuttlebug_seg6_texture_06010108[] = {
@ -245,14 +237,10 @@ const Gfx scuttlebug_seg6_dl_06013DA0[] = {
};
// 0x06013E10
static const Ambient scuttlebug_seg6_light_06013E10 = {
{{0x33, 0x22, 0x01}, 0, {0x33, 0x22, 0x01}, 0}
};
// 0x06013E18
static const Light scuttlebug_seg6_light_06013E18 = {
{{0xcf, 0x89, 0x06}, 0, {0xcf, 0x89, 0x06}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 scuttlebug_seg6_lights_06013E10 = gdSPDefLights1(
0x33, 0x22, 0x01,
0xcf, 0x89, 0x06, 0x28, 0x28, 0x28
);
// 0x06013E28
static const Vtx scuttlebug_seg6_vertex_06013E28[] = {
@ -290,8 +278,8 @@ static const Vtx scuttlebug_seg6_vertex_06013F28[] = {
// 0x06013FC8 - 0x060140F0
const Gfx scuttlebug_seg6_dl_06013FC8[] = {
gsSPLight(&scuttlebug_seg6_light_06013E18, 1),
gsSPLight(&scuttlebug_seg6_light_06013E10, 2),
gsSPLight(&scuttlebug_seg6_lights_06013E10.l, 1),
gsSPLight(&scuttlebug_seg6_lights_06013E10.a, 2),
gsSPVertex(scuttlebug_seg6_vertex_06013E28, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 5, 4, 6, 0x0),
@ -394,14 +382,10 @@ const Gfx scuttlebug_seg6_dl_06014270[] = {
};
// 0x060142E0
static const Ambient scuttlebug_seg6_light_060142E0 = {
{{0x26, 0x05, 0x05}, 0, {0x26, 0x05, 0x05}, 0}
};
// 0x060142E8
static const Light scuttlebug_seg6_light_060142E8 = {
{{0x99, 0x16, 0x16}, 0, {0x99, 0x16, 0x16}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 scuttlebug_seg6_lights_060142E0 = gdSPDefLights1(
0x26, 0x05, 0x05,
0x99, 0x16, 0x16, 0x28, 0x28, 0x28
);
// 0x060142F8
static const Vtx scuttlebug_seg6_vertex_060142F8[] = {
@ -413,8 +397,8 @@ static const Vtx scuttlebug_seg6_vertex_060142F8[] = {
// 0x06014338 - 0x06014378
const Gfx scuttlebug_seg6_dl_06014338[] = {
gsSPLight(&scuttlebug_seg6_light_060142E8, 1),
gsSPLight(&scuttlebug_seg6_light_060142E0, 2),
gsSPLight(&scuttlebug_seg6_lights_060142E0.l, 1),
gsSPLight(&scuttlebug_seg6_lights_060142E0.a, 2),
gsSPVertex(scuttlebug_seg6_vertex_060142F8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0),
gsSP2Triangles( 2, 3, 0, 0x0, 1, 0, 3, 0x0),

28
actors/seaweed/model.inc.c
View File

@ -1,14 +1,10 @@
// Seaweed
// 0x06007DF8
static const Ambient seaweed_seg6_light_06007DF8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x06007E00
static const Light seaweed_seg6_light_06007E00 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 seaweed_seg6_lights_06007DF8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06007E10
ALIGNED8 static const u8 seaweed_seg6_texture_06007E10[] = {
@ -43,8 +39,8 @@ const Gfx seaweed_seg6_dl_06009E50[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, seaweed_seg6_texture_06007E10),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&seaweed_seg6_light_06007E00, 1),
gsSPLight(&seaweed_seg6_light_06007DF8, 2),
gsSPLight(&seaweed_seg6_lights_06007DF8.l, 1),
gsSPLight(&seaweed_seg6_lights_06007DF8.a, 2),
gsSPVertex(seaweed_seg6_vertex_06009E10, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -81,8 +77,8 @@ const Gfx seaweed_seg6_dl_06009F48[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, seaweed_seg6_texture_06008610),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&seaweed_seg6_light_06007E00, 1),
gsSPLight(&seaweed_seg6_light_06007DF8, 2),
gsSPLight(&seaweed_seg6_lights_06007DF8.l, 1),
gsSPLight(&seaweed_seg6_lights_06007DF8.a, 2),
gsSPVertex(seaweed_seg6_vertex_06009F08, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@ -119,8 +115,8 @@ const Gfx seaweed_seg6_dl_0600A040[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, seaweed_seg6_texture_06008E10),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&seaweed_seg6_light_06007E00, 1),
gsSPLight(&seaweed_seg6_light_06007DF8, 2),
gsSPLight(&seaweed_seg6_lights_06007DF8.l, 1),
gsSPLight(&seaweed_seg6_lights_06007DF8.a, 2),
gsSPVertex(seaweed_seg6_vertex_0600A000, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -157,8 +153,8 @@ const Gfx seaweed_seg6_dl_0600A138[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, seaweed_seg6_texture_06009610),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&seaweed_seg6_light_06007E00, 1),
gsSPLight(&seaweed_seg6_light_06007DF8, 2),
gsSPLight(&seaweed_seg6_lights_06007DF8.l, 1),
gsSPLight(&seaweed_seg6_lights_06007DF8.a, 2),
gsSPVertex(seaweed_seg6_vertex_0600A0F8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),

100
actors/skeeter/model.inc.c
View File

@ -1,64 +1,40 @@
// Skeeter
// Unreferenced light
UNUSED static const Ambient skeeter_light_1 = {
{{0x3f, 0x20, 0x02}, 0, {0x3f, 0x20, 0x02}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 skeeter_lights_unused1 = gdSPDefLights1(
0x3f, 0x20, 0x02,
0xfc, 0x80, 0x08, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light skeeter_light_2 = {
{{0xfc, 0x80, 0x08}, 0, {0xfc, 0x80, 0x08}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 skeeter_lights_unused2 = gdSPDefLights1(
0x05, 0x05, 0x02,
0x15, 0x15, 0x08, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient skeeter_light_3 = {
{{0x05, 0x05, 0x02}, 0, {0x05, 0x05, 0x02}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 skeeter_lights_unused3 = gdSPDefLights1(
0x03, 0x10, 0x29,
0x0e, 0x40, 0xa4, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light skeeter_light_4 = {
{{0x15, 0x15, 0x08}, 0, {0x15, 0x15, 0x08}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 skeeter_lights_unused4 = gdSPDefLights1(
0x3b, 0x3a, 0x36,
0xef, 0xea, 0xd9, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient skeeter_light_5 = {
{{0x03, 0x10, 0x29}, 0, {0x03, 0x10, 0x29}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 skeeter_lights_unused5 = gdSPDefLights1(
0x33, 0x0c, 0x00,
0xcf, 0x32, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light skeeter_light_6 = {
{{0x0e, 0x40, 0xa4}, 0, {0x0e, 0x40, 0xa4}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient skeeter_light_7 = {
{{0x3b, 0x3a, 0x36}, 0, {0x3b, 0x3a, 0x36}, 0}
};
// Unreferenced light
UNUSED static const Light skeeter_light_8 = {
{{0xef, 0xea, 0xd9}, 0, {0xef, 0xea, 0xd9}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient skeeter_light_9 = {
{{0x33, 0x0c, 0x00}, 0, {0x33, 0x0c, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light skeeter_light_10 = {
{{0xcf, 0x32, 0x00}, 0, {0xcf, 0x32, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient skeeter_light_11 = {
{{0x10, 0x29, 0x20}, 0, {0x10, 0x29, 0x20}, 0}
};
// Unreferenced light
UNUSED static const Light skeeter_light_12 = {
{{0x42, 0xa5, 0x81}, 0, {0x42, 0xa5, 0x81}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 skeeter_lights_unused6 = gdSPDefLights1(
0x10, 0x29, 0x20,
0x42, 0xa5, 0x81, 0x28, 0x28, 0x28
);
// 0x06000090
ALIGNED8 static const u8 skeeter_seg6_texture_06000090[] = {
@ -249,14 +225,10 @@ const Gfx skeeter_seg6_dl_06000D78[] = {
};
// 0x06000DE8
static const Ambient skeeter_seg6_light_06000DE8 = {
{{0x7f, 0x55, 0x00}, 0, {0x7f, 0x55, 0x00}, 0}
};
// 0x06000DF0
static const Light skeeter_seg6_light_06000DF0 = {
{{0xff, 0xaa, 0x00}, 0, {0xff, 0xaa, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 skeeter_seg6_lights_06000DE8 = gdSPDefLights1(
0x7f, 0x55, 0x00,
0xff, 0xaa, 0x00, 0x28, 0x28, 0x28
);
// 0x06000E00
static const Vtx skeeter_seg6_vertex_06000E00[] = {
@ -270,8 +242,8 @@ static const Vtx skeeter_seg6_vertex_06000E00[] = {
// 0x06000E60 - 0x06000EC0
const Gfx skeeter_seg6_dl_06000E60[] = {
gsSPLight(&skeeter_seg6_light_06000DF0, 1),
gsSPLight(&skeeter_seg6_light_06000DE8, 2),
gsSPLight(&skeeter_seg6_lights_06000DE8.l, 1),
gsSPLight(&skeeter_seg6_lights_06000DE8.a, 2),
gsSPVertex(skeeter_seg6_vertex_06000E00, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 1, 3, 4, 0x0),

64
actors/small_key/model.inc.c
View File

@ -4,44 +4,28 @@
UNUSED static const u64 small_key_unused_1 = 0;
// 0x05005798
static const Ambient small_key_seg5_light_05005798 = {
{{0x3f, 0x19, 0x0c}, 0, {0x3f, 0x19, 0x0c}, 0}
};
// 0x050057A0
static const Light small_key_seg5_light_050057A0 = {
{{0xff, 0x64, 0x32}, 0, {0xff, 0x64, 0x32}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 small_key_seg5_lights_05005798 = gdSPDefLights1(
0x3f, 0x19, 0x0c,
0xff, 0x64, 0x32, 0x28, 0x28, 0x28
);
// 0x050057B0
static const Ambient small_key_seg5_light_050057B0 = {
{{0x0c, 0x3f, 0x19}, 0, {0x0c, 0x3f, 0x19}, 0}
};
// 0x050057B8
static const Light small_key_seg5_light_050057B8 = {
{{0x32, 0xff, 0x64}, 0, {0x32, 0xff, 0x64}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 small_key_seg5_lights_050057B0 = gdSPDefLights1(
0x0c, 0x3f, 0x19,
0x32, 0xff, 0x64, 0x28, 0x28, 0x28
);
// 0x050057C8
static const Ambient small_key_seg5_light_050057C8 = {
{{0x0c, 0x19, 0x3f}, 0, {0x0c, 0x19, 0x3f}, 0}
};
// 0x050057D0
static const Light small_key_seg5_light_050057D0 = {
{{0x32, 0x64, 0xff}, 0, {0x32, 0x64, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 small_key_seg5_lights_050057C8 = gdSPDefLights1(
0x0c, 0x19, 0x3f,
0x32, 0x64, 0xff, 0x28, 0x28, 0x28
);
// 0x050057E0
static const Ambient small_key_seg5_light_050057E0 = {
{{0x33, 0x3f, 0x00}, 0, {0x33, 0x3f, 0x00}, 0}
};
// 0x050057E8
static const Light small_key_seg5_light_050057E8 = {
{{0xcc, 0xff, 0x00}, 0, {0xcc, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 small_key_seg5_lights_050057E0 = gdSPDefLights1(
0x33, 0x3f, 0x00,
0xcc, 0xff, 0x00, 0x28, 0x28, 0x28
);
// align
UNUSED static const u64 small_key_unused_2 = 0;
@ -420,32 +404,24 @@ const Gfx small_key_seg5_dl_05006700[] = {
// 0x05006A08 - 0x05006A28
const Gfx small_key_seg5_dl_05006A08[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&small_key_seg5_light_050057D0, 1),
gsSPLight(&small_key_seg5_light_050057C8, 2),
gsSPSetLights1(small_key_seg5_lights_050057C8),
gsSPBranchList(small_key_seg5_dl_05006700),
};
// 0x05006A28 - 0x05006A48
const Gfx small_key_seg5_dl_05006A28[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&small_key_seg5_light_050057B8, 1),
gsSPLight(&small_key_seg5_light_050057B0, 2),
gsSPSetLights1(small_key_seg5_lights_050057B0),
gsSPBranchList(small_key_seg5_dl_05006700),
};
// 0x05006A48 - 0x05006A68
const Gfx small_key_seg5_dl_05006A48[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&small_key_seg5_light_050057A0, 1),
gsSPLight(&small_key_seg5_light_05005798, 2),
gsSPSetLights1(small_key_seg5_lights_05005798),
gsSPBranchList(small_key_seg5_dl_05006700),
};
// 0x05006A68 - 0x05006A88
const Gfx small_key_seg5_dl_05006A68[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&small_key_seg5_light_050057E8, 1),
gsSPLight(&small_key_seg5_light_050057E0, 2),
gsSPSetLights1(small_key_seg5_lights_050057E0),
gsSPBranchList(small_key_seg5_dl_05006700),
};

88
actors/snowman/model.inc.c
View File

@ -3,45 +3,29 @@
// ???
UNUSED static const u64 snowman_unused_1 = 1;
// Unreferenced light
UNUSED static const Ambient snowman_light_1 = {
{{0x0d, 0x0c, 0x28}, 0, {0x0d, 0x0c, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 snowman_lights_unused1 = gdSPDefLights1(
0x0d, 0x0c, 0x28,
0x35, 0x32, 0xa2, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light snowman_light_2 = {
{{0x35, 0x32, 0xa2}, 0, {0x35, 0x32, 0xa2}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 snowman_lights_unused2 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient snowman_light_3 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 snowman_lights_unused3 = gdSPDefLights1(
0x08, 0x07, 0x04,
0x23, 0x1c, 0x12, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light snowman_light_4 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient snowman_light_5 = {
{{0x08, 0x07, 0x04}, 0, {0x08, 0x07, 0x04}, 0}
};
// Unreferenced light
UNUSED static const Light snowman_light_6 = {
{{0x23, 0x1c, 0x12}, 0, {0x23, 0x1c, 0x12}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient snowman_light_7 = {
{{0x03, 0x03, 0x02}, 0, {0x03, 0x03, 0x02}, 0}
};
// Unreferenced light
UNUSED static const Light snowman_light_8 = {
{{0x0e, 0x0d, 0x0b}, 0, {0x0e, 0x0d, 0x0b}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 snowman_lights_unused4 = gdSPDefLights1(
0x03, 0x03, 0x02,
0x0e, 0x0d, 0x0b, 0x28, 0x28, 0x28
);
// 0x05008C70
ALIGNED8 static const u8 snowman_seg5_texture_05008C70[] = {
@ -69,14 +53,10 @@ ALIGNED8 static const u8 snowman_seg5_texture_0500BC70[] = {
};
// 0x0500C470
static const Ambient snowman_seg5_light_0500C470 = {
{{0x1c, 0x0f, 0x07}, 0, {0x1c, 0x0f, 0x07}, 0}
};
// 0x0500C478
static const Light snowman_seg5_light_0500C478 = {
{{0x38, 0x1e, 0x0e}, 0, {0x38, 0x1e, 0x0e}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 snowman_seg5_lights_0500C470 = gdSPDefLights1(
0x1c, 0x0f, 0x07,
0x38, 0x1e, 0x0e, 0x28, 0x28, 0x28
);
// 0x0500C488
static const Vtx snowman_seg5_vertex_0500C488[] = {
@ -88,8 +68,8 @@ static const Vtx snowman_seg5_vertex_0500C488[] = {
// 0x0500C4C8 - 0x0500C500
const Gfx snowman_seg5_dl_0500C4C8[] = {
gsSPLight(&snowman_seg5_light_0500C478, 1),
gsSPLight(&snowman_seg5_light_0500C470, 2),
gsSPLight(&snowman_seg5_lights_0500C470.l, 1),
gsSPLight(&snowman_seg5_lights_0500C470.a, 2),
gsSPVertex(snowman_seg5_vertex_0500C488, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP1Triangle( 0, 3, 1, 0x0),
@ -203,14 +183,10 @@ const Gfx snowman_seg5_dl_0500C760[] = {
};
// 0x0500C7D0
static const Ambient snowman_seg5_light_0500C7D0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C7D8
static const Light snowman_seg5_light_0500C7D8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 snowman_seg5_lights_0500C7D0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C7E8
static const Vtx snowman_seg5_vertex_0500C7E8[] = {
@ -250,8 +226,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)),
gsSPLight(&snowman_seg5_light_0500C7D8, 1),
gsSPLight(&snowman_seg5_light_0500C7D0, 2),
gsSPLight(&snowman_seg5_lights_0500C7D0.l, 1),
gsSPLight(&snowman_seg5_lights_0500C7D0.a, 2),
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),

80
actors/snufit/model.inc.c
View File

@ -21,24 +21,16 @@ ALIGNED8 static const u8 snufit_seg6_texture_060084E0[] = {
};
// 0x06008CE0
static const Ambient snufit_seg6_light_06008CE0 = {
{{0x47, 0x47, 0x47}, 0, {0x47, 0x47, 0x47}, 0}
};
// 0x06008CE8
static const Light snufit_seg6_light_06008CE8 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 snufit_seg6_lights_06008CE0 = gdSPDefLights1(
0x47, 0x47, 0x47,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x06008CF8
static const Ambient snufit_seg6_light_06008CF8 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06008D00
static const Light snufit_seg6_light_06008D00 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 snufit_seg6_lights_06008CF8 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06008D10
static const Vtx snufit_seg6_vertex_06008D10[] = {
@ -146,8 +138,8 @@ const Gfx snufit_seg6_dl_060091E0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snufit_seg6_texture_060080E0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&snufit_seg6_light_06008CE8, 1),
gsSPLight(&snufit_seg6_light_06008CE0, 2),
gsSPLight(&snufit_seg6_lights_06008CE0.l, 1),
gsSPLight(&snufit_seg6_lights_06008CE0.a, 2),
gsSPVertex(snufit_seg6_vertex_06008D10, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 0, 2, 0x0, 3, 5, 1, 0x0),
@ -163,8 +155,8 @@ const Gfx snufit_seg6_dl_06009278[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snufit_seg6_texture_060078E0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&snufit_seg6_light_06008D00, 1),
gsSPLight(&snufit_seg6_light_06008CF8, 2),
gsSPLight(&snufit_seg6_lights_06008CF8.l, 1),
gsSPLight(&snufit_seg6_lights_06008CF8.a, 2),
gsSPVertex(snufit_seg6_vertex_06008DF0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 2, 3, 4, 0x0, 4, 3, 5, 0x0),
@ -231,14 +223,10 @@ const Gfx snufit_seg6_dl_06009498[] = {
};
// 0x06009530
static const Ambient snufit_seg6_light_06009530 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x06009538
static const Light snufit_seg6_light_06009538 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 snufit_seg6_lights_06009530 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06009548
static const Vtx snufit_seg6_vertex_06009548[] = {
@ -271,8 +259,8 @@ const Gfx snufit_seg6_dl_06009668[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snufit_seg6_texture_060080E0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&snufit_seg6_light_06009538, 1),
gsSPLight(&snufit_seg6_light_06009530, 2),
gsSPLight(&snufit_seg6_lights_06009530.l, 1),
gsSPLight(&snufit_seg6_lights_06009530.a, 2),
gsSPVertex(snufit_seg6_vertex_06009548, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 0, 3, 0x0, 1, 5, 2, 0x0),
@ -315,14 +303,10 @@ const Gfx snufit_seg6_dl_06009748[] = {
};
// 0x060097C8
static const Ambient snufit_seg6_light_060097C8 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x060097D0
static const Light snufit_seg6_light_060097D0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 snufit_seg6_lights_060097C8 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x060097E0
static const Vtx snufit_seg6_vertex_060097E0[] = {
@ -345,8 +329,8 @@ const Gfx snufit_seg6_dl_060098A0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snufit_seg6_texture_060080E0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&snufit_seg6_light_060097D0, 1),
gsSPLight(&snufit_seg6_light_060097C8, 2),
gsSPLight(&snufit_seg6_lights_060097C8.l, 1),
gsSPLight(&snufit_seg6_lights_060097C8.a, 2),
gsSPVertex(snufit_seg6_vertex_060097E0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 3, 5, 6, 0x0),
@ -410,14 +394,10 @@ const Gfx snufit_seg6_dl_06009A10[] = {
};
// 0x06009A80
static const Ambient snufit_seg6_light_06009A80 = {
{{0x65, 0x08, 0x08}, 0, {0x65, 0x08, 0x08}, 0}
};
// 0x06009A88
static const Light snufit_seg6_light_06009A88 = {
{{0xfe, 0x14, 0x14}, 0, {0xfe, 0x14, 0x14}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 snufit_seg6_lights_06009A80 = gdSPDefLights1(
0x65, 0x08, 0x08,
0xfe, 0x14, 0x14, 0x28, 0x28, 0x28
);
// 0x06009A98
static const Vtx snufit_seg6_vertex_06009A98[] = {
@ -433,8 +413,8 @@ static const Vtx snufit_seg6_vertex_06009A98[] = {
// 0x06009B18 - 0x06009B68
const Gfx snufit_seg6_dl_06009B18[] = {
gsSPLight(&snufit_seg6_light_06009A88, 1),
gsSPLight(&snufit_seg6_light_06009A80, 2),
gsSPLight(&snufit_seg6_lights_06009A80.l, 1),
gsSPLight(&snufit_seg6_lights_06009A80.a, 2),
gsSPVertex(snufit_seg6_vertex_06009A98, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 1, 0, 3, 0x0, 4, 5, 6, 0x0),

48
actors/spindrift/anims/anim_050006AC.inc.c
View File

@ -199,14 +199,10 @@ const Gfx spindrift_seg5_dl_05002900[] = {
};
// 0x05002970
static const Ambient spindrift_seg5_light_05002970 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05002978
static const Light spindrift_seg5_light_05002978 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spindrift_seg5_lights_05002970 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05002988
static const Vtx spindrift_seg5_vertex_05002988[] = {
@ -222,8 +218,8 @@ const Gfx spindrift_seg5_dl_050029C8[] = {
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPLight(&spindrift_seg5_light_05002978, 1),
gsSPLight(&spindrift_seg5_light_05002970, 2),
gsSPLight(&spindrift_seg5_lights_05002970.l, 1),
gsSPLight(&spindrift_seg5_lights_05002970.a, 2),
gsSPVertex(spindrift_seg5_vertex_05002988, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPSetGeometryMode(G_CULL_BACK),
@ -247,14 +243,10 @@ const Gfx spindrift_seg5_dl_05002A20[] = {
};
// 0x05002A80
static const Ambient spindrift_seg5_light_05002A80 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05002A88
static const Light spindrift_seg5_light_05002A88 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spindrift_seg5_lights_05002A80 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05002A98
static const Vtx spindrift_seg5_vertex_05002A98[] = {
@ -270,8 +262,8 @@ const Gfx spindrift_seg5_dl_05002AD8[] = {
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPLight(&spindrift_seg5_light_05002A88, 1),
gsSPLight(&spindrift_seg5_light_05002A80, 2),
gsSPLight(&spindrift_seg5_lights_05002A80.l, 1),
gsSPLight(&spindrift_seg5_lights_05002A80.a, 2),
gsSPVertex(spindrift_seg5_vertex_05002A98, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSPSetGeometryMode(G_CULL_BACK),
@ -295,14 +287,10 @@ const Gfx spindrift_seg5_dl_05002B30[] = {
};
// 0x05002B90
static const Ambient spindrift_seg5_light_05002B90 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x05002B98
static const Light spindrift_seg5_light_05002B98 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spindrift_seg5_lights_05002B90 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05002BA8
static const Vtx spindrift_seg5_vertex_05002BA8[] = {
@ -329,8 +317,8 @@ const Gfx spindrift_seg5_dl_05002C98[] = {
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPLight(&spindrift_seg5_light_05002B98, 1),
gsSPLight(&spindrift_seg5_light_05002B90, 2),
gsSPLight(&spindrift_seg5_lights_05002B90.l, 1),
gsSPLight(&spindrift_seg5_lights_05002B90.a, 2),
gsSPVertex(spindrift_seg5_vertex_05002BA8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),

120
actors/spindrift/model.inc.c
View File

@ -1,84 +1,52 @@
// Spindrift
// Unreferenced light
UNUSED static const Ambient spindrift_light_1 = {
{{0x3f, 0x08, 0x1b}, 0, {0x3f, 0x08, 0x1b}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 spindrift_lights_unused1 = gdSPDefLights1(
0x3f, 0x08, 0x1b,
0xff, 0x22, 0x6d, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light spindrift_light_2 = {
{{0xff, 0x22, 0x6d}, 0, {0xff, 0x22, 0x6d}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient spindrift_light_3 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light
UNUSED static const Light spindrift_light_4 = {
{{0xfd, 0xff, 0xff}, 0, {0xfd, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 spindrift_lights_unused2 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xfd, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05000030
static const Ambient spindrift_seg5_light_05000030 = {
{{0x12, 0x2c, 0x00}, 0, {0x12, 0x2c, 0x00}, 0}
};
// 0x05000038
static const Light spindrift_seg5_light_05000038 = {
{{0x49, 0xb2, 0x00}, 0, {0x49, 0xb2, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spindrift_seg5_lights_05000030 = gdSPDefLights1(
0x12, 0x2c, 0x00,
0x49, 0xb2, 0x00, 0x28, 0x28, 0x28
);
// 0x05000048
static const Ambient spindrift_seg5_light_05000048 = {
{{0x37, 0x3f, 0x00}, 0, {0x37, 0x3f, 0x00}, 0}
};
static const Lights1 spindrift_seg5_lights_05000048 = gdSPDefLights1(
0x37, 0x3f, 0x00,
0xdd, 0xff, 0x01, 0x28, 0x28, 0x28
);
// 0x05000050
static const Light spindrift_seg5_light_05000050 = {
{{0xdd, 0xff, 0x01}, 0, {0xdd, 0xff, 0x01}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient spindrift_light_5 = {
{{0x00, 0x15, 0x00}, 0, {0x00, 0x15, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light spindrift_light_6 = {
{{0x00, 0x56, 0x00}, 0, {0x00, 0x56, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 spindrift_lights_unused3 = gdSPDefLights1(
0x00, 0x15, 0x00,
0x00, 0x56, 0x00, 0x28, 0x28, 0x28
);
// 0x05000078
static const Ambient spindrift_seg5_light_05000078 = {
{{0x3f, 0x38, 0x00}, 0, {0x3f, 0x38, 0x00}, 0}
};
// 0x05000080
static const Light spindrift_seg5_light_05000080 = {
{{0xff, 0xe2, 0x00}, 0, {0xff, 0xe2, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spindrift_seg5_lights_05000078 = gdSPDefLights1(
0x3f, 0x38, 0x00,
0xff, 0xe2, 0x00, 0x28, 0x28, 0x28
);
// 0x05000090
static const Ambient spindrift_seg5_light_05000090 = {
{{0x00, 0x0f, 0x00}, 0, {0x00, 0x0f, 0x00}, 0}
};
static const Lights1 spindrift_seg5_lights_05000090 = gdSPDefLights1(
0x00, 0x0f, 0x00,
0x00, 0x3f, 0x00, 0x28, 0x28, 0x28
);
// 0x05000098
static const Light spindrift_seg5_light_05000098 = {
{{0x00, 0x3f, 0x00}, 0, {0x00, 0x3f, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient spindrift_light_7 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light spindrift_light_8 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 spindrift_lights_unused4 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x050000C0
static const Vtx spindrift_seg5_vertex_050000C0[] = {
@ -128,14 +96,14 @@ static const Vtx spindrift_seg5_vertex_05000210[] = {
// 0x050002A0 - 0x05000328
const Gfx spindrift_seg5_dl_050002A0[] = {
gsSPLight(&spindrift_seg5_light_05000050, 1),
gsSPLight(&spindrift_seg5_light_05000048, 2),
gsSPLight(&spindrift_seg5_lights_05000048.l, 1),
gsSPLight(&spindrift_seg5_lights_05000048.a, 2),
gsSPVertex(spindrift_seg5_vertex_050000C0, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0),
gsSP2Triangles( 1, 3, 2, 0x0, 4, 5, 2, 0x0),
gsSP1Triangle( 5, 0, 2, 0x0),
gsSPLight(&spindrift_seg5_light_05000038, 1),
gsSPLight(&spindrift_seg5_light_05000030, 2),
gsSPLight(&spindrift_seg5_lights_05000030.l, 1),
gsSPLight(&spindrift_seg5_lights_05000030.a, 2),
gsSPVertex(spindrift_seg5_vertex_05000120, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 1, 0, 4, 0x0, 4, 0, 5, 0x0),
@ -146,15 +114,15 @@ const Gfx spindrift_seg5_dl_050002A0[] = {
// 0x05000328 - 0x050003D8
const Gfx spindrift_seg5_dl_05000328[] = {
gsSPClearGeometryMode(G_CULL_BACK),
gsSPLight(&spindrift_seg5_light_05000098, 1),
gsSPLight(&spindrift_seg5_light_05000090, 2),
gsSPLight(&spindrift_seg5_lights_05000090.l, 1),
gsSPLight(&spindrift_seg5_lights_05000090.a, 2),
gsSPVertex(spindrift_seg5_vertex_05000180, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 0, 4, 3, 0x0, 1, 5, 6, 0x0),
gsSP2Triangles( 7, 4, 0, 0x0, 5, 4, 8, 0x0),
gsSP2Triangles( 5, 1, 3, 0x0, 4, 5, 3, 0x0),
gsSPLight(&spindrift_seg5_light_05000080, 1),
gsSPLight(&spindrift_seg5_light_05000078, 2),
gsSPLight(&spindrift_seg5_lights_05000078.l, 1),
gsSPLight(&spindrift_seg5_lights_05000078.a, 2),
gsSPVertex(spindrift_seg5_vertex_05000210, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 1, 5, 6, 0x0, 5, 7, 8, 0x0),

122
actors/spiny/model.inc.c
View File

@ -1,64 +1,40 @@
// Spiny
// 0x050157F8
static const Ambient spiny_seg5_light_050157F8 = {
{{0x32, 0x23, 0x0a}, 0, {0x32, 0x23, 0x0a}, 0}
};
// 0x05015800
static const Light spiny_seg5_light_05015800 = {
{{0xca, 0x8d, 0x29}, 0, {0xca, 0x8d, 0x29}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spiny_seg5_lights_050157F8 = gdSPDefLights1(
0x32, 0x23, 0x0a,
0xca, 0x8d, 0x29, 0x28, 0x28, 0x28
);
// 0x05015810
static const Ambient spiny_seg5_light_05015810 = {
{{0x3a, 0x2c, 0x1f}, 0, {0x3a, 0x2c, 0x1f}, 0}
};
// 0x05015818
static const Light spiny_seg5_light_05015818 = {
{{0xeb, 0xb0, 0x7f}, 0, {0xeb, 0xb0, 0x7f}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spiny_seg5_lights_05015810 = gdSPDefLights1(
0x3a, 0x2c, 0x1f,
0xeb, 0xb0, 0x7f, 0x28, 0x28, 0x28
);
// 0x05015828
static const Ambient spiny_seg5_light_05015828 = {
{{0x2c, 0x2c, 0x2c}, 0, {0x2c, 0x2c, 0x2c}, 0}
};
// 0x05015830
static const Light spiny_seg5_light_05015830 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spiny_seg5_lights_05015828 = gdSPDefLights1(
0x2c, 0x2c, 0x2c,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// 0x05015840
static const Ambient spiny_seg5_light_05015840 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// 0x05015848
static const Light spiny_seg5_light_05015848 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spiny_seg5_lights_05015840 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x05015858
static const Ambient spiny_seg5_light_05015858 = {
{{0x3d, 0x25, 0x01}, 0, {0x3d, 0x25, 0x01}, 0}
};
// 0x05015860
static const Light spiny_seg5_light_05015860 = {
{{0xf4, 0x96, 0x07}, 0, {0xf4, 0x96, 0x07}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spiny_seg5_lights_05015858 = gdSPDefLights1(
0x3d, 0x25, 0x01,
0xf4, 0x96, 0x07, 0x28, 0x28, 0x28
);
// 0x05015870
static const Ambient spiny_seg5_light_05015870 = {
{{0x3c, 0x2c, 0x09}, 0, {0x3c, 0x2c, 0x09}, 0}
};
// 0x05015878
static const Light spiny_seg5_light_05015878 = {
{{0xf1, 0xb2, 0x25}, 0, {0xf1, 0xb2, 0x25}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spiny_seg5_lights_05015870 = gdSPDefLights1(
0x3c, 0x2c, 0x09,
0xf1, 0xb2, 0x25, 0x28, 0x28, 0x28
);
// 0x05015888
static const Vtx spiny_seg5_vertex_05015888[] = {
@ -311,8 +287,8 @@ static const Vtx spiny_seg5_vertex_05016328[] = {
// 0x05016418 - 0x050164E0
const Gfx spiny_seg5_dl_05016418[] = {
gsSPLight(&spiny_seg5_light_05015800, 1),
gsSPLight(&spiny_seg5_light_050157F8, 2),
gsSPLight(&spiny_seg5_lights_050157F8.l, 1),
gsSPLight(&spiny_seg5_lights_050157F8.a, 2),
gsSPVertex(spiny_seg5_vertex_05015888, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 7, 0x0, 8, 7, 9, 0x0),
@ -321,8 +297,8 @@ const Gfx spiny_seg5_dl_05016418[] = {
gsSP2Triangles( 3, 5, 11, 0x0, 11, 5, 0, 0x0),
gsSP2Triangles( 7, 8, 3, 0x0, 9, 12, 8, 0x0),
gsSP2Triangles( 9, 2, 1, 0x0, 2, 10, 0, 0x0),
gsSPLight(&spiny_seg5_light_05015818, 1),
gsSPLight(&spiny_seg5_light_05015810, 2),
gsSPLight(&spiny_seg5_lights_05015810.l, 1),
gsSPLight(&spiny_seg5_lights_05015810.a, 2),
gsSPVertex(spiny_seg5_vertex_05015958, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 3, 4, 0, 0x0, 1, 5, 2, 0x0),
@ -331,8 +307,8 @@ const Gfx spiny_seg5_dl_05016418[] = {
// 0x050164E0 - 0x050165A8
const Gfx spiny_seg5_dl_050164E0[] = {
gsSPLight(&spiny_seg5_light_05015800, 1),
gsSPLight(&spiny_seg5_light_050157F8, 2),
gsSPLight(&spiny_seg5_lights_050157F8.l, 1),
gsSPLight(&spiny_seg5_lights_050157F8.a, 2),
gsSPVertex(spiny_seg5_vertex_050159B8, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 7, 0x0, 8, 7, 9, 0x0),
@ -341,8 +317,8 @@ const Gfx spiny_seg5_dl_050164E0[] = {
gsSP2Triangles( 3, 5, 11, 0x0, 11, 5, 0, 0x0),
gsSP2Triangles( 7, 8, 3, 0x0, 9, 12, 8, 0x0),
gsSP2Triangles( 9, 2, 1, 0x0, 2, 10, 0, 0x0),
gsSPLight(&spiny_seg5_light_05015818, 1),
gsSPLight(&spiny_seg5_light_05015810, 2),
gsSPLight(&spiny_seg5_lights_05015810.l, 1),
gsSPLight(&spiny_seg5_lights_05015810.a, 2),
gsSPVertex(spiny_seg5_vertex_05015A88, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 3, 4, 0, 0x0, 1, 5, 2, 0x0),
@ -351,8 +327,8 @@ const Gfx spiny_seg5_dl_050164E0[] = {
// 0x050165A8 - 0x05016670
const Gfx spiny_seg5_dl_050165A8[] = {
gsSPLight(&spiny_seg5_light_05015800, 1),
gsSPLight(&spiny_seg5_light_050157F8, 2),
gsSPLight(&spiny_seg5_lights_050157F8.l, 1),
gsSPLight(&spiny_seg5_lights_050157F8.a, 2),
gsSPVertex(spiny_seg5_vertex_05015AE8, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 5, 0x0, 8, 6, 9, 0x0),
@ -361,8 +337,8 @@ const Gfx spiny_seg5_dl_050165A8[] = {
gsSP2Triangles(10, 3, 5, 0x0, 2, 3, 10, 0x0),
gsSP2Triangles( 5, 9, 6, 0x0, 9, 12, 8, 0x0),
gsSP2Triangles( 1, 0, 8, 0x0, 2, 11, 0, 0x0),
gsSPLight(&spiny_seg5_light_05015818, 1),
gsSPLight(&spiny_seg5_light_05015810, 2),
gsSPLight(&spiny_seg5_lights_05015810.l, 1),
gsSPLight(&spiny_seg5_lights_05015810.a, 2),
gsSPVertex(spiny_seg5_vertex_05015BB8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 2, 4, 3, 0x0, 0, 5, 1, 0x0),
@ -371,8 +347,8 @@ const Gfx spiny_seg5_dl_050165A8[] = {
// 0x05016670 - 0x05016738
const Gfx spiny_seg5_dl_05016670[] = {
gsSPLight(&spiny_seg5_light_05015800, 1),
gsSPLight(&spiny_seg5_light_050157F8, 2),
gsSPLight(&spiny_seg5_lights_050157F8.l, 1),
gsSPLight(&spiny_seg5_lights_050157F8.a, 2),
gsSPVertex(spiny_seg5_vertex_05015C18, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 5, 0x0, 8, 6, 9, 0x0),
@ -381,8 +357,8 @@ const Gfx spiny_seg5_dl_05016670[] = {
gsSP2Triangles(10, 3, 5, 0x0, 2, 3, 10, 0x0),
gsSP2Triangles( 5, 9, 6, 0x0, 9, 12, 8, 0x0),
gsSP2Triangles( 1, 0, 8, 0x0, 2, 11, 0, 0x0),
gsSPLight(&spiny_seg5_light_05015818, 1),
gsSPLight(&spiny_seg5_light_05015810, 2),
gsSPLight(&spiny_seg5_lights_05015810.l, 1),
gsSPLight(&spiny_seg5_lights_05015810.a, 2),
gsSPVertex(spiny_seg5_vertex_05015CE8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 2, 4, 3, 0x0, 0, 5, 1, 0x0),
@ -391,8 +367,8 @@ const Gfx spiny_seg5_dl_05016670[] = {
// 0x05016738 - 0x05016A48
const Gfx spiny_seg5_dl_05016738[] = {
gsSPLight(&spiny_seg5_light_05015830, 1),
gsSPLight(&spiny_seg5_light_05015828, 2),
gsSPLight(&spiny_seg5_lights_05015828.l, 1),
gsSPLight(&spiny_seg5_lights_05015828.a, 2),
gsSPVertex(spiny_seg5_vertex_05015D48, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 3, 4, 2, 0x0, 1, 0, 5, 0x0),
@ -413,8 +389,8 @@ const Gfx spiny_seg5_dl_05016738[] = {
gsSPVertex(spiny_seg5_vertex_05015F48, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0),
gsSP2Triangles( 5, 2, 4, 0x0, 4, 2, 1, 0x0),
gsSPLight(&spiny_seg5_light_05015860, 1),
gsSPLight(&spiny_seg5_light_05015858, 2),
gsSPLight(&spiny_seg5_lights_05015858.l, 1),
gsSPLight(&spiny_seg5_lights_05015858.a, 2),
gsSPVertex(spiny_seg5_vertex_05015FA8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0),
gsSP2Triangles( 0, 2, 4, 0x0, 5, 6, 7, 0x0),
@ -426,8 +402,8 @@ const Gfx spiny_seg5_dl_05016738[] = {
gsSP2Triangles( 0, 9, 10, 0x0, 0, 10, 1, 0x0),
gsSP2Triangles( 6, 5, 0, 0x0, 15, 10, 13, 0x0),
gsSP2Triangles( 3, 1, 15, 0x0, 10, 15, 1, 0x0),
gsSPLight(&spiny_seg5_light_05015848, 1),
gsSPLight(&spiny_seg5_light_05015840, 2),
gsSPLight(&spiny_seg5_lights_05015840.l, 1),
gsSPLight(&spiny_seg5_lights_05015840.a, 2),
gsSPVertex(spiny_seg5_vertex_050160A8, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 0, 8, 1, 0x0),
@ -435,8 +411,8 @@ const Gfx spiny_seg5_dl_05016738[] = {
gsSP2Triangles( 3, 5, 9, 0x0, 1, 8, 7, 0x0),
gsSP2Triangles( 3, 9, 2, 0x0, 3, 7, 4, 0x0),
gsSP2Triangles( 4, 7, 6, 0x0, 4, 6, 5, 0x0),
gsSPLight(&spiny_seg5_light_05015878, 1),
gsSPLight(&spiny_seg5_light_05015870, 2),
gsSPLight(&spiny_seg5_lights_05015870.l, 1),
gsSPLight(&spiny_seg5_lights_05015870.a, 2),
gsSPVertex(spiny_seg5_vertex_05016148, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -454,6 +430,6 @@ const Gfx spiny_seg5_dl_05016738[] = {
// 0x05016A48 - 0x05016A58
const Gfx spiny_seg5_dl_05016A48[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPNumLights(NUMLIGHTS_1),
gsSPEndDisplayList(),
};

62
actors/spiny_egg/model.inc.c
View File

@ -1,24 +1,16 @@
// Spiny Egg
// 0x050144F8
static const Ambient spiny_egg_seg5_light_050144F8 = {
{{0x3f, 0x3f, 0x00}, 0, {0x3f, 0x3f, 0x00}, 0}
};
// 0x05014500
static const Light spiny_egg_seg5_light_05014500 = {
{{0xff, 0xff, 0x00}, 0, {0xff, 0xff, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spiny_egg_seg5_lights_050144F8 = gdSPDefLights1(
0x3f, 0x3f, 0x00,
0xff, 0xff, 0x00, 0x28, 0x28, 0x28
);
// 0x05014510
static const Ambient spiny_egg_seg5_light_05014510 = {
{{0x3f, 0x00, 0x00}, 0, {0x3f, 0x00, 0x00}, 0}
};
// 0x05014518
static const Light spiny_egg_seg5_light_05014518 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 spiny_egg_seg5_lights_05014510 = gdSPDefLights1(
0x3f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x05014528
static const Vtx spiny_egg_seg5_vertex_05014528[] = {
@ -286,8 +278,8 @@ static const Vtx spiny_egg_seg5_vertex_050150A8[] = {
// 0x050151A8 - 0x050151E0
const Gfx spiny_egg_seg5_dl_050151A8[] = {
gsSPLight(&spiny_egg_seg5_light_05014500, 1),
gsSPLight(&spiny_egg_seg5_light_050144F8, 2),
gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1),
gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_05014528, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
@ -296,8 +288,8 @@ const Gfx spiny_egg_seg5_dl_050151A8[] = {
// 0x050151E0 - 0x05015218
const Gfx spiny_egg_seg5_dl_050151E0[] = {
gsSPLight(&spiny_egg_seg5_light_05014500, 1),
gsSPLight(&spiny_egg_seg5_light_050144F8, 2),
gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1),
gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_050145B8, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
@ -306,8 +298,8 @@ const Gfx spiny_egg_seg5_dl_050151E0[] = {
// 0x05015218 - 0x05015250
const Gfx spiny_egg_seg5_dl_05015218[] = {
gsSPLight(&spiny_egg_seg5_light_05014500, 1),
gsSPLight(&spiny_egg_seg5_light_050144F8, 2),
gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1),
gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_05014648, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
@ -316,8 +308,8 @@ const Gfx spiny_egg_seg5_dl_05015218[] = {
// 0x05015250 - 0x05015288
const Gfx spiny_egg_seg5_dl_05015250[] = {
gsSPLight(&spiny_egg_seg5_light_05014500, 1),
gsSPLight(&spiny_egg_seg5_light_050144F8, 2),
gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1),
gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_050146D8, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
@ -326,8 +318,8 @@ const Gfx spiny_egg_seg5_dl_05015250[] = {
// 0x05015288 - 0x050152C0
const Gfx spiny_egg_seg5_dl_05015288[] = {
gsSPLight(&spiny_egg_seg5_light_05014500, 1),
gsSPLight(&spiny_egg_seg5_light_050144F8, 2),
gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1),
gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_05014768, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
@ -336,8 +328,8 @@ const Gfx spiny_egg_seg5_dl_05015288[] = {
// 0x050152C0 - 0x050152F8
const Gfx spiny_egg_seg5_dl_050152C0[] = {
gsSPLight(&spiny_egg_seg5_light_05014500, 1),
gsSPLight(&spiny_egg_seg5_light_050144F8, 2),
gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1),
gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_050147F8, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
@ -346,8 +338,8 @@ const Gfx spiny_egg_seg5_dl_050152C0[] = {
// 0x050152F8 - 0x05015330
const Gfx spiny_egg_seg5_dl_050152F8[] = {
gsSPLight(&spiny_egg_seg5_light_05014500, 1),
gsSPLight(&spiny_egg_seg5_light_050144F8, 2),
gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1),
gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_05014888, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
@ -356,8 +348,8 @@ const Gfx spiny_egg_seg5_dl_050152F8[] = {
// 0x05015330 - 0x05015368
const Gfx spiny_egg_seg5_dl_05015330[] = {
gsSPLight(&spiny_egg_seg5_light_05014500, 1),
gsSPLight(&spiny_egg_seg5_light_050144F8, 2),
gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1),
gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_05014918, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
@ -366,8 +358,8 @@ const Gfx spiny_egg_seg5_dl_05015330[] = {
// 0x05015368 - 0x05015740
const Gfx spiny_egg_seg5_dl_05015368[] = {
gsSPLight(&spiny_egg_seg5_light_05014518, 1),
gsSPLight(&spiny_egg_seg5_light_05014510, 2),
gsSPLight(&spiny_egg_seg5_lights_05014510.l, 1),
gsSPLight(&spiny_egg_seg5_lights_05014510.a, 2),
gsSPVertex(spiny_egg_seg5_vertex_050149A8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
@ -437,6 +429,6 @@ const Gfx spiny_egg_seg5_dl_05015368[] = {
// 0x05015740 - 0x05015750
const Gfx spiny_egg_seg5_dl_05015740[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPNumLights(NUMLIGHTS_1),
gsSPEndDisplayList(),
};

24
actors/springboard/model.inc.c
View File

@ -1,14 +1,10 @@
// Springboard (unused)
// 0x05000000
static const Ambient springboard_seg5_light_05000000 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x05000008
static const Light springboard_seg5_light_05000008 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 springboard_seg5_lights_05000000 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05000018
ALIGNED8 static const u8 springboard_seg5_texture_05000018[] = {
@ -171,8 +167,8 @@ const Gfx springboard_checkerboard_seg5_dl_050016B8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, springboard_seg5_texture_05000018),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&springboard_seg5_light_05000008, 1),
gsSPLight(&springboard_seg5_light_05000000, 2),
gsSPLight(&springboard_seg5_lights_05000000.l, 1),
gsSPLight(&springboard_seg5_lights_05000000.a, 2),
gsSPVertex(springboard_seg5_vertex_05001018, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0),
@ -207,8 +203,8 @@ const Gfx springboard_spring_seg5_dl_05001800[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, springboard_seg5_texture_05000818),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&springboard_seg5_light_05000008, 1),
gsSPLight(&springboard_seg5_light_05000000, 2),
gsSPLight(&springboard_seg5_lights_05000000.l, 1),
gsSPLight(&springboard_seg5_lights_05000000.a, 2),
gsSPVertex(springboard_seg5_vertex_050012B8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -238,8 +234,8 @@ const Gfx springboard_checkerboard_seg5_dl_05001900[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, springboard_seg5_texture_05000018),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&springboard_seg5_light_05000008, 1),
gsSPLight(&springboard_seg5_light_05000000, 2),
gsSPLight(&springboard_seg5_lights_05000000.l, 1),
gsSPLight(&springboard_seg5_lights_05000000.a, 2),
gsSPVertex(springboard_seg5_vertex_05001458, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0),

32
actors/star/model.inc.c
View File

@ -1,14 +1,10 @@
// Star
// 0x0302A6D8
static const Ambient star_seg3_light_0302A6D8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0302A6E0
static const Light star_seg3_light_0302A6E0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 star_seg3_lights_0302A6D8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0302A6F0
ALIGNED8 static const u8 star_seg3_texture_0302A6F0[] = {
@ -38,8 +34,8 @@ static const Vtx star_seg3_vertex_0302B6F0[] = {
// 0x0302B7B0 - 0x0302B870
const Gfx star_seg3_dl_0302B7B0[] = {
gsSPLight(&star_seg3_light_0302A6E0, 1),
gsSPLight(&star_seg3_light_0302A6D8, 2),
gsSPLight(&star_seg3_lights_0302A6D8.l, 1),
gsSPLight(&star_seg3_lights_0302A6D8.a, 2),
gsSPVertex(star_seg3_vertex_0302B6F0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 1, 3, 4, 0x0),
@ -72,14 +68,10 @@ const Gfx star_seg3_dl_0302B870[] = {
};
// 0x0302B908
static const Ambient star_seg3_light_0302B908 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0302B910
static const Light star_seg3_light_0302B910 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 star_seg3_lights_0302B908 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0302B920
static const Vtx star_seg3_vertex_0302B920[] = {
@ -100,8 +92,8 @@ const Gfx star_seg3_dl_0302B9C0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, star_seg3_texture_0302AEF0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&star_seg3_light_0302B910, 1),
gsSPLight(&star_seg3_light_0302B908, 2),
gsSPLight(&star_seg3_lights_0302B908.l, 1),
gsSPLight(&star_seg3_lights_0302B908.a, 2),
gsSPVertex(star_seg3_vertex_0302B920, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0),

60
actors/swoop/model.inc.c
View File

@ -1,24 +1,16 @@
// Swoop
// Unreferenced light
UNUSED static const Ambient swoop_light_1 = {
{{0x0a, 0x00, 0x25}, 0, {0x0a, 0x00, 0x25}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 swoop_lights_unused1 = gdSPDefLights1(
0x0a, 0x00, 0x25,
0x2a, 0x00, 0x95, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light swoop_light_2 = {
{{0x2a, 0x00, 0x95}, 0, {0x2a, 0x00, 0x95}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient swoop_light_3 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light
UNUSED static const Light swoop_light_4 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 swoop_lights_unused2 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06004270
ALIGNED8 static const u8 swoop_seg6_texture_06004270[] = {
@ -41,14 +33,10 @@ ALIGNED8 static const u8 swoop_seg6_texture_06005A70[] = {
};
// 0x06006270
static const Ambient swoop_seg6_light_06006270 = {
{{0x79, 0x79, 0x79}, 0, {0x79, 0x79, 0x79}, 0}
};
// 0x06006278
static const Light swoop_seg6_light_06006278 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 swoop_seg6_lights_06006270 = gdSPDefLights1(
0x79, 0x79, 0x79,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06006288
static const Vtx swoop_seg6_vertex_06006288[] = {
@ -122,8 +110,8 @@ const Gfx swoop_seg6_dl_060065B8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, swoop_seg6_texture_06004A70),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&swoop_seg6_light_06006278, 1),
gsSPLight(&swoop_seg6_light_06006270, 2),
gsSPLight(&swoop_seg6_lights_06006270.l, 1),
gsSPLight(&swoop_seg6_lights_06006270.a, 2),
gsSPVertex(swoop_seg6_vertex_06006288, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 3, 0x0, 3, 7, 4, 0x0),
@ -231,14 +219,10 @@ const Gfx swoop_seg6_dl_06006880[] = {
};
// 0x06006938
static const Ambient swoop_seg6_light_06006938 = {
{{0x79, 0x79, 0x79}, 0, {0x79, 0x79, 0x79}, 0}
};
// 0x06006940
static const Light swoop_seg6_light_06006940 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 swoop_seg6_lights_06006938 = gdSPDefLights1(
0x79, 0x79, 0x79,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06006950
static const Vtx swoop_seg6_vertex_06006950[] = {
@ -265,8 +249,8 @@ const Gfx swoop_seg6_dl_06006A10[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, swoop_seg6_texture_06005270),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&swoop_seg6_light_06006940, 1),
gsSPLight(&swoop_seg6_light_06006938, 2),
gsSPLight(&swoop_seg6_lights_06006938.l, 1),
gsSPLight(&swoop_seg6_lights_06006938.a, 2),
gsSPVertex(swoop_seg6_vertex_06006950, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),

16
actors/test_platform/model.inc.c
View File

@ -1,14 +1,10 @@
// Test Platform (small tiny platform 1/4th the size of a box. Probably used in early modeling tests?)
// 0x08026008
static const Ambient unknown_seg8_light_08026008 = {
{{0x32, 0x32, 0x07}, 0, {0x32, 0x32, 0x07}, 0}
};
// 0x08026010
static const Light unknown_seg8_light_08026010 = {
{{0xc8, 0xc8, 0x1e}, 0, {0xc8, 0xc8, 0x1e}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 unknown_seg8_lights_08026008 = gdSPDefLights1(
0x32, 0x32, 0x07,
0xc8, 0xc8, 0x1e, 0x28, 0x28, 0x28
);
// 0x08026020
static const Vtx unknown_seg8_vertex_08026020[] = {
@ -60,9 +56,7 @@ static const Vtx unknown_seg8_vertex_08026200[] = {
// 0x08026260 - 0x080262F8
const Gfx unknown_seg8_dl_08026260[] = {
gsSPNumLights(NUMLIGHTS_0), // I cannot tell if they meant to put 0 or 1 here.
gsSPLight(&unknown_seg8_light_08026010, 1),
gsSPLight(&unknown_seg8_light_08026008, 2),
gsSPSetLights1(unknown_seg8_lights_08026008),
gsSPVertex(unknown_seg8_vertex_08026020, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),

16
actors/thwomp/model.inc.c
View File

@ -1,14 +1,10 @@
// Thwomp
// 0x050098E8
static const Ambient thwomp_seg5_light_050098E8 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x050098F0
static const Light thwomp_seg5_light_050098F0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 thwomp_seg5_lights_050098E8 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x05009900
ALIGNED8 static const u8 thwomp_seg5_texture_05009900[] = {
@ -120,8 +116,8 @@ const Gfx thwomp_seg5_dl_0500B570[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, thwomp_seg5_texture_0500A900),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&thwomp_seg5_light_050098F0, 1),
gsSPLight(&thwomp_seg5_light_050098E8, 2),
gsSPLight(&thwomp_seg5_lights_050098E8.l, 1),
gsSPLight(&thwomp_seg5_lights_050098E8.a, 2),
gsSPVertex(thwomp_seg5_vertex_0500B100, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP2Triangles( 0, 3, 4, 0x0, 0, 4, 5, 0x0),

128
actors/toad/model.inc.c
View File

@ -1,14 +1,10 @@
// Toad
// 0x06005908
static const Ambient toad_seg6_light_06005908 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06005910
static const Light toad_seg6_light_06005910 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 toad_seg6_lights_06005908 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06005920
ALIGNED8 static const u8 toad_seg6_texture_06005920[] = {
@ -227,8 +223,8 @@ const Gfx toad_seg6_dl_06007300[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, toad_seg6_texture_06005920),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&toad_seg6_light_06005910, 1),
gsSPLight(&toad_seg6_light_06005908, 2),
gsSPLight(&toad_seg6_lights_06005908.l, 1),
gsSPLight(&toad_seg6_lights_06005908.a, 2),
gsSPVertex(toad_seg6_vertex_06006920, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 2, 4, 0, 0x0, 0, 5, 6, 0x0),
@ -354,14 +350,10 @@ const Gfx toad_seg6_us_dl_06007788[] = {
#endif
// 0x06007788
static const Ambient toad_seg6_light_06007788 = {
{{0x21, 0x13, 0x5a}, 0, {0x21, 0x13, 0x5a}, 0}
};
// 0x06007790
static const Light toad_seg6_light_06007790 = {
{{0x42, 0x27, 0xb5}, 0, {0x42, 0x27, 0xb5}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 toad_seg6_lights_06007788 = gdSPDefLights1(
0x21, 0x13, 0x5a,
0x42, 0x27, 0xb5, 0x28, 0x28, 0x28
);
// 0x060077A0
static const Vtx toad_seg6_vertex_060077A0[] = {
@ -401,8 +393,8 @@ static const Vtx toad_seg6_vertex_060078A0[] = {
// 0x06007960 - 0x06007A48
const Gfx toad_seg6_dl_06007960[] = {
gsSPLight(&toad_seg6_light_06007790, 1),
gsSPLight(&toad_seg6_light_06007788, 2),
gsSPLight(&toad_seg6_lights_06007788.l, 1),
gsSPLight(&toad_seg6_lights_06007788.a, 2),
gsSPVertex(toad_seg6_vertex_060077A0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 8, 0x0),
@ -443,24 +435,16 @@ const Gfx toad_seg6_us_dl_06007B00[] = {
#endif
// 0x06007A80
static const Ambient toad_seg6_light_06007A80 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06007A88
static const Light toad_seg6_light_06007A88 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 toad_seg6_lights_06007A80 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06007A98
static const Ambient toad_seg6_light_06007A98 = {
{{0x7f, 0x6a, 0x50}, 0, {0x7f, 0x6a, 0x50}, 0}
};
// 0x06007AA0
static const Light toad_seg6_light_06007AA0 = {
{{0xfe, 0xd5, 0xa1}, 0, {0xfe, 0xd5, 0xa1}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 toad_seg6_lights_06007A98 = gdSPDefLights1(
0x7f, 0x6a, 0x50,
0xfe, 0xd5, 0xa1, 0x28, 0x28, 0x28
);
// 0x06007AB0
static const Vtx toad_seg6_vertex_06007AB0[] = {
@ -514,8 +498,8 @@ static const Vtx toad_seg6_vertex_06007C50[] = {
// 0x06007D10 - 0x06007EB0
const Gfx toad_seg6_dl_06007D10[] = {
gsSPLight(&toad_seg6_light_06007A88, 1),
gsSPLight(&toad_seg6_light_06007A80, 2),
gsSPLight(&toad_seg6_lights_06007A80.l, 1),
gsSPLight(&toad_seg6_lights_06007A80.a, 2),
gsSPVertex(toad_seg6_vertex_06007AB0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 7, 0x0),
@ -534,8 +518,8 @@ const Gfx toad_seg6_dl_06007D10[] = {
gsSP2Triangles( 5, 9, 0, 0x0, 0, 9, 1, 0x0),
gsSP2Triangles(11, 6, 0, 0x0, 11, 0, 2, 0x0),
gsSP1Triangle( 0, 6, 5, 0x0),
gsSPLight(&toad_seg6_light_06007AA0, 1),
gsSPLight(&toad_seg6_light_06007A98, 2),
gsSPLight(&toad_seg6_lights_06007A98.l, 1),
gsSPLight(&toad_seg6_lights_06007A98.a, 2),
gsSPVertex(toad_seg6_vertex_06007C50, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 4, 2, 1, 0x0, 4, 1, 5, 0x0),
@ -557,14 +541,10 @@ const Gfx toad_seg6_dl_06007EB0[] = {
};
// 0x06007ED8
static const Ambient toad_seg6_light_06007ED8 = {
{{0x7f, 0x6a, 0x50}, 0, {0x7f, 0x6a, 0x50}, 0}
};
// 0x06007EE0
static const Light toad_seg6_light_06007EE0 = {
{{0xfe, 0xd5, 0xa1}, 0, {0xfe, 0xd5, 0xa1}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 toad_seg6_lights_06007ED8 = gdSPDefLights1(
0x7f, 0x6a, 0x50,
0xfe, 0xd5, 0xa1, 0x28, 0x28, 0x28
);
// 0x06007EF0
static const Vtx toad_seg6_vertex_06007EF0[] = {
@ -605,8 +585,8 @@ static const Vtx toad_seg6_vertex_06007FF0[] = {
// 0x060080C0 - 0x060081F8
const Gfx toad_seg6_dl_060080C0[] = {
gsSPLight(&toad_seg6_light_06007EE0, 1),
gsSPLight(&toad_seg6_light_06007ED8, 2),
gsSPLight(&toad_seg6_lights_06007ED8.l, 1),
gsSPLight(&toad_seg6_lights_06007ED8.a, 2),
gsSPVertex(toad_seg6_vertex_06007EF0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 0, 2, 4, 0x0, 4, 3, 0, 0x0),
@ -639,14 +619,10 @@ const Gfx toad_seg6_dl_060081F8[] = {
};
// 0x06008220
static const Ambient toad_seg6_light_06008220 = {
{{0x7f, 0x6a, 0x50}, 0, {0x7f, 0x6a, 0x50}, 0}
};
// 0x06008228
static const Light toad_seg6_light_06008228 = {
{{0xfe, 0xd5, 0xa1}, 0, {0xfe, 0xd5, 0xa1}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 toad_seg6_lights_06008220 = gdSPDefLights1(
0x7f, 0x6a, 0x50,
0xfe, 0xd5, 0xa1, 0x28, 0x28, 0x28
);
// 0x06008238
static const Vtx toad_seg6_vertex_06008238[] = {
@ -685,8 +661,8 @@ static const Vtx toad_seg6_vertex_06008338[] = {
// 0x060083E8 - 0x06008520
const Gfx toad_seg6_dl_060083E8[] = {
gsSPLight(&toad_seg6_light_06008228, 1),
gsSPLight(&toad_seg6_light_06008220, 2),
gsSPLight(&toad_seg6_lights_06008220.l, 1),
gsSPLight(&toad_seg6_lights_06008220.a, 2),
gsSPVertex(toad_seg6_vertex_06008238, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP2Triangles( 5, 1, 0, 0x0, 0, 4, 6, 0x0),
@ -738,14 +714,10 @@ const Gfx toad_seg6_us_dl_06008608[] = {
#endif
// 0x06008560
static const Ambient toad_seg6_light_06008560 = {
{{0x34, 0x20, 0x0d}, 0, {0x34, 0x20, 0x0d}, 0}
};
// 0x06008568
static const Light toad_seg6_light_06008568 = {
{{0x68, 0x40, 0x1b}, 0, {0x68, 0x40, 0x1b}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 toad_seg6_lights_06008560 = gdSPDefLights1(
0x34, 0x20, 0x0d,
0x68, 0x40, 0x1b, 0x28, 0x28, 0x28
);
// 0x06008578
static const Vtx toad_seg6_vertex_06008578[] = {
@ -786,8 +758,8 @@ static const Vtx toad_seg6_vertex_06008678[] = {
// 0x06008748 - 0x06008890
const Gfx toad_seg6_dl_06008748[] = {
gsSPLight(&toad_seg6_light_06008568, 1),
gsSPLight(&toad_seg6_light_06008560, 2),
gsSPLight(&toad_seg6_lights_06008560.l, 1),
gsSPLight(&toad_seg6_lights_06008560.a, 2),
gsSPVertex(toad_seg6_vertex_06008578, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 6, 0x0),
@ -822,14 +794,10 @@ const Gfx toad_seg6_dl_06008890[] = {
};
// 0x060088B8
static const Ambient toad_seg6_light_060088B8 = {
{{0x34, 0x20, 0x0d}, 0, {0x34, 0x20, 0x0d}, 0}
};
// 0x060088C0
static const Light toad_seg6_light_060088C0 = {
{{0x68, 0x40, 0x1b}, 0, {0x68, 0x40, 0x1b}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 toad_seg6_lights_060088B8 = gdSPDefLights1(
0x34, 0x20, 0x0d,
0x68, 0x40, 0x1b, 0x28, 0x28, 0x28
);
// 0x060088D0
static const Vtx toad_seg6_vertex_060088D0[] = {
@ -869,8 +837,8 @@ static const Vtx toad_seg6_vertex_060089D0[] = {
// 0x06008A90 - 0x06008BD8
const Gfx toad_seg6_dl_06008A90[] = {
gsSPLight(&toad_seg6_light_060088C0, 1),
gsSPLight(&toad_seg6_light_060088B8, 2),
gsSPLight(&toad_seg6_lights_060088B8.l, 1),
gsSPLight(&toad_seg6_lights_060088B8.a, 2),
gsSPVertex(toad_seg6_vertex_060088D0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 4, 1, 0x0, 0, 2, 5, 0x0),

16
actors/tornado/model.inc.c
View File

@ -6,14 +6,10 @@ ALIGNED8 static const u8 tornado_seg5_texture_05013128[] = {
};
// 0x05014128
static const Ambient tornado_seg5_light_05014128 = {
{{0x3b, 0x34, 0x23}, 0, {0x3b, 0x34, 0x23}, 0}
};
// 0x05014130
static const Light tornado_seg5_light_05014130 = {
{{0xee, 0xd0, 0x8d}, 0, {0xee, 0xd0, 0x8d}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 tornado_seg5_lights_05014128 = gdSPDefLights1(
0x3b, 0x34, 0x23,
0xee, 0xd0, 0x8d, 0x28, 0x28, 0x28
);
// 0x05014140
static const Vtx tornado_seg5_vertex_05014140[] = {
@ -85,8 +81,8 @@ const Gfx tornado_seg5_dl_05014450[] = {
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, tornado_seg5_texture_05013128),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&tornado_seg5_light_05014130, 1),
gsSPLight(&tornado_seg5_light_05014128, 2),
gsSPLight(&tornado_seg5_lights_05014128.l, 1),
gsSPLight(&tornado_seg5_lights_05014128.a, 2),
gsSPVertex(tornado_seg5_vertex_05014140, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 0, 5, 6, 0x0, 0, 6, 1, 0x0),

16
actors/transparent_star/model.inc.c
View File

@ -1,14 +1,10 @@
// Transparent Star
// 0x0302C488
static const Ambient transparent_star_seg3_light_0302C488 = {
{{0x03, 0x05, 0x17}, 0, {0x03, 0x05, 0x17}, 0}
};
// 0x0302C490
static const Light transparent_star_seg3_light_0302C490 = {
{{0x1e, 0x32, 0xe6}, 0, {0x1e, 0x32, 0xe6}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 transparent_star_seg3_lights_0302C488 = gdSPDefLights1(
0x03, 0x05, 0x17,
0x1e, 0x32, 0xe6, 0x28, 0x28, 0x28
);
// 0x0302C4A0
static const Vtx transparent_star_seg3_vertex_0302C4A0[] = {
@ -28,8 +24,8 @@ static const Vtx transparent_star_seg3_vertex_0302C4A0[] = {
// 0x0302C560 - 0x0302C620
const Gfx transparent_star_seg3_dl_0302C560[] = {
gsSPLight(&transparent_star_seg3_light_0302C490, 1),
gsSPLight(&transparent_star_seg3_light_0302C488, 2),
gsSPLight(&transparent_star_seg3_lights_0302C488.l, 1),
gsSPLight(&transparent_star_seg3_lights_0302C488.a, 2),
gsSPVertex(transparent_star_seg3_vertex_0302C4A0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 1, 3, 4, 0x0),

20
actors/treasure_chest/model.inc.c
View File

@ -1,14 +1,10 @@
// Treasure Chest
// 0x06013F90
static const Ambient treasure_chest_seg6_light_06013F90 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x06013F98
static const Light treasure_chest_seg6_light_06013F98 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 treasure_chest_seg6_lights_06013F90 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06013FA8
ALIGNED8 static const u8 treasure_chest_seg6_texture_06013FA8[] = {
@ -158,8 +154,8 @@ const Gfx treasure_chest_seg6_dl_06016D58[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, treasure_chest_seg6_texture_06013FA8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&treasure_chest_seg6_light_06013F98, 1),
gsSPLight(&treasure_chest_seg6_light_06013F90, 2),
gsSPLight(&treasure_chest_seg6_lights_06013F90.l, 1),
gsSPLight(&treasure_chest_seg6_lights_06013F90.a, 2),
gsSPVertex(treasure_chest_seg6_vertex_060167A8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@ -381,8 +377,8 @@ const Gfx treasure_chest_seg6_dl_06017680[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, treasure_chest_seg6_texture_060147A8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&treasure_chest_seg6_light_06013F98, 1),
gsSPLight(&treasure_chest_seg6_light_06013F90, 2),
gsSPLight(&treasure_chest_seg6_lights_06013F90.l, 1),
gsSPLight(&treasure_chest_seg6_lights_06013F90.a, 2),
gsSPVertex(treasure_chest_seg6_vertex_06017030, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 0, 3, 4, 0x0, 5, 6, 7, 0x0),

28
actors/tree/model.inc.c
View File

@ -1,14 +1,10 @@
// Tree
// 0x0302DE10
static const Ambient tree_seg3_light_0302DE10 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0302DE18
static const Light tree_seg3_light_0302DE18 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 tree_seg3_lights_0302DE10 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0302DE28
ALIGNED8 static const u8 tree_seg3_texture_0302DE28[] = {
@ -99,8 +95,8 @@ const Gfx tree_seg3_dl_03030FA0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, tree_seg3_texture_0302FF60),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&tree_seg3_light_0302DE18, 1),
gsSPLight(&tree_seg3_light_0302DE10, 2),
gsSPLight(&tree_seg3_lights_0302DE10.l, 1),
gsSPLight(&tree_seg3_lights_0302DE10.a, 2),
gsSPVertex(tree_seg3_vertex_03030F60, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@ -136,8 +132,8 @@ const Gfx tree_seg3_dl_03032088[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, tree_seg3_texture_03031048),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&tree_seg3_light_0302DE18, 1),
gsSPLight(&tree_seg3_light_0302DE10, 2),
gsSPLight(&tree_seg3_lights_0302DE10.l, 1),
gsSPLight(&tree_seg3_lights_0302DE10.a, 2),
gsSPVertex(tree_seg3_vertex_03032048, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@ -168,8 +164,8 @@ const Gfx tree_seg3_dl_03032170[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, tree_seg3_texture_0302FF60),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&tree_seg3_light_0302DE18, 1),
gsSPLight(&tree_seg3_light_0302DE10, 2),
gsSPLight(&tree_seg3_lights_0302DE10.l, 1),
gsSPLight(&tree_seg3_lights_0302DE10.a, 2),
gsSPVertex(tree_seg3_vertex_03032130, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@ -205,8 +201,8 @@ const Gfx tree_seg3_dl_03033258[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, tree_seg3_texture_03032218),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&tree_seg3_light_0302DE18, 1),
gsSPLight(&tree_seg3_light_0302DE10, 2),
gsSPLight(&tree_seg3_lights_0302DE10.l, 1),
gsSPLight(&tree_seg3_lights_0302DE10.a, 2),
gsSPVertex(tree_seg3_vertex_03033218, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),

280
actors/ukiki/model.inc.c
View File

@ -1,34 +1,22 @@
// Ukiki
// Unreferenced light
UNUSED static const Ambient ukiki_light_1 = {
{{0x1d, 0x12, 0x07}, 0, {0x1d, 0x12, 0x07}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 ukiki_lights_unused1 = gdSPDefLights1(
0x1d, 0x12, 0x07,
0x77, 0x48, 0x1f, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light ukiki_light_2 = {
{{0x77, 0x48, 0x1f}, 0, {0x77, 0x48, 0x1f}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient ukiki_light_3 = {
{{0x39, 0x24, 0x18}, 0, {0x39, 0x24, 0x18}, 0}
};
// Unreferenced light
UNUSED static const Light ukiki_light_4 = {
{{0xe7, 0x93, 0x61}, 0, {0xe7, 0x93, 0x61}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 ukiki_lights_unused2 = gdSPDefLights1(
0x39, 0x24, 0x18,
0xe7, 0x93, 0x61, 0x28, 0x28, 0x28
);
// 0x05007BA0
static const Ambient ukiki_seg5_light_05007BA0 = {
{{0x39, 0x24, 0x18}, 0, {0x39, 0x24, 0x18}, 0}
};
// 0x05007BA8
static const Light ukiki_seg5_light_05007BA8 = {
{{0xe7, 0x93, 0x61}, 0, {0xe7, 0x93, 0x61}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_05007BA0 = gdSPDefLights1(
0x39, 0x24, 0x18,
0xe7, 0x93, 0x61, 0x28, 0x28, 0x28
);
// The hell?
UNUSED static const u64 ukiki_unused_1 = 1;
@ -54,24 +42,16 @@ ALIGNED8 static const u8 ukiki_seg5_texture_0500A3C0[] = {
};
// 0x0500ABC0
static const Ambient ukiki_seg5_light_0500ABC0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500ABC8
static const Light ukiki_seg5_light_0500ABC8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500ABC0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500ABD8
static const Ambient ukiki_seg5_light_0500ABD8 = {
{{0x77, 0x66, 0x45}, 0, {0x77, 0x66, 0x45}, 0}
};
// 0x0500ABE0
static const Light ukiki_seg5_light_0500ABE0 = {
{{0xee, 0xcd, 0x8a}, 0, {0xee, 0xcd, 0x8a}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500ABD8 = gdSPDefLights1(
0x77, 0x66, 0x45,
0xee, 0xcd, 0x8a, 0x28, 0x28, 0x28
);
// 0x0500ABF0
static const Vtx ukiki_seg5_vertex_0500ABF0[] = {
@ -164,8 +144,8 @@ static const Vtx ukiki_seg5_vertex_0500AF60[] = {
// 0x0500B040 - 0x0500B1D8
const Gfx ukiki_seg5_dl_0500B040[] = {
gsSPLight(&ukiki_seg5_light_0500ABC8, 1),
gsSPLight(&ukiki_seg5_light_0500ABC0, 2),
gsSPLight(&ukiki_seg5_lights_0500ABC0.l, 1),
gsSPLight(&ukiki_seg5_lights_0500ABC0.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500ABF0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 5, 2, 4, 0x0),
@ -198,8 +178,8 @@ const Gfx ukiki_seg5_dl_0500B040[] = {
// 0x0500B1D8 - 0x0500B278
const Gfx ukiki_seg5_dl_0500B1D8[] = {
gsSPLight(&ukiki_seg5_light_0500ABE0, 1),
gsSPLight(&ukiki_seg5_light_0500ABD8, 2),
gsSPLight(&ukiki_seg5_lights_0500ABD8.l, 1),
gsSPLight(&ukiki_seg5_lights_0500ABD8.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500AF60, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 2, 4, 0, 0x0, 5, 6, 4, 0x0),
@ -253,14 +233,10 @@ const Gfx ukiki_seg5_dl_0500B310[] = {
};
// 0x0500B338
static const Ambient ukiki_seg5_light_0500B338 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500B340
static const Light ukiki_seg5_light_0500B340 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500B338 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500B350
static const Vtx ukiki_seg5_vertex_0500B350[] = {
@ -332,8 +308,8 @@ const Gfx ukiki_seg5_dl_0500B660[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500B340, 1),
gsSPLight(&ukiki_seg5_light_0500B338, 2),
gsSPLight(&ukiki_seg5_lights_0500B338.l, 1),
gsSPLight(&ukiki_seg5_lights_0500B338.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500B350, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 3, 0, 4, 0x0, 3, 5, 6, 0x0),
@ -389,14 +365,10 @@ const Gfx ukiki_seg5_dl_0500B820[] = {
};
// 0x0500B888
static const Ambient ukiki_seg5_light_0500B888 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500B890
static const Light ukiki_seg5_light_0500B890 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500B888 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500B8A0
static const Vtx ukiki_seg5_vertex_0500B8A0[] = {
@ -415,8 +387,8 @@ const Gfx ukiki_seg5_dl_0500B920[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500B890, 1),
gsSPLight(&ukiki_seg5_light_0500B888, 2),
gsSPLight(&ukiki_seg5_lights_0500B888.l, 1),
gsSPLight(&ukiki_seg5_lights_0500B888.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500B8A0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 4, 6, 5, 0x0),
@ -441,14 +413,10 @@ const Gfx ukiki_seg5_dl_0500B988[] = {
};
// 0x0500B9E8
static const Ambient ukiki_seg5_light_0500B9E8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500B9F0
static const Light ukiki_seg5_light_0500B9F0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500B9E8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500BA00
static const Vtx ukiki_seg5_vertex_0500BA00[] = {
@ -468,8 +436,8 @@ const Gfx ukiki_seg5_dl_0500BA90[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500B9F0, 1),
gsSPLight(&ukiki_seg5_light_0500B9E8, 2),
gsSPLight(&ukiki_seg5_lights_0500B9E8.l, 1),
gsSPLight(&ukiki_seg5_lights_0500B9E8.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500BA00, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0),
gsSP2Triangles( 1, 5, 6, 0x0, 1, 6, 2, 0x0),
@ -497,14 +465,10 @@ const Gfx ukiki_seg5_dl_0500BB28[] = {
};
// 0x0500BB88
static const Ambient ukiki_seg5_light_0500BB88 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500BB90
static const Light ukiki_seg5_light_0500BB90 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500BB88 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500BBA0
static const Vtx ukiki_seg5_vertex_0500BBA0[] = {
@ -522,8 +486,8 @@ const Gfx ukiki_seg5_dl_0500BC10[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500BB90, 1),
gsSPLight(&ukiki_seg5_light_0500BB88, 2),
gsSPLight(&ukiki_seg5_lights_0500BB88.l, 1),
gsSPLight(&ukiki_seg5_lights_0500BB88.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500BBA0, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 2, 4, 3, 0x0, 2, 5, 4, 0x0),
@ -548,14 +512,10 @@ const Gfx ukiki_seg5_dl_0500BC78[] = {
};
// 0x0500BCD8
static const Ambient ukiki_seg5_light_0500BCD8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500BCE0
static const Light ukiki_seg5_light_0500BCE0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500BCD8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500BCF0
static const Vtx ukiki_seg5_vertex_0500BCF0[] = {
@ -577,8 +537,8 @@ const Gfx ukiki_seg5_dl_0500BDA0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500BCE0, 1),
gsSPLight(&ukiki_seg5_light_0500BCD8, 2),
gsSPLight(&ukiki_seg5_lights_0500BCD8.l, 1),
gsSPLight(&ukiki_seg5_lights_0500BCD8.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500BCF0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 0, 3, 5, 0x0, 0, 2, 6, 0x0),
@ -606,14 +566,10 @@ const Gfx ukiki_seg5_dl_0500BE38[] = {
};
// 0x0500BE98
static const Ambient ukiki_seg5_light_0500BE98 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500BEA0
static const Light ukiki_seg5_light_0500BEA0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500BE98 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500BEB0
static const Vtx ukiki_seg5_vertex_0500BEB0[] = {
@ -635,8 +591,8 @@ const Gfx ukiki_seg5_dl_0500BF60[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500BEA0, 1),
gsSPLight(&ukiki_seg5_light_0500BE98, 2),
gsSPLight(&ukiki_seg5_lights_0500BE98.l, 1),
gsSPLight(&ukiki_seg5_lights_0500BE98.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500BEB0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 3, 0x0),
@ -664,14 +620,10 @@ const Gfx ukiki_seg5_dl_0500BFF8[] = {
};
// 0x0500C058
static const Ambient ukiki_seg5_light_0500C058 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C060
static const Light ukiki_seg5_light_0500C060 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500C058 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C070
static const Vtx ukiki_seg5_vertex_0500C070[] = {
@ -693,8 +645,8 @@ const Gfx ukiki_seg5_dl_0500C120[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500C060, 1),
gsSPLight(&ukiki_seg5_light_0500C058, 2),
gsSPLight(&ukiki_seg5_lights_0500C058.l, 1),
gsSPLight(&ukiki_seg5_lights_0500C058.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500C070, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0),
gsSP2Triangles( 2, 1, 5, 0x0, 2, 5, 4, 0x0),
@ -722,14 +674,10 @@ const Gfx ukiki_seg5_dl_0500C1B8[] = {
};
// 0x0500C218
static const Ambient ukiki_seg5_light_0500C218 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C220
static const Light ukiki_seg5_light_0500C220 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500C218 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C230
static const Vtx ukiki_seg5_vertex_0500C230[] = {
@ -750,8 +698,8 @@ const Gfx ukiki_seg5_dl_0500C2D0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500C220, 1),
gsSPLight(&ukiki_seg5_light_0500C218, 2),
gsSPLight(&ukiki_seg5_lights_0500C218.l, 1),
gsSPLight(&ukiki_seg5_lights_0500C218.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500C230, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 0, 3, 1, 0x0, 0, 2, 5, 0x0),
@ -779,14 +727,10 @@ const Gfx ukiki_seg5_dl_0500C368[] = {
};
// 0x0500C3C8
static const Ambient ukiki_seg5_light_0500C3C8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C3D0
static const Light ukiki_seg5_light_0500C3D0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500C3C8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C3E0
static const Vtx ukiki_seg5_vertex_0500C3E0[] = {
@ -808,8 +752,8 @@ const Gfx ukiki_seg5_dl_0500C490[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500C3D0, 1),
gsSPLight(&ukiki_seg5_light_0500C3C8, 2),
gsSPLight(&ukiki_seg5_lights_0500C3C8.l, 1),
gsSPLight(&ukiki_seg5_lights_0500C3C8.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500C3E0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 0, 3, 4, 0x0, 2, 1, 5, 0x0),
@ -837,14 +781,10 @@ const Gfx ukiki_seg5_dl_0500C528[] = {
};
// 0x0500C588
static const Ambient ukiki_seg5_light_0500C588 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C590
static const Light ukiki_seg5_light_0500C590 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500C588 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C5A0
static const Vtx ukiki_seg5_vertex_0500C5A0[] = {
@ -866,8 +806,8 @@ const Gfx ukiki_seg5_dl_0500C650[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500C590, 1),
gsSPLight(&ukiki_seg5_light_0500C588, 2),
gsSPLight(&ukiki_seg5_lights_0500C588.l, 1),
gsSPLight(&ukiki_seg5_lights_0500C588.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500C5A0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 2, 3, 4, 0x0, 0, 5, 1, 0x0),
@ -895,14 +835,10 @@ const Gfx ukiki_seg5_dl_0500C6E8[] = {
};
// 0x0500C748
static const Ambient ukiki_seg5_light_0500C748 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C750
static const Light ukiki_seg5_light_0500C750 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500C748 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C760
static const Vtx ukiki_seg5_vertex_0500C760[] = {
@ -923,8 +859,8 @@ const Gfx ukiki_seg5_dl_0500C800[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500C750, 1),
gsSPLight(&ukiki_seg5_light_0500C748, 2),
gsSPLight(&ukiki_seg5_lights_0500C748.l, 1),
gsSPLight(&ukiki_seg5_lights_0500C748.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500C760, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 2, 4, 3, 0x0),
@ -952,14 +888,10 @@ const Gfx ukiki_seg5_dl_0500C898[] = {
};
// 0x0500C8F8
static const Ambient ukiki_seg5_light_0500C8F8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0500C900
static const Light ukiki_seg5_light_0500C900 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 ukiki_seg5_lights_0500C8F8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500C910
static const Vtx ukiki_seg5_vertex_0500C910[] = {
@ -980,8 +912,8 @@ const Gfx ukiki_seg5_dl_0500C9B0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ukiki_seg5_light_0500C900, 1),
gsSPLight(&ukiki_seg5_light_0500C8F8, 2),
gsSPLight(&ukiki_seg5_lights_0500C8F8.l, 1),
gsSPLight(&ukiki_seg5_lights_0500C8F8.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500C910, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 3, 0x0),
@ -1110,8 +1042,8 @@ static const Vtx ukiki_seg5_vertex_0500CE98[] = {
// 0x0500CF68 - 0x0500CFF0
const Gfx ukiki_seg5_dl_0500CF68[] = {
gsSPLight(&ukiki_seg5_light_05007BA8, 1),
gsSPLight(&ukiki_seg5_light_05007BA0, 2),
gsSPLight(&ukiki_seg5_lights_05007BA0.l, 1),
gsSPLight(&ukiki_seg5_lights_05007BA0.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500CAA8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -1125,8 +1057,8 @@ const Gfx ukiki_seg5_dl_0500CF68[] = {
// 0x0500CFF0 - 0x0500D078
const Gfx ukiki_seg5_dl_0500CFF0[] = {
gsSPLight(&ukiki_seg5_light_05007BA8, 1),
gsSPLight(&ukiki_seg5_light_05007BA0, 2),
gsSPLight(&ukiki_seg5_lights_05007BA0.l, 1),
gsSPLight(&ukiki_seg5_lights_05007BA0.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500CC28, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -1140,8 +1072,8 @@ const Gfx ukiki_seg5_dl_0500CFF0[] = {
// 0x0500D078 - 0x0500D108
const Gfx ukiki_seg5_dl_0500D078[] = {
gsSPLight(&ukiki_seg5_light_05007BA8, 1),
gsSPLight(&ukiki_seg5_light_05007BA0, 2),
gsSPLight(&ukiki_seg5_lights_05007BA0.l, 1),
gsSPLight(&ukiki_seg5_lights_05007BA0.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500CDA8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 2, 7, 6, 0x0),
@ -1155,8 +1087,8 @@ const Gfx ukiki_seg5_dl_0500D078[] = {
// 0x0500D108 - 0x0500D198
const Gfx ukiki_seg5_dl_0500D108[] = {
gsSPLight(&ukiki_seg5_light_05007BA8, 1),
gsSPLight(&ukiki_seg5_light_05007BA0, 2),
gsSPLight(&ukiki_seg5_lights_05007BA0.l, 1),
gsSPLight(&ukiki_seg5_lights_05007BA0.a, 2),
gsSPVertex(ukiki_seg5_vertex_0500CE98, 13, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 0, 5, 0x0, 4, 5, 6, 0x0),

112
actors/unagi/model.inc.c
View File

@ -1,84 +1,52 @@
// Unagi (Eel)
// Unreferenced light
UNUSED static const Ambient unagi_light_1 = {
{{0x2c, 0x25, 0x00}, 0, {0x2c, 0x25, 0x00}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 unagi_lights_unused1 = gdSPDefLights1(
0x2c, 0x25, 0x00,
0xb2, 0x94, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light unagi_light_2 = {
{{0xb2, 0x94, 0x00}, 0, {0xb2, 0x94, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 unagi_lights_unused2 = gdSPDefLights1(
0x35, 0x00, 0x00,
0xd5, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient unagi_light_3 = {
{{0x35, 0x00, 0x00}, 0, {0x35, 0x00, 0x00}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 unagi_lights_unused3 = gdSPDefLights1(
0x37, 0x00, 0x00,
0xdd, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light unagi_light_4 = {
{{0xd5, 0x00, 0x00}, 0, {0xd5, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 unagi_lights_unused4 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient unagi_light_5 = {
{{0x37, 0x00, 0x00}, 0, {0x37, 0x00, 0x00}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 unagi_lights_unused5 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light unagi_light_6 = {
{{0xdd, 0x00, 0x00}, 0, {0xdd, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 unagi_lights_unused6 = gdSPDefLights1(
0x34, 0x00, 0x00,
0xd2, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient unagi_light_7 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 unagi_lights_unused7 = gdSPDefLights1(
0x34, 0x00, 0x00,
0xd3, 0x00, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Light unagi_light_8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient unagi_light_9 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light unagi_light_10 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient unagi_light_11 = {
{{0x34, 0x00, 0x00}, 0, {0x34, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light unagi_light_12 = {
{{0xd2, 0x00, 0x00}, 0, {0xd2, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient unagi_light_13 = {
{{0x34, 0x00, 0x00}, 0, {0x34, 0x00, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light unagi_light_14 = {
{{0xd3, 0x00, 0x00}, 0, {0xd3, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient unagi_light_15 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// Unreferenced light
UNUSED static const Light unagi_light_16 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 unagi_lights_unused8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500AF20
ALIGNED8 static const u8 unagi_seg5_texture_0500AF20[] = {

48
actors/warp_pipe/model.inc.c
View File

@ -1,14 +1,10 @@
// Warp Pipe
// 0x030079E8
static const Ambient warp_pipe_seg3_light_030079E8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x030079F0
static const Light warp_pipe_seg3_light_030079F0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 warp_pipe_seg3_lights_030079E8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x03007A00
static const Vtx warp_pipe_seg3_vertex_03007A00[] = {
@ -108,8 +104,8 @@ const Gfx warp_pipe_seg3_dl_03008E40[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, warp_pipe_seg3_texture_03007E40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&warp_pipe_seg3_light_030079F0, 1),
gsSPLight(&warp_pipe_seg3_light_030079E8, 2),
gsSPLight(&warp_pipe_seg3_lights_030079E8.l, 1),
gsSPLight(&warp_pipe_seg3_lights_030079E8.a, 2),
gsSPVertex(warp_pipe_seg3_vertex_03007A00, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
@ -153,24 +149,16 @@ const Gfx warp_pipe_seg3_dl_03008F98[] = {
};
// 0x03008FF8
static const Ambient warp_pipe_seg3_light_03008FF8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x03009000
static const Light warp_pipe_seg3_light_03009000 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 warp_pipe_seg3_lights_03008FF8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x03009010
static const Ambient warp_pipe_seg3_light_03009010 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// 0x03009018
static const Light warp_pipe_seg3_light_03009018 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 warp_pipe_seg3_lights_03009010 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x03009028
static const Vtx warp_pipe_seg3_vertex_03009028[] = {
@ -210,8 +198,8 @@ const Gfx warp_pipe_seg3_dl_03009968[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, warp_pipe_seg3_texture_03009168),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&warp_pipe_seg3_light_03009000, 1),
gsSPLight(&warp_pipe_seg3_light_03008FF8, 2),
gsSPLight(&warp_pipe_seg3_lights_03008FF8.l, 1),
gsSPLight(&warp_pipe_seg3_lights_03008FF8.a, 2),
gsSPVertex(warp_pipe_seg3_vertex_03009028, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 3, 5, 0x0),
@ -226,8 +214,8 @@ const Gfx warp_pipe_seg3_dl_03009968[] = {
// 0x03009A20 - 0x03009A50
const Gfx warp_pipe_seg3_dl_03009A20[] = {
gsSPLight(&warp_pipe_seg3_light_03009018, 1),
gsSPLight(&warp_pipe_seg3_light_03009010, 2),
gsSPLight(&warp_pipe_seg3_lights_03009010.l, 1),
gsSPLight(&warp_pipe_seg3_lights_03009010.a, 2),
gsSPVertex(warp_pipe_seg3_vertex_03009128, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),

16
actors/water_bubble/model.inc.c
View File

@ -1,14 +1,10 @@
// Water Bubble
// 0x0500FE68
static const Ambient water_bubble_seg5_light_0500FE68 = {
{{0xbf, 0xbf, 0xbf}, 0, {0xbf, 0xbf, 0xbf}, 0}
};
// 0x0500FE70
static const Light water_bubble_seg5_light_0500FE70 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 water_bubble_seg5_lights_0500FE68 = gdSPDefLights1(
0xbf, 0xbf, 0xbf,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0500FE80
ALIGNED8 static const u8 water_bubble_seg5_texture_0500FE80[] = {
@ -152,8 +148,8 @@ static const Vtx water_bubble_seg5_vertex_05010C50[] = {
// 0x05010D30 - 0x05011000
const Gfx water_bubble_seg5_dl_05010D30[] = {
gsSPLight(&water_bubble_seg5_light_0500FE70, 1),
gsSPLight(&water_bubble_seg5_light_0500FE68, 2),
gsSPLight(&water_bubble_seg5_lights_0500FE68.l, 1),
gsSPLight(&water_bubble_seg5_lights_0500FE68.a, 2),
gsSPVertex(water_bubble_seg5_vertex_05010680, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 2, 3, 4, 0x0, 1, 5, 3, 0x0),

16
actors/water_mine/model.inc.c
View File

@ -1,14 +1,10 @@
// Water Mine (unused)
// 0x0600A4E0
static const Ambient water_mine_seg6_light_0600A4E0 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0600A4E8
static const Light water_mine_seg6_light_0600A4E8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 water_mine_seg6_lights_0600A4E0 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0600A4F8
ALIGNED8 static const u8 water_mine_seg6_texture_0600A4F8[] = {
@ -177,8 +173,8 @@ const Gfx water_mine_seg6_dl_0600D2E0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_mine_seg6_texture_0600C4F8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&water_mine_seg6_light_0600A4E8, 1),
gsSPLight(&water_mine_seg6_light_0600A4E0, 2),
gsSPLight(&water_mine_seg6_lights_0600A4E0.l, 1),
gsSPLight(&water_mine_seg6_lights_0600A4E0.a, 2),
gsSPVertex(water_mine_seg6_vertex_0600CD78, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),

16
actors/water_ring/model.inc.c
View File

@ -1,14 +1,10 @@
// Water Ring
// 0x06012368
static const Ambient water_ring_seg6_light_06012368 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x06012370
static const Light water_ring_seg6_light_06012370 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 water_ring_seg6_lights_06012368 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x06012380
ALIGNED8 static const u8 water_ring_seg6_texture_06012380[] = {
@ -170,8 +166,8 @@ const Gfx water_ring_seg6_dl_06013AC0[] = {
gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
gsDPLoadTextureBlock(water_ring_seg6_texture_06012380, 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(0x1800, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
gsSPLight(&water_ring_seg6_light_06012370, 1),
gsSPLight(&water_ring_seg6_light_06012368, 2),
gsSPLight(&water_ring_seg6_lights_06012368.l, 1),
gsSPLight(&water_ring_seg6_lights_06012368.a, 2),
gsSPVertex(water_ring_seg6_vertex_06013380, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

80
actors/whomp/model.inc.c
View File

@ -25,14 +25,10 @@ ALIGNED8 static const u8 whomp_seg6_texture_0601EB60[] = {
};
// 0x0601F360
static const Ambient whomp_seg6_light_0601F360 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x0601F368
static const Light whomp_seg6_light_0601F368 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 whomp_seg6_lights_0601F360 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0601F378
static const Vtx whomp_seg6_vertex_0601F378[] = {
@ -75,8 +71,8 @@ const Gfx whomp_seg6_dl_0601F4F8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&whomp_seg6_light_0601F368, 1),
gsSPLight(&whomp_seg6_light_0601F360, 2),
gsSPLight(&whomp_seg6_lights_0601F360.l, 1),
gsSPLight(&whomp_seg6_lights_0601F360.a, 2),
gsSPVertex(whomp_seg6_vertex_0601F378, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@ -129,14 +125,10 @@ const Gfx whomp_seg6_dl_0601F5E0[] = {
};
// 0x0601F678
static const Ambient whomp_seg6_light_0601F678 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x0601F680
static const Light whomp_seg6_light_0601F680 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 whomp_seg6_lights_0601F678 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0601F690
static const Vtx whomp_seg6_vertex_0601F690[] = {
@ -173,8 +165,8 @@ const Gfx whomp_seg6_dl_0601F7F0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&whomp_seg6_light_0601F680, 1),
gsSPLight(&whomp_seg6_light_0601F678, 2),
gsSPLight(&whomp_seg6_lights_0601F678.l, 1),
gsSPLight(&whomp_seg6_lights_0601F678.a, 2),
gsSPVertex(whomp_seg6_vertex_0601F690, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@ -203,14 +195,10 @@ const Gfx whomp_seg6_dl_0601F880[] = {
};
// 0x0601F8E0
static const Ambient whomp_seg6_light_0601F8E0 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x0601F8E8
static const Light whomp_seg6_light_0601F8E8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 whomp_seg6_lights_0601F8E0 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0601F8F8
static const Vtx whomp_seg6_vertex_0601F8F8[] = {
@ -247,8 +235,8 @@ const Gfx whomp_seg6_dl_0601FA58[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&whomp_seg6_light_0601F8E8, 1),
gsSPLight(&whomp_seg6_light_0601F8E0, 2),
gsSPLight(&whomp_seg6_lights_0601F8E0.l, 1),
gsSPLight(&whomp_seg6_lights_0601F8E0.a, 2),
gsSPVertex(whomp_seg6_vertex_0601F8F8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@ -349,14 +337,10 @@ const Gfx whomp_seg6_dl_0601FCA8[] = {
};
// 0x0601FD18
static const Ambient whomp_seg6_light_0601FD18 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x0601FD20
static const Light whomp_seg6_light_0601FD20 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 whomp_seg6_lights_0601FD18 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0601FD30
static const Vtx whomp_seg6_vertex_0601FD30[] = {
@ -381,8 +365,8 @@ const Gfx whomp_seg6_dl_0601FE10[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&whomp_seg6_light_0601FD20, 1),
gsSPLight(&whomp_seg6_light_0601FD18, 2),
gsSPLight(&whomp_seg6_lights_0601FD18.l, 1),
gsSPLight(&whomp_seg6_lights_0601FD18.a, 2),
gsSPVertex(whomp_seg6_vertex_0601FD30, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 2, 1, 4, 0x0, 4, 3, 2, 0x0),
@ -410,14 +394,10 @@ const Gfx whomp_seg6_dl_0601FEA8[] = {
};
// 0x0601FF08
static const Ambient whomp_seg6_light_0601FF08 = {
{{0x4c, 0x4c, 0x4c}, 0, {0x4c, 0x4c, 0x4c}, 0}
};
// 0x0601FF10
static const Light whomp_seg6_light_0601FF10 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 whomp_seg6_lights_0601FF08 = gdSPDefLights1(
0x4c, 0x4c, 0x4c,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0601FF20
static const Vtx whomp_seg6_vertex_0601FF20[] = {
@ -436,8 +416,8 @@ const Gfx whomp_seg6_dl_0601FFA0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&whomp_seg6_light_0601FF10, 1),
gsSPLight(&whomp_seg6_light_0601FF08, 2),
gsSPLight(&whomp_seg6_lights_0601FF08.l, 1),
gsSPLight(&whomp_seg6_lights_0601FF08.a, 2),
gsSPVertex(whomp_seg6_vertex_0601FF20, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 2, 1, 0x0, 1, 5, 4, 0x0),

62
actors/wiggler_body/model.inc.c
View File

@ -36,34 +36,22 @@ ALIGNED8 static const u8 wiggler_seg5_texture_0500A230[] = {
};
// 0x0500B230
static const Ambient wiggler_seg5_light_0500B230 = {
{{0x37, 0x00, 0x00}, 0, {0x37, 0x00, 0x00}, 0}
};
// 0x0500B238
static const Light wiggler_seg5_light_0500B238 = {
{{0xdf, 0x00, 0x00}, 0, {0xdf, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 wiggler_seg5_lights_0500B230 = gdSPDefLights1(
0x37, 0x00, 0x00,
0xdf, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0500B248
static const Ambient wiggler_seg5_light_0500B248 = {
{{0x39, 0x11, 0x00}, 0, {0x39, 0x11, 0x00}, 0}
};
static const Lights1 wiggler_seg5_lights_0500B248 = gdSPDefLights1(
0x39, 0x11, 0x00,
0xe7, 0x47, 0x00, 0x28, 0x28, 0x28
);
// 0x0500B250
static const Light wiggler_seg5_light_0500B250 = {
{{0xe7, 0x47, 0x00}, 0, {0xe7, 0x47, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient wiggler_body_light_1 = {
{{0x3a, 0x22, 0x05}, 0, {0x3a, 0x22, 0x05}, 0}
};
// Unreferenced light
UNUSED static const Light wiggler_body_light_2 = {
{{0xea, 0x8b, 0x16}, 0, {0xea, 0x8b, 0x16}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 wiggler_body_lights_unused = gdSPDefLights1(
0x3a, 0x22, 0x05,
0xea, 0x8b, 0x16, 0x28, 0x28, 0x28
);
// 0x0500B278
static const Vtx wiggler_seg5_vertex_0500B278[] = {
@ -279,8 +267,8 @@ static const Vtx wiggler_seg5_vertex_0500BBC8[] = {
// 0x0500BCB8 - 0x0500BE10
const Gfx wiggler_seg5_dl_0500BCB8[] = {
gsSPLight(&wiggler_seg5_light_0500B238, 1),
gsSPLight(&wiggler_seg5_light_0500B230, 2),
gsSPLight(&wiggler_seg5_lights_0500B230.l, 1),
gsSPLight(&wiggler_seg5_lights_0500B230.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500B278, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -308,8 +296,8 @@ const Gfx wiggler_seg5_dl_0500BCB8[] = {
// 0x0500BE10 - 0x0500BE98
const Gfx wiggler_seg5_dl_0500BE10[] = {
gsSPLight(&wiggler_seg5_light_0500B250, 1),
gsSPLight(&wiggler_seg5_light_0500B248, 2),
gsSPLight(&wiggler_seg5_lights_0500B248.l, 1),
gsSPLight(&wiggler_seg5_lights_0500B248.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500B5B8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -323,8 +311,8 @@ const Gfx wiggler_seg5_dl_0500BE10[] = {
// 0x0500BE98 - 0x0500BF20
const Gfx wiggler_seg5_dl_0500BE98[] = {
gsSPLight(&wiggler_seg5_light_0500B250, 1),
gsSPLight(&wiggler_seg5_light_0500B248, 2),
gsSPLight(&wiggler_seg5_lights_0500B248.l, 1),
gsSPLight(&wiggler_seg5_lights_0500B248.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500B6A8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -338,8 +326,8 @@ const Gfx wiggler_seg5_dl_0500BE98[] = {
// 0x0500BF20 - 0x0500C078
const Gfx wiggler_seg5_dl_0500BF20[] = {
gsSPLight(&wiggler_seg5_light_0500B238, 1),
gsSPLight(&wiggler_seg5_light_0500B230, 2),
gsSPLight(&wiggler_seg5_lights_0500B230.l, 1),
gsSPLight(&wiggler_seg5_lights_0500B230.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500B798, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -367,8 +355,8 @@ const Gfx wiggler_seg5_dl_0500BF20[] = {
// 0x0500C078 - 0x0500C100
const Gfx wiggler_seg5_dl_0500C078[] = {
gsSPLight(&wiggler_seg5_light_0500B250, 1),
gsSPLight(&wiggler_seg5_light_0500B248, 2),
gsSPLight(&wiggler_seg5_lights_0500B248.l, 1),
gsSPLight(&wiggler_seg5_lights_0500B248.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500BAD8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -382,8 +370,8 @@ const Gfx wiggler_seg5_dl_0500C078[] = {
// 0x0500C100 - 0x0500C188
const Gfx wiggler_seg5_dl_0500C100[] = {
gsSPLight(&wiggler_seg5_light_0500B250, 1),
gsSPLight(&wiggler_seg5_light_0500B248, 2),
gsSPLight(&wiggler_seg5_lights_0500B248.l, 1),
gsSPLight(&wiggler_seg5_lights_0500B248.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500BBC8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

76
actors/wiggler_head/model.inc.c
View File

@ -1,44 +1,28 @@
// Wiggler Head
// 0x0500C878
static const Ambient wiggler_seg5_light_0500C878 = {
{{0x37, 0x00, 0x00}, 0, {0x37, 0x00, 0x00}, 0}
};
// 0x0500C880
static const Light wiggler_seg5_light_0500C880 = {
{{0xdf, 0x00, 0x00}, 0, {0xdf, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 wiggler_seg5_lights_0500C878 = gdSPDefLights1(
0x37, 0x00, 0x00,
0xdf, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0500C890
static const Ambient wiggler_seg5_light_0500C890 = {
{{0x39, 0x11, 0x00}, 0, {0x39, 0x11, 0x00}, 0}
};
static const Lights1 wiggler_seg5_lights_0500C890 = gdSPDefLights1(
0x39, 0x11, 0x00,
0xe7, 0x47, 0x00, 0x28, 0x28, 0x28
);
// 0x0500C898
static const Light wiggler_seg5_light_0500C898 = {
{{0xe7, 0x47, 0x00}, 0, {0xe7, 0x47, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 wiggler_head_lights_unused1 = gdSPDefLights1(
0x1b, 0x06, 0x00,
0x6d, 0x1a, 0x00, 0x28, 0x28, 0x28
);
// Unreferenced light
UNUSED static const Ambient wiggler_head_light_1 = {
{{0x1b, 0x06, 0x00}, 0, {0x1b, 0x06, 0x00}, 0}
};
// Unreferenced light
UNUSED static const Light wiggler_head_light_2 = {
{{0x6d, 0x1a, 0x00}, 0, {0x6d, 0x1a, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light
UNUSED static const Ambient wiggler_head_light_3 = {
{{0x3a, 0x22, 0x05}, 0, {0x3a, 0x22, 0x05}, 0}
};
// Unreferenced light
UNUSED static const Light wiggler_head_light_4 = {
{{0xea, 0x8b, 0x16}, 0, {0xea, 0x8b, 0x16}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 wiggler_head_lights_unused2 = gdSPDefLights1(
0x3a, 0x22, 0x05,
0xea, 0x8b, 0x16, 0x28, 0x28, 0x28
);
// 0x0500C8D8
static const Vtx wiggler_seg5_vertex_0500C8D8[] = {
@ -402,8 +386,8 @@ static const Vtx wiggler_seg5_vertex_0500D318[] = {
// 0x0500DC18 - 0x0500DD70
const Gfx wiggler_seg5_dl_0500DC18[] = {
gsSPLight(&wiggler_seg5_light_0500C880, 1),
gsSPLight(&wiggler_seg5_light_0500C878, 2),
gsSPLight(&wiggler_seg5_lights_0500C878.l, 1),
gsSPLight(&wiggler_seg5_lights_0500C878.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500C8D8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -431,8 +415,8 @@ const Gfx wiggler_seg5_dl_0500DC18[] = {
// 0x0500DD70 - 0x0500DDF8
const Gfx wiggler_seg5_dl_0500DD70[] = {
gsSPLight(&wiggler_seg5_light_0500C898, 1),
gsSPLight(&wiggler_seg5_light_0500C890, 2),
gsSPLight(&wiggler_seg5_lights_0500C890.l, 1),
gsSPLight(&wiggler_seg5_lights_0500C890.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500CC18, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -446,8 +430,8 @@ const Gfx wiggler_seg5_dl_0500DD70[] = {
// 0x0500DDF8 - 0x0500DE80
const Gfx wiggler_seg5_dl_0500DDF8[] = {
gsSPLight(&wiggler_seg5_light_0500C898, 1),
gsSPLight(&wiggler_seg5_light_0500C890, 2),
gsSPLight(&wiggler_seg5_lights_0500C890.l, 1),
gsSPLight(&wiggler_seg5_lights_0500C890.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500CD08, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -461,8 +445,8 @@ const Gfx wiggler_seg5_dl_0500DDF8[] = {
// 0x0500DE80 - 0x0500DFD8
const Gfx wiggler_seg5_dl_0500DE80[] = {
gsSPLight(&wiggler_seg5_light_0500C880, 1),
gsSPLight(&wiggler_seg5_light_0500C878, 2),
gsSPLight(&wiggler_seg5_lights_0500C878.l, 1),
gsSPLight(&wiggler_seg5_lights_0500C878.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500CDF8, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -490,8 +474,8 @@ const Gfx wiggler_seg5_dl_0500DE80[] = {
// 0x0500DFD8 - 0x0500E060
const Gfx wiggler_seg5_dl_0500DFD8[] = {
gsSPLight(&wiggler_seg5_light_0500C898, 1),
gsSPLight(&wiggler_seg5_light_0500C890, 2),
gsSPLight(&wiggler_seg5_lights_0500C890.l, 1),
gsSPLight(&wiggler_seg5_lights_0500C890.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500D138, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -505,8 +489,8 @@ const Gfx wiggler_seg5_dl_0500DFD8[] = {
// 0x0500E060 - 0x0500E0E8
const Gfx wiggler_seg5_dl_0500E060[] = {
gsSPLight(&wiggler_seg5_light_0500C898, 1),
gsSPLight(&wiggler_seg5_light_0500C890, 2),
gsSPLight(&wiggler_seg5_lights_0500C890.l, 1),
gsSPLight(&wiggler_seg5_lights_0500C890.a, 2),
gsSPVertex(wiggler_seg5_vertex_0500D228, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

32
actors/wooden_signpost/model.inc.c
View File

@ -1,14 +1,10 @@
// Signpost
// 0x0302C940
static const Ambient wooden_signpost_seg3_light_0302C940 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0302C948
static const Light wooden_signpost_seg3_light_0302C948 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 wooden_signpost_seg3_lights_0302C940 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0302C958
static const Vtx wooden_signpost_seg3_vertex_0302C958[] = {
@ -36,8 +32,8 @@ const Gfx wooden_signpost_seg3_dl_0302D9C8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wooden_signpost_seg3_texture_0302C9C8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&wooden_signpost_seg3_light_0302C948, 1),
gsSPLight(&wooden_signpost_seg3_light_0302C940, 2),
gsSPLight(&wooden_signpost_seg3_lights_0302C940.l, 1),
gsSPLight(&wooden_signpost_seg3_lights_0302C940.a, 2),
gsSPVertex(wooden_signpost_seg3_vertex_0302C958, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 0, 3, 1, 0x0, 4, 1, 3, 0x0),
@ -64,14 +60,10 @@ const Gfx wooden_signpost_seg3_dl_0302DA48[] = {
};
// 0x0302DAA8
static const Ambient wooden_signpost_seg3_light_0302DAA8 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0302DAB0
static const Light wooden_signpost_seg3_light_0302DAB0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 wooden_signpost_seg3_lights_0302DAA8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0302DAC0
static const Vtx wooden_signpost_seg3_vertex_0302DAC0[] = {
@ -114,8 +106,8 @@ const Gfx wooden_signpost_seg3_dl_0302DC40[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wooden_signpost_seg3_texture_0302C9C8),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&wooden_signpost_seg3_light_0302DAB0, 1),
gsSPLight(&wooden_signpost_seg3_light_0302DAA8, 2),
gsSPLight(&wooden_signpost_seg3_lights_0302DAA8.l, 1),
gsSPLight(&wooden_signpost_seg3_lights_0302DAA8.a, 2),
gsSPVertex(wooden_signpost_seg3_vertex_0302DAC0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0),

216
actors/yoshi/model.inc.c
View File

@ -1,34 +1,22 @@
// Yoshi
// 0x0501C458
static const Ambient yoshi_seg5_light_0501C458 = {
{{0x00, 0x7c, 0x00}, 0, {0x00, 0x7c, 0x00}, 0}
};
// 0x0501C460
static const Light yoshi_seg5_light_0501C460 = {
{{0x00, 0xf9, 0x00}, 0, {0x00, 0xf9, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 yoshi_seg5_lights_0501C458 = gdSPDefLights1(
0x00, 0x7c, 0x00,
0x00, 0xf9, 0x00, 0x28, 0x28, 0x28
);
// 0x0501C470
static const Ambient yoshi_seg5_light_0501C470 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0501C478
static const Light yoshi_seg5_light_0501C478 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 yoshi_seg5_lights_0501C470 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0501C488
static const Ambient yoshi_seg5_light_0501C488 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// 0x0501C490
static const Light yoshi_seg5_light_0501C490 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 yoshi_seg5_lights_0501C488 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0501C4A0
ALIGNED8 static const u8 yoshi_seg5_texture_0501C4A0[] = {
@ -256,8 +244,8 @@ const Gfx yoshi_seg5_dl_0501D440[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, yoshi_seg5_texture_0501C8A0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)),
gsSPLight(&yoshi_seg5_light_0501C460, 1),
gsSPLight(&yoshi_seg5_light_0501C458, 2),
gsSPLight(&yoshi_seg5_lights_0501C458.l, 1),
gsSPLight(&yoshi_seg5_lights_0501C458.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501CAA0, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
@ -265,8 +253,8 @@ const Gfx yoshi_seg5_dl_0501D440[] = {
// 0x0501D488 - 0x0501D4E0
const Gfx yoshi_seg5_dl_0501D488[] = {
gsSPLight(&yoshi_seg5_light_0501C478, 1),
gsSPLight(&yoshi_seg5_light_0501C470, 2),
gsSPLight(&yoshi_seg5_lights_0501C470.l, 1),
gsSPLight(&yoshi_seg5_lights_0501C470.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501CB00, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 3, 4, 5, 0x0, 5, 0, 3, 0x0),
@ -277,13 +265,13 @@ const Gfx yoshi_seg5_dl_0501D488[] = {
// 0x0501D4E0 - 0x0501D8F8
const Gfx yoshi_seg5_dl_0501D4E0[] = {
gsSPLight(&yoshi_seg5_light_0501C490, 1),
gsSPLight(&yoshi_seg5_light_0501C488, 2),
gsSPLight(&yoshi_seg5_lights_0501C488.l, 1),
gsSPLight(&yoshi_seg5_lights_0501C488.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501CBB0, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 4, 1, 3, 0x0, 2, 1, 4, 0x0),
gsSPLight(&yoshi_seg5_light_0501C460, 1),
gsSPLight(&yoshi_seg5_light_0501C458, 2),
gsSPLight(&yoshi_seg5_lights_0501C458.l, 1),
gsSPLight(&yoshi_seg5_lights_0501C458.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501CC00, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 3, 0x0, 3, 5, 6, 0x0),
@ -343,8 +331,8 @@ const Gfx yoshi_seg5_dl_0501D4E0[] = {
gsSPVertex(yoshi_seg5_vertex_0501D2C0, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSP2Triangles( 2, 4, 5, 0x0, 3, 5, 6, 0x0),
gsSPLight(&yoshi_seg5_light_0501C478, 1),
gsSPLight(&yoshi_seg5_light_0501C470, 2),
gsSPLight(&yoshi_seg5_lights_0501C470.l, 1),
gsSPLight(&yoshi_seg5_lights_0501C470.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501D330, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 7, 4, 8, 0x0),
@ -398,64 +386,40 @@ const Gfx yoshi_seg5_dl_0501D998[] = {
};
// 0x0501D9C0
static const Ambient yoshi_seg5_light_0501D9C0 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x0501D9C8
static const Light yoshi_seg5_light_0501D9C8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 yoshi_seg5_lights_0501D9C0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0501D9D8
static const Ambient yoshi_seg5_light_0501D9D8 = {
{{0x00, 0x7b, 0x00}, 0, {0x00, 0x7b, 0x00}, 0}
};
// 0x0501D9E0
static const Light yoshi_seg5_light_0501D9E0 = {
{{0x00, 0xf7, 0x00}, 0, {0x00, 0xf7, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 yoshi_seg5_lights_0501D9D8 = gdSPDefLights1(
0x00, 0x7b, 0x00,
0x00, 0xf7, 0x00, 0x28, 0x28, 0x28
);
// 0x0501D9F0
static const Ambient yoshi_seg5_light_0501D9F0 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
static const Lights1 yoshi_seg5_lights_0501D9F0 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0501D9F8
static const Light yoshi_seg5_light_0501D9F8 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 yoshi_lights_unused1 = gdSPDefLights1(
0x59, 0x59, 0x59,
0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28
);
// unreferenced light
UNUSED static const Ambient yoshi_light_1 = {
{{0x59, 0x59, 0x59}, 0, {0x59, 0x59, 0x59}, 0}
};
// unreferenced light
UNUSED static const Light yoshi_light_2 = {
{{0xb2, 0xb2, 0xb2}, 0, {0xb2, 0xb2, 0xb2}, 0, {0x28, 0x28, 0x28}, 0}
};
// unreferenced light
UNUSED static const Ambient yoshi_light_3 = {
{{0x7f, 0x00, 0x00}, 0, {0x7f, 0x00, 0x00}, 0}
};
// unreferenced light
UNUSED static const Light yoshi_light_4 = {
{{0xff, 0x00, 0x00}, 0, {0xff, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// Unreferenced light group
UNUSED static const Lights1 yoshi_lights_unused2 = gdSPDefLights1(
0x7f, 0x00, 0x00,
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0501DA38
static const Ambient yoshi_seg5_light_0501DA38 = {
{{0x45, 0x00, 0x00}, 0, {0x45, 0x00, 0x00}, 0}
};
// 0x0501DA40
static const Light yoshi_seg5_light_0501DA40 = {
{{0x8b, 0x00, 0x00}, 0, {0x8b, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
static const Lights1 yoshi_seg5_lights_0501DA38 = gdSPDefLights1(
0x45, 0x00, 0x00,
0x8b, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0501DA50
static const Vtx yoshi_seg5_vertex_0501DA50[] = {
@ -1621,8 +1585,8 @@ static const Vtx yoshi_seg5_vertex_050211D0[] = {
// 0x050212B0 - 0x05021490
const Gfx yoshi_seg5_dl_050212B0[] = {
gsSPLight(&yoshi_seg5_light_0501D9C8, 1),
gsSPLight(&yoshi_seg5_light_0501D9C0, 2),
gsSPLight(&yoshi_seg5_lights_0501D9C0.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9C0.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501DA50, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -1664,8 +1628,8 @@ const Gfx yoshi_seg5_dl_050212B0[] = {
// 0x05021490 - 0x050215D8
const Gfx yoshi_seg5_dl_05021490[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501E1E0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -1694,8 +1658,8 @@ const Gfx yoshi_seg5_dl_05021490[] = {
// 0x050215D8 - 0x05021678
const Gfx yoshi_seg5_dl_050215D8[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501E530, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 2, 6, 7, 0x0),
@ -1710,8 +1674,8 @@ const Gfx yoshi_seg5_dl_050215D8[] = {
// 0x05021678 - 0x05021718
const Gfx yoshi_seg5_dl_05021678[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501E5D0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 0, 6, 7, 0x0, 4, 8, 1, 0x0),
@ -1726,8 +1690,8 @@ const Gfx yoshi_seg5_dl_05021678[] = {
// 0x05021718 - 0x05021860
const Gfx yoshi_seg5_dl_05021718[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501E680, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@ -1756,8 +1720,8 @@ const Gfx yoshi_seg5_dl_05021718[] = {
// 0x05021860 - 0x05021900
const Gfx yoshi_seg5_dl_05021860[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501E9D0, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0),
gsSP2Triangles( 4, 5, 1, 0x0, 6, 7, 0, 0x0),
@ -1772,8 +1736,8 @@ const Gfx yoshi_seg5_dl_05021860[] = {
// 0x05021900 - 0x050219A0
const Gfx yoshi_seg5_dl_05021900[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501EA70, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 2, 0x0, 1, 8, 4, 0x0),
@ -1788,8 +1752,8 @@ const Gfx yoshi_seg5_dl_05021900[] = {
// 0x050219A0 - 0x05021B90
const Gfx yoshi_seg5_dl_050219A0[] = {
gsSPLight(&yoshi_seg5_light_0501D9F8, 1),
gsSPLight(&yoshi_seg5_light_0501D9F0, 2),
gsSPLight(&yoshi_seg5_lights_0501D9F0.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9F0.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501EB20, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0),
@ -1830,8 +1794,8 @@ const Gfx yoshi_seg5_dl_050219A0[] = {
// 0x05021B90 - 0x05021CD8
const Gfx yoshi_seg5_dl_05021B90[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501F180, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 0, 6, 1, 0x0, 3, 7, 4, 0x0),
@ -1859,8 +1823,8 @@ const Gfx yoshi_seg5_dl_05021B90[] = {
// 0x05021CD8 - 0x05021E38
const Gfx yoshi_seg5_dl_05021CD8[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501F540, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -1890,8 +1854,8 @@ const Gfx yoshi_seg5_dl_05021CD8[] = {
// 0x05021E38 - 0x05021F70
const Gfx yoshi_seg5_dl_05021E38[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501FA00, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0),
gsSP2Triangles( 4, 5, 3, 0x0, 6, 7, 8, 0x0),
@ -1903,8 +1867,8 @@ const Gfx yoshi_seg5_dl_05021E38[] = {
gsSP2Triangles(10, 8, 7, 0x0, 3, 9, 12, 0x0),
gsSP2Triangles( 2, 1, 11, 0x0, 8, 11, 6, 0x0),
gsSP1Triangle( 5, 0, 3, 0x0),
gsSPLight(&yoshi_seg5_light_0501D9C8, 1),
gsSPLight(&yoshi_seg5_light_0501D9C0, 2),
gsSPLight(&yoshi_seg5_lights_0501D9C0.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9C0.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501FAF0, 11, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 7, 6, 8, 0x0),
@ -1918,8 +1882,8 @@ const Gfx yoshi_seg5_dl_05021E38[] = {
// 0x05021F70 - 0x05022160
const Gfx yoshi_seg5_dl_05021F70[] = {
gsSPLight(&yoshi_seg5_light_0501D9F8, 1),
gsSPLight(&yoshi_seg5_light_0501D9F0, 2),
gsSPLight(&yoshi_seg5_lights_0501D9F0.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9F0.a, 2),
gsSPVertex(yoshi_seg5_vertex_0501FBA0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
@ -1960,8 +1924,8 @@ const Gfx yoshi_seg5_dl_05021F70[] = {
// 0x05022160 - 0x050222A8
const Gfx yoshi_seg5_dl_05022160[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_05020200, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 1, 6, 2, 0x0, 4, 7, 5, 0x0),
@ -1989,8 +1953,8 @@ const Gfx yoshi_seg5_dl_05022160[] = {
// 0x050222A8 - 0x05022408
const Gfx yoshi_seg5_dl_050222A8[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_050205C0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -2020,8 +1984,8 @@ const Gfx yoshi_seg5_dl_050222A8[] = {
// 0x05022408 - 0x05022608
const Gfx yoshi_seg5_dl_05022408[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_05020A80, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -2042,8 +2006,8 @@ const Gfx yoshi_seg5_dl_05022408[] = {
gsSP1Triangle( 4, 14, 15, 0x0),
gsSPVertex(yoshi_seg5_vertex_05020E60, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPLight(&yoshi_seg5_light_0501D9C8, 1),
gsSPLight(&yoshi_seg5_light_0501D9C0, 2),
gsSPLight(&yoshi_seg5_lights_0501D9C0.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9C0.a, 2),
gsSPVertex(yoshi_seg5_vertex_05020E90, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 5, 9, 3, 0x0),
@ -2054,8 +2018,8 @@ const Gfx yoshi_seg5_dl_05022408[] = {
gsSP2Triangles(14, 15, 8, 0x0, 3, 10, 12, 0x0),
gsSP2Triangles(12, 4, 3, 0x0, 12, 14, 7, 0x0),
gsSP2Triangles( 8, 7, 14, 0x0, 7, 4, 12, 0x0),
gsSPLight(&yoshi_seg5_light_0501D9F8, 1),
gsSPLight(&yoshi_seg5_light_0501D9F0, 2),
gsSPLight(&yoshi_seg5_lights_0501D9F0.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9F0.a, 2),
gsSPVertex(yoshi_seg5_vertex_05020F90, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 3, 5, 0x0, 7, 6, 5, 0x0),
@ -2064,8 +2028,8 @@ const Gfx yoshi_seg5_dl_05022408[] = {
// 0x05022608 - 0x050227D8
const Gfx yoshi_seg5_dl_05022608[] = {
gsSPLight(&yoshi_seg5_light_0501D9E0, 1),
gsSPLight(&yoshi_seg5_light_0501D9D8, 2),
gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2),
gsSPVertex(yoshi_seg5_vertex_05021010, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0),
@ -2075,8 +2039,8 @@ const Gfx yoshi_seg5_dl_05022608[] = {
gsSP2Triangles(14, 7, 3, 0x0, 13, 9, 12, 0x0),
gsSP2Triangles(11, 12, 9, 0x0, 7, 14, 8, 0x0),
gsSP2Triangles( 3, 13, 4, 0x0, 1, 15, 2, 0x0),
gsSPLight(&yoshi_seg5_light_0501DA40, 1),
gsSPLight(&yoshi_seg5_light_0501DA38, 2),
gsSPLight(&yoshi_seg5_lights_0501DA38.l, 1),
gsSPLight(&yoshi_seg5_lights_0501DA38.a, 2),
gsSPVertex(yoshi_seg5_vertex_05021110, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 2, 1, 0x0, 6, 7, 4, 0x0),
@ -2085,8 +2049,8 @@ const Gfx yoshi_seg5_dl_05022608[] = {
gsSP2Triangles( 4, 1, 6, 0x0, 2, 9, 10, 0x0),
gsSP2Triangles( 5, 11, 3, 0x0, 2, 10, 0, 0x0),
gsSP2Triangles(11, 8, 3, 0x0, 1, 4, 3, 0x0),
gsSPLight(&yoshi_seg5_light_0501D9C8, 1),
gsSPLight(&yoshi_seg5_light_0501D9C0, 2),
gsSPLight(&yoshi_seg5_lights_0501D9C0.l, 1),
gsSPLight(&yoshi_seg5_lights_0501D9C0.a, 2),
gsSPVertex(yoshi_seg5_vertex_050211D0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 9, 7, 6, 0x0),

2
asm/non_matchings/func_8031784C.s → asm/non_matchings/patch_audio_bank.s
View File

@ -1,4 +1,4 @@
glabel func_8031784C
glabel patch_audio_bank
/* 0D284C 8031784C 27ADFFF0 */ addiu $t5, $sp, -0x10
/* 0D2850 80317850 ADA60018 */ sw $a2, 0x18($t5)
/* 0D2854 80317854 8C820000 */ lw $v0, ($a0)

4
asm/non_matchings/process_level_music_dynamics.s
View File

@ -30,8 +30,8 @@ glabel process_level_music_dynamics # US: 803208EC
/* 0DAA8C 8031FA8C 10000005 */ b .L8031FAA4
/* 0DAA90 8031FA90 A06E0000 */ sb $t6, ($v1)
.L8031FA94:
/* 0DAA94 8031FA94 3C0F8033 */ lui $t7, %hi(gPlayer0CurSeqId) # $t7, 0x8033
/* 0DAA98 8031FA98 91EF209C */ lbu $t7, %lo(gPlayer0CurSeqId)($t7)
/* 0DAA94 8031FA94 3C0F8033 */ lui $t7, %hi(sPlayer0CurSeqId) # $t7, 0x8033
/* 0DAA98 8031FA98 91EF209C */ lbu $t7, %lo(sPlayer0CurSeqId)($t7)
/* 0DAA9C 8031FA9C 3C018033 */ lui $at, %hi(sBackgroundMusicForDynamics) # $at, 0x8033
/* 0DAAA0 8031FAA0 A02F1EB0 */ sb $t7, %lo(sBackgroundMusicForDynamics)($at)
.L8031FAA4:

Some files were not shown because too many files have changed in this diff Show More