etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 21:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable

Browse source
This commit is contained in:
MysterD 2022-03-13 00:25:22 -08:00
commit b695cbd55a
511 changed files with 31385 additions and 21847 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
CHANGES
View file

@ -1,3 +1,41 @@
Refresh 13
- No more nonmatchings remain for US, JP, or EU builds. Three(!!!) remain for Shindou (SH).
*) SHINDOU MATCHING (#1081)
*) Makefile gcc fixes (#1114)
1.) Update diff.py (#1113)
2.) Add support for generating C arrays from n64graphics and add Texture typedef (#1032)
3.) Update README and Dockerfile with recomp info (#1105)
4.) Support building tools with MSYS2 (#1112)
5.) Support building tools with clang and macOS (#1106)
6.) Clean tools directory when running distclean target (#1104)
7.) Make build output cleaner (#1095)
8.) Added 2 surface defines to bowser.inc.c (#1111)
9.) fix fake matchings (#1108)
10.) Use statically recompiled IDO instead of qemu-irix (#1099)
11.) Add VERBOSE=1 to Jenkinsfile
12.) updated intro_geo to use layer defines for geo flags (#1090)
13.) Fix F3DZEX (#1097)
14.) layer_transpose should take an s8 (#1093)
15.) Fix tools/ build (#1082)
16.) Relabel and document fish.inc.c (#1077)
17.) Ensure all calls to .py files use $(PYTHON) (#1080)
18.) Name Mario, Peach, and instrument sound files (#1078)
19.) Goddard labeling, part 2 (#1076)
20.) Fix envfx_snow and envfx_bubbles fake matches (#1075)
21.) Use array subscripts instead of pointer math in 2 files (#1074)
22.) refactor Makefile a bit (#1068)
23.) Further improvements on field names (#1059)
24.) Label and document manta_ray.inc.c (#1073)
25.) Fix level_script and behavior fake matches (#1072)
26.) Proper cell defines and more floor lower limit values. (#1065)
27.) Document and re-label some goddard/intro code (#1069)
28.) Match remaining functions (#1070)
29.) match 'spawn_special_objects' (#1071)
30.) Document parts of external.c and format sound defines (#1067)
Refresh 12
1.) Debug box improvements (#1066)

15
Dockerfile
View file

@ -5,20 +5,13 @@ RUN apt-get update && \
binutils-mips-linux-gnu \
bsdmainutils \
build-essential \
libaudiofile-dev \
python3 \
wget
RUN wget \
https://github.com/n64decomp/qemu-irix/releases/download/v2.11-deb/qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb \
-O qemu.deb && \
echo 8170f37cf03a08cc2d7c1c58f10d650ea0d158f711f6916da9364f6d8c85f741 qemu.deb | sha256sum --check && \
dpkg -i qemu.deb && \
rm qemu.deb
libcapstone-dev \
pkgconf \
python3
RUN mkdir /sm64
WORKDIR /sm64
ENV PATH="/sm64/tools:${PATH}"
CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=${VERSION:-us} -j4\n' \
CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=us -j4\n' \
'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage'

16
Jenkinsfile vendored
View file

@ -11,25 +11,31 @@ pipeline {
sh 'ln -s "$ROMS_DIR/Super Mario 64 (J) [!].z64" baserom.jp.z64'
sh 'ln -s "$ROMS_DIR/Super Mario 64 (U) [!].z64" baserom.us.z64'
sh 'ln -s "$ROMS_DIR/Super Mario 64 (E) (M3) [!].z64" baserom.eu.z64'
sh 'ln -s "$ROMS_DIR/Super Mario 64 - Shindou Edition (J) [!].z64" baserom.sh.z64'
// verify no assets were committed to repo
sh '[ -z "$(find {actors,levels,textures}/ -name \'*.png\')" ]'
sh '[ -z "$(find assets/ -name \'*.m64\' -or \'*.bin\')" ]'
sh './extract_assets.py jp us eu'
sh './extract_assets.py jp us eu sh'
}
}
stage('Build U Source') {
steps {
sh 'make -j4 VERSION=us'
sh 'make -j4 VERSION=us VERBOSE=1 COLOR=0'
}
}
stage('Build S Source') {
steps {
sh 'make -j4 VERSION=sh VERBOSE=1 COLOR=0'
}
}
stage('Build E Source') {
steps {
sh 'make -j4 VERSION=eu'
sh 'make -j4 VERSION=eu VERBOSE=1 COLOR=0'
}
}
stage('Build J Source') {
steps {
sh 'make -j4 VERSION=jp'
sh 'make -j4 VERSION=jp VERBOSE=1 COLOR=0'
}
}
stage('Test Enhancements') {
@ -41,7 +47,7 @@ pipeline {
git clean -fd .
git checkout -- .
echo 'y' | tools/apply_patch.sh "$f"
make -j4 VERSION=us COMPARE=0
make -j4 VERSION=us COMPARE=0 VERBOSE=1
done
'''
}

1475
Makefile
View file

File diff suppressed because it is too large Load diff

252
Makefile.split
View file

@ -3,9 +3,16 @@
# --------------------------------------
# obtain a list of segments from the *.c files in bin directory
SEGMENTS := $(notdir $(basename $(wildcard bin/*.c))) $(addprefix $(VERSION)/,$(notdir $(basename $(wildcard bin/$(VERSION)/*.c)))) $(addsuffix _skybox,$(notdir $(basename $(wildcard textures/skyboxes/*.png))))
ACTORS := $(filter %/,$(wildcard actors/*/))
TEXTURE_DIRS := $(addprefix textures/,$(SEGMENTS)) $(ACTORS) textures/crash_screen textures/intro_raw textures/ipl3_raw textures/skybox_tiles
SEGMENTS := \
$(notdir $(basename $(wildcard bin/*.c))) \
$(addprefix $(VERSION)/,$(notdir $(basename $(wildcard bin/$(VERSION)/*.c)))) \
$(addsuffix _skybox,$(notdir $(basename $(wildcard textures/skyboxes/*.png))))
# Directories containing PNG files
TEXTURE_DIRS := \
$(wildcard textures/*/) \
$(filter %/,$(wildcard actors/*/))
# NOTE: textures assume naming convention "texture.<encoding>.png" generates "texture.<encoding>"
@ -34,12 +41,19 @@ ACTOR_GROUPS := \
zcustom0
LEVEL_FILES := $(addsuffix leveldata,$(LEVEL_DIRS))
MIO0_FILES := $(addprefix $(MIO0_DIR)/,$(addsuffix .mio0,$(SEGMENTS))) $(addprefix $(BUILD_DIR)/actors/,$(addsuffix .mio0,$(ACTOR_GROUPS))) $(addprefix $(BUILD_DIR)/levels/,$(addsuffix .mio0,$(LEVEL_FILES)))
SEG_FILES := \
$(SEGMENTS:%=$(BUILD_DIR)/bin/%.elf) \
$(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.elf) \
$(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.elf)
MIO0_FILES := \
$(SEGMENTS:%=$(BUILD_DIR)/bin/%.mio0) \
$(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.mio0) \
$(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.mio0)
MIO0_OBJ_FILES := $(MIO0_FILES:.mio0=.mio0.o)
SEGMENT_ELF_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .elf,$(SEGMENTS)))
ACTOR_ELF_FILES := $(addprefix $(BUILD_DIR)/actors/,$(addsuffix .elf,$(ACTOR_GROUPS)))
LEVEL_ELF_FILES := $(addprefix $(BUILD_DIR)/levels/,$(addsuffix .elf,$(LEVEL_FILES)))
# --------------------------------------
# Actor Rules
@ -83,65 +97,65 @@ ZCUSTOM_DIRS += waluigi
CUSTOM_DIRS += wario_cap
ZCUSTOM_DIRS += wario
# Actor Files
CUSTOM_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CUSTOM_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
AMP_CHUCKYA_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(AMP_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
BOBOMBS_BUBBLE_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KING_BOBOMB_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
BOO_BOOKEND_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BOO_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
CAPSWITCH_SPRINGBOARD_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CAPSWITCH_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
COINS_PIPE_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(COINS_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
BOWSER_FLAMES_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BOWSER_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
BUBBA_WIGGLER_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BUBBA_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
BULLY_BLARGG_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BULLY_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
CHILLYCHIEF_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CHILLYCHIEF_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
HOOT_THWOMP_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(HOOT_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
KOOPA_LOG_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KOOPA_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
KLEPTO_EYEROK_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KLEPTO_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
LAKITU_TOAD_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(LAKITU_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
MARIO_WATER_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MARIO_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
MOLE_UKIKI_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MOLE_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
MR_I_SWOOP_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MR_I_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
PEACH_TOADSTOOL_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(PEACH_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
SEA_CREATURES_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SEA_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
SKEETER_FISH_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SKEETER_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
SPINDRIFT_PENGUIN_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SPINDRIFT_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
ZCUSTOM_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(ZCUSTOM_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
# Actor Textures
CUSTOM_TEXTURES := $(foreach dir,$(CUSTOM_DIRS), $(wildcard actors/$(dir)/*.png))
AMP_CHUCKYA_TEXTURES := $(foreach dir,$(AMP_DIRS), $(wildcard actors/$(dir)/*.png))
BOBOMBS_BUBBLE_TEXTURES := $(foreach dir,$(KING_BOBOMB_DIRS),$(wildcard actors/$(dir)/*.png))
BOO_BOOKEND_TEXTURES := $(foreach dir,$(BOO_DIRS), $(wildcard actors/$(dir)/*.png))
CAPSWITCH_SPRINGBOARD_TEXTURES := $(foreach dir,$(CAPSWITCH_DIRS), $(wildcard actors/$(dir)/*.png))
COINS_PIPE_TEXTURES := $(foreach dir,$(COINS_DIRS), $(wildcard actors/$(dir)/*.png))
BOWSER_FLAMES_TEXTURES := $(foreach dir,$(BOWSER_DIRS), $(wildcard actors/$(dir)/*.png))
BUBBA_WIGGLER_TEXTURES := $(foreach dir,$(BUBBA_DIRS), $(wildcard actors/$(dir)/*.png))
BULLY_BLARGG_TEXTURES := $(foreach dir,$(BULLY_DIRS), $(wildcard actors/$(dir)/*.png))
CHILLYCHIEF_TEXTURES := $(foreach dir,$(CHILLYCHIEF_DIRS),$(wildcard actors/$(dir)/*.png))
HOOT_THWOMP_TEXTURES := $(foreach dir,$(HOOT_DIRS), $(wildcard actors/$(dir)/*.png))
KOOPA_LOG_TEXTURES := $(foreach dir,$(KOOPA_DIRS), $(wildcard actors/$(dir)/*.png))
KLEPTO_EYEROK_TEXTURES := $(foreach dir,$(KLEPTO_DIRS), $(wildcard actors/$(dir)/*.png))
LAKITU_TOAD_TEXTURES := $(foreach dir,$(LAKITU_DIRS), $(wildcard actors/$(dir)/*.png))
MARIO_WATER_TEXTURES := $(foreach dir,$(MARIO_DIRS), $(wildcard actors/$(dir)/*.png))
MOLE_UKIKI_TEXTURES := $(foreach dir,$(MOLE_DIRS), $(wildcard actors/$(dir)/*.png))
MR_I_SWOOP_TEXTURES := $(foreach dir,$(MR_I_DIRS), $(wildcard actors/$(dir)/*.png))
PEACH_TOADSTOOL_TEXTURES := $(foreach dir,$(PEACH_DIRS), $(wildcard actors/$(dir)/*.png))
SEA_CREATURES_TEXTURES := $(foreach dir,$(SEA_DIRS), $(wildcard actors/$(dir)/*.png))
SKEETER_FISH_TEXTURES := $(foreach dir,$(SKEETER_DIRS), $(wildcard actors/$(dir)/*.png))
SPINDRIFT_PENGUIN_TEXTURES := $(foreach dir,$(SPINDRIFT_DIRS), $(wildcard actors/$(dir)/*.png))
ZCUSTOM_TEXTURES := $(foreach dir,$(ZCUSTOM_DIRS), $(wildcard actors/$(dir)/*.png))
# Actor dependencies
$(BUILD_DIR)/actors/group0.o: $(addprefix $(BUILD_DIR)/,$(MARIO_WATER_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MARIO_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group1.o: $(addprefix $(BUILD_DIR)/,$(HOOT_THWOMP_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(HOOT_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group2.o: $(addprefix $(BUILD_DIR)/,$(BULLY_BLARGG_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BULLY_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group3.o: $(addprefix $(BUILD_DIR)/,$(BOBOMBS_BUBBLE_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KING_BOBOMB_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group4.o: $(addprefix $(BUILD_DIR)/,$(SEA_CREATURES_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SEA_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group5.o: $(addprefix $(BUILD_DIR)/,$(KLEPTO_EYEROK_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KLEPTO_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group6.o: $(addprefix $(BUILD_DIR)/,$(MOLE_UKIKI_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MOLE_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group7.o: $(addprefix $(BUILD_DIR)/,$(SPINDRIFT_PENGUIN_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SPINDRIFT_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group8.o: $(addprefix $(BUILD_DIR)/,$(CAPSWITCH_SPRINGBOARD_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CAPSWITCH_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group9.o: $(addprefix $(BUILD_DIR)/,$(BOO_BOOKEND_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BOO_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group10.o: $(addprefix $(BUILD_DIR)/,$(PEACH_TOADSTOOL_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(PEACH_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group11.o: $(addprefix $(BUILD_DIR)/,$(BUBBA_WIGGLER_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BUBBA_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group12.o: $(addprefix $(BUILD_DIR)/,$(BOWSER_FLAMES_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(BOWSER_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group13.o: $(addprefix $(BUILD_DIR)/,$(SKEETER_FISH_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(SKEETER_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group14.o: $(addprefix $(BUILD_DIR)/,$(KOOPA_LOG_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KOOPA_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group15.o: $(addprefix $(BUILD_DIR)/,$(LAKITU_TOAD_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(LAKITU_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group16.o: $(addprefix $(BUILD_DIR)/,$(CHILLYCHIEF_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CHILLYCHIEF_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group17.o: $(addprefix $(BUILD_DIR)/,$(MR_I_SWOOP_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(MR_I_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/common0.o: $(addprefix $(BUILD_DIR)/,$(AMP_CHUCKYA_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(AMP_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/common1.o: $(addprefix $(BUILD_DIR)/,$(COINS_PIPE_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(COINS_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/custom0.o: | $(BUILD_DIR)/actors/common1.o $(addprefix $(BUILD_DIR)/,$(CUSTOM_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(CUSTOM_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/zcustom0.o:| $(BUILD_DIR)/actors/group0.o $(addprefix $(BUILD_DIR)/,$(ZCUSTOM_FILES)) $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(ZCUSTOM_DIRS)),$(wildcard $(dir)/*.c))
$(BUILD_DIR)/actors/group0.o: $(MARIO_WATER_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group1.o: $(HOOT_THWOMP_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group2.o: $(BULLY_BLARGG_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group3.o: $(BOBOMBS_BUBBLE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group4.o: $(SEA_CREATURES_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group5.o: $(KLEPTO_EYEROK_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group6.o: $(MOLE_UKIKI_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group7.o: $(SPINDRIFT_PENGUIN_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group8.o: $(CAPSWITCH_SPRINGBOARD_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group9.o: $(BOO_BOOKEND_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group10.o: $(PEACH_TOADSTOOL_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group11.o: $(BUBBA_WIGGLER_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group12.o: $(BOWSER_FLAMES_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group13.o: $(SKEETER_FISH_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group14.o: $(KOOPA_LOG_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group15.o: $(LAKITU_TOAD_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group16.o: $(CHILLYCHIEF_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/group17.o: $(MR_I_SWOOP_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/common0.o: $(AMP_CHUCKYA_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/common1.o: $(COINS_PIPE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/custom0.o: $(CUSTOM_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/actors/zcustom0.o: $(ZCUSTOM_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
# Actor Elf Files
$(BUILD_DIR)/actors/group0.elf: SEGMENT_ADDRESS := 0x04000000
$(BUILD_DIR)/actors/group1.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group2.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group3.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group4.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group5.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group6.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group7.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group8.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group9.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group0.elf: SEGMENT_ADDRESS := 0x04000000
$(BUILD_DIR)/actors/group1.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group2.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group3.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group4.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group5.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group6.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group7.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group8.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group9.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group10.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group11.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group12.elf: SEGMENT_ADDRESS := 0x06000000
@ -172,7 +186,8 @@ endef
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),distclean)
$(BUILD_DIR)/level_rules.mk: levels/level_rules.mk levels/level_defines.h
$(CPP) $(VERSION_CFLAGS) -I . $(EXTRA_INCLUDES) -o $@ $<
@$(PRINT) "$(GREEN)Preprocessing level make rules: $(BLUE)$@ $(NO_COL)\n"
@$(CPP) $(VERSION_CFLAGS) -I . $(EXTRA_INCLUDES) -o $@ $<
include $(BUILD_DIR)/level_rules.mk
endif
endif
@ -189,80 +204,83 @@ $(eval $(call level_rules,menu,generic)) # Menu (File Select)
# Ending cake textures are generated in a special way
$(BUILD_DIR)/levels/ending/cake_eu.inc.c: levels/ending/cake_eu.png
$(SKYCONV) $(SKYCONV_ARGS) --type cake-eu --split $^ $(BUILD_DIR)/levels/ending
@$(PRINT) "$(GREEN)Splitting $(YELLOW)$< $(GREEN)to: $(BLUE)$@ $(NO_COL)\n"
$(V)$(SKYCONV) $(SKYCONV_ARGS) --type cake-eu --split $^ $(BUILD_DIR)/levels/ending
$(BUILD_DIR)/levels/ending/cake.inc.c: levels/ending/cake.png
$(SKYCONV) $(SKYCONV_ARGS) --type cake --split $^ $(BUILD_DIR)/levels/ending
@$(PRINT) "$(GREEN)Splitting $(YELLOW)$< $(GREEN)to: $(BLUE)$@ $(NO_COL)\n"
$(V)$(SKYCONV) $(SKYCONV_ARGS) --type cake --split $^ $(BUILD_DIR)/levels/ending
# --------------------------------------
# Texture Bin Rules
# --------------------------------------
# Others
SEGMENT2_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/segment2/*.png))
TITLE_SCREEN_BG_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/title_screen_bg/*.png))
SPOOKY_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/spooky/*.png))
GENERIC_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/generic/*.png))
OUTSIDE_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/outside/*.png))
SNOW_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/snow/*.png))
EFFECT_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/effect/*.png))
CAVE_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/cave/*.png))
INSIDE_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/inside/*.png))
WATER_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/water/*.png))
FIRE_TEXTURES_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/fire/*.png))
SKY_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/sky/*.png))
MACHINE_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/machine/*.png))
MOUNTAIN_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/mountain/*.png))
GRASS_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/grass/*.png))
CUSTOM_FONT_TITLE_FILES := $(patsubst %.png,%.inc.c,$(wildcard $(TEXTURE_DIR)/custom_font_title/*.png))
SEGMENT2_TEXTURES := $(wildcard $(TEXTURE_DIR)/segment2/*.png)
TITLE_SCREEN_BG_TEXTURES := $(wildcard $(TEXTURE_DIR)/title_screen_bg/*.png)
SPOOKY_TEXTURES := $(wildcard $(TEXTURE_DIR)/spooky/*.png)
GENERIC_TEXTURES := $(wildcard $(TEXTURE_DIR)/generic/*.png)
OUTSIDE_TEXTURES := $(wildcard $(TEXTURE_DIR)/outside/*.png)
SNOW_TEXTURES := $(wildcard $(TEXTURE_DIR)/snow/*.png)
EFFECT_TEXTURES := $(wildcard $(TEXTURE_DIR)/effect/*.png)
CAVE_TEXTURES := $(wildcard $(TEXTURE_DIR)/cave/*.png)
INSIDE_TEXTURES := $(wildcard $(TEXTURE_DIR)/inside/*.png)
WATER_TEXTURES := $(wildcard $(TEXTURE_DIR)/water/*.png)
FIRE_TEXTURES_TEXTURES := $(wildcard $(TEXTURE_DIR)/fire/*.png)
SKY_TEXTURES := $(wildcard $(TEXTURE_DIR)/sky/*.png)
MACHINE_TEXTURES := $(wildcard $(TEXTURE_DIR)/machine/*.png)
MOUNTAIN_TEXTURES := $(wildcard $(TEXTURE_DIR)/mountain/*.png)
GRASS_TEXTURES := $(wildcard $(TEXTURE_DIR)/grass/*.png)
CUSTOM_FONT_TITLE_TEXTURES := $(wildcard $(TEXTURE_DIR)/custom_font_title/*.png)
# Texture Files
$(BUILD_DIR)/bin/segment2.o: $(addprefix $(BUILD_DIR)/,$(SEGMENT2_FILES))
$(BUILD_DIR)/bin/title_screen_bg.o: $(addprefix $(BUILD_DIR)/,$(TITLE_SCREEN_BG_FILES))
$(BUILD_DIR)/bin/spooky.o: $(addprefix $(BUILD_DIR)/,$(SPOOKY_FILES))
$(BUILD_DIR)/bin/generic.o: $(addprefix $(BUILD_DIR)/,$(GENERIC_FILES))
$(BUILD_DIR)/bin/outside.o: $(addprefix $(BUILD_DIR)/,$(OUTSIDE_FILES))
$(BUILD_DIR)/bin/snow.o: $(addprefix $(BUILD_DIR)/,$(SNOW_FILES))
$(BUILD_DIR)/bin/effect.o: $(addprefix $(BUILD_DIR)/,$(EFFECT_FILES))
$(BUILD_DIR)/bin/cave.o: $(addprefix $(BUILD_DIR)/,$(CAVE_FILES))
$(BUILD_DIR)/bin/inside.o: $(addprefix $(BUILD_DIR)/,$(INSIDE_FILES))
$(BUILD_DIR)/bin/water.o: $(addprefix $(BUILD_DIR)/,$(WATER_FILES))
$(BUILD_DIR)/bin/fire.o: $(addprefix $(BUILD_DIR)/,$(FIRE_TEXTURES_FILES))
$(BUILD_DIR)/bin/sky.o: $(addprefix $(BUILD_DIR)/,$(SKY_FILES))
$(BUILD_DIR)/bin/machine.o: $(addprefix $(BUILD_DIR)/,$(MACHINE_FILES))
$(BUILD_DIR)/bin/mountain.o: $(addprefix $(BUILD_DIR)/,$(MOUNTAIN_FILES))
$(BUILD_DIR)/bin/grass.o: $(addprefix $(BUILD_DIR)/,$(GRASS_FILES))
$(BUILD_DIR)/bin/custom_font_title.o: $(addprefix $(BUILD_DIR)/,$(CUSTOM_FONT_TITLE_FILES))
$(BUILD_DIR)/bin/segment2.o: $(SEGMENT2_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/title_screen_bg.o: $(TITLE_SCREEN_BG_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/spooky.o: $(SPOOKY_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/generic.o: $(GENERIC_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/outside.o: $(OUTSIDE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/snow.o: $(SNOW_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/effect.o: $(EFFECT_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/cave.o: $(CAVE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/inside.o: $(INSIDE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/water.o: $(WATER_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/fire.o: $(FIRE_TEXTURES_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/sky.o: $(SKY_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/machine.o: $(MACHINE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/mountain.o: $(MOUNTAIN_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/grass.o: $(GRASS_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/custom_font_title.o: $(CUSTOM_FONT_TITLE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
# Others
$(BUILD_DIR)/bin/segment2.elf: SEGMENT_ADDRESS := 0x02000000
$(BUILD_DIR)/bin/title_screen_bg.elf: SEGMENT_ADDRESS := 0x0A000000
$(BUILD_DIR)/bin/segment2.elf: SEGMENT_ADDRESS := 0x02000000
$(BUILD_DIR)/bin/title_screen_bg.elf: SEGMENT_ADDRESS := 0x0A000000
$(BUILD_DIR)/bin/debug_level_select.elf: SEGMENT_ADDRESS := 0x07000000
$(BUILD_DIR)/bin/effect.elf: SEGMENT_ADDRESS := 0x0B000000
$(BUILD_DIR)/bin/spooky.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/generic.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/outside.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/snow.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/cave.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/inside.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/water.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/fire.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/sky.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/machine.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/mountain.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/grass.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/custom_font_title.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/effect.elf: SEGMENT_ADDRESS := 0x0B000000
$(BUILD_DIR)/bin/spooky.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/generic.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/outside.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/snow.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/cave.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/inside.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/water.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/fire.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/sky.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/machine.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/mountain.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/grass.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/custom_font_title.elf: SEGMENT_ADDRESS := 0x09000000
# EU segment 19 translations
$(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
$(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
# --------------------------------------
$(BUILD_DIR)/bin/%_skybox.c: textures/skyboxes/%.png
$(SKYCONV) $(SKYCONV_ARGS) --type sky --split $^ $(BUILD_DIR)/bin
@$(PRINT) "$(GREEN)Splitting $(YELLOW)$< $(GREEN)to: $(BLUE)$@ $(NO_COL)\n"
$(V)$(SKYCONV) $(SKYCONV_ARGS) --type sky --split $^ $(BUILD_DIR)/bin
$(BUILD_DIR)/bin/%_skybox.elf: SEGMENT_ADDRESS := 0x0A000000

8
actors/amp/model.inc.c
View file

@ -1,22 +1,22 @@
// Amp
// 0x08000F18
ALIGNED8 static const u8 amp_seg8_texture_08000F18[] = {
ALIGNED8 static const Texture amp_seg8_texture_08000F18[] = {
#include "actors/amp/amp_electricity.rgba16.inc.c"
};
// 0x08001318
ALIGNED8 static const u8 amp_seg8_texture_08001318[] = {
ALIGNED8 static const Texture amp_seg8_texture_08001318[] = {
#include "actors/amp/amp_eyes.rgba16.inc.c"
};
// 0x08001B18
ALIGNED8 static const u8 amp_seg8_texture_08001B18[] = {
ALIGNED8 static const Texture amp_seg8_texture_08001B18[] = {
#include "actors/amp/amp_body.rgba16.inc.c"
};
// 0x08002318
ALIGNED8 static const u8 amp_seg8_texture_08002318[] = {
ALIGNED8 static const Texture amp_seg8_texture_08002318[] = {
#include "actors/amp/amp_mouth.rgba16.inc.c"
};

4
actors/blue_coin_switch/model.inc.c
View file

@ -7,12 +7,12 @@ static const Lights1 blue_coin_switch_seg8_lights_08000000 = gdSPDefLights1(
);
// 0x08000018
ALIGNED8 static const u8 blue_coin_switch_seg8_texture_08000018[] = {
ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000018[] = {
#include "actors/blue_coin_switch/blue_coin_switch_side.rgba16.inc.c"
};
// 0x08000418
ALIGNED8 static const u8 blue_coin_switch_seg8_texture_08000418[] = {
ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000418[] = {
#include "actors/blue_coin_switch/blue_coin_switch_top.rgba16.inc.c"
};

2
actors/blue_fish/model.inc.c
View file

@ -7,7 +7,7 @@ static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1(
);
// 0x0301B5E0
ALIGNED8 static const u8 blue_fish_seg3_texture_0301B5E0[] = {
ALIGNED8 static const Texture blue_fish_seg3_texture_0301B5E0[] = {
#include "actors/blue_fish/blue_fish.rgba16.inc.c"
};

12
actors/bobomb/model.inc.c
View file

@ -1,32 +1,32 @@
// Bobomb
// 0x0801DA60
ALIGNED8 static const u8 bobomb_seg8_texture_0801DA60[] = {
ALIGNED8 static const Texture bobomb_seg8_texture_0801DA60[] = {
#include "actors/bobomb/bob-omb_left_side.rgba16.inc.c"
};
// 0x0801EA60
ALIGNED8 static const u8 bobomb_seg8_texture_0801EA60[] = {
ALIGNED8 static const Texture bobomb_seg8_texture_0801EA60[] = {
#include "actors/bobomb/bob-omb_right_side.rgba16.inc.c"
};
// 0x0801FA60
ALIGNED8 static const u8 bobomb_seg8_texture_0801FA60[] = {
ALIGNED8 static const Texture bobomb_seg8_texture_0801FA60[] = {
#include "actors/bobomb/bob-omb_buddy_left_side.rgba16.inc.c"
};
// 0x08020A60
ALIGNED8 static const u8 bobomb_seg8_texture_08020A60[] = {
ALIGNED8 static const Texture bobomb_seg8_texture_08020A60[] = {
#include "actors/bobomb/bob-omb_buddy_right_side.rgba16.inc.c"
};
// 0x08021A60
ALIGNED8 static const u8 bobomb_seg8_texture_08021A60[] = {
ALIGNED8 static const Texture bobomb_seg8_texture_08021A60[] = {
#include "actors/bobomb/bob-omb_eyes.rgba16.inc.c"
};
// 0x08022260
ALIGNED8 static const u8 bobomb_seg8_texture_08022260[] = {
ALIGNED8 static const Texture bobomb_seg8_texture_08022260[] = {
#include "actors/bobomb/bob-omb_eyes_blink.rgba16.inc.c"
};

6
actors/bomb/model.inc.c
View file

@ -7,17 +7,17 @@ static const Lights1 bomb_seg6_lights_06057AA8 = gdSPDefLights1(
);
// 0x06057AC0
ALIGNED8 static const u8 bomb_seg6_texture_06057AC0[] = {
ALIGNED8 static const Texture bomb_seg6_texture_06057AC0[] = {
#include "actors/bomb/bomb_left_side.rgba16.inc.c"
};
// 0x06058AC0
ALIGNED8 static const u8 bomb_seg6_texture_06058AC0[] = {
ALIGNED8 static const Texture bomb_seg6_texture_06058AC0[] = {
#include "actors/bomb/bomb_right_side.rgba16.inc.c"
};
// 0x06059AC0
ALIGNED8 static const u8 bomb_seg6_texture_06059AC0[] = {
ALIGNED8 static const Texture bomb_seg6_texture_06059AC0[] = {
#include "actors/bomb/bomb_spike.rgba16.inc.c"
};

4
actors/boo/model.inc.c
View file

@ -7,12 +7,12 @@ static const Lights1 boo_seg5_lights_05009B28 = gdSPDefLights1(
);
// 0x05009B40
ALIGNED8 static const u8 boo_seg5_texture_05009B40[] = {
ALIGNED8 static const Texture boo_seg5_texture_05009B40[] = {
#include "actors/boo/boo_eyes.rgba16.inc.c"
};
// 0x0500AB40
ALIGNED8 static const u8 boo_seg5_texture_0500AB40[] = {
ALIGNED8 static const Texture boo_seg5_texture_0500AB40[] = {
#include "actors/boo/boo_mouth.rgba16.inc.c"
};

4
actors/boo_castle/model.inc.c
View file

@ -7,12 +7,12 @@ static const Lights1 boo_castle_seg6_lights_06015658 = gdSPDefLights1(
);
// 0x06015670
ALIGNED8 static const u8 boo_castle_seg6_texture_06015670[] = {
ALIGNED8 static const Texture boo_castle_seg6_texture_06015670[] = {
#include "actors/boo_castle/bbh_boo_eyes.rgba16.inc.c"
};
// 0x06016670
ALIGNED8 static const u8 boo_castle_seg6_texture_06016670[] = {
ALIGNED8 static const Texture boo_castle_seg6_texture_06016670[] = {
#include "actors/boo_castle/bbh_boo_mouth.rgba16.inc.c"
};

2
actors/book/model.inc.c
View file

@ -9,7 +9,7 @@ static const Lights1 book_seg5_lights_05002558 = gdSPDefLights1(
);
// 0x05002570
ALIGNED8 static const u8 book_seg5_texture_05002570[] = {
ALIGNED8 static const Texture book_seg5_texture_05002570[] = {
#include "actors/book/book_cover.rgba16.inc.c"
};

10
actors/bookend/model.inc.c
View file

@ -25,27 +25,27 @@ UNUSED static const Lights1 bookend_lights_unused4 = gdSPDefLights1(
);
// 0x05000060
ALIGNED8 static const u8 bookend_seg5_texture_05000060[] = {
ALIGNED8 static const Texture bookend_seg5_texture_05000060[] = {
#include "actors/bookend/bookend_spine.rgba16.inc.c"
};
// 0x05000460
ALIGNED8 static const u8 bookend_seg5_texture_05000460[] = {
ALIGNED8 static const Texture bookend_seg5_texture_05000460[] = {
#include "actors/bookend/bookend_tooth.rgba16.inc.c"
};
// 0x05000860
ALIGNED8 static const u8 bookend_seg5_texture_05000860[] = {
ALIGNED8 static const Texture bookend_seg5_texture_05000860[] = {
#include "actors/bookend/bookend_mouth.rgba16.inc.c"
};
// 0x05000C60
ALIGNED8 static const u8 bookend_seg5_texture_05000C60[] = {
ALIGNED8 static const Texture bookend_seg5_texture_05000C60[] = {
#include "actors/bookend/bookend_pages.rgba16.inc.c"
};
// 0x05001060
ALIGNED8 static const u8 bookend_seg5_texture_05001060[] = {
ALIGNED8 static const Texture bookend_seg5_texture_05001060[] = {
#include "actors/bookend/bookend_cover.rgba16.inc.c"
};

58
actors/bowser/model.inc.c
View file

@ -1,149 +1,149 @@
// Bowser (King Koopa)
// 0x0601F438
ALIGNED8 static const u8 bowser_seg6_texture_0601F438[] = {
ALIGNED8 static const Texture bowser_seg6_texture_0601F438[] = {
#include "actors/bowser/bowser_shell.rgba16.inc.c"
};
// 0x0601FC38
ALIGNED8 static const u8 bowser_seg6_texture_0601FC38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_0601FC38[] = {
#include "actors/bowser/bowser_eyebrow.rgba16.inc.c"
};
// 0x06020C38
ALIGNED8 static const u8 bowser_seg6_texture_06020C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06020C38[] = {
#include "actors/bowser/bowser_muzzle.rgba16.inc.c"
};
// 0x06021438
ALIGNED8 static const u8 bowser_seg6_texture_06021438[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06021438[] = {
#include "actors/bowser/bowser_nostrils.rgba16.inc.c"
};
// 0x06022438
ALIGNED8 static const u8 bowser_seg6_texture_06022438[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06022438[] = {
#include "actors/bowser/bowser_body.rgba16.inc.c"
};
// 0x06022C38
ALIGNED8 static const u8 bowser_seg6_texture_06022C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06022C38[] = {
#include "actors/bowser/bowser_armband_spike.rgba16.inc.c"
};
// 0x06023C38
ALIGNED8 static const u8 bowser_seg6_texture_06023C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06023C38[] = {
#include "actors/bowser/bowser_armband.rgba16.inc.c"
};
// 0x06024438
ALIGNED8 static const u8 bowser_seg6_texture_06024438[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06024438[] = {
#include "actors/bowser/bowser_tongue.rgba16.inc.c"
};
// 0x06025438
ALIGNED8 static const u8 bowser_seg6_texture_06025438[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06025438[] = {
#include "actors/bowser/bowser_chest.rgba16.inc.c"
};
// 0x06025C38
ALIGNED8 static const u8 bowser_seg6_texture_06025C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06025C38[] = {
#include "actors/bowser/bowser_shell_edge.rgba16.inc.c"
};
// unreferenced, seen in pre-Spaceworld 1995 B-roll footage build
// 0x06026438
ALIGNED8 static const u8 bowser_seg6_texture_06026438[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06026438[] = {
#include "actors/bowser/bowser_blue_eye_unused.rgba16.inc.c"
};
// unreferenced (stubbed texture? possibly original texture for mouth)
// 0x06027438
ALIGNED8 static const u8 bowser_seg6_texture_06027438[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06027438[] = {
#include "actors/bowser/bowser_mouth_unused.rgba16.inc.c"
};
// 0x06028438
ALIGNED8 static const u8 bowser_seg6_texture_06028438[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06028438[] = {
#include "actors/bowser/bowser_upper_face.rgba16.inc.c"
};
// 0x06028C38
ALIGNED8 static const u8 bowser_seg6_texture_06028C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06028C38[] = {
#include "actors/bowser/bowser_hair.rgba16.inc.c"
};
// 0x06029C38
ALIGNED8 static const u8 bowser_seg6_texture_06029C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06029C38[] = {
#include "actors/bowser/bowser_claw_edge.rgba16.inc.c"
};
// 0x0602AC38
ALIGNED8 static const u8 bowser_seg6_texture_0602AC38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_0602AC38[] = {
#include "actors/bowser/bowser_claw_horn_tooth.rgba16.inc.c"
};
// 0x0602BC38
ALIGNED8 static const u8 bowser_seg6_texture_0602BC38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_0602BC38[] = {
#include "actors/bowser/bowser_claw_horn_angle.rgba16.inc.c"
};
// 0x0602CC38
ALIGNED8 static const u8 bowser_seg6_texture_0602CC38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_0602CC38[] = {
#include "actors/bowser/bowser_eye_left_0.rgba16.inc.c"
};
// 0x0602DC38
ALIGNED8 static const u8 bowser_seg6_texture_0602DC38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_0602DC38[] = {
#include "actors/bowser/bowser_eye_half_closed_0.rgba16.inc.c"
};
// 0x0602EC38
ALIGNED8 static const u8 bowser_seg6_texture_0602EC38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_0602EC38[] = {
#include "actors/bowser/bowser_eye_closed_0.rgba16.inc.c"
};
// 0x0602FC38
ALIGNED8 static const u8 bowser_seg6_texture_0602FC38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_0602FC38[] = {
#include "actors/bowser/bowser_eye_center_0.rgba16.inc.c"
};
// 0x06030C38
ALIGNED8 static const u8 bowser_seg6_texture_06030C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06030C38[] = {
#include "actors/bowser/bowser_eye_right_0.rgba16.inc.c"
};
// 0x06031C38
ALIGNED8 static const u8 bowser_seg6_texture_06031C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06031C38[] = {
#include "actors/bowser/bowser_eye_far_left_0.rgba16.inc.c"
};
// 0x06032C38
ALIGNED8 static const u8 bowser_seg6_texture_06032C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06032C38[] = {
#include "actors/bowser/bowser_eye_left_1.rgba16.inc.c"
};
// 0x06033C38
ALIGNED8 static const u8 bowser_seg6_texture_06033C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06033C38[] = {
#include "actors/bowser/bowser_eye_half_closed_1.rgba16.inc.c"
};
// 0x06034C38
ALIGNED8 static const u8 bowser_seg6_texture_06034C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06034C38[] = {
#include "actors/bowser/bowser_eye_closed_1.rgba16.inc.c"
};
// 0x06035C38
ALIGNED8 static const u8 bowser_seg6_texture_06035C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06035C38[] = {
#include "actors/bowser/bowser_eye_center_1.rgba16.inc.c"
};
// 0x06036C38
ALIGNED8 static const u8 bowser_seg6_texture_06036C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06036C38[] = {
#include "actors/bowser/bowser_eye_right_1.rgba16.inc.c"
};
// 0x06037C38
ALIGNED8 static const u8 bowser_seg6_texture_06037C38[] = {
ALIGNED8 static const Texture bowser_seg6_texture_06037C38[] = {
#include "actors/bowser/bowser_eye_far_left_1.rgba16.inc.c"
};

45
actors/bowser_flame/model.inc.c
View file

@ -1,74 +1,74 @@
// Bowser Flame
// TODO: Are these seperate textures or unified 64x64 ones?
// TODO: These 64x64 textures are referenced as two different texture addresses in the DLs
// 0x06000000
ALIGNED8 static const u8 flame_seg6_texture_06000000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06000000[] = {
#include "actors/bowser_flame/bowser_flame_0.rgba16.inc.c"
};
// 0x06002000
ALIGNED8 static const u8 flame_seg6_texture_06002000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06002000[] = {
#include "actors/bowser_flame/bowser_flame_1.rgba16.inc.c"
};
// 0x06004000
ALIGNED8 static const u8 flame_seg6_texture_06004000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06004000[] = {
#include "actors/bowser_flame/bowser_flame_2.rgba16.inc.c"
};
// 0x06006000
ALIGNED8 static const u8 flame_seg6_texture_06006000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06006000[] = {
#include "actors/bowser_flame/bowser_flame_3.rgba16.inc.c"
};
// 0x06008000
ALIGNED8 static const u8 flame_seg6_texture_06008000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06008000[] = {
#include "actors/bowser_flame/bowser_flame_4.rgba16.inc.c"
};
// 0x0600A000
ALIGNED8 static const u8 flame_seg6_texture_0600A000[] = {
ALIGNED8 static const Texture flame_seg6_texture_0600A000[] = {
#include "actors/bowser_flame/bowser_flame_5.rgba16.inc.c"
};
// 0x0600C000
ALIGNED8 static const u8 flame_seg6_texture_0600C000[] = {
ALIGNED8 static const Texture flame_seg6_texture_0600C000[] = {
#include "actors/bowser_flame/bowser_flame_6.rgba16.inc.c"
};
// 0x0600E000
ALIGNED8 static const u8 flame_seg6_texture_0600E000[] = {
ALIGNED8 static const Texture flame_seg6_texture_0600E000[] = {
#include "actors/bowser_flame/bowser_flame_7.rgba16.inc.c"
};
// 0x06010000
ALIGNED8 static const u8 flame_seg6_texture_06010000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06010000[] = {
#include "actors/bowser_flame/bowser_flame_8.rgba16.inc.c"
};
// 0x06012000
ALIGNED8 static const u8 flame_seg6_texture_06012000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06012000[] = {
#include "actors/bowser_flame/bowser_flame_9.rgba16.inc.c"
};
// 0x06014000
ALIGNED8 static const u8 flame_seg6_texture_06014000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06014000[] = {
#include "actors/bowser_flame/bowser_flame_10.rgba16.inc.c"
};
// 0x06016000
ALIGNED8 static const u8 flame_seg6_texture_06016000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06016000[] = {
#include "actors/bowser_flame/bowser_flame_11.rgba16.inc.c"
};
// 0x06018000
ALIGNED8 static const u8 flame_seg6_texture_06018000[] = {
ALIGNED8 static const Texture flame_seg6_texture_06018000[] = {
#include "actors/bowser_flame/bowser_flame_12.rgba16.inc.c"
};
// 0x0601A000
ALIGNED8 static const u8 flame_seg6_texture_0601A000[] = {
ALIGNED8 static const Texture flame_seg6_texture_0601A000[] = {
#include "actors/bowser_flame/bowser_flame_13.rgba16.inc.c"
};
@ -120,6 +120,7 @@ const Gfx flame_seg6_dl_0601C108[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06000000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06000000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -131,6 +132,7 @@ const Gfx flame_seg6_dl_0601C1A8[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06002000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06002000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -142,6 +144,7 @@ const Gfx flame_seg6_dl_0601C248[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06004000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06004000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -153,6 +156,7 @@ const Gfx flame_seg6_dl_0601C2E8[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06006000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06006000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -164,6 +168,7 @@ const Gfx flame_seg6_dl_0601C388[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06008000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06008000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -175,6 +180,7 @@ const Gfx flame_seg6_dl_0601C428[] = {
gsDPLoadTextureBlock(flame_seg6_texture_0600A000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_0600A000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -185,6 +191,8 @@ const Gfx flame_seg6_dl_0601C4C8[] = {
gsSPDisplayList(flame_seg6_dl_0601C080),
gsDPLoadTextureBlock(flame_seg6_texture_0600C000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_0600C000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -196,6 +204,7 @@ const Gfx flame_seg6_dl_0601C568[] = {
gsDPLoadTextureBlock(flame_seg6_texture_0600E000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_0600E000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -207,6 +216,7 @@ const Gfx flame_seg6_dl_0601C608[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06010000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06010000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -218,6 +228,7 @@ const Gfx flame_seg6_dl_0601C6A8[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06012000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06012000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -229,6 +240,7 @@ const Gfx flame_seg6_dl_0601C748[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06014000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06014000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -240,6 +252,7 @@ const Gfx flame_seg6_dl_0601C7E8[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06016000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06016000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -251,6 +264,7 @@ const Gfx flame_seg6_dl_0601C888[] = {
gsDPLoadTextureBlock(flame_seg6_texture_06018000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_06018000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),
@ -262,6 +276,7 @@ const Gfx flame_seg6_dl_0601C928[] = {
gsDPLoadTextureBlock(flame_seg6_texture_0601A000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(flame_seg6_vertex_0601C000, 8, 0),
gsSPDisplayList(flame_seg6_dl_0601C0B0),
//gsDPLoadTextureBlock((u8*)flame_seg6_texture_0601A000 + 0x1000, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(flame_seg6_dl_0601C0C8),
gsSPDisplayList(flame_seg6_dl_0601C0E0),
gsSPEndDisplayList(),

4
actors/breakable_box/model.inc.c
View file

@ -7,12 +7,12 @@ static const Lights1 breakable_box_seg8_lights_08011A80 = gdSPDefLights1(
);
// 0x08011A90
ALIGNED8 static const u8 breakable_box_seg8_texture_08011A90[] = {
ALIGNED8 static const Texture breakable_box_seg8_texture_08011A90[] = {
#include "actors/breakable_box/crazy_box_surface.rgba16.inc.c"
};
// 0x08012290
ALIGNED8 static const u8 breakable_box_seg8_texture_08012290[] = {
ALIGNED8 static const Texture breakable_box_seg8_texture_08012290[] = {
#include "actors/breakable_box/cork_box_surface.rgba16.inc.c"
};

8
actors/bub/model.inc.c
View file

@ -13,22 +13,22 @@ static const Lights1 bub_seg6_lights_0600E290 = gdSPDefLights1(
);
// 0x0600E2A8
ALIGNED8 static const u8 bub_seg6_texture_0600E2A8[] = {
ALIGNED8 static const Texture bub_seg6_texture_0600E2A8[] = {
#include "actors/bub/bub_eye_border.rgba16.inc.c"
};
// 0x0600EAA8
ALIGNED8 static const u8 bub_seg6_texture_0600EAA8[] = {
ALIGNED8 static const Texture bub_seg6_texture_0600EAA8[] = {
#include "actors/bub/bub_fins.rgba16.inc.c"
};
// 0x0600F2A8
ALIGNED8 static const u8 bub_seg6_texture_0600F2A8[] = {
ALIGNED8 static const Texture bub_seg6_texture_0600F2A8[] = {
#include "actors/bub/bub_eyes.rgba16.inc.c"
};
// 0x060102A8
ALIGNED8 static const u8 bub_seg6_texture_060102A8[] = {
ALIGNED8 static const Texture bub_seg6_texture_060102A8[] = {
#include "actors/bub/bub_scales.rgba16.inc.c"
};

10
actors/bubba/model.inc.c
View file

@ -8,28 +8,28 @@ UNUSED static const u64 bubba_unused_1 = 0;
// Bubba
// 0x05000008
ALIGNED8 static const u8 bubba_seg5_texture_05000008[] = {
ALIGNED8 static const Texture bubba_seg5_texture_05000008[] = {
#include "actors/bubba/bubba_sunglasses.rgba16.inc.c"
};
// unused eye texture, assumed leftover from when actor file was copied from bub
// 0x05000408
ALIGNED8 static const u8 bubba_seg5_texture_05000408[] = {
ALIGNED8 static const Texture bubba_seg5_texture_05000408[] = {
#include "actors/bubba/bubba_eyes_unused.rgba16.inc.c"
};
// 0x05001408
ALIGNED8 static const u8 bubba_seg5_texture_05001408[] = {
ALIGNED8 static const Texture bubba_seg5_texture_05001408[] = {
#include "actors/bubba/bubba_eye_border.rgba16.inc.c"
};
// 0x05001C08
ALIGNED8 static const u8 bubba_seg5_texture_05001C08[] = {
ALIGNED8 static const Texture bubba_seg5_texture_05001C08[] = {
#include "actors/bubba/bubba_fins.rgba16.inc.c"
};
// 0x05002408
ALIGNED8 static const u8 bubba_seg5_texture_05002408[] = {
ALIGNED8 static const Texture bubba_seg5_texture_05002408[] = {
#include "actors/bubba/bubba_scales.rgba16.inc.c"
};

4
actors/bubble/model.inc.c
View file

@ -9,12 +9,12 @@ static const Vtx bubble_seg4_vertex_0401CD20[] = {
};
// 0x0401CD60
ALIGNED8 static const u8 bubble_seg4_texture_0401CD60[] = {
ALIGNED8 static const Texture bubble_seg4_texture_0401CD60[] = {
#include "actors/bubble/bubble.rgba16.inc.c"
};
// 0x0401D560
ALIGNED8 static const u8 bubble_seg4_texture_0401D560[] = {
ALIGNED8 static const Texture bubble_seg4_texture_0401D560[] = {
#include "actors/bubble/mr_i_bubble.rgba16.inc.c"
};

4
actors/bullet_bill/model.inc.c
View file

@ -7,12 +7,12 @@ static const Lights1 bullet_bill_seg5_lights_0500BA90 = gdSPDefLights1(
);
// 0x0500BAA8
ALIGNED8 static const u8 bullet_bill_seg5_texture_0500BAA8[] = {
ALIGNED8 static const Texture bullet_bill_seg5_texture_0500BAA8[] = {
#include "actors/bullet_bill/bullet_bill_eye.rgba16.inc.c"
};
// 0x0500CAA8
ALIGNED8 static const u8 bullet_bill_seg5_texture_0500CAA8[] = {
ALIGNED8 static const Texture bullet_bill_seg5_texture_0500CAA8[] = {
#include "actors/bullet_bill/bullet_bill_mouth.rgba16.inc.c"
};

10
actors/bully/model.inc.c
View file

@ -19,7 +19,7 @@ static const Vtx bully_seg5_vertex_05000000[] = {
};
// 0x050000E0
ALIGNED8 static const u8 bully_seg5_texture_050000E0[] = {
ALIGNED8 static const Texture bully_seg5_texture_050000E0[] = {
#include "actors/bully/bully_horn.rgba16.inc.c"
};
@ -85,17 +85,17 @@ static const Lights1 bully_seg5_lights_05000450 = gdSPDefLights1(
// //! There's another malformed light entry here.
// 0x05000468
ALIGNED8 static const u8 bully_seg5_texture_05000468[] = {
ALIGNED8 static const Texture bully_seg5_texture_05000468[] = {
#include "actors/bully/bully_left_side.rgba16.inc.c"
};
// 0x05001468
ALIGNED8 static const u8 bully_seg5_texture_05001468[] = {
ALIGNED8 static const Texture bully_seg5_texture_05001468[] = {
#include "actors/bully/bully_right_side.rgba16.inc.c"
};
// 0x05002468
ALIGNED8 static const u8 bully_seg5_texture_05002468[] = {
ALIGNED8 static const Texture bully_seg5_texture_05002468[] = {
#include "actors/bully/bully_eye.rgba16.inc.c"
};
@ -355,7 +355,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((u8*)bully_seg5_texture_05000468 + 0x8, 1), //! yet another malformed light...
gsSPLight(bully_seg5_texture_05000468, 2),
gsSPVertex(bully_seg5_vertex_05002EA8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),

2
actors/burn_smoke/model.inc.c
View file

@ -15,7 +15,7 @@ static const Vtx burn_smoke_seg4_vertex_040217C0[] = {
// said fix is on a compile-time variable. Use TEXTURE_FIX=1 at compile time
// to fix this.
// 0x04021800
ALIGNED8 static const u8 burn_smoke_seg4_texture_04021800[] = {
ALIGNED8 static const Texture burn_smoke_seg4_texture_04021800[] = {
#include "actors/burn_smoke/burn_smoke.ia16.inc.c"
};

2
actors/butterfly/model.inc.c
View file

@ -11,7 +11,7 @@ static const Vtx butterfly_seg3_vertex_03004348[] = {
};
// 0x030043A8
ALIGNED8 static const u8 butterfly_seg3_texture_030043A8[] = {
ALIGNED8 static const Texture butterfly_seg3_texture_030043A8[] = {
#include "actors/butterfly/butterfly_wing.rgba16.inc.c"
};

2
actors/cannon_barrel/model.inc.c
View file

@ -13,7 +13,7 @@ static const Lights1 cannon_barrel_seg8_lights_08005890 = gdSPDefLights1(
);
// 0x080058A8
ALIGNED8 static const u8 cannon_barrel_seg8_texture_080058A8[] = {
ALIGNED8 static const Texture cannon_barrel_seg8_texture_080058A8[] = {
#include "actors/cannon_barrel/cannon_barrel.rgba16.inc.c"
};

2
actors/cannon_base/model.inc.c
View file

@ -13,7 +13,7 @@ static const Lights1 cannon_base_seg8_lights_080049A0 = gdSPDefLights1(
);
// 0x080049B8
ALIGNED8 static const u8 cannon_base_seg8_texture_080049B8[] = {
ALIGNED8 static const Texture cannon_base_seg8_texture_080049B8[] = {
#include "actors/cannon_base/cannon_base.rgba16.inc.c"
};

2
actors/cannon_lid/model.inc.c
View file

@ -7,7 +7,7 @@ static const Lights1 cannon_lid_seg8_lights_08004040 = gdSPDefLights1(
);
// 0x08004058
ALIGNED8 static const u8 cannon_lid_seg8_texture_08004058[] = {
ALIGNED8 static const Texture cannon_lid_seg8_texture_08004058[] = {
#include "actors/cannon_lid/cannon_lid.rgba16.inc.c"
};

4
actors/capswitch/model.inc.c
View file

@ -37,12 +37,12 @@ static const Lights1 capswitch_seg5_lights_05001C30 = gdSPDefLights1(
);
// 0x05001C48
ALIGNED8 static const u8 capswitch_seg5_texture_05001C48[] = {
ALIGNED8 static const Texture capswitch_seg5_texture_05001C48[] = {
#include "actors/capswitch/cap_switch_head.ia16.inc.c"
};
// 0x05002C48
ALIGNED8 static const u8 capswitch_seg5_texture_05002C48[] = {
ALIGNED8 static const Texture capswitch_seg5_texture_05002C48[] = {
#include "actors/capswitch/cap_switch_base.rgba16.inc.c"
};

2
actors/chain_ball/model.inc.c
View file

@ -13,7 +13,7 @@ static const Vtx chain_ball_seg6_vertex_06020AA0[] = {
UNUSED static const u64 chain_ball_unused_1 = 0;
// 0x06020AE8
ALIGNED8 static const u8 chain_ball_seg6_texture_06020AE8[] = {
ALIGNED8 static const Texture chain_ball_seg6_texture_06020AE8[] = {
#include "actors/chain_ball/chain_ball.rgba16.inc.c"
};

10
actors/chain_chomp/model.inc.c
View file

@ -19,27 +19,27 @@ UNUSED static const Lights1 chain_chomp_lights_unused3 = gdSPDefLights1(
);
// 0x060213D0
ALIGNED8 static const u8 chain_chomp_seg6_texture_060213D0[] = {
ALIGNED8 static const Texture chain_chomp_seg6_texture_060213D0[] = {
#include "actors/chain_chomp/chain_chomp_bright_shine.rgba16.inc.c"
};
// 0x06021BD0
ALIGNED8 static const u8 chain_chomp_seg6_texture_06021BD0[] = {
ALIGNED8 static const Texture chain_chomp_seg6_texture_06021BD0[] = {
#include "actors/chain_chomp/chain_chomp_dull_shine.rgba16.inc.c"
};
// 0x060223D0
ALIGNED8 static const u8 chain_chomp_seg6_texture_060223D0[] = {
ALIGNED8 static const Texture chain_chomp_seg6_texture_060223D0[] = {
#include "actors/chain_chomp/chain_chomp_tongue.rgba16.inc.c"
};
// 0x06022BD0
ALIGNED8 static const u8 chain_chomp_seg6_texture_06022BD0[] = {
ALIGNED8 static const Texture chain_chomp_seg6_texture_06022BD0[] = {
#include "actors/chain_chomp/chain_chomp_tooth.rgba16.inc.c"
};
// 0x060233D0
ALIGNED8 static const u8 chain_chomp_seg6_texture_060233D0[] = {
ALIGNED8 static const Texture chain_chomp_seg6_texture_060233D0[] = {
#include "actors/chain_chomp/chain_chomp_eye.rgba16.inc.c"
};

8
actors/chair/model.inc.c
View file

@ -7,23 +7,23 @@ UNUSED static const Lights1 chair_lights_unused = gdSPDefLights1(
);
// 0x05003060
ALIGNED8 static const u8 chair_seg5_texture_05003060[] = {
ALIGNED8 static const Texture chair_seg5_texture_05003060[] = {
#include "actors/chair/chair_front.rgba16.inc.c"
};
// 0x05003860
ALIGNED8 static const u8 chair_seg5_texture_05003860[] = {
ALIGNED8 static const Texture chair_seg5_texture_05003860[] = {
#include "actors/chair/chair_leg.rgba16.inc.c"
};
// 0x05004060
ALIGNED8 static const u8 chair_seg5_texture_05004060[] = {
ALIGNED8 static const Texture chair_seg5_texture_05004060[] = {
#include "actors/chair/chair_bottom.rgba16.inc.c"
};
// unreferenced
// 0x05004460
ALIGNED8 static const u8 chair_seg5_texture_05004460[] = {
ALIGNED8 static const Texture chair_seg5_texture_05004460[] = {
#include "actors/chair/chair_surface_unused.rgba16.inc.c"
};

4
actors/checkerboard_platform/model.inc.c
View file

@ -7,12 +7,12 @@ static const Lights1 checkerboard_platform_seg8_lights_0800C828 = gdSPDefLights1
);
// 0x0800C840
ALIGNED8 static const u8 checkerboard_platform_seg8_texture_0800C840[] = {
ALIGNED8 static const Texture checkerboard_platform_seg8_texture_0800C840[] = {
#include "actors/checkerboard_platform/checkerboard_platform_side.rgba16.inc.c"
};
// 0x0800CC40
ALIGNED8 static const u8 checkerboard_platform_seg8_texture_0800CC40[] = {
ALIGNED8 static const Texture checkerboard_platform_seg8_texture_0800CC40[] = {
#include "actors/checkerboard_platform/checkerboard_platform.rgba16.inc.c"
};

6
actors/chillychief/model.inc.c
View file

@ -25,17 +25,17 @@ UNUSED static const Lights1 chillychief_lights_unused = gdSPDefLights1(
);
// 0x06000060
ALIGNED8 static const u8 chilly_chief_seg6_texture_06000060[] = {
ALIGNED8 static const Texture chilly_chief_seg6_texture_06000060[] = {
#include "actors/chillychief/chill_bully_left_side.rgba16.inc.c"
};
// 0x06001060
ALIGNED8 static const u8 chilly_chief_seg6_texture_06001060[] = {
ALIGNED8 static const Texture chilly_chief_seg6_texture_06001060[] = {
#include "actors/chillychief/chill_bully_right_side.rgba16.inc.c"
};
// 0x06002060
ALIGNED8 static const u8 chilly_chief_seg6_texture_06002060[] = {
ALIGNED8 static const Texture chilly_chief_seg6_texture_06002060[] = {
#include "actors/chillychief/chill_bully_eye.rgba16.inc.c"
};

8
actors/chuckya/model.inc.c
View file

@ -43,22 +43,22 @@ UNUSED static const Lights1 chuckya_lights_unused7 = gdSPDefLights1(
);
// 0x08006778
ALIGNED8 static const u8 chuckya_seg8_texture_08006778[] = {
ALIGNED8 static const Texture chuckya_seg8_texture_08006778[] = {
#include "actors/chuckya/chuckya_eyes.rgba16.inc.c"
};
// 0x08007778
ALIGNED8 static const u8 chuckya_seg8_texture_08007778[] = {
ALIGNED8 static const Texture chuckya_seg8_texture_08007778[] = {
#include "actors/chuckya/chuckya_hand_antenna.rgba16.inc.c"
};
// 0x08007F78
ALIGNED8 static const u8 chuckya_seg8_texture_08007F78[] = {
ALIGNED8 static const Texture chuckya_seg8_texture_08007F78[] = {
#include "actors/chuckya/chuckya_body_arm_left_side.rgba16.inc.c"
};
// 0x08008F78
ALIGNED8 static const u8 chuckya_seg8_texture_08008F78[] = {
ALIGNED8 static const Texture chuckya_seg8_texture_08008F78[] = {
#include "actors/chuckya/chuckya_body_arm_right_side.rgba16.inc.c"
};

4
actors/clam_shell/model.inc.c
View file

@ -13,12 +13,12 @@ UNUSED static const Lights1 clam_shell_lights_unused2 = gdSPDefLights1(
);
// 0x05000030
ALIGNED8 static const u8 clam_shell_seg5_texture_05000030[] = {
ALIGNED8 static const Texture clam_shell_seg5_texture_05000030[] = {
#include "actors/clam_shell/clam_shell.rgba16.inc.c"
};
// 0x05000830
ALIGNED8 static const u8 clam_shell_seg5_texture_05000830[] = {
ALIGNED8 static const Texture clam_shell_seg5_texture_05000830[] = {
#include "actors/clam_shell/clam_shell_mouth.rgba16.inc.c"
};

8
actors/coin/model.inc.c
View file

@ -25,22 +25,22 @@ static const Vtx coin_seg3_vertex_03005740[] = {
};
// 0x03005780
ALIGNED8 static const u8 coin_seg3_texture_03005780[] = {
ALIGNED8 static const Texture coin_seg3_texture_03005780[] = {
#include "actors/coin/coin_front.ia16.inc.c"
};
// 0x03005F80
ALIGNED8 static const u8 coin_seg3_texture_03005F80[] = {
ALIGNED8 static const Texture coin_seg3_texture_03005F80[] = {
#include "actors/coin/coin_tilt_right.ia16.inc.c"
};
// 0x03006780
ALIGNED8 static const u8 coin_seg3_texture_03006780[] = {
ALIGNED8 static const Texture coin_seg3_texture_03006780[] = {
#include "actors/coin/coin_side.ia16.inc.c"
};
// 0x03006F80
ALIGNED8 static const u8 coin_seg3_texture_03006F80[] = {
ALIGNED8 static const Texture coin_seg3_texture_03006F80[] = {
#include "actors/coin/coin_tilt_left.ia16.inc.c"
};

9
actors/common0.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "blue_coin_switch/model.inc.c"

9
actors/common1.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "mist/model.inc.c"

2
actors/cyan_fish/model.inc.c
View file

@ -4,7 +4,7 @@
UNUSED static const u64 cyan_fish_unused_1 = 0;
// 0x0600D468
ALIGNED8 static const u8 cyan_fish_seg6_texture_0600D468[] = {
ALIGNED8 static const Texture cyan_fish_seg6_texture_0600D468[] = {
#include "actors/cyan_fish/cyan_fish.rgba16.inc.c"
};

2
actors/dirt/model.inc.c
View file

@ -32,7 +32,7 @@ static const Vtx dirt_seg3_vertex_0302BDC8[] = {
};
// 0x0302BDF8
ALIGNED8 static const u8 dirt_seg3_texture_0302BDF8[] = {
ALIGNED8 static const Texture dirt_seg3_texture_0302BDF8[] = {
#include "actors/dirt/dirt_particle.rgba16.inc.c"
};

28
actors/door/model.inc.c
View file

@ -13,72 +13,72 @@ static const Lights1 door_seg3_lights_03009CF8 = gdSPDefLights1(
);
// 0x03009D10
ALIGNED8 static const u8 door_seg3_texture_03009D10[] = {
ALIGNED8 static const Texture door_seg3_texture_03009D10[] = {
#include "actors/door/polished_wooden_door.rgba16.inc.c"
};
// 0x0300AD10
ALIGNED8 static const u8 door_seg3_texture_0300AD10[] = {
ALIGNED8 static const Texture door_seg3_texture_0300AD10[] = {
#include "actors/door/polished_wooden_door_overlay.rgba16.inc.c"
};
// 0x0300BD10
ALIGNED8 static const u8 door_seg3_texture_0300BD10[] = {
ALIGNED8 static const Texture door_seg3_texture_0300BD10[] = {
#include "actors/door/rough_wooden_door.rgba16.inc.c"
};
// 0x0300CD10
ALIGNED8 static const u8 door_seg3_texture_0300CD10[] = {
ALIGNED8 static const Texture door_seg3_texture_0300CD10[] = {
#include "actors/door/rough_wooden_door_overlay.rgba16.inc.c"
};
// 0x0300D510
ALIGNED8 static const u8 door_seg3_texture_0300D510[] = {
ALIGNED8 static const Texture door_seg3_texture_0300D510[] = {
#include "actors/door/metal_door.rgba16.inc.c"
};
// 0x0300E510
ALIGNED8 static const u8 door_seg3_texture_0300E510[] = {
ALIGNED8 static const Texture door_seg3_texture_0300E510[] = {
#include "actors/door/metal_door_overlay.rgba16.inc.c"
};
// 0x0300ED10
ALIGNED8 static const u8 door_seg3_texture_0300ED10[] = {
ALIGNED8 static const Texture door_seg3_texture_0300ED10[] = {
#include "actors/door/hmc_mural_door.rgba16.inc.c"
};
// 0x0300FD10
ALIGNED8 static const u8 door_seg3_texture_0300FD10[] = {
ALIGNED8 static const Texture door_seg3_texture_0300FD10[] = {
#include "actors/door/hmc_mural_door_overlay.rgba16.inc.c"
};
// 0x03010510
ALIGNED8 static const u8 door_seg3_texture_03010510[] = {
ALIGNED8 static const Texture door_seg3_texture_03010510[] = {
#include "actors/door/bbh_door.rgba16.inc.c"
};
// 0x03011510
ALIGNED8 static const u8 door_seg3_texture_03011510[] = {
ALIGNED8 static const Texture door_seg3_texture_03011510[] = {
#include "actors/door/bbh_door_overlay.rgba16.inc.c"
};
// 0x03011D10
ALIGNED8 static const u8 door_seg3_texture_03011D10[] = {
ALIGNED8 static const Texture door_seg3_texture_03011D10[] = {
#include "actors/door/zero_star_door_sign.rgba16.inc.c"
};
// 0x03012510
ALIGNED8 static const u8 door_seg3_texture_03012510[] = {
ALIGNED8 static const Texture door_seg3_texture_03012510[] = {
#include "actors/door/one_star_door_sign.rgba16.inc.c"
};
// 0x03012D10
ALIGNED8 static const u8 door_seg3_texture_03012D10[] = {
ALIGNED8 static const Texture door_seg3_texture_03012D10[] = {
#include "actors/door/three_star_door_sign.rgba16.inc.c"
};
// 0x03013510
ALIGNED8 static const u8 door_seg3_texture_03013510[] = {
ALIGNED8 static const Texture door_seg3_texture_03013510[] = {
#include "actors/door/door_lock.rgba16.inc.c"
};

6
actors/dorrie/model.inc.c
View file

@ -1,17 +1,17 @@
// Dorrie
// 0x06009BA0
ALIGNED8 static const u8 dorrie_seg6_texture_06009BA0[] = {
ALIGNED8 static const Texture dorrie_seg6_texture_06009BA0[] = {
#include "actors/dorrie/dorrie_eye.rgba16.inc.c"
};
// 0x06009DA0
ALIGNED8 static const u8 dorrie_seg6_texture_06009DA0[] = {
ALIGNED8 static const Texture dorrie_seg6_texture_06009DA0[] = {
#include "actors/dorrie/dorrie_skin.rgba16.inc.c"
};
// 0x0600ADA0
ALIGNED8 static const u8 dorrie_seg6_texture_0600ADA0[] = {
ALIGNED8 static const Texture dorrie_seg6_texture_0600ADA0[] = {
#include "actors/dorrie/dorrie_tongue.rgba16.inc.c"
};

16
actors/exclamation_box/model.inc.c
View file

@ -7,42 +7,42 @@ static const Lights1 exclamation_box_seg8_lights_08012E10 = gdSPDefLights1(
);
// 0x08012E28
ALIGNED8 static const u8 exclamation_box_seg8_texture_08012E28[] = {
ALIGNED8 static const Texture exclamation_box_seg8_texture_08012E28[] = {
#include "actors/exclamation_box/vanish_cap_box_front.rgba16.inc.c"
};
// 0x08013628
ALIGNED8 static const u8 exclamation_box_seg8_texture_08013628[] = {
ALIGNED8 static const Texture exclamation_box_seg8_texture_08013628[] = {
#include "actors/exclamation_box/vanish_cap_box_side.rgba16.inc.c"
};
// 0x08014628
ALIGNED8 static const u8 exclamation_box_seg8_texture_08014628[] = {
ALIGNED8 static const Texture exclamation_box_seg8_texture_08014628[] = {
#include "actors/exclamation_box/metal_cap_box_front.rgba16.inc.c"
};
// 0x08014E28
ALIGNED8 static const u8 exclamation_box_seg8_texture_08014E28[] = {
ALIGNED8 static const Texture exclamation_box_seg8_texture_08014E28[] = {
#include "actors/exclamation_box/metal_cap_box_side.rgba16.inc.c"
};
// 0x08015E28
ALIGNED8 static const u8 exclamation_box_seg8_texture_08015E28[] = {
ALIGNED8 static const Texture exclamation_box_seg8_texture_08015E28[] = {
#include "actors/exclamation_box/wing_cap_box_front.rgba16.inc.c"
};
// 0x08016628
ALIGNED8 static const u8 exclamation_box_seg8_texture_08016628[] = {
ALIGNED8 static const Texture exclamation_box_seg8_texture_08016628[] = {
#include "actors/exclamation_box/wing_cap_box_side.rgba16.inc.c"
};
// 0x08017628
ALIGNED8 static const u8 exclamation_box_seg8_texture_08017628[] = {
ALIGNED8 static const Texture exclamation_box_seg8_texture_08017628[] = {
#include "actors/exclamation_box/exclamation_box_front.rgba16.inc.c"
};
// 0x08017E28
ALIGNED8 static const u8 exclamation_box_seg8_texture_08017E28[] = {
ALIGNED8 static const Texture exclamation_box_seg8_texture_08017E28[] = {
#include "actors/exclamation_box/exclamation_box_side.rgba16.inc.c"
};

4
actors/exclamation_box_outline/model.inc.c
View file

@ -154,7 +154,7 @@ static const Vtx exclamation_box_outline_seg8_vertex_080250E8[] = {
};
// 0x08025168
ALIGNED8 static const u8 exclamation_box_outline_seg8_texture_08025168[] = {
ALIGNED8 static const Texture exclamation_box_outline_seg8_texture_08025168[] = {
#include "actors/exclamation_box_outline/exclamation_box_outline.rgba16.inc.c"
};
@ -199,7 +199,7 @@ static const Lights1 exclamation_box_outline_seg8_lights_08025A68 = gdSPDefLight
);
// 0x08025A80
ALIGNED8 static const u8 exclamation_box_outline_seg8_texture_08025A80[] = {
ALIGNED8 static const Texture exclamation_box_outline_seg8_texture_08025A80[] = {
#include "actors/exclamation_box_outline/exclamation_point.rgba16.inc.c"
};

14
actors/explosion/model.inc.c
View file

@ -9,37 +9,37 @@ static const Vtx explosion_seg3_vertex_030009C8[] = {
};
// 0x03000A08
ALIGNED8 static const u8 explosion_seg3_texture_03000A08[] = {
ALIGNED8 static const Texture explosion_seg3_texture_03000A08[] = {
#include "actors/explosion/explosion_0.rgba16.inc.c"
};
// 0x03001208
ALIGNED8 static const u8 explosion_seg3_texture_03001208[] = {
ALIGNED8 static const Texture explosion_seg3_texture_03001208[] = {
#include "actors/explosion/explosion_1.rgba16.inc.c"
};
// 0x03001A08
ALIGNED8 static const u8 explosion_seg3_texture_03001A08[] = {
ALIGNED8 static const Texture explosion_seg3_texture_03001A08[] = {
#include "actors/explosion/explosion_2.rgba16.inc.c"
};
// 0x03002208
ALIGNED8 static const u8 explosion_seg3_texture_03002208[] = {
ALIGNED8 static const Texture explosion_seg3_texture_03002208[] = {
#include "actors/explosion/explosion_3.rgba16.inc.c"
};
// 0x03002A08
ALIGNED8 static const u8 explosion_seg3_texture_03002A08[] = {
ALIGNED8 static const Texture explosion_seg3_texture_03002A08[] = {
#include "actors/explosion/explosion_4.rgba16.inc.c"
};
// 0x03003208
ALIGNED8 static const u8 explosion_seg3_texture_03003208[] = {
ALIGNED8 static const Texture explosion_seg3_texture_03003208[] = {
#include "actors/explosion/explosion_5.rgba16.inc.c"
};
// 0x03003A08
ALIGNED8 static const u8 explosion_seg3_texture_03003A08[] = {
ALIGNED8 static const Texture explosion_seg3_texture_03003A08[] = {
#include "actors/explosion/explosion_6.rgba16.inc.c"
};

10
actors/eyerok/model.inc.c
View file

@ -7,27 +7,27 @@ UNUSED static const Lights1 eyerok_lights_unused = gdSPDefLights1(
);
// 0x05008D40
ALIGNED8 static const u8 eyerok_seg5_texture_05008D40[] = {
ALIGNED8 static const Texture eyerok_seg5_texture_05008D40[] = {
#include "actors/eyerok/eyerok_bricks.rgba16.inc.c"
};
// 0x05009540
ALIGNED8 static const u8 eyerok_seg5_texture_05009540[] = {
ALIGNED8 static const Texture eyerok_seg5_texture_05009540[] = {
#include "actors/eyerok/eyerok_eye_open.rgba16.inc.c"
};
// 0x05009D40
ALIGNED8 static const u8 eyerok_seg5_texture_05009D40[] = {
ALIGNED8 static const Texture eyerok_seg5_texture_05009D40[] = {
#include "actors/eyerok/eyerok_eye_mostly_open.rgba16.inc.c"
};
// 0x0500A540
ALIGNED8 static const u8 eyerok_seg5_texture_0500A540[] = {
ALIGNED8 static const Texture eyerok_seg5_texture_0500A540[] = {
#include "actors/eyerok/eyerok_eye_mostly_closed.rgba16.inc.c"
};
// 0x0500AD40
ALIGNED8 static const u8 eyerok_seg5_texture_0500AD40[] = {
ALIGNED8 static const Texture eyerok_seg5_texture_0500AD40[] = {
#include "actors/eyerok/eyerok_eye_closed.rgba16.inc.c"
};

16
actors/flame/model.inc.c
View file

@ -9,42 +9,42 @@ static const Vtx flame_seg3_vertex_030172E0[] = {
};
// 0x03017320
ALIGNED8 static const u8 flame_seg3_texture_03017320[] = {
ALIGNED8 static const Texture flame_seg3_texture_03017320[] = {
#include "actors/flame/flame_0.ia16.inc.c"
};
// 0x03017B20
ALIGNED8 static const u8 flame_seg3_texture_03017B20[] = {
ALIGNED8 static const Texture flame_seg3_texture_03017B20[] = {
#include "actors/flame/flame_1.ia16.inc.c"
};
// 0x03018320
ALIGNED8 static const u8 flame_seg3_texture_03018320[] = {
ALIGNED8 static const Texture flame_seg3_texture_03018320[] = {
#include "actors/flame/flame_2.ia16.inc.c"
};
// 0x03018B20
ALIGNED8 static const u8 flame_seg3_texture_03018B20[] = {
ALIGNED8 static const Texture flame_seg3_texture_03018B20[] = {
#include "actors/flame/flame_3.ia16.inc.c"
};
// 0x03019320
ALIGNED8 static const u8 flame_seg3_texture_03019320[] = {
ALIGNED8 static const Texture flame_seg3_texture_03019320[] = {
#include "actors/flame/flame_4.ia16.inc.c"
};
// 0x03019B20
ALIGNED8 static const u8 flame_seg3_texture_03019B20[] = {
ALIGNED8 static const Texture flame_seg3_texture_03019B20[] = {
#include "actors/flame/flame_5.ia16.inc.c"
};
// 0x0301A320
ALIGNED8 static const u8 flame_seg3_texture_0301A320[] = {
ALIGNED8 static const Texture flame_seg3_texture_0301A320[] = {
#include "actors/flame/flame_6.ia16.inc.c"
};
// 0x0301AB20
ALIGNED8 static const u8 flame_seg3_texture_0301AB20[] = {
ALIGNED8 static const Texture flame_seg3_texture_0301AB20[] = {
#include "actors/flame/flame_7.ia16.inc.c"
};

6
actors/flyguy/model.inc.c
View file

@ -4,17 +4,17 @@
UNUSED static const u64 flyguy_unused_1 = 0;
// 0x0800E088
ALIGNED8 static const u8 flyguy_seg8_texture_0800E088[] = {
ALIGNED8 static const Texture flyguy_seg8_texture_0800E088[] = {
#include "actors/flyguy/flyguy_cloth_wrinkle.rgba16.inc.c"
};
// 0x0800F088
ALIGNED8 static const u8 flyguy_seg8_texture_0800F088[] = {
ALIGNED8 static const Texture flyguy_seg8_texture_0800F088[] = {
#include "actors/flyguy/flyguy_face.rgba16.inc.c"
};
// 0x0800F888
ALIGNED8 static const u8 flyguy_seg8_texture_0800F888[] = {
ALIGNED8 static const Texture flyguy_seg8_texture_0800F888[] = {
#include "actors/flyguy/flyguy_propeller.ia16.inc.c"
};

2
actors/fwoosh/model.inc.c
View file

@ -9,7 +9,7 @@ static const Vtx fwoosh_seg5_vertex_050157C8[] = {
};
// 0x05015808
ALIGNED8 static const u8 fwoosh_seg5_texture_05015808[] = {
ALIGNED8 static const Texture fwoosh_seg5_texture_05015808[] = {
#include "actors/fwoosh/fwoosh_face.ia16.inc.c"
};

6
actors/goomba/model.inc.c
View file

@ -37,17 +37,17 @@ static const Lights1 goomba_seg8_lights_08019518 = gdSPDefLights1(
);
// 0x08019530
ALIGNED8 static const u8 goomba_seg8_texture_08019530[] = {
ALIGNED8 static const Texture goomba_seg8_texture_08019530[] = {
#include "actors/goomba/goomba_body.rgba16.inc.c"
};
// 0x08019D30
ALIGNED8 static const u8 goomba_seg8_texture_08019D30[] = {
ALIGNED8 static const Texture goomba_seg8_texture_08019D30[] = {
#include "actors/goomba/goomba_face.rgba16.inc.c"
};
// 0x0801A530
ALIGNED8 static const u8 goomba_seg8_texture_0801A530[] = {
ALIGNED8 static const Texture goomba_seg8_texture_0801A530[] = {
#include "actors/goomba/goomba_face_blink.rgba16.inc.c"
};

9
actors/group1.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "yellow_sphere_small/model.inc.c"

9
actors/group10.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "bird/model.inc.c"

9
actors/group11.c
View file

@ -1,8 +1,11 @@
#include <ultra64.h>
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "geo_commands.h"
#include "macros.h"
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "bubba/model.inc.c"

9
actors/group12.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "bowser_flame/model.inc.c"

9
actors/group13.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "skeeter/model.inc.c"

9
actors/group14.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "koopa_flag/model.inc.c"

9
actors/group15.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "lakitu_cameraman/model.inc.c"

9
actors/group16.c
View file

@ -1,8 +1,11 @@
#include <ultra64.h>
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "geo_commands.h"
#include "macros.h"
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "chillychief/model.inc.c"

9
actors/group17.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "mr_i_eyeball/model.inc.c"

9
actors/group2.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "bully/model.inc.c"

9
actors/group3.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "king_bobomb/model.inc.c"

10
actors/group4.c
View file

@ -1,8 +1,10 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "geo_commands.h"
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "clam_shell/model.inc.c"

11
actors/group5.c
View file

@ -1,8 +1,11 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "geo_commands.h"
#include "macros.h"
#include "surface_terrains.h"
#include "sm64.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "klepto/model.inc.c"

9
actors/group6.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "monty_mole_hole/model.inc.c"

9
actors/group7.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "spindrift/model.inc.c"

8
actors/group8.c
View file

@ -1,8 +1,8 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "springboard/model.inc.c"

9
actors/group9.c
View file

@ -1,8 +1,9 @@
#include <ultra64.h>
#include "sm64.h"
#include "surface_terrains.h"
#include "geo_commands.h"
#include <PR/ultratypes.h>
#include <PR/gbi.h>
#include "macros.h"
#include "surface_terrains.h"
#include "types.h"
#include "make_const_nonconst.h"
#include "bookend/model.inc.c"

12
actors/haunted_cage/model.inc.c
View file

@ -13,27 +13,27 @@ static const Lights1 haunted_cage_seg5_lights_0500C270 = gdSPDefLights1(
);
// 0x0500C288
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500C288[] = {
ALIGNED8 static const Texture haunted_cage_seg5_texture_0500C288[] = {
#include "actors/haunted_cage/bbh_cage_floor.rgba16.inc.c"
};
// 0x0500CA88
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500CA88[] = {
ALIGNED8 static const Texture haunted_cage_seg5_texture_0500CA88[] = {
#include "actors/haunted_cage/bbh_cage_double_ornament.rgba16.inc.c"
};
// 0x0500D288
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500D288[] = {
ALIGNED8 static const Texture haunted_cage_seg5_texture_0500D288[] = {
#include "actors/haunted_cage/bbh_cage_ornament.rgba16.inc.c"
};
// 0x0500D688
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500D688[] = {
ALIGNED8 static const Texture haunted_cage_seg5_texture_0500D688[] = {
#include "actors/haunted_cage/bbh_cage_wooden_base.rgba16.inc.c"
};
// 0x0500DA88
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500DA88[] = {
ALIGNED8 static const Texture haunted_cage_seg5_texture_0500DA88[] = {
#include "actors/haunted_cage/bbh_cage_bars.rgba16.inc.c"
};
@ -41,7 +41,7 @@ ALIGNED8 static const u8 haunted_cage_seg5_texture_0500DA88[] = {
// also could be some sort of shader mask from much earlier in development, considering
// Big Boo's Haunt was a very very early level.
// 0x0500E288
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500E288[] = {
ALIGNED8 static const Texture haunted_cage_seg5_texture_0500E288[] = {
#include "actors/haunted_cage/bbh_cage_garbage.rgba16.inc.c"
};

2
actors/heart/model.inc.c
View file

@ -9,7 +9,7 @@ static const Vtx heart_seg8_vertex_0800D7A0[] = {
};
// 0x0800D7E0
ALIGNED8 static const u8 heart_seg8_texture_0800D7E0[] = {
ALIGNED8 static const Texture heart_seg8_texture_0800D7E0[] = {
#include "actors/heart/spinning_heart.rgba16.inc.c"
};

12
actors/heave_ho/model.inc.c
View file

@ -43,32 +43,32 @@ static const Lights1 heave_ho_lights_unused5 = gdSPDefLights1(
);
// 0x0500E9C8
ALIGNED8 static const u8 heave_ho_seg5_texture_0500E9C8[] = {
ALIGNED8 static const Texture heave_ho_seg5_texture_0500E9C8[] = {
#include "actors/heave_ho/heave-ho_face.rgba16.inc.c"
};
// 0x0500F1C8
ALIGNED8 static const u8 heave_ho_seg5_texture_0500F1C8[] = {
ALIGNED8 static const Texture heave_ho_seg5_texture_0500F1C8[] = {
#include "actors/heave_ho/heave-ho_platform.rgba16.inc.c"
};
// 0x0500F9C8
ALIGNED8 static const u8 heave_ho_seg5_texture_0500F9C8[] = {
ALIGNED8 static const Texture heave_ho_seg5_texture_0500F9C8[] = {
#include "actors/heave_ho/heave-ho_logo.rgba16.inc.c"
};
// 0x050109C8
ALIGNED8 static const u8 heave_ho_seg5_texture_050109C8[] = {
ALIGNED8 static const Texture heave_ho_seg5_texture_050109C8[] = {
#include "actors/heave_ho/heave-ho_arm_ornament.rgba16.inc.c"
};
// 0x050111C8
ALIGNED8 static const u8 heave_ho_seg5_texture_050111C8[] = {
ALIGNED8 static const Texture heave_ho_seg5_texture_050111C8[] = {
#include "actors/heave_ho/heave-ho_roller.rgba16.inc.c"
};
// 0x050113C8
ALIGNED8 static const u8 heave_ho_seg5_texture_050113C8[] = {
ALIGNED8 static const Texture heave_ho_seg5_texture_050113C8[] = {
#include "actors/heave_ho/heave-ho_turnkey.rgba16.inc.c"
};

6
actors/hoot/model.inc.c
View file

@ -73,7 +73,7 @@ static const Lights1 hoot_seg5_lights_05000A08 = gdSPDefLights1(
);
// 0x05000A20
ALIGNED8 static const u8 hoot_seg5_texture_05000A20[] = {
ALIGNED8 static const Texture hoot_seg5_texture_05000A20[] = {
#include "actors/hoot/hoot_eyes.rgba16.inc.c"
};
@ -351,12 +351,12 @@ static const Lights1 hoot_seg5_lights_05001E38 = gdSPDefLights1(
);
// 0x05001E50
ALIGNED8 static const u8 hoot_seg5_texture_05001E50[] = {
ALIGNED8 static const Texture hoot_seg5_texture_05001E50[] = {
#include "actors/hoot/hoot_wing.rgba16.inc.c"
};
// 0x05002650
ALIGNED8 static const u8 hoot_seg5_texture_05002650[] = {
ALIGNED8 static const Texture hoot_seg5_texture_05002650[] = {
#include "actors/hoot/hoot_wing_tip.rgba16.inc.c"
};

4
actors/impact_ring/model.inc.c
View file

@ -17,12 +17,12 @@ static const Vtx impact_ring_seg6_vertex_0601CA10[] = {
};
// 0x0601CA50
ALIGNED8 static const u8 impact_ring_seg6_texture_0601CA50[] = {
ALIGNED8 static const Texture impact_ring_seg6_texture_0601CA50[] = {
#include "actors/impact_ring/impact_ring_left_side.ia16.inc.c"
};
// 0x0601DA50
ALIGNED8 static const u8 impact_ring_seg6_texture_0601DA50[] = {
ALIGNED8 static const Texture impact_ring_seg6_texture_0601DA50[] = {
#include "actors/impact_ring/impact_ring_right_side.ia16.inc.c"
};

6
actors/impact_smoke/model.inc.c
View file

@ -1,6 +1,6 @@
// Impact Smoke
// TODO: Are these seperate textures or unified 64x64 ones?
// TODO: These 64x64 textures are referenced as two different texture addresses in the DLs
// 0x0605AA28
ALIGNED8 static const u8 impact_smoke_seg6_texture_0605AA28[] = {
@ -71,6 +71,7 @@ const Gfx impact_smoke_seg6_dl_06062B38[] = {
gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605AA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(impact_smoke_seg6_vertex_06062A28, 8, 0),
gsSPDisplayList(impact_smoke_seg6_dl_06062AD8),
//gsDPLoadTextureBlock((u8*)impact_smoke_seg6_texture_0605AA28 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(impact_smoke_seg6_dl_06062AF0),
gsSPDisplayList(impact_smoke_seg6_dl_06062B08),
gsSPEndDisplayList(),
@ -82,6 +83,7 @@ const Gfx impact_smoke_seg6_dl_06062BD8[] = {
gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605CA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(impact_smoke_seg6_vertex_06062A28, 8, 0),
gsSPDisplayList(impact_smoke_seg6_dl_06062AD8),
//gsDPLoadTextureBlock((u8*)impact_smoke_seg6_texture_0605CA28 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(impact_smoke_seg6_dl_06062AF0),
gsSPDisplayList(impact_smoke_seg6_dl_06062B08),
gsSPEndDisplayList(),
@ -93,6 +95,7 @@ const Gfx impact_smoke_seg6_dl_06062C78[] = {
gsDPLoadTextureBlock(impact_smoke_seg6_texture_0605EA28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(impact_smoke_seg6_vertex_06062A28, 8, 0),
gsSPDisplayList(impact_smoke_seg6_dl_06062AD8),
//gsDPLoadTextureBlock((u8*)impact_smoke_seg6_texture_0605EA28 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(impact_smoke_seg6_dl_06062AF0),
gsSPDisplayList(impact_smoke_seg6_dl_06062B08),
gsSPEndDisplayList(),
@ -104,6 +107,7 @@ const Gfx impact_smoke_seg6_dl_06062D18[] = {
gsDPLoadTextureBlock(impact_smoke_seg6_texture_06060A28, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 64, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(impact_smoke_seg6_vertex_06062A28, 8, 0),
gsSPDisplayList(impact_smoke_seg6_dl_06062AD8),
//gsDPLoadTextureBlock((u8*)impact_smoke_seg6_texture_06060A28 + 0x1000, G_IM_FMT_IA, G_IM_SIZ_16b, 64, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPDisplayList(impact_smoke_seg6_dl_06062AF0),
gsSPDisplayList(impact_smoke_seg6_dl_06062B08),
gsSPEndDisplayList(),

20
actors/king_bobomb/model.inc.c
View file

@ -31,52 +31,52 @@ UNUSED static const Lights1 king_bobomb_lights_unused5 = gdSPDefLights1(
);
// 0x05000078
ALIGNED8 static const u8 king_bobomb_seg5_texture_05000078[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05000078[] = {
#include "actors/king_bobomb/bob-omb_buddy_left_side_unused.rgba16.inc.c"
};
// 0x05001078
ALIGNED8 static const u8 king_bobomb_seg5_texture_05001078[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05001078[] = {
#include "actors/king_bobomb/bob-omb_buddy_right_side_unused.rgba16.inc.c"
};
// 0x05002078
ALIGNED8 static const u8 king_bobomb_seg5_texture_05002078[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05002078[] = {
#include "actors/king_bobomb/king_bob-omb_arm.rgba16.inc.c"
};
// 0x05002878
ALIGNED8 static const u8 king_bobomb_seg5_texture_05002878[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05002878[] = {
#include "actors/king_bobomb/king_bob-omb_body_unused.rgba16.inc.c"
};
// 0x05004878
ALIGNED8 static const u8 king_bobomb_seg5_texture_05004878[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05004878[] = {
#include "actors/king_bobomb/king_bob-omb_eyes.rgba16.inc.c"
};
// 0x05005878
ALIGNED8 static const u8 king_bobomb_seg5_texture_05005878[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05005878[] = {
#include "actors/king_bobomb/king_bob-omb_hand.rgba16.inc.c"
};
// 0x05006078
ALIGNED8 static const u8 king_bobomb_seg5_texture_05006078[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05006078[] = {
#include "actors/king_bobomb/king_bob-omb_crown_rim.rgba16.inc.c"
};
// 0x05006478
ALIGNED8 static const u8 king_bobomb_seg5_texture_05006478[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05006478[] = {
#include "actors/king_bobomb/bob-omb_buddy_body_unused.rgba16.inc.c"
};
// 0x05008478
ALIGNED8 static const u8 king_bobomb_seg5_texture_05008478[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05008478[] = {
#include "actors/king_bobomb/king_bob-omb_left_side.rgba16.inc.c"
};
// 0x05009478
ALIGNED8 static const u8 king_bobomb_seg5_texture_05009478[] = {
ALIGNED8 static const Texture king_bobomb_seg5_texture_05009478[] = {
#include "actors/king_bobomb/king_bob-omb_right_side.rgba16.inc.c"
};

10
actors/klepto/model.inc.c
View file

@ -6,27 +6,27 @@ UNUSED static const u64 klepto_unused_1 = 0;
// Klepto
// 0x05000008
ALIGNED8 static const u8 klepto_seg5_texture_05000008[] = {
ALIGNED8 static const Texture klepto_seg5_texture_05000008[] = {
#include "actors/klepto/klepto_chest_tuft.rgba16.inc.c"
};
// 0x05000808
ALIGNED8 static const u8 klepto_seg5_texture_05000808[] = {
ALIGNED8 static const Texture klepto_seg5_texture_05000808[] = {
#include "actors/klepto/klepto_eye.rgba16.inc.c"
};
// 0x05001008
ALIGNED8 static const u8 klepto_seg5_texture_05001008[] = {
ALIGNED8 static const Texture klepto_seg5_texture_05001008[] = {
#include "actors/klepto/klepto_beak.rgba16.inc.c"
};
// 0x05002008
ALIGNED8 static const u8 klepto_seg5_texture_05002008[] = {
ALIGNED8 static const Texture klepto_seg5_texture_05002008[] = {
#include "actors/klepto/klepto_wing.rgba16.inc.c"
};
// 0x05003008
ALIGNED8 static const u8 klepto_seg5_texture_05003008[] = {
ALIGNED8 static const Texture klepto_seg5_texture_05003008[] = {
#include "actors/klepto/klepto_wing_flap.rgba16.inc.c"
};

20
actors/koopa/model.inc.c
View file

@ -57,42 +57,42 @@ static const Lights1 koopa_seg6_lights_06002630 = gdSPDefLights1(
// Due to debate in the PR surrounding the fix to this, said fix is on
// a compile-time variable. Use TEXTURE_FIX=1 at compile time to fix this.
// 0x06002648
ALIGNED8 static const u8 koopa_seg6_texture_06002648[] = {
ALIGNED8 static const Texture koopa_seg6_texture_06002648[] = {
#include "actors/koopa/koopa_shell_front.rgba16.inc.c"
};
// 0x06002E48
ALIGNED8 static const u8 koopa_seg6_texture_06002E48[] = {
ALIGNED8 static const Texture koopa_seg6_texture_06002E48[] = {
#include "actors/koopa/koopa_shell_back.rgba16.inc.c"
};
// 0x06003648
ALIGNED8 static const u8 koopa_seg6_texture_06003648[] = {
ALIGNED8 static const Texture koopa_seg6_texture_06003648[] = {
#include "actors/koopa/koopa_shoe.rgba16.inc.c"
};
// 0x06003E48
ALIGNED8 static const u8 koopa_seg6_texture_06003E48[] = {
ALIGNED8 static const Texture koopa_seg6_texture_06003E48[] = {
#include "actors/koopa/koopa_shell_front_top.rgba16.inc.c"
};
// 0x06004648
ALIGNED8 static const u8 koopa_seg6_texture_06004648[] = {
ALIGNED8 static const Texture koopa_seg6_texture_06004648[] = {
#include "actors/koopa/koopa_eyes_open.rgba16.inc.c"
};
// 0x06004E48
ALIGNED8 static const u8 koopa_seg6_texture_06004E48[] = {
ALIGNED8 static const Texture koopa_seg6_texture_06004E48[] = {
#include "actors/koopa/koopa_eyes_closed.rgba16.inc.c"
};
// 0x06005648
ALIGNED8 static const u8 koopa_seg6_texture_06005648[] = {
ALIGNED8 static const Texture koopa_seg6_texture_06005648[] = {
#include "actors/koopa/koopa_eye_border.rgba16.inc.c"
};
// 0x06005E48
ALIGNED8 static const u8 koopa_seg6_texture_06005E48[] = {
ALIGNED8 static const Texture koopa_seg6_texture_06005E48[] = {
#include "actors/koopa/koopa_nostrils.rgba16.inc.c"
};
@ -2083,8 +2083,8 @@ const Gfx koopa_seg6_dl_0600C498[] = {
gsSPLight(&koopa_seg6_lights_06002630.l, 1),
gsSPLight(&koopa_seg6_lights_06002630.a, 2),
#else
gsSPLight(koopa_seg6_texture_06002648 + 0x20, 1), // this malformed light results in a
gsSPLight(koopa_seg6_texture_06002648 + 0x18, 2), // koopa appearing to wear pink shorts.
gsSPLight((u8*)koopa_seg6_texture_06002648 + 0x20, 1), //! this malformed light results in a
gsSPLight((u8*)koopa_seg6_texture_06002648 + 0x18, 2), //! koopa appearing to wear pink shorts.
#endif
gsSPVertex(koopa_seg6_vertex_0600B5F0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),

2
actors/koopa_flag/model.inc.c
View file

@ -19,7 +19,7 @@ static const Lights1 koopa_flag_seg6_lights_06000030 = gdSPDefLights1(
);
// 0x06000048
ALIGNED8 static const u8 koopa_flag_seg6_texture_06000048[] = {
ALIGNED8 static const Texture koopa_flag_seg6_texture_06000048[] = {
#include "actors/koopa_flag/koopa_flag_banner.rgba16.inc.c"
};

4
actors/koopa_shell/model.inc.c
View file

@ -408,12 +408,12 @@ static const Lights1 koopa_shell_seg8_lights_08027488 = gdSPDefLights1(
);
// 0x080274A0
ALIGNED8 static const u8 koopa_shell_seg8_texture_080274A0[] = {
ALIGNED8 static const Texture koopa_shell_seg8_texture_080274A0[] = {
#include "actors/koopa_shell/koopa_shell_front.rgba16.inc.c"
};
// 0x08027CA0
ALIGNED8 static const u8 koopa_shell_seg8_texture_08027CA0[] = {
ALIGNED8 static const Texture koopa_shell_seg8_texture_08027CA0[] = {
#include "actors/koopa_shell/koopa_shell_back.rgba16.inc.c"
};

12
actors/lakitu_cameraman/model.inc.c
View file

@ -1,32 +1,32 @@
// Lakitu (Cameraman)
// 0x06000000
ALIGNED8 static const u8 lakitu_seg6_texture_06000000[] = {
ALIGNED8 static const Texture lakitu_seg6_texture_06000000[] = {
#include "actors/lakitu_cameraman/lakitu_cameraman_cloud_face_unused.rgba16.inc.c"
};
// 0x06000800
ALIGNED8 static const u8 lakitu_seg6_texture_06000800[] = {
ALIGNED8 static const Texture lakitu_seg6_texture_06000800[] = {
#include "actors/lakitu_cameraman/lakitu_cameraman_eyes_open.rgba16.inc.c"
};
// 0x06001800
ALIGNED8 static const u8 lakitu_seg6_texture_06001800[] = {
ALIGNED8 static const Texture lakitu_seg6_texture_06001800[] = {
#include "actors/lakitu_cameraman/lakitu_cameraman_eyes_closed.rgba16.inc.c"
};
// 0x06002800
ALIGNED8 static const u8 lakitu_seg6_texture_06002800[] = {
ALIGNED8 static const Texture lakitu_seg6_texture_06002800[] = {
#include "actors/lakitu_cameraman/lakitu_cameraman_shell.rgba16.inc.c"
};
// 0x06003000
ALIGNED8 static const u8 lakitu_seg6_texture_06003000[] = {
ALIGNED8 static const Texture lakitu_seg6_texture_06003000[] = {
#include "actors/lakitu_cameraman/lakitu_cameraman_frown.rgba16.inc.c"
};
// 0x06003800
ALIGNED8 static const u8 lakitu_seg6_texture_06003800[] = {
ALIGNED8 static const Texture lakitu_seg6_texture_06003800[] = {
#include "actors/lakitu_cameraman/lakitu_camera_lens.rgba16.inc.c"
};

30
actors/lakitu_enemy/model.inc.c
View file

@ -2,58 +2,58 @@
// Unreferenced light group
UNUSED static const Lights1 lakitu_enemy_lights_unused1 = gdSPDefLights1(
0x33, 0x1f, 0x0c,
0xcc, 0x7f, 0x33, 0x28, 0x28, 0x28
0x33, 0x1f, 0x0c,
0xcc, 0x7f, 0x33, 0x28, 0x28, 0x28
);
// 0x0500ECB0
static const Lights1 lakitu_enemy_seg5_lights_0500ECB0 = gdSPDefLights1(
0x29, 0x13, 0x06,
0xa5, 0x4f, 0x1b, 0x28, 0x28, 0x28
0x29, 0x13, 0x06,
0xa5, 0x4f, 0x1b, 0x28, 0x28, 0x28
);
// Unreferenced light group
UNUSED static const Lights1 lakitu_enemy_lights_unused2 = gdSPDefLights1(
0x0d, 0x2c, 0x0b,
0x34, 0xb2, 0x2c, 0x28, 0x28, 0x28
0x0d, 0x2c, 0x0b,
0x34, 0xb2, 0x2c, 0x28, 0x28, 0x28
);
// Unreferenced texture
// 0x0500ECE0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_0500ECE0[] = {
ALIGNED8 static const Texture lakitu_enemy_seg5_texture_0500ECE0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_cloud_face_unused.rgba16.inc.c"
};
// 0x0500F4E0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_0500F4E0[] = {
ALIGNED8 static const Texture lakitu_enemy_seg5_texture_0500F4E0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_eyes_open.rgba16.inc.c"
};
// 0x050104E0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_050104E0[] = {
ALIGNED8 static const Texture lakitu_enemy_seg5_texture_050104E0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_eyes_closed.rgba16.inc.c"
};
// 0x050114E0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_050114E0[] = {
ALIGNED8 static const Texture lakitu_enemy_seg5_texture_050114E0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_shell.rgba16.inc.c"
};
// 0x05011CE0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_05011CE0[] = {
ALIGNED8 static const Texture lakitu_enemy_seg5_texture_05011CE0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_frown.rgba16.inc.c"
};
// 0x050124E0
static const Lights1 lakitu_enemy_seg5_lights_050124E0 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x050124F8
static const Lights1 lakitu_enemy_seg5_lights_050124F8 = gdSPDefLights1(
0x79, 0x55, 0x00,
0xf2, 0xab, 0x00, 0x28, 0x28, 0x28
0x79, 0x55, 0x00,
0xf2, 0xab, 0x00, 0x28, 0x28, 0x28
);
// 0x05012510

2
actors/leaves/model.inc.c
View file

@ -9,7 +9,7 @@ static const Vtx leaves_seg3_vertex_0301CBA0[] = {
};
// 0x0301CBE0
ALIGNED8 static const u8 leaves_seg3_texture_0301CBE0[] = {
ALIGNED8 static const Texture leaves_seg3_texture_0301CBE0[] = {
#include "actors/leaves/leaf.rgba16.inc.c"
};

12
actors/mad_piano/model.inc.c
View file

@ -25,32 +25,32 @@ UNUSED static const Lights1 mad_piano_lights_unused4 = gdSPDefLights1(
);
// 0x05006AF0
ALIGNED8 static const u8 mad_piano_seg5_texture_05006AF0[] = {
ALIGNED8 static const Texture mad_piano_seg5_texture_05006AF0[] = {
#include "actors/mad_piano/mad_piano_tooth.rgba16.inc.c"
};
// 0x050072F0
ALIGNED8 static const u8 mad_piano_seg5_texture_050072F0[] = {
ALIGNED8 static const Texture mad_piano_seg5_texture_050072F0[] = {
#include "actors/mad_piano/mad_piano_body.rgba16.inc.c"
};
// 0x050076F0
ALIGNED8 static const u8 mad_piano_seg5_texture_050076F0[] = {
ALIGNED8 static const Texture mad_piano_seg5_texture_050076F0[] = {
#include "actors/mad_piano/mad_piano_keys_corner.rgba16.inc.c"
};
// 0x05007AF0
ALIGNED8 static const u8 mad_piano_seg5_texture_05007AF0[] = {
ALIGNED8 static const Texture mad_piano_seg5_texture_05007AF0[] = {
#include "actors/mad_piano/mad_piano_mouth.rgba16.inc.c"
};
// 0x05007EF0
ALIGNED8 static const u8 mad_piano_seg5_texture_05007EF0[] = {
ALIGNED8 static const Texture mad_piano_seg5_texture_05007EF0[] = {
#include "actors/mad_piano/mad_piano_keys.rgba16.inc.c"
};
// 0x050082F0
ALIGNED8 static const u8 mad_piano_seg5_texture_050082F0[] = {
ALIGNED8 static const Texture mad_piano_seg5_texture_050082F0[] = {
#include "actors/mad_piano/mad_piano_keys_edge.rgba16.inc.c"
};

8
actors/manta/model.inc.c
View file

@ -19,22 +19,22 @@ static const Lights1 manta_lights_unused = gdSPDefLights1(
);
// 0x050017A0
ALIGNED8 static const u8 manta_seg5_texture_050017A0[] = {
ALIGNED8 static const Texture manta_seg5_texture_050017A0[] = {
#include "actors/manta/manta_fin_corner.rgba16.inc.c"
};
// 0x05001FA0
ALIGNED8 static const u8 manta_seg5_texture_05001FA0[] = {
ALIGNED8 static const Texture manta_seg5_texture_05001FA0[] = {
#include "actors/manta/manta_gills.rgba16.inc.c"
};
// 0x05002FA0
ALIGNED8 static const u8 manta_seg5_texture_05002FA0[] = {
ALIGNED8 static const Texture manta_seg5_texture_05002FA0[] = {
#include "actors/manta/manta_eye.rgba16.inc.c"
};
// 0x050037A0
ALIGNED8 static const u8 manta_seg5_texture_050037A0[] = {
ALIGNED8 static const Texture manta_seg5_texture_050037A0[] = {
#include "actors/manta/manta_fin_edge.rgba16.inc.c"
};

38
actors/mario/model.inc.c
View file

@ -37,99 +37,99 @@ static const Lights1 mario_brown2_lights_group = gdSPDefLights1(
);
// 0x04000090
ALIGNED8 static const u8 mario_texture_metal[] = {
ALIGNED8 static const Texture mario_texture_metal[] = {
#include "actors/mario/mario_metal.rgba16.inc.c"
};
// 0x04001090
ALIGNED8 static const u8 mario_texture_yellow_button[] = {
ALIGNED8 static const Texture mario_texture_yellow_button[] = {
#include "actors/mario/mario_overalls_button.rgba16.inc.c"
};
// 0x04001890
ALIGNED8 static const u8 mario_texture_m_logo[] = {
ALIGNED8 static const Texture mario_texture_m_logo[] = {
#include "actors/mario/custom_mario_logo.rgba16.inc.c"
};
// 0x04002090
ALIGNED8 static const u8 mario_texture_hair_sideburn[] = {
ALIGNED8 static const Texture mario_texture_hair_sideburn[] = {
#include "actors/mario/mario_sideburn.rgba16.inc.c"
};
// 0x04002890
ALIGNED8 static const u8 mario_texture_mustache[] = {
ALIGNED8 static const Texture mario_texture_mustache[] = {
#include "actors/mario/mario_mustache.rgba16.inc.c"
};
// 0x04003090
ALIGNED8 static const u8 mario_texture_eyes_front[] = {
ALIGNED8 static const Texture mario_texture_eyes_front[] = {
#include "actors/mario/mario_eyes_center.rgba16.inc.c"
};
// 0x04003890
ALIGNED8 static const u8 mario_texture_eyes_half_closed[] = {
ALIGNED8 static const Texture mario_texture_eyes_half_closed[] = {
#include "actors/mario/mario_eyes_half_closed.rgba16.inc.c"
};
// 0x04004090
ALIGNED8 static const u8 mario_texture_eyes_closed[] = {
ALIGNED8 static const Texture mario_texture_eyes_closed[] = {
#include "actors/mario/mario_eyes_closed.rgba16.inc.c"
};
// Unreferenced
// 0x04004890
ALIGNED8 static const u8 mario_texture_eyes_closed_unused1[] = {
ALIGNED8 static const Texture mario_texture_eyes_closed_unused1[] = {
#include "actors/mario/mario_eyes_closed_unused_0.rgba16.inc.c"
};
// Unreferenced
// 0x04005090
ALIGNED8 static const u8 mario_texture_eyes_closed_unused2[] = {
ALIGNED8 static const Texture mario_texture_eyes_closed_unused2[] = {
#include "actors/mario/mario_eyes_closed_unused_1.rgba16.inc.c"
};
// 0x04005890
ALIGNED8 static const u8 mario_texture_eyes_right[] = {
ALIGNED8 static const Texture mario_texture_eyes_right[] = {
#include "actors/mario/mario_eyes_left_unused.rgba16.inc.c"
};
// 0x04006090
ALIGNED8 static const u8 mario_texture_eyes_left[] = {
ALIGNED8 static const Texture mario_texture_eyes_left[] = {
#include "actors/mario/mario_eyes_right_unused.rgba16.inc.c"
};
// 0x04006890
ALIGNED8 static const u8 mario_texture_eyes_up[] = {
ALIGNED8 static const Texture mario_texture_eyes_up[] = {
#include "actors/mario/mario_eyes_up_unused.rgba16.inc.c"
};
// 0x04007090
ALIGNED8 static const u8 mario_texture_eyes_down[] = {
ALIGNED8 static const Texture mario_texture_eyes_down[] = {
#include "actors/mario/mario_eyes_down_unused.rgba16.inc.c"
};
// 0x04007890
ALIGNED8 static const u8 mario_texture_eyes_dead[] = {
ALIGNED8 static const Texture mario_texture_eyes_dead[] = {
#include "actors/mario/mario_eyes_dead.rgba16.inc.c"
};
// 0x04008090
ALIGNED8 static const u8 mario_texture_wings_half_1[] = {
ALIGNED8 static const Texture mario_texture_wings_half_1[] = {
#include "actors/mario/mario_wing.rgba16.inc.c"
};
// 0x04009090
ALIGNED8 static const u8 mario_texture_wings_half_2[] = {
ALIGNED8 static const Texture mario_texture_wings_half_2[] = {
#include "actors/mario/mario_wing_tip.rgba16.inc.c"
};
// 0x0400A090
ALIGNED8 static const u8 mario_texture_metal_wings_half_1[] = {
ALIGNED8 static const Texture mario_texture_metal_wings_half_1[] = {
#include "actors/mario/mario_metal_wing_unused.rgba16.inc.c"
};
// 0x0400B090
ALIGNED8 static const u8 mario_texture_metal_wings_half_2[] = {
ALIGNED8 static const Texture mario_texture_metal_wings_half_2[] = {
#include "actors/mario/mario_metal_wing_tip_unused.rgba16.inc.c"
};

12
actors/mario_cap/model.inc.c
View file

@ -19,32 +19,32 @@ static const Lights1 mario_cap_seg3_lights_0301CF38 = gdSPDefLights1(
);
// 0x0301CF50
ALIGNED8 static const u8 mario_cap_seg3_texture_0301CF50[] = {
ALIGNED8 static const Texture mario_cap_seg3_texture_0301CF50[] = {
#include "actors/mario_cap/mario_cap_metal.rgba16.inc.c"
};
// 0x0301DF50
ALIGNED8 static const u8 mario_cap_seg3_texture_0301DF50[] = {
ALIGNED8 static const Texture mario_cap_seg3_texture_0301DF50[] = {
#include "actors/mario_cap/custom_mario_cap_logo.rgba16.inc.c"
};
// 0x0301E750
ALIGNED8 static const u8 mario_cap_seg3_texture_0301E750[] = {
ALIGNED8 static const Texture mario_cap_seg3_texture_0301E750[] = {
#include "actors/mario_cap/mario_cap_wing.rgba16.inc.c"
};
// 0x0301F750
ALIGNED8 static const u8 mario_cap_seg3_texture_0301F750[] = {
ALIGNED8 static const Texture mario_cap_seg3_texture_0301F750[] = {
#include "actors/mario_cap/mario_cap_wing_tip.rgba16.inc.c"
};
// 0x03020750
ALIGNED8 static const u8 mario_cap_seg3_texture_03020750[] = {
ALIGNED8 static const Texture mario_cap_seg3_texture_03020750[] = {
#include "actors/mario_cap/mario_cap_metal_wing_unused.rgba16.inc.c"
};
// 0x03021750
ALIGNED8 static const u8 mario_cap_seg3_texture_03021750[] = {
ALIGNED8 static const Texture mario_cap_seg3_texture_03021750[] = {
#include "actors/mario_cap/mario_cap_metal_wing_tip_unused.rgba16.inc.c"
};

2
actors/metal_box/model.inc.c
View file

@ -7,7 +7,7 @@ static const Lights1 metal_box_seg8_lights_08023980 = gdSPDefLights1(
);
// 0x08023998
ALIGNED8 static const u8 metal_box_seg8_texture_08023998[] = {
ALIGNED8 static const Texture metal_box_seg8_texture_08023998[] = {
#include "actors/metal_box/metal_box_side.rgba16.inc.c"
};

2
actors/mips/model.inc.c
View file

@ -1,7 +1,7 @@
// Mips
// 0x0600FB80
ALIGNED8 static const u8 mips_seg6_texture_0600FB80[] = {
ALIGNED8 static const Texture mips_seg6_texture_0600FB80[] = {
#include "actors/mips/mips_eyes.rgba16.inc.c"
};

2
actors/mist/model.inc.c
View file

@ -17,7 +17,7 @@ static const Vtx mist_seg3_vertex_03000040[] = {
};
// 0x03000080
ALIGNED8 static const u8 mist_seg3_texture_03000080[] = {
ALIGNED8 static const Texture mist_seg3_texture_03000080[] = {
#include "actors/mist/mist.ia16.inc.c"
};

4
actors/moneybag/model.inc.c
View file

@ -1,12 +1,12 @@
// Moneybag
// 0x060039B0
ALIGNED8 static const u8 moneybag_seg6_texture_060039B0[] = {
ALIGNED8 static const Texture moneybag_seg6_texture_060039B0[] = {
#include "actors/moneybag/moneybag_mouth.rgba16.inc.c"
};
// 0x060049B0
ALIGNED8 static const u8 moneybag_seg6_texture_060049B0[] = {
ALIGNED8 static const Texture moneybag_seg6_texture_060049B0[] = {
#include "actors/moneybag/moneybag_eyes.rgba16.inc.c"
};

10
actors/monty_mole/model.inc.c
View file

@ -37,27 +37,27 @@ UNUSED static const Lights1 monty_mole_lights_unused6 = gdSPDefLights1(
);
// 0x05000970
ALIGNED8 static const u8 monty_mole_seg5_texture_05000970[] = {
ALIGNED8 static const Texture monty_mole_seg5_texture_05000970[] = {
#include "actors/monty_mole/monty_mole_cheek.rgba16.inc.c"
};
// 0x05001170
ALIGNED8 static const u8 monty_mole_seg5_texture_05001170[] = {
ALIGNED8 static const Texture monty_mole_seg5_texture_05001170[] = {
#include "actors/monty_mole/monty_mole_eye.rgba16.inc.c"
};
// 0x05001970
ALIGNED8 static const u8 monty_mole_seg5_texture_05001970[] = {
ALIGNED8 static const Texture monty_mole_seg5_texture_05001970[] = {
#include "actors/monty_mole/monty_mole_nose.rgba16.inc.c"
};
// 0x05002170
ALIGNED8 static const u8 monty_mole_seg5_texture_05002170[] = {
ALIGNED8 static const Texture monty_mole_seg5_texture_05002170[] = {
#include "actors/monty_mole/monty_mole_tooth.rgba16.inc.c"
};
// 0x05002970
ALIGNED8 static const u8 monty_mole_seg5_texture_05002970[] = {
ALIGNED8 static const Texture monty_mole_seg5_texture_05002970[] = {
#include "actors/monty_mole/monty_mole_claw.rgba16.inc.c"
};

2
actors/monty_mole_hole/model.inc.c
View file

@ -9,7 +9,7 @@ static const Vtx monty_mole_hole_seg5_vertex_05000000[] = {
};
// 0x05000040
ALIGNED8 static const u8 monty_mole_hole_seg5_texture_05000040[] = {
ALIGNED8 static const Texture monty_mole_hole_seg5_texture_05000040[] = {
#include "actors/monty_mole_hole/monty_mole_hole.ia16.inc.c"
};

4
actors/mr_i_eyeball/model.inc.c
View file

@ -13,12 +13,12 @@ static const Vtx mr_i_eyeball_seg6_vertex_06000000[] = {
};
// 0x06000080
ALIGNED8 static const u8 mr_i_eyeball_seg6_texture_06000080[] = {
ALIGNED8 static const Texture mr_i_eyeball_seg6_texture_06000080[] = {
#include "actors/mr_i_eyeball/mr_i_eyeball_left_side.rgba16.inc.c"
};
// 0x06001080
ALIGNED8 static const u8 mr_i_eyeball_seg6_texture_06001080[] = {
ALIGNED8 static const Texture mr_i_eyeball_seg6_texture_06001080[] = {
#include "actors/mr_i_eyeball/mr_i_eyeball_right_side.rgba16.inc.c"
};

8
actors/mr_i_iris/model.inc.c
View file

@ -9,22 +9,22 @@ static const Vtx mr_i_iris_seg6_vertex_06002130[] = {
};
// 0x06002170
ALIGNED8 static const u8 mr_i_iris_seg6_texture_06002170[] = {
ALIGNED8 static const Texture mr_i_iris_seg6_texture_06002170[] = {
#include "actors/mr_i_iris/mr_i_iris_open.rgba16.inc.c"
};
// 0x06002970
ALIGNED8 static const u8 mr_i_iris_seg6_texture_06002970[] = {
ALIGNED8 static const Texture mr_i_iris_seg6_texture_06002970[] = {
#include "actors/mr_i_iris/mr_i_iris_mostly_open.rgba16.inc.c"
};
// 0x06003170
ALIGNED8 static const u8 mr_i_iris_seg6_texture_06003170[] = {
ALIGNED8 static const Texture mr_i_iris_seg6_texture_06003170[] = {
#include "actors/mr_i_iris/mr_i_iris_mostly_closed.rgba16.inc.c"
};
// 0x06003970
ALIGNED8 static const u8 mr_i_iris_seg6_texture_06003970[] = {
ALIGNED8 static const Texture mr_i_iris_seg6_texture_06003970[] = {
#include "actors/mr_i_iris/mr_i_iris_closed.rgba16.inc.c"
};

2
actors/mushroom_1up/model.inc.c
View file

@ -9,7 +9,7 @@ static const Vtx mushroom_1up_seg3_vertex_030295E8[] = {
};
// 0x03029628
ALIGNED8 static const u8 mushroom_1up_seg3_texture_03029628[] = {
ALIGNED8 static const Texture mushroom_1up_seg3_texture_03029628[] = {
#include "actors/mushroom_1up/1-up_mushroom.rgba16.inc.c"
};

20
actors/peach/model.inc.c
View file

@ -13,52 +13,52 @@ static const Lights1 peach_seg5_lights_05000A10 = gdSPDefLights1(
);
// 0x05000A28
ALIGNED8 static const u8 peach_seg5_texture_05000A28[] = {
ALIGNED8 static const Texture peach_seg5_texture_05000A28[] = {
#include "actors/peach/peach_eye_open.rgba16.inc.c"
};
// 0x05001228
ALIGNED8 static const u8 peach_seg5_texture_05001228[] = {
ALIGNED8 static const Texture peach_seg5_texture_05001228[] = {
#include "actors/peach/peach_eye_mostly_open.rgba16.inc.c"
};
// 0x05001A28
ALIGNED8 static const u8 peach_seg5_texture_05001A28[] = {
ALIGNED8 static const Texture peach_seg5_texture_05001A28[] = {
#include "actors/peach/peach_eye_mostly_closed.rgba16.inc.c"
};
// 0x05002228
ALIGNED8 static const u8 peach_seg5_texture_05002228[] = {
ALIGNED8 static const Texture peach_seg5_texture_05002228[] = {
#include "actors/peach/peach_eye_closed.rgba16.inc.c"
};
// 0x05002A28
ALIGNED8 static const u8 peach_seg5_texture_05002A28[] = {
ALIGNED8 static const Texture peach_seg5_texture_05002A28[] = {
#include "actors/peach/peach_crown_jewel.rgba16.inc.c"
};
// 0x05002C28
ALIGNED8 static const u8 peach_seg5_texture_05002C28[] = {
ALIGNED8 static const Texture peach_seg5_texture_05002C28[] = {
#include "actors/peach/peach_chest_jewel.rgba16.inc.c"
};
// 0x05002E28
ALIGNED8 static const u8 peach_seg5_texture_05002E28[] = {
ALIGNED8 static const Texture peach_seg5_texture_05002E28[] = {
#include "actors/peach/peach_lips_scrunched.rgba16.inc.c"
};
// 0x05003628
ALIGNED8 static const u8 peach_seg5_texture_05003628[] = {
ALIGNED8 static const Texture peach_seg5_texture_05003628[] = {
#include "actors/peach/peach_lips.rgba16.inc.c"
};
// 0x05003E28
ALIGNED8 static const u8 peach_seg5_texture_05003E28[] = {
ALIGNED8 static const Texture peach_seg5_texture_05003E28[] = {
#include "actors/peach/peach_nostril.rgba16.inc.c"
};
// 0x05004028
ALIGNED8 static const u8 peach_seg5_texture_05004028[] = {
ALIGNED8 static const Texture peach_seg5_texture_05004028[] = {
#include "actors/peach/peach_dress.rgba16.inc.c"
};

2
actors/pebble/model.inc.c
View file

@ -9,7 +9,7 @@ static const Vtx pebble_seg3_vertex_0301C2C0[] = {
};
// 0x0301C300
ALIGNED8 static const u8 pebble_seg3_texture_0301C300[] = {
ALIGNED8 static const Texture pebble_seg3_texture_0301C300[] = {
#include "actors/pebble/pebble.rgba16.inc.c"
};

2
actors/penguin/geo.inc.c
View file

@ -1,6 +1,6 @@
// 0x0C000104
const GeoLayout penguin_geo[] = {
#ifdef VERSION_EU
#if defined(VERSION_EU) || defined(VERSION_SH)
GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0x96, 60),
#else
GEO_SHADOW(SHADOW_CIRCLE_4_VERTS, 0x96, 100),

12
actors/penguin/model.inc.c
View file

@ -25,32 +25,32 @@ static const Lights1 penguin_seg5_lights_05002DC8 = gdSPDefLights1(
);
// 0x05002DE0
ALIGNED8 static const u8 penguin_seg5_texture_05002DE0[] = {
ALIGNED8 static const Texture penguin_seg5_texture_05002DE0[] = {
#include "actors/penguin/penguin_eye_open.rgba16.inc.c"
};
// 0x050035E0
ALIGNED8 static const u8 penguin_seg5_texture_050035E0[] = {
ALIGNED8 static const Texture penguin_seg5_texture_050035E0[] = {
#include "actors/penguin/penguin_eye_half_closed.rgba16.inc.c"
};
// 0x05003DE0
ALIGNED8 static const u8 penguin_seg5_texture_05003DE0[] = {
ALIGNED8 static const Texture penguin_seg5_texture_05003DE0[] = {
#include "actors/penguin/penguin_eye_closed.rgba16.inc.c"
};
// 0x050045E0
ALIGNED8 static const u8 penguin_seg5_texture_050045E0[] = {
ALIGNED8 static const Texture penguin_seg5_texture_050045E0[] = {
#include "actors/penguin/penguin_eye_angry.rgba16.inc.c"
};
// 0x05004DE0
ALIGNED8 static const u8 penguin_seg5_texture_05004DE0[] = {
ALIGNED8 static const Texture penguin_seg5_texture_05004DE0[] = {
#include "actors/penguin/penguin_eye_angry_unused.rgba16.inc.c"
};
// 0x050055E0
ALIGNED8 static const u8 penguin_seg5_texture_050055E0[] = {
ALIGNED8 static const Texture penguin_seg5_texture_050055E0[] = {
#include "actors/penguin/penguin_beak.rgba16.inc.c"
};

12
actors/piranha_plant/model.inc.c
View file

@ -19,32 +19,32 @@ static const Lights1 piranha_plant_seg6_lights_060113E0 = gdSPDefLights1(
);
// 0x060113F8
ALIGNED8 static const u8 piranha_plant_seg6_texture_060113F8[] = {
ALIGNED8 static const Texture piranha_plant_seg6_texture_060113F8[] = {
#include "actors/piranha_plant/piranha_plant_tongue.rgba16.inc.c"
};
// 0x060123F8
ALIGNED8 static const u8 piranha_plant_seg6_texture_060123F8[] = {
ALIGNED8 static const Texture piranha_plant_seg6_texture_060123F8[] = {
#include "actors/piranha_plant/piranha_plant_skin.rgba16.inc.c"
};
// 0x06012BF8
ALIGNED8 static const u8 piranha_plant_seg6_texture_06012BF8[] = {
ALIGNED8 static const Texture piranha_plant_seg6_texture_06012BF8[] = {
#include "actors/piranha_plant/piranha_plant_stem.rgba16.inc.c"
};
// 0x060133F8
ALIGNED8 static const u8 piranha_plant_seg6_texture_060133F8[] = {
ALIGNED8 static const Texture piranha_plant_seg6_texture_060133F8[] = {
#include "actors/piranha_plant/piranha_plant_bottom_lip.rgba16.inc.c"
};
// 0x06013BF8
ALIGNED8 static const u8 piranha_plant_seg6_texture_06013BF8[] = {
ALIGNED8 static const Texture piranha_plant_seg6_texture_06013BF8[] = {
#include "actors/piranha_plant/piranha_plant_tooth.rgba16.inc.c"
};
// 0x060143F8
ALIGNED8 static const u8 piranha_plant_seg6_texture_060143F8[] = {
ALIGNED8 static const Texture piranha_plant_seg6_texture_060143F8[] = {
#include "actors/piranha_plant/piranha_plant_leaf.rgba16.inc.c"
};

6
actors/pokey/model.inc.c
View file

@ -9,12 +9,12 @@ static const Vtx pokey_seg5_vertex_05011710[] = {
};
// 0x05011750
ALIGNED8 static const u8 pokey_seg5_texture_05011750[] = {
ALIGNED8 static const Texture pokey_seg5_texture_05011750[] = {
#include "actors/pokey/pokey_face.rgba16.inc.c"
};
// 0x05011F50
ALIGNED8 static const u8 pokey_seg5_texture_05011F50[] = {
ALIGNED8 static const Texture pokey_seg5_texture_05011F50[] = {
#include "actors/pokey/pokey_face_blink.rgba16.inc.c"
};
@ -71,7 +71,7 @@ static const Vtx pokey_seg5_vertex_05012838[] = {
};
// 0x05012878
ALIGNED8 static const u8 pokey_seg5_texture_05012878[] = {
ALIGNED8 static const Texture pokey_seg5_texture_05012878[] = {
#include "actors/pokey/pokey_body.rgba16.inc.c"
};

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