Removed texture #include and added texture_converter.py tool

This commit is contained in:
NoHomoBoi 2020-08-18 01:36:54 -05:00
parent 0ca30fbd7e
commit 77570e7137
175 changed files with 1919 additions and 6055 deletions

View File

@ -43,9 +43,7 @@ TEXTURE_FIX ?= 0
# Enable extended options menu by default
EXT_OPTIONS_MENU ?= 1
# Disable text-based save-files by default
TEXTSAVES ?= 0
# Load resources from external files
EXTERNAL_DATA ?= 0
TEXTSAVES ?= 1
# Enable Discord Rich Presence
DISCORDRPC ?= 0
@ -65,8 +63,6 @@ AUDIO_API ?= SDL2
# Controller backends (can have multiple, space separated): SDL2
CONTROLLER_API ?= SDL2
# Misc settings for EXTERNAL_DATA
BASEDIR ?= res
# Automatic settings for PC port(s)
@ -412,7 +408,7 @@ RPC_LIBS :=
ifeq ($(DISCORDRPC),1)
ifeq ($(WINDOWS_BUILD),1)
RPC_LIBS := lib/discord/libdiscord-rpc.dll
else ifeq ($(OSX_BUILD),1)
else ifeq ($(OSX_BUILD),1)
# needs testing
RPC_LIBS := lib/discord/libdiscord-rpc.dylib
else
@ -595,14 +591,14 @@ ifeq ($(LEGACY_GL),1)
CFLAGS += -DLEGACY_GL
endif
# TODO: Remove -DEXTERNAL_DATA
# Load external textures
ifeq ($(EXTERNAL_DATA),1)
CC_CHECK += -DEXTERNAL_DATA -DFS_BASEDIR="\"$(BASEDIR)\""
CFLAGS += -DEXTERNAL_DATA -DFS_BASEDIR="\"$(BASEDIR)\""
# tell skyconv to write names instead of actual texture data and save the split tiles so we can use them later
SKYTILE_DIR := $(BUILD_DIR)/textures/skybox_tiles
SKYCONV_ARGS := --store-names --write-tiles "$(SKYTILE_DIR)"
endif
CC_CHECK += -DEXTERNAL_DATA -DFS_BASEDIR="\"$(BASEDIR)\""
CFLAGS += -DEXTERNAL_DATA -DFS_BASEDIR="\"$(BASEDIR)\""
# tell skyconv to write names instead of actual texture data and save the split tiles so we can use them later
SKYTILE_DIR := $(BUILD_DIR)/textures/skybox_tiles
SKYCONV_ARGS := --store-names --write-tiles "$(SKYTILE_DIR)"
ASFLAGS := -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS)
@ -670,8 +666,6 @@ else
CP := cp
endif
ifeq ($(EXTERNAL_DATA),1)
BASEPACK_PATH := $(BUILD_DIR)/$(BASEDIR)/
BASEPACK_LST := $(BUILD_DIR)/basepack.lst
@ -698,8 +692,6 @@ $(BASEPACK_LST): $(EXE)
$(BASEPACK_PATH): $(BASEPACK_LST)
@$(PYTHON) $(TOOLS_DIR)/mkzip.py $(BASEPACK_LST) $(BASEPACK_PATH)
endif
clean:
$(RM) -r $(BUILD_DIR_BASE)
@ -797,42 +789,6 @@ ifeq ($(DISCORDRPC),1)
endif
endif
################################################################
# TEXTURE GENERATION #
################################################################
# RGBA32, RGBA16, IA16, IA8, IA4, IA1, I8, I4
ifeq ($(EXTERNAL_DATA),1)
$(BUILD_DIR)/%: %.png
$(ZEROTERM) "$(patsubst %.png,%,$^)" > $@
else
$(BUILD_DIR)/%: %.png
$(N64GRAPHICS) -i $@ -g $< -f $(lastword $(subst ., ,$@))
endif
$(BUILD_DIR)/%.inc.c: $(BUILD_DIR)/% %.png
hexdump -v -e '1/1 "0x%X,"' $< > $@
echo >> $@
ifeq ($(EXTERNAL_DATA),0)
# Color Index CI8
$(BUILD_DIR)/%.ci8: %.ci8.png
$(N64GRAPHICS_CI) -i $@ -g $< -f ci8
# Color Index CI4
$(BUILD_DIR)/%.ci4: %.ci4.png
$(N64GRAPHICS_CI) -i $@ -g $< -f ci4
endif
################################################################
# compressed segment generation
# PC Area
@ -875,19 +831,9 @@ $(SOUND_BIN_DIR)/%.m64: $(SOUND_BIN_DIR)/%.o
$(SOUND_BIN_DIR)/%.o: $(SOUND_BIN_DIR)/%.s
$(AS) $(ASFLAGS) -o $@ $<
ifeq ($(EXTERNAL_DATA),1)
$(SOUND_BIN_DIR)/%.inc.c: $(SOUND_BIN_DIR)/%
$(ZEROTERM) "$(patsubst $(BUILD_DIR)/%,%,$^)" | hexdump -v -e '1/1 "0x%X,"' > $@
else
$(SOUND_BIN_DIR)/%.inc.c: $(SOUND_BIN_DIR)/%
hexdump -v -e '1/1 "0x%X,"' $< > $@
echo >> $@
endif
$(SOUND_BIN_DIR)/sound_data.o: $(SOUND_BIN_DIR)/sound_data.ctl.inc.c $(SOUND_BIN_DIR)/sound_data.tbl.inc.c $(SOUND_BIN_DIR)/sequences.bin.inc.c $(SOUND_BIN_DIR)/bank_sets.inc.c
$(BUILD_DIR)/levels/scripts.o: $(BUILD_DIR)/include/level_headers.h

View File

@ -1,235 +1,3 @@
# --------------------------------------
# General Rules
# --------------------------------------
# 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
# NOTE: textures assume naming convention "texture.<encoding>.png" generates "texture.<encoding>"
ACTOR_GROUPS := \
group0 \
group1 \
group2 \
group3 \
group4 \
group5 \
group6 \
group7 \
group8 \
group9 \
group10 \
group11 \
group12 \
group13 \
group14 \
group15 \
group16 \
group17 \
common0 \
common1
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)))
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
# --------------------------------------
# Actor Directories
KOOPA_DIRS := koopa_flag poundable_pole koopa piranha_plant whomp chain_ball chain_chomp
CAPSWITCH_DIRS := capswitch springboard
CHILLYCHIEF_DIRS := chillychief moneybag
BULLY_DIRS := bully blargg
SPINDRIFT_DIRS := spindrift penguin snowman
KING_BOBOMB_DIRS := king_bobomb water_bubble
BOO_DIRS := bookend book chair small_key mad_piano boo haunted_cage
MR_I_DIRS := mr_i_eyeball mr_i_iris swoop snufit dorrie scuttlebug
HOOT_DIRS := yellow_sphere_small hoot yoshi_egg thwomp bullet_bill heave_ho
COINS_DIRS := mist explosion butterfly coin warp_pipe door bowser_key flame blue_fish pebble leaves warp_collision mario_cap power_meter mushroom_1up star sand dirt transparent_star white_particle wooden_signpost tree
BUBBA_DIRS := bubba wiggler wiggler_body_part lakitu_enemy spiny_egg spiny
SKEETER_DIRS := skeeter seaweed water_mine cyan_fish bub water_ring treasure_chest
KLEPTO_DIRS := klepto eyerok pokey tornado
SEA_DIRS := clam_shell manta sushi unagi whirlpool
AMP_DIRS := blue_coin_switch amp cannon_lid cannon_base cannon_barrel chuckya purple_switch checkerboard_platform heart flyguy breakable_box exclamation_box goomba bobomb metal_box exclamation_box_outline test_platform koopa_shell
MOLE_DIRS := monty_mole_hole monty_mole smoke ukiki fwoosh
LAKITU_DIRS := lakitu_cameraman toad mips boo_castle
PEACH_DIRS := bird peach yoshi
BOWSER_DIRS := bowser_flame impact_ring yellow_sphere bowser bomb impact_smoke
MARIO_DIRS := mario bubble walk_smoke burn_smoke stomp_smoke water_wave sparkle water_splash white_particle_small sparkle_animation
# Actor Files
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)))
# 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))
# 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/group10.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group11.elf: SEGMENT_ADDRESS := 0x05000000
$(BUILD_DIR)/actors/group12.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/actors/group13.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/actors/group14.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/actors/group15.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/actors/group16.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/actors/group17.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/actors/common0.elf: SEGMENT_ADDRESS := 0x08000000
$(BUILD_DIR)/actors/common1.elf: SEGMENT_ADDRESS := 0x03000000
# --------------------------------------
# Level Rules
# --------------------------------------
$(BUILD_DIR)/levels/%/leveldata.elf: SEGMENT_ADDRESS := 0x07000000
# TODO: Generate these rules from the level configs?
define level_rules =
$(1)_SEG7_FILES := $$(patsubst %.png,%.inc.c,$$(wildcard levels/$(1)/*.png))
$$(BUILD_DIR)/levels/$(1)/leveldata.o: $$(addprefix $$(BUILD_DIR)/,$$($(1)_SEG7_FILES))
$$(BUILD_DIR)/levels/$(1)/leveldata.elf: TEXTURE_BIN := $(2)
endef
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),distclean)
$(BUILD_DIR)/level_rules.mk: levels/level_rules.mk levels/level_defines.h
$(CPP) $(VERSION_CFLAGS) -I . -o $@ $<
include $(BUILD_DIR)/level_rules.mk
endif
endif
# --------------------------------------
# Extra Level Rules
# --------------------------------------
$(eval $(call level_rules,intro,generic)) # Intro (Super Mario 64 Logo)
$(eval $(call level_rules,menu,generic)) # Menu (File Select)
# --------------------------------------
# Cake Texture Rules
# --------------------------------------
# Ending cake textures are generated in a special way
$(BUILD_DIR)/levels/ending/cake_eu.inc.c: levels/ending/cake_eu.png
$(SKYCONV) $(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
# --------------------------------------
# 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))
# 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))
# Others
$(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
# 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
# --------------------------------------
# Skybox Rules
# --------------------------------------
@ -237,18 +5,4 @@ $(BUILD_DIR)/bin/eu/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/%_skybox.c: textures/skyboxes/%.png
$(SKYCONV) $(SKYCONV_ARGS) --type sky --split $^ $(BUILD_DIR)/bin
$(BUILD_DIR)/bin/%_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
# --------------------------------------
# Misc Rules
# --------------------------------------
# intro and ipl3 textures are not compressed
INTRO_RAW_FILES := $(wildcard $(TEXTURE_DIR)/intro_raw/*.png)
$(BUILD_DIR)/src/goddard/renderer.o: $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(INTRO_RAW_FILES)))
IPL3_TEXTURE_FILES := $(wildcard $(TEXTURE_DIR)/ipl3_raw/*.png)
IPL3_RAW_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%,$(IPL3_TEXTURE_FILES)))
CRASH_TEXTURE_FILES := $(wildcard $(TEXTURE_DIR)/crash_screen/*.png)
CRASH_TEXTURE_C_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(CRASH_TEXTURE_FILES)))
$(BUILD_DIR)/bin/%_skybox.elf: SEGMENT_ADDRESS := 0x0A000000

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,74 +3,46 @@
// TODO: Are these seperate textures or unified 64x64 ones?
// 0x06000000
ALIGNED8 static const u8 flame_seg6_texture_06000000[] = {
#include "actors/bowser_flame/bowser_flame_0.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06000000[] = "actors/bowser_flame/bowser_flame_0.rgba16";
// 0x06002000
ALIGNED8 static const u8 flame_seg6_texture_06002000[] = {
#include "actors/bowser_flame/bowser_flame_1.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06002000[] = "actors/bowser_flame/bowser_flame_1.rgba16";
// 0x06004000
ALIGNED8 static const u8 flame_seg6_texture_06004000[] = {
#include "actors/bowser_flame/bowser_flame_2.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06004000[] = "actors/bowser_flame/bowser_flame_2.rgba16";
// 0x06006000
ALIGNED8 static const u8 flame_seg6_texture_06006000[] = {
#include "actors/bowser_flame/bowser_flame_3.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06006000[] = "actors/bowser_flame/bowser_flame_3.rgba16";
// 0x06008000
ALIGNED8 static const u8 flame_seg6_texture_06008000[] = {
#include "actors/bowser_flame/bowser_flame_4.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06008000[] = "actors/bowser_flame/bowser_flame_4.rgba16";
// 0x0600A000
ALIGNED8 static const u8 flame_seg6_texture_0600A000[] = {
#include "actors/bowser_flame/bowser_flame_5.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_0600A000[] = "actors/bowser_flame/bowser_flame_5.rgba16";
// 0x0600C000
ALIGNED8 static const u8 flame_seg6_texture_0600C000[] = {
#include "actors/bowser_flame/bowser_flame_6.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_0600C000[] = "actors/bowser_flame/bowser_flame_6.rgba16";
// 0x0600E000
ALIGNED8 static const u8 flame_seg6_texture_0600E000[] = {
#include "actors/bowser_flame/bowser_flame_7.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_0600E000[] = "actors/bowser_flame/bowser_flame_7.rgba16";
// 0x06010000
ALIGNED8 static const u8 flame_seg6_texture_06010000[] = {
#include "actors/bowser_flame/bowser_flame_8.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06010000[] = "actors/bowser_flame/bowser_flame_8.rgba16";
// 0x06012000
ALIGNED8 static const u8 flame_seg6_texture_06012000[] = {
#include "actors/bowser_flame/bowser_flame_9.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06012000[] = "actors/bowser_flame/bowser_flame_9.rgba16";
// 0x06014000
ALIGNED8 static const u8 flame_seg6_texture_06014000[] = {
#include "actors/bowser_flame/bowser_flame_10.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06014000[] = "actors/bowser_flame/bowser_flame_10.rgba16";
// 0x06016000
ALIGNED8 static const u8 flame_seg6_texture_06016000[] = {
#include "actors/bowser_flame/bowser_flame_11.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06016000[] = "actors/bowser_flame/bowser_flame_11.rgba16";
// 0x06018000
ALIGNED8 static const u8 flame_seg6_texture_06018000[] = {
#include "actors/bowser_flame/bowser_flame_12.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_06018000[] = "actors/bowser_flame/bowser_flame_12.rgba16";
// 0x0601A000
ALIGNED8 static const u8 flame_seg6_texture_0601A000[] = {
#include "actors/bowser_flame/bowser_flame_13.rgba16.inc.c"
};
ALIGNED8 static const u8 flame_seg6_texture_0601A000[] = "actors/bowser_flame/bowser_flame_13.rgba16";
// 0x0601C000
static const Vtx flame_seg6_vertex_0601C000[] = {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -19,9 +19,7 @@ static const Vtx bully_seg5_vertex_05000000[] = {
};
// 0x050000E0
ALIGNED8 static const u8 bully_seg5_texture_050000E0[] = {
#include "actors/bully/bully_horn.rgba16.inc.c"
};
ALIGNED8 static const u8 bully_seg5_texture_050000E0[] = "actors/bully/bully_horn.rgba16";
// 0x050002E0 - 0x05000398
const Gfx bully_seg5_dl_050002E0[] = {
@ -85,19 +83,13 @@ static const Lights1 bully_seg5_lights_05000450 = gdSPDefLights1(
// //! There's another malformed light entry here.
// 0x05000468
ALIGNED8 static const u8 bully_seg5_texture_05000468[] = {
#include "actors/bully/bully_left_side.rgba16.inc.c"
};
ALIGNED8 static const u8 bully_seg5_texture_05000468[] = "actors/bully/bully_left_side.rgba16";
// 0x05001468
ALIGNED8 static const u8 bully_seg5_texture_05001468[] = {
#include "actors/bully/bully_right_side.rgba16.inc.c"
};
ALIGNED8 static const u8 bully_seg5_texture_05001468[] = "actors/bully/bully_right_side.rgba16";
// 0x05002468
ALIGNED8 static const u8 bully_seg5_texture_05002468[] = {
#include "actors/bully/bully_eye.rgba16.inc.c"
};
ALIGNED8 static const u8 bully_seg5_texture_05002468[] = "actors/bully/bully_eye.rgba16";
// 0x05002C68
static const Vtx bully_seg5_vertex_05002C68[] = {

View File

@ -15,9 +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[] = {
#include "actors/burn_smoke/burn_smoke.ia16.inc.c"
};
ALIGNED8 static const u8 burn_smoke_seg4_texture_04021800[] = "actors/burn_smoke/burn_smoke.ia16";
// 0x04022000 - 0x04022028
const Gfx burn_smoke_seg4_dl_04022000[] = {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -13,9 +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[] = {
#include "actors/chain_ball/chain_ball.rgba16.inc.c"
};
ALIGNED8 static const u8 chain_ball_seg6_texture_06020AE8[] = "actors/chain_ball/chain_ball.rgba16";
// 0x060212E8 - 0x06021380
const Gfx chain_ball_seg6_dl_060212E8[] = {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -4,19 +4,13 @@
UNUSED static const u64 flyguy_unused_1 = 0;
// 0x0800E088
ALIGNED8 static const u8 flyguy_seg8_texture_0800E088[] = {
#include "actors/flyguy/flyguy_cloth_wrinkle.rgba16.inc.c"
};
ALIGNED8 static const u8 flyguy_seg8_texture_0800E088[] = "actors/flyguy/flyguy_cloth_wrinkle.rgba16";
// 0x0800F088
ALIGNED8 static const u8 flyguy_seg8_texture_0800F088[] = {
#include "actors/flyguy/flyguy_face.rgba16.inc.c"
};
ALIGNED8 static const u8 flyguy_seg8_texture_0800F088[] = "actors/flyguy/flyguy_face.rgba16";
// 0x0800F888
ALIGNED8 static const u8 flyguy_seg8_texture_0800F888[] = {
#include "actors/flyguy/flyguy_propeller.ia16.inc.c"
};
ALIGNED8 static const u8 flyguy_seg8_texture_0800F888[] = "actors/flyguy/flyguy_propeller.ia16";
// Unreferenced light group
UNUSED static const Lights1 flyguy_lights_unused1 = gdSPDefLights1(

View File

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

View File

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

View File

@ -13,37 +13,25 @@ static const Lights1 haunted_cage_seg5_lights_0500C270 = gdSPDefLights1(
);
// 0x0500C288
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500C288[] = {
#include "actors/haunted_cage/bbh_cage_floor.rgba16.inc.c"
};
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500C288[] = "actors/haunted_cage/bbh_cage_floor.rgba16";
// 0x0500CA88
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500CA88[] = {
#include "actors/haunted_cage/bbh_cage_double_ornament.rgba16.inc.c"
};
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500CA88[] = "actors/haunted_cage/bbh_cage_double_ornament.rgba16";
// 0x0500D288
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500D288[] = {
#include "actors/haunted_cage/bbh_cage_ornament.rgba16.inc.c"
};
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500D288[] = "actors/haunted_cage/bbh_cage_ornament.rgba16";
// 0x0500D688
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500D688[] = {
#include "actors/haunted_cage/bbh_cage_wooden_base.rgba16.inc.c"
};
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500D688[] = "actors/haunted_cage/bbh_cage_wooden_base.rgba16";
// 0x0500DA88
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500DA88[] = {
#include "actors/haunted_cage/bbh_cage_bars.rgba16.inc.c"
};
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500DA88[] = "actors/haunted_cage/bbh_cage_bars.rgba16";
// possibly garbage. does not at all appear to be a texture and is unreferenced
// 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[] = {
#include "actors/haunted_cage/bbh_cage_garbage.rgba16.inc.c"
};
ALIGNED8 static const u8 haunted_cage_seg5_texture_0500E288[] = "actors/haunted_cage/bbh_cage_garbage.rgba16";
// 0x0500EA88
static const Vtx haunted_cage_seg5_vertex_0500EA88[] = {

View File

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

View File

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

View File

@ -73,9 +73,7 @@ static const Lights1 hoot_seg5_lights_05000A08 = gdSPDefLights1(
);
// 0x05000A20
ALIGNED8 static const u8 hoot_seg5_texture_05000A20[] = {
#include "actors/hoot/hoot_eyes.rgba16.inc.c"
};
ALIGNED8 static const u8 hoot_seg5_texture_05000A20[] = "actors/hoot/hoot_eyes.rgba16";
// 0x05001220
static const Vtx hoot_seg5_vertex_05001220[] = {
@ -351,14 +349,10 @@ static const Lights1 hoot_seg5_lights_05001E38 = gdSPDefLights1(
);
// 0x05001E50
ALIGNED8 static const u8 hoot_seg5_texture_05001E50[] = {
#include "actors/hoot/hoot_wing.rgba16.inc.c"
};
ALIGNED8 static const u8 hoot_seg5_texture_05001E50[] = "actors/hoot/hoot_wing.rgba16";
// 0x05002650
ALIGNED8 static const u8 hoot_seg5_texture_05002650[] = {
#include "actors/hoot/hoot_wing_tip.rgba16.inc.c"
};
ALIGNED8 static const u8 hoot_seg5_texture_05002650[] = "actors/hoot/hoot_wing_tip.rgba16";
// //! The vertex macro which calls this has too large of a size.
// 0x05002E50

View File

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

View File

@ -3,24 +3,16 @@
// TODO: Are these seperate textures or unified 64x64 ones?
// 0x0605AA28
ALIGNED8 static const u8 impact_smoke_seg6_texture_0605AA28[] = {
#include "actors/impact_smoke/impact_smoke_0.ia16.inc.c"
};
ALIGNED8 static const u8 impact_smoke_seg6_texture_0605AA28[] = "actors/impact_smoke/impact_smoke_0.ia16";
// 0x0605CA28
ALIGNED8 static const u8 impact_smoke_seg6_texture_0605CA28[] = {
#include "actors/impact_smoke/impact_smoke_1.ia16.inc.c"
};
ALIGNED8 static const u8 impact_smoke_seg6_texture_0605CA28[] = "actors/impact_smoke/impact_smoke_1.ia16";
// 0x0605EA28
ALIGNED8 static const u8 impact_smoke_seg6_texture_0605EA28[] = {
#include "actors/impact_smoke/impact_smoke_2.ia16.inc.c"
};
ALIGNED8 static const u8 impact_smoke_seg6_texture_0605EA28[] = "actors/impact_smoke/impact_smoke_2.ia16";
// 0x06060A28
ALIGNED8 static const u8 impact_smoke_seg6_texture_06060A28[] = {
#include "actors/impact_smoke/impact_smoke_3.ia16.inc.c"
};
ALIGNED8 static const u8 impact_smoke_seg6_texture_06060A28[] = "actors/impact_smoke/impact_smoke_3.ia16";
// 0x06062A28
static const Vtx impact_smoke_seg6_vertex_06062A28[] = {

View File

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

View File

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

View File

@ -57,44 +57,28 @@ 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[] = {
#include "actors/koopa/koopa_shell_front.rgba16.inc.c"
};
ALIGNED8 static const u8 koopa_seg6_texture_06002648[] = "actors/koopa/koopa_shell_front.rgba16";
// 0x06002E48
ALIGNED8 static const u8 koopa_seg6_texture_06002E48[] = {
#include "actors/koopa/koopa_shell_back.rgba16.inc.c"
};
ALIGNED8 static const u8 koopa_seg6_texture_06002E48[] = "actors/koopa/koopa_shell_back.rgba16";
// 0x06003648
ALIGNED8 static const u8 koopa_seg6_texture_06003648[] = {
#include "actors/koopa/koopa_shoe.rgba16.inc.c"
};
ALIGNED8 static const u8 koopa_seg6_texture_06003648[] = "actors/koopa/koopa_shoe.rgba16";
// 0x06003E48
ALIGNED8 static const u8 koopa_seg6_texture_06003E48[] = {
#include "actors/koopa/koopa_shell_front_top.rgba16.inc.c"
};
ALIGNED8 static const u8 koopa_seg6_texture_06003E48[] = "actors/koopa/koopa_shell_front_top.rgba16";
// 0x06004648
ALIGNED8 static const u8 koopa_seg6_texture_06004648[] = {
#include "actors/koopa/koopa_eyes_open.rgba16.inc.c"
};
ALIGNED8 static const u8 koopa_seg6_texture_06004648[] = "actors/koopa/koopa_eyes_open.rgba16";
// 0x06004E48
ALIGNED8 static const u8 koopa_seg6_texture_06004E48[] = {
#include "actors/koopa/koopa_eyes_closed.rgba16.inc.c"
};
ALIGNED8 static const u8 koopa_seg6_texture_06004E48[] = "actors/koopa/koopa_eyes_closed.rgba16";
// 0x06005648
ALIGNED8 static const u8 koopa_seg6_texture_06005648[] = {
#include "actors/koopa/koopa_eye_border.rgba16.inc.c"
};
ALIGNED8 static const u8 koopa_seg6_texture_06005648[] = "actors/koopa/koopa_eye_border.rgba16";
// 0x06005E48
ALIGNED8 static const u8 koopa_seg6_texture_06005E48[] = {
#include "actors/koopa/koopa_nostrils.rgba16.inc.c"
};
ALIGNED8 static const u8 koopa_seg6_texture_06005E48[] = "actors/koopa/koopa_nostrils.rgba16";
// 0x06006E48
static const Lights1 koopa_seg6_lights_06006E48 = gdSPDefLights1(

View File

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

View File

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

View File

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

View File

@ -20,29 +20,19 @@ UNUSED static const Lights1 lakitu_enemy_lights_unused2 = gdSPDefLights1(
// Unreferenced texture
// 0x0500ECE0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_0500ECE0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_cloud_face_unused.rgba16.inc.c"
};
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_0500ECE0[] = "actors/lakitu_enemy/lakitu_enemy_cloud_face_unused.rgba16";
// 0x0500F4E0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_0500F4E0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_eyes_open.rgba16.inc.c"
};
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_0500F4E0[] = "actors/lakitu_enemy/lakitu_enemy_eyes_open.rgba16";
// 0x050104E0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_050104E0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_eyes_closed.rgba16.inc.c"
};
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_050104E0[] = "actors/lakitu_enemy/lakitu_enemy_eyes_closed.rgba16";
// 0x050114E0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_050114E0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_shell.rgba16.inc.c"
};
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_050114E0[] = "actors/lakitu_enemy/lakitu_enemy_shell.rgba16";
// 0x05011CE0
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_05011CE0[] = {
#include "actors/lakitu_enemy/lakitu_enemy_frown.rgba16.inc.c"
};
ALIGNED8 static const u8 lakitu_enemy_seg5_texture_05011CE0[] = "actors/lakitu_enemy/lakitu_enemy_frown.rgba16";
// 0x050124E0
static const Lights1 lakitu_enemy_seg5_lights_050124E0 = gdSPDefLights1(

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,14 +1,10 @@
// Moneybag
// 0x060039B0
ALIGNED8 static const u8 moneybag_seg6_texture_060039B0[] = {
#include "actors/moneybag/moneybag_mouth.rgba16.inc.c"
};
ALIGNED8 static const u8 moneybag_seg6_texture_060039B0[] = "actors/moneybag/moneybag_mouth.rgba16";
// 0x060049B0
ALIGNED8 static const u8 moneybag_seg6_texture_060049B0[] = {
#include "actors/moneybag/moneybag_eyes.rgba16.inc.c"
};
ALIGNED8 static const u8 moneybag_seg6_texture_060049B0[] = "actors/moneybag/moneybag_eyes.rgba16";
// 0x060051B0
static const Lights1 moneybag_seg6_lights_060051B0 = gdSPDefLights1(

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -9,14 +9,10 @@ static const Vtx pokey_seg5_vertex_05011710[] = {
};
// 0x05011750
ALIGNED8 static const u8 pokey_seg5_texture_05011750[] = {
#include "actors/pokey/pokey_face.rgba16.inc.c"
};
ALIGNED8 static const u8 pokey_seg5_texture_05011750[] = "actors/pokey/pokey_face.rgba16";
// 0x05011F50
ALIGNED8 static const u8 pokey_seg5_texture_05011F50[] = {
#include "actors/pokey/pokey_face_blink.rgba16.inc.c"
};
ALIGNED8 static const u8 pokey_seg5_texture_05011F50[] = "actors/pokey/pokey_face_blink.rgba16";
// 0x05012750 - 0x05012798
const Gfx pokey_seg5_dl_05012750[] = {
@ -71,9 +67,7 @@ static const Vtx pokey_seg5_vertex_05012838[] = {
};
// 0x05012878
ALIGNED8 static const u8 pokey_seg5_texture_05012878[] = {
#include "actors/pokey/pokey_body.rgba16.inc.c"
};
ALIGNED8 static const u8 pokey_seg5_texture_05012878[] = "actors/pokey/pokey_body.rgba16";
// 0x05013078 - 0x050130B0
const Gfx pokey_seg5_dl_05013078[] = {

View File

@ -7,14 +7,10 @@ static const Lights1 poundable_pole_seg6_lights_06001038 = gdSPDefLights1(
);
// 0x06001050
ALIGNED8 static const u8 poundable_pole_seg6_texture_06001050[] = {
#include "actors/poundable_pole/poundable_pole_top.rgba16.inc.c"
};
ALIGNED8 static const u8 poundable_pole_seg6_texture_06001050[] = "actors/poundable_pole/poundable_pole_top.rgba16";
// 0x06001850
ALIGNED8 static const u8 poundable_pole_seg6_texture_06001850[] = {
#include "actors/poundable_pole/poundable_pole_side.rgba16.inc.c"
};
ALIGNED8 static const u8 poundable_pole_seg6_texture_06001850[] = "actors/poundable_pole/poundable_pole_side.rgba16";
// 0x06002050
static const Vtx poundable_pole_seg6_vertex_06002050[] = {

View File

@ -3,54 +3,34 @@
UNUSED static const u64 power_meter_unused_1 = 0;
// 0x030233E0
ALIGNED8 static const u8 texture_power_meter_left_side[] = {
#include "actors/power_meter/power_meter_left_side.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_left_side[] = "actors/power_meter/power_meter_left_side.rgba16";
// 0x030243E0
ALIGNED8 static const u8 texture_power_meter_right_side[] = {
#include "actors/power_meter/power_meter_right_side.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_right_side[] = "actors/power_meter/power_meter_right_side.rgba16";
// 0x030253E0
ALIGNED8 static const u8 texture_power_meter_full[] = {
#include "actors/power_meter/power_meter_full.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_full[] = "actors/power_meter/power_meter_full.rgba16";
// 0x03025BE0
ALIGNED8 static const u8 texture_power_meter_seven_segments[] = {
#include "actors/power_meter/power_meter_seven_segments.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_seven_segments[] = "actors/power_meter/power_meter_seven_segments.rgba16";
// 0x030263E0
ALIGNED8 static const u8 texture_power_meter_six_segments[] = {
#include "actors/power_meter/power_meter_six_segments.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_six_segments[] = "actors/power_meter/power_meter_six_segments.rgba16";
// 0x03026BE0
ALIGNED8 static const u8 texture_power_meter_five_segments[] = {
#include "actors/power_meter/power_meter_five_segments.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_five_segments[] = "actors/power_meter/power_meter_five_segments.rgba16";
// 0x030273E0
ALIGNED8 static const u8 texture_power_meter_four_segments[] = {
#include "actors/power_meter/power_meter_four_segments.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_four_segments[] = "actors/power_meter/power_meter_four_segments.rgba16";
// 0x03027BE0
ALIGNED8 static const u8 texture_power_meter_three_segments[] = {
#include "actors/power_meter/power_meter_three_segments.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_three_segments[] = "actors/power_meter/power_meter_three_segments.rgba16";
// 0x030283E0
ALIGNED8 static const u8 texture_power_meter_two_segments[] = {
#include "actors/power_meter/power_meter_two_segments.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_two_segments[] = "actors/power_meter/power_meter_two_segments.rgba16";
// 0x03028BE0
ALIGNED8 static const u8 texture_power_meter_one_segments[] = {
#include "actors/power_meter/power_meter_one_segment.rgba16.inc.c"
};
ALIGNED8 static const u8 texture_power_meter_one_segments[] = "actors/power_meter/power_meter_one_segment.rgba16";
// 0x030293E0
const u8 *const power_meter_health_segments_lut[] = {

View File

@ -7,14 +7,10 @@ static const Lights1 purple_switch_seg8_lights_0800C090 = gdSPDefLights1(
);
// 0x0800C0A8
ALIGNED8 static const u8 purple_switch_seg8_texture_0800C0A8[] = {
#include "actors/purple_switch/purple_switch_base.rgba16.inc.c"
};
ALIGNED8 static const u8 purple_switch_seg8_texture_0800C0A8[] = "actors/purple_switch/purple_switch_base.rgba16";
// 0x0800C128
ALIGNED8 static const u8 purple_switch_seg8_texture_0800C128[] = {
#include "actors/purple_switch/purple_switch_exclamation_point.rgba16.inc.c"
};
ALIGNED8 static const u8 purple_switch_seg8_texture_0800C128[] = "actors/purple_switch/purple_switch_exclamation_point.rgba16";
// 0x0800C528
static const Vtx purple_switch_seg8_vertex_0800C528[] = {

View File

@ -9,9 +9,7 @@ static const Vtx sand_seg3_vertex_0302BA90[] = {
};
// 0x0302BAD0
ALIGNED8 static const u8 sand_seg3_texture_0302BAD0[] = {
#include "actors/sand/sand_particle.rgba16.inc.c"
};
ALIGNED8 static const u8 sand_seg3_texture_0302BAD0[] = "actors/sand/sand_particle.rgba16";
// 0x0302BCD0 - 0x0302BD60
const Gfx sand_seg3_dl_0302BCD0[] = {

View File

@ -13,29 +13,19 @@ UNUSED static const Lights1 scuttlebug_lights_unused2 = gdSPDefLights1(
);
// 0x06010108
ALIGNED8 static const u8 scuttlebug_seg6_texture_06010108[] = {
#include "actors/scuttlebug/scuttlebug_eye.rgba16.inc.c"
};
ALIGNED8 static const u8 scuttlebug_seg6_texture_06010108[] = "actors/scuttlebug/scuttlebug_eye.rgba16";
// 0x06010908
ALIGNED8 static const u8 scuttlebug_seg6_texture_06010908[] = {
#include "actors/scuttlebug/scuttlebug_left_side.rgba16.inc.c"
};
ALIGNED8 static const u8 scuttlebug_seg6_texture_06010908[] = "actors/scuttlebug/scuttlebug_left_side.rgba16";
// 0x06011908
ALIGNED8 static const u8 scuttlebug_seg6_texture_06011908[] = {
#include "actors/scuttlebug/scuttlebug_right_side.rgba16.inc.c"
};
ALIGNED8 static const u8 scuttlebug_seg6_texture_06011908[] = "actors/scuttlebug/scuttlebug_right_side.rgba16";
// 0x06012908
ALIGNED8 static const u8 scuttlebug_seg6_texture_06012908[] = {
#include "actors/scuttlebug/scuttlebug_iris.rgba16.inc.c"
};
ALIGNED8 static const u8 scuttlebug_seg6_texture_06012908[] = "actors/scuttlebug/scuttlebug_iris.rgba16";
// 0x06013108
ALIGNED8 static const u8 scuttlebug_seg6_texture_06013108[] = {
#include "actors/scuttlebug/scuttlebug_leg.rgba16.inc.c"
};
ALIGNED8 static const u8 scuttlebug_seg6_texture_06013108[] = "actors/scuttlebug/scuttlebug_leg.rgba16";
// 0x06013908
static const Vtx scuttlebug_seg6_vertex_06013908[] = {

View File

@ -7,24 +7,16 @@ static const Lights1 seaweed_seg6_lights_06007DF8 = gdSPDefLights1(
);
// 0x06007E10
ALIGNED8 static const u8 seaweed_seg6_texture_06007E10[] = {
#include "actors/seaweed/seaweed_tip.rgba16.inc.c"
};
ALIGNED8 static const u8 seaweed_seg6_texture_06007E10[] = "actors/seaweed/seaweed_tip.rgba16";
// 0x06008610
ALIGNED8 static const u8 seaweed_seg6_texture_06008610[] = {
#include "actors/seaweed/seaweed_upper_center.rgba16.inc.c"
};
ALIGNED8 static const u8 seaweed_seg6_texture_06008610[] = "actors/seaweed/seaweed_upper_center.rgba16";
// 0x06008E10
ALIGNED8 static const u8 seaweed_seg6_texture_06008E10[] = {
#include "actors/seaweed/seaweed_lower_center.rgba16.inc.c"
};
ALIGNED8 static const u8 seaweed_seg6_texture_06008E10[] = "actors/seaweed/seaweed_lower_center.rgba16";
// 0x06009610
ALIGNED8 static const u8 seaweed_seg6_texture_06009610[] = {
#include "actors/seaweed/seaweed_base.rgba16.inc.c"
};
ALIGNED8 static const u8 seaweed_seg6_texture_06009610[] = "actors/seaweed/seaweed_base.rgba16";
// 0x06009E10
static const Vtx seaweed_seg6_vertex_06009E10[] = {

View File

@ -37,14 +37,10 @@ UNUSED static const Lights1 skeeter_lights_unused6 = gdSPDefLights1(
);
// 0x06000090
ALIGNED8 static const u8 skeeter_seg6_texture_06000090[] = {
#include "actors/skeeter/skeeter_eye.rgba16.inc.c"
};
ALIGNED8 static const u8 skeeter_seg6_texture_06000090[] = "actors/skeeter/skeeter_eye.rgba16";
// 0x06000890
ALIGNED8 static const u8 skeeter_seg6_texture_06000890[] = {
#include "actors/skeeter/skeeter_iris.rgba16.inc.c"
};
ALIGNED8 static const u8 skeeter_seg6_texture_06000890[] = "actors/skeeter/skeeter_iris.rgba16";
// 0x06000990
static const Vtx skeeter_seg6_vertex_06000990[] = {

View File

@ -9,9 +9,7 @@ static const Vtx smoke_seg5_vertex_05007280[] = {
};
// 0x050072C0
ALIGNED8 static const u8 smoke_seg5_texture_050072C0[] = {
#include "actors/smoke/smoke.ia16.inc.c"
};
ALIGNED8 static const u8 smoke_seg5_texture_050072C0[] = "actors/smoke/smoke.ia16";
// 0x05007AC0 - 0x05007AF8
const Gfx smoke_seg5_dl_05007AC0[] = {

View File

@ -28,29 +28,19 @@ UNUSED static const Lights1 snowman_lights_unused4 = gdSPDefLights1(
);
// 0x05008C70
ALIGNED8 static const u8 snowman_seg5_texture_05008C70[] = {
#include "actors/snowman/mr_blizzard_mitten.rgba16.inc.c"
};
ALIGNED8 static const u8 snowman_seg5_texture_05008C70[] = "actors/snowman/mr_blizzard_mitten.rgba16";
// 0x05009470
ALIGNED8 static const u8 snowman_seg5_texture_05009470[] = {
#include "actors/snowman/mr_blizzard_left_side.rgba16.inc.c"
};
ALIGNED8 static const u8 snowman_seg5_texture_05009470[] = "actors/snowman/mr_blizzard_left_side.rgba16";
// 0x0500A470
ALIGNED8 static const u8 snowman_seg5_texture_0500A470[] = {
#include "actors/snowman/mr_blizzard_right_side.rgba16.inc.c"
};
ALIGNED8 static const u8 snowman_seg5_texture_0500A470[] = "actors/snowman/mr_blizzard_right_side.rgba16";
// 0x0500B470
ALIGNED8 static const u8 snowman_seg5_texture_0500B470[] = {
#include "actors/snowman/mr_blizzard_eye.rgba16.inc.c"
};
ALIGNED8 static const u8 snowman_seg5_texture_0500B470[] = "actors/snowman/mr_blizzard_eye.rgba16";
// 0x0500BC70
ALIGNED8 static const u8 snowman_seg5_texture_0500BC70[] = {
#include "actors/snowman/mr_blizzard_mouth.rgba16.inc.c"
};
ALIGNED8 static const u8 snowman_seg5_texture_0500BC70[] = "actors/snowman/mr_blizzard_mouth.rgba16";
// 0x0500C470
static const Lights1 snowman_seg5_lights_0500C470 = gdSPDefLights1(

View File

@ -1,24 +1,16 @@
// Snufit
// 0x060070E0
ALIGNED8 static const u8 snufit_seg6_texture_060070E0[] = {
#include "actors/snufit/snufit_body.rgba16.inc.c"
};
ALIGNED8 static const u8 snufit_seg6_texture_060070E0[] = "actors/snufit/snufit_body.rgba16";
// 0x060078E0
ALIGNED8 static const u8 snufit_seg6_texture_060078E0[] = {
#include "actors/snufit/snufit_eye.rgba16.inc.c"
};
ALIGNED8 static const u8 snufit_seg6_texture_060078E0[] = "actors/snufit/snufit_eye.rgba16";
// 0x060080E0
ALIGNED8 static const u8 snufit_seg6_texture_060080E0[] = {
#include "actors/snufit/snufit_mask_strap.rgba16.inc.c"
};
ALIGNED8 static const u8 snufit_seg6_texture_060080E0[] = "actors/snufit/snufit_mask_strap.rgba16";
// 0x060084E0
ALIGNED8 static const u8 snufit_seg6_texture_060084E0[] = {
#include "actors/snufit/snufit_mouth.rgba16.inc.c"
};
ALIGNED8 static const u8 snufit_seg6_texture_060084E0[] = "actors/snufit/snufit_mouth.rgba16";
// 0x06008CE0
static const Lights1 snufit_seg6_lights_06008CE0 = gdSPDefLights1(

View File

@ -9,34 +9,22 @@ static const Vtx sparkles_seg4_vertex_04027450[] = {
};
// 0x04027490
ALIGNED8 static const u8 sparkles_seg4_texture_04027490[] = {
#include "actors/sparkle/sparkle_0.rgba16.inc.c"
};
ALIGNED8 static const u8 sparkles_seg4_texture_04027490[] = "actors/sparkle/sparkle_0.rgba16";
// 0x04027C90
ALIGNED8 static const u8 sparkles_seg4_texture_04027C90[] = {
#include "actors/sparkle/sparkle_1.rgba16.inc.c"
};
ALIGNED8 static const u8 sparkles_seg4_texture_04027C90[] = "actors/sparkle/sparkle_1.rgba16";
// 0x04028490
ALIGNED8 static const u8 sparkles_seg4_texture_04028490[] = {
#include "actors/sparkle/sparkle_2.rgba16.inc.c"
};
ALIGNED8 static const u8 sparkles_seg4_texture_04028490[] = "actors/sparkle/sparkle_2.rgba16";
// 0x04028C90
ALIGNED8 static const u8 sparkles_seg4_texture_04028C90[] = {
#include "actors/sparkle/sparkle_3.rgba16.inc.c"
};
ALIGNED8 static const u8 sparkles_seg4_texture_04028C90[] = "actors/sparkle/sparkle_3.rgba16";
// 0x04029490
ALIGNED8 static const u8 sparkles_seg4_texture_04029490[] = {
#include "actors/sparkle/sparkle_4.rgba16.inc.c"
};
ALIGNED8 static const u8 sparkles_seg4_texture_04029490[] = "actors/sparkle/sparkle_4.rgba16";
// 0x04029C90
ALIGNED8 static const u8 sparkles_seg4_texture_04029C90[] = {
#include "actors/sparkle/sparkle_5.rgba16.inc.c"
};
ALIGNED8 static const u8 sparkles_seg4_texture_04029C90[] = "actors/sparkle/sparkle_5.rgba16";
// 0x0402A490 - 0x0402A4F8
const Gfx sparkles_seg4_dl_0402A490[] = {

View File

@ -9,29 +9,19 @@ static const Vtx sparkles_animation_seg4_vertex_04032A48[] = {
};
// 0x04032A88
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04032A88[] = {
#include "actors/sparkle_animation/sparkle_animation_0.ia16.inc.c"
};
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04032A88[] = "actors/sparkle_animation/sparkle_animation_0.ia16";
// 0x04033288
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04033288[] = {
#include "actors/sparkle_animation/sparkle_animation_1.ia16.inc.c"
};
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04033288[] = "actors/sparkle_animation/sparkle_animation_1.ia16";
// 0x04033A88
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04033A88[] = {
#include "actors/sparkle_animation/sparkle_animation_2.ia16.inc.c"
};
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04033A88[] = "actors/sparkle_animation/sparkle_animation_2.ia16";
// 0x04034288
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04034288[] = {
#include "actors/sparkle_animation/sparkle_animation_3.ia16.inc.c"
};
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04034288[] = "actors/sparkle_animation/sparkle_animation_3.ia16";
// 0x04034A88
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04034A88[] = {
#include "actors/sparkle_animation/sparkle_animation_4.ia16.inc.c"
};
ALIGNED8 static const u8 sparkles_animation_seg4_texture_04034A88[] = "actors/sparkle_animation/sparkle_animation_4.ia16";
// 0x04035288 - 0x04035300
const Gfx sparkles_animation_seg4_dl_04035288[] = {

View File

@ -72,24 +72,16 @@ static const struct Animation spindrift_seg5_anim_050006AC = {
UNUSED static const u64 spindrift_unused_1 = 1;
// 0x050006D0
ALIGNED8 static const u8 spindrift_seg5_texture_050006D0[] = {
#include "actors/spindrift/spindrift_face.rgba16.inc.c"
};
ALIGNED8 static const u8 spindrift_seg5_texture_050006D0[] = "actors/spindrift/spindrift_face.rgba16";
// 0x05000ED0
ALIGNED8 static const u8 spindrift_seg5_texture_05000ED0[] = {
#include "actors/spindrift/spindrift_petal.rgba16.inc.c"
};
ALIGNED8 static const u8 spindrift_seg5_texture_05000ED0[] = "actors/spindrift/spindrift_petal.rgba16";
// 0x050016D0
ALIGNED8 static const u8 spindrift_seg5_texture_050016D0[] = {
#include "actors/spindrift/spindrift_leaf.rgba16.inc.c"
};
ALIGNED8 static const u8 spindrift_seg5_texture_050016D0[] = "actors/spindrift/spindrift_leaf.rgba16";
// 0x05001ED0
ALIGNED8 static const u8 spindrift_seg5_texture_05001ED0[] = {
#include "actors/spindrift/spindrift_head.rgba16.inc.c"
};
ALIGNED8 static const u8 spindrift_seg5_texture_05001ED0[] = "actors/spindrift/spindrift_head.rgba16";
// 0x050026D0
static const Vtx spindrift_seg5_vertex_050026D0[] = {

View File

@ -7,14 +7,10 @@ static const Lights1 springboard_seg5_lights_05000000 = gdSPDefLights1(
);
// 0x05000018
ALIGNED8 static const u8 springboard_seg5_texture_05000018[] = {
#include "actors/springboard/springboard_top_unused.rgba16.inc.c"
};
ALIGNED8 static const u8 springboard_seg5_texture_05000018[] = "actors/springboard/springboard_top_unused.rgba16";
// 0x05000818
ALIGNED8 static const u8 springboard_seg5_texture_05000818[] = {
#include "actors/springboard/springboard_base_unused.rgba16.inc.c"
};
ALIGNED8 static const u8 springboard_seg5_texture_05000818[] = "actors/springboard/springboard_base_unused.rgba16";
// 0x05001018
static const Vtx springboard_seg5_vertex_05001018[] = {

View File

@ -7,14 +7,10 @@ static const Lights1 star_seg3_lights_0302A6D8 = gdSPDefLights1(
);
// 0x0302A6F0
ALIGNED8 static const u8 star_seg3_texture_0302A6F0[] = {
#include "actors/star/star_surface.rgba16.inc.c"
};
ALIGNED8 static const u8 star_seg3_texture_0302A6F0[] = "actors/star/star_surface.rgba16";
// 0x0302AEF0
ALIGNED8 static const u8 star_seg3_texture_0302AEF0[] = {
#include "actors/star/star_eye.rgba16.inc.c"
};
ALIGNED8 static const u8 star_seg3_texture_0302AEF0[] = "actors/star/star_eye.rgba16";
// 0x0302B6F0
static const Vtx star_seg3_vertex_0302B6F0[] = {

View File

@ -17,34 +17,22 @@ static const Vtx stomp_smoke_seg4_vertex_04022108[] = {
};
// 0x04022148
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04022148[] = {
#include "actors/stomp_smoke/stomp_smoke_0.ia16.inc.c"
};
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04022148[] = "actors/stomp_smoke/stomp_smoke_0.ia16";
// 0x04022948
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04022948[] = {
#include "actors/stomp_smoke/stomp_smoke_1.ia16.inc.c"
};
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04022948[] = "actors/stomp_smoke/stomp_smoke_1.ia16";
// 0x04023148
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04023148[] = {
#include "actors/stomp_smoke/stomp_smoke_2.ia16.inc.c"
};
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04023148[] = "actors/stomp_smoke/stomp_smoke_2.ia16";
// 0x04023948
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04023948[] = {
#include "actors/stomp_smoke/stomp_smoke_3.ia16.inc.c"
};
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04023948[] = "actors/stomp_smoke/stomp_smoke_3.ia16";
// 0x04024148
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04024148[] = {
#include "actors/stomp_smoke/stomp_smoke_4.ia16.inc.c"
};
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04024148[] = "actors/stomp_smoke/stomp_smoke_4.ia16";
// 0x04024948
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04024948[] = {
#include "actors/stomp_smoke/stomp_smoke_5.ia16.inc.c"
};
ALIGNED8 static const u8 stomp_smoke_seg4_texture_04024948[] = "actors/stomp_smoke/stomp_smoke_5.ia16";
// 0x04025148 - 0x04025190
const Gfx stomp_smoke_seg4_dl_04025148[] = {

View File

@ -6,19 +6,13 @@
UNUSED static const u64 sushi_unused_1 = 1;
// 0x05008ED0
ALIGNED8 static const u8 sushi_seg5_texture_05008ED0[] = {
#include "actors/sushi/sushi_snout.rgba16.inc.c"
};
ALIGNED8 static const u8 sushi_seg5_texture_05008ED0[] = "actors/sushi/sushi_snout.rgba16";
// 0x050096D0
ALIGNED8 static const u8 sushi_seg5_texture_050096D0[] = {
#include "actors/sushi/sushi_eye.rgba16.inc.c"
};
ALIGNED8 static const u8 sushi_seg5_texture_050096D0[] = "actors/sushi/sushi_eye.rgba16";
// 0x05009AD0
ALIGNED8 static const u8 sushi_seg5_texture_05009AD0[] = {
#include "actors/sushi/sushi_tooth.rgba16.inc.c"
};
ALIGNED8 static const u8 sushi_seg5_texture_05009AD0[] = "actors/sushi/sushi_tooth.rgba16";
// 0x05009B50
static const Vtx sushi_seg5_vertex_05009B50[] = {

View File

@ -13,24 +13,16 @@ UNUSED static const Lights1 swoop_lights_unused2 = gdSPDefLights1(
);
// 0x06004270
ALIGNED8 static const u8 swoop_seg6_texture_06004270[] = {
#include "actors/swoop/swoop_body.rgba16.inc.c"
};
ALIGNED8 static const u8 swoop_seg6_texture_06004270[] = "actors/swoop/swoop_body.rgba16";
// 0x06004A70
ALIGNED8 static const u8 swoop_seg6_texture_06004A70[] = {
#include "actors/swoop/swoop_eye.rgba16.inc.c"
};
ALIGNED8 static const u8 swoop_seg6_texture_06004A70[] = "actors/swoop/swoop_eye.rgba16";
// 0x06005270
ALIGNED8 static const u8 swoop_seg6_texture_06005270[] = {
#include "actors/swoop/swoop_nose.rgba16.inc.c"
};
ALIGNED8 static const u8 swoop_seg6_texture_06005270[] = "actors/swoop/swoop_nose.rgba16";
// 0x06005A70
ALIGNED8 static const u8 swoop_seg6_texture_06005A70[] = {
#include "actors/swoop/swoop_wing.rgba16.inc.c"
};
ALIGNED8 static const u8 swoop_seg6_texture_06005A70[] = "actors/swoop/swoop_wing.rgba16";
// 0x06006270
static const Lights1 swoop_seg6_lights_06006270 = gdSPDefLights1(

View File

@ -7,14 +7,10 @@ static const Lights1 thwomp_seg5_lights_050098E8 = gdSPDefLights1(
);
// 0x05009900
ALIGNED8 static const u8 thwomp_seg5_texture_05009900[] = {
#include "actors/thwomp/thwomp_face.rgba16.inc.c"
};
ALIGNED8 static const u8 thwomp_seg5_texture_05009900[] = "actors/thwomp/thwomp_face.rgba16";
// 0x0500A900
ALIGNED8 static const u8 thwomp_seg5_texture_0500A900[] = {
#include "actors/thwomp/thwomp_surface.rgba16.inc.c"
};
ALIGNED8 static const u8 thwomp_seg5_texture_0500A900[] = "actors/thwomp/thwomp_surface.rgba16";
// 0x0500B100
static const Vtx thwomp_seg5_vertex_0500B100[] = {

View File

@ -7,14 +7,10 @@ static const Lights1 toad_seg6_lights_06005908 = gdSPDefLights1(
);
// 0x06005920
ALIGNED8 static const u8 toad_seg6_texture_06005920[] = {
#include "actors/toad/toad_face.rgba16.inc.c"
};
ALIGNED8 static const u8 toad_seg6_texture_06005920[] = "actors/toad/toad_face.rgba16";
// 0x06006120
ALIGNED8 static const u8 toad_seg6_texture_06006120[] = {
#include "actors/toad/toad_head.rgba16.inc.c"
};
ALIGNED8 static const u8 toad_seg6_texture_06006120[] = "actors/toad/toad_head.rgba16";
// 0x06006920
static const Vtx toad_seg6_vertex_06006920[] = {

View File

@ -1,9 +1,7 @@
// Tornado
// 0x05013128
ALIGNED8 static const u8 tornado_seg5_texture_05013128[] = {
#include "actors/tornado/tornado.ia16.inc.c"
};
ALIGNED8 static const u8 tornado_seg5_texture_05013128[] = "actors/tornado/tornado.ia16";
// 0x05014128
static const Lights1 tornado_seg5_lights_05014128 = gdSPDefLights1(

View File

@ -7,24 +7,16 @@ static const Lights1 treasure_chest_seg6_lights_06013F90 = gdSPDefLights1(
);
// 0x06013FA8
ALIGNED8 static const u8 treasure_chest_seg6_texture_06013FA8[] = {
#include "actors/treasure_chest/treasure_chest_lock.rgba16.inc.c"
};
ALIGNED8 static const u8 treasure_chest_seg6_texture_06013FA8[] = "actors/treasure_chest/treasure_chest_lock.rgba16";
// 0x060147A8
ALIGNED8 static const u8 treasure_chest_seg6_texture_060147A8[] = {
#include "actors/treasure_chest/treasure_chest_side.rgba16.inc.c"
};
ALIGNED8 static const u8 treasure_chest_seg6_texture_060147A8[] = "actors/treasure_chest/treasure_chest_side.rgba16";
// 0x06014FA8
ALIGNED8 static const u8 treasure_chest_seg6_texture_06014FA8[] = {
#include "actors/treasure_chest/treasure_chest_lock_top.rgba16.inc.c"
};
ALIGNED8 static const u8 treasure_chest_seg6_texture_06014FA8[] = "actors/treasure_chest/treasure_chest_lock_top.rgba16";
// 0x060157A8
ALIGNED8 static const u8 treasure_chest_seg6_texture_060157A8[] = {
#include "actors/treasure_chest/treasure_chest_front.rgba16.inc.c"
};
ALIGNED8 static const u8 treasure_chest_seg6_texture_060157A8[] = "actors/treasure_chest/treasure_chest_front.rgba16";
// 0x060167A8
static const Vtx treasure_chest_seg6_vertex_060167A8[] = {

View File

@ -7,14 +7,10 @@ static const Lights1 tree_seg3_lights_0302DE10 = gdSPDefLights1(
);
// 0x0302DE28
ALIGNED8 static const u8 tree_seg3_texture_0302DE28[] = {
#include "actors/tree/tree_left_side.rgba16.inc.c"
};
ALIGNED8 static const u8 tree_seg3_texture_0302DE28[] = "actors/tree/tree_left_side.rgba16";
// 0x0302EE28
ALIGNED8 static const u8 tree_seg3_texture_0302EE28[] = {
#include "actors/tree/tree_right_side.rgba16.inc.c"
};
ALIGNED8 static const u8 tree_seg3_texture_0302EE28[] = "actors/tree/tree_right_side.rgba16";
// 0x0302FE28
static const Vtx tree_seg3_vertex_0302FE28[] = {
@ -70,9 +66,7 @@ const Gfx tree_seg3_dl_0302FEE8[] = {
};
// 0x0302FF60
ALIGNED8 static const u8 tree_seg3_texture_0302FF60[] = {
#include "actors/tree/pine_tree.rgba16.inc.c"
};
ALIGNED8 static const u8 tree_seg3_texture_0302FF60[] = "actors/tree/pine_tree.rgba16";
// 0x03030F60
static const Vtx tree_seg3_vertex_03030F60[] = {
@ -107,9 +101,7 @@ const Gfx tree_seg3_dl_03030FA0[] = {
};
// 0x03031048
ALIGNED8 static const u8 tree_seg3_texture_03031048[] = {
#include "actors/tree/snowy_pine_tree.rgba16.inc.c"
};
ALIGNED8 static const u8 tree_seg3_texture_03031048[] = "actors/tree/snowy_pine_tree.rgba16";
// 0x03032048
static const Vtx tree_seg3_vertex_03032048[] = {
@ -176,9 +168,7 @@ const Gfx tree_seg3_dl_03032170[] = {
};
// 0x03032218
ALIGNED8 static const u8 tree_seg3_texture_03032218[] = {
#include "actors/tree/palm_tree.rgba16.inc.c"
};
ALIGNED8 static const u8 tree_seg3_texture_03032218[] = "actors/tree/palm_tree.rgba16";
// 0x03033218
static const Vtx tree_seg3_vertex_03033218[] = {

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