From 77570e7137c04820ad03a4b882a55513f69c5f64 Mon Sep 17 00:00:00 2001 From: NoHomoBoi <36680385+KiritoDv@users.noreply.github.com> Date: Tue, 18 Aug 2020 01:36:54 -0500 Subject: [PATCH] Removed texture #include and added texture_converter.py tool --- Makefile | 72 +- Makefile.split | 248 +-- actors/amp/model.inc.c | 16 +- actors/blue_coin_switch/model.inc.c | 8 +- actors/blue_fish/model.inc.c | 4 +- actors/bobomb/model.inc.c | 24 +- actors/bomb/model.inc.c | 12 +- actors/boo/model.inc.c | 8 +- actors/boo_castle/model.inc.c | 8 +- actors/book/model.inc.c | 4 +- actors/bookend/model.inc.c | 20 +- actors/bowser/model.inc.c | 116 +- actors/bowser_flame/model.inc.c | 56 +- actors/breakable_box/model.inc.c | 8 +- actors/bub/model.inc.c | 16 +- actors/bubba/model.inc.c | 20 +- actors/bubble/model.inc.c | 8 +- actors/bullet_bill/model.inc.c | 8 +- actors/bully/model.inc.c | 16 +- actors/burn_smoke/model.inc.c | 4 +- actors/butterfly/model.inc.c | 4 +- actors/cannon_barrel/model.inc.c | 4 +- actors/cannon_base/model.inc.c | 4 +- actors/cannon_lid/model.inc.c | 4 +- actors/capswitch/model.inc.c | 8 +- actors/chain_ball/model.inc.c | 4 +- actors/chain_chomp/model.inc.c | 20 +- actors/chair/model.inc.c | 16 +- actors/checkerboard_platform/model.inc.c | 8 +- actors/chillychief/model.inc.c | 12 +- actors/chuckya/model.inc.c | 16 +- actors/clam_shell/model.inc.c | 8 +- actors/coin/model.inc.c | 16 +- actors/cyan_fish/model.inc.c | 4 +- actors/dirt/model.inc.c | 4 +- actors/door/model.inc.c | 56 +- actors/dorrie/model.inc.c | 12 +- actors/exclamation_box/model.inc.c | 32 +- actors/exclamation_box_outline/model.inc.c | 8 +- actors/explosion/model.inc.c | 28 +- actors/eyerok/model.inc.c | 20 +- actors/flame/model.inc.c | 32 +- actors/flyguy/model.inc.c | 12 +- actors/fwoosh/model.inc.c | 4 +- actors/goomba/model.inc.c | 12 +- actors/haunted_cage/model.inc.c | 24 +- actors/heart/model.inc.c | 4 +- actors/heave_ho/model.inc.c | 24 +- actors/hoot/model.inc.c | 12 +- actors/impact_ring/model.inc.c | 8 +- actors/impact_smoke/model.inc.c | 16 +- actors/king_bobomb/model.inc.c | 40 +- actors/klepto/model.inc.c | 20 +- actors/koopa/model.inc.c | 32 +- actors/koopa_flag/model.inc.c | 4 +- actors/koopa_shell/model.inc.c | 8 +- actors/lakitu_cameraman/model.inc.c | 24 +- actors/lakitu_enemy/model.inc.c | 20 +- actors/leaves/model.inc.c | 4 +- actors/mad_piano/model.inc.c | 24 +- actors/manta/model.inc.c | 16 +- actors/mario/model.inc.c | 76 +- actors/mario_cap/model.inc.c | 24 +- actors/metal_box/model.inc.c | 4 +- actors/mips/model.inc.c | 4 +- actors/mist/model.inc.c | 4 +- actors/moneybag/model.inc.c | 8 +- actors/monty_mole/model.inc.c | 20 +- actors/monty_mole_hole/model.inc.c | 4 +- actors/mr_i_eyeball/model.inc.c | 8 +- actors/mr_i_iris/model.inc.c | 16 +- actors/mushroom_1up/model.inc.c | 4 +- actors/peach/model.inc.c | 40 +- actors/pebble/model.inc.c | 4 +- actors/penguin/model.inc.c | 24 +- actors/piranha_plant/model.inc.c | 24 +- actors/pokey/model.inc.c | 12 +- actors/poundable_pole/model.inc.c | 8 +- actors/power_meter/model.inc.c | 40 +- actors/purple_switch/model.inc.c | 8 +- actors/sand/model.inc.c | 4 +- actors/scuttlebug/model.inc.c | 20 +- actors/seaweed/model.inc.c | 16 +- actors/skeeter/model.inc.c | 8 +- actors/smoke/model.inc.c | 4 +- actors/snowman/model.inc.c | 20 +- actors/snufit/model.inc.c | 16 +- actors/sparkle/model.inc.c | 24 +- actors/sparkle_animation/model.inc.c | 20 +- actors/spindrift/anims/anim_050006AC.inc.c | 16 +- actors/springboard/model.inc.c | 8 +- actors/star/model.inc.c | 8 +- actors/stomp_smoke/model.inc.c | 24 +- actors/sushi/model.inc.c | 12 +- actors/swoop/model.inc.c | 16 +- actors/thwomp/model.inc.c | 8 +- actors/toad/model.inc.c | 8 +- actors/tornado/model.inc.c | 4 +- actors/treasure_chest/model.inc.c | 16 +- actors/tree/model.inc.c | 20 +- actors/ukiki/model.inc.c | 16 +- actors/unagi/model.inc.c | 24 +- actors/walk_smoke/model.inc.c | 28 +- actors/warp_pipe/model.inc.c | 8 +- actors/water_bubble/model.inc.c | 4 +- actors/water_mine/model.inc.c | 12 +- actors/water_ring/model.inc.c | 4 +- actors/water_splash/model.inc.c | 32 +- actors/water_wave/model.inc.c | 16 +- actors/whirlpool/model.inc.c | 4 +- actors/white_particle/model.inc.c | 4 +- actors/white_particle_small/model.inc.c | 4 +- actors/whomp/model.inc.c | 16 +- actors/wiggler_body/model.inc.c | 28 +- actors/wooden_signpost/model.inc.c | 8 +- actors/yellow_sphere/model.inc.c | 4 +- actors/yellow_sphere_small/model.inc.c | 4 +- actors/yoshi/model.inc.c | 12 +- actors/yoshi_egg/model.inc.c | 32 +- bin/cave.c | 68 +- bin/effect.c | 60 +- bin/fire.c | 96 +- bin/generic.c | 88 +- bin/grass.c | 96 +- bin/inside.c | 68 +- bin/machine.c | 68 +- bin/mountain.c | 84 +- bin/outside.c | 84 +- bin/segment2.c | 1816 +++++------------- bin/sky.c | 60 +- bin/snow.c | 72 +- bin/spooky.c | 68 +- bin/title_screen_bg.c | 32 +- bin/water.c | 60 +- levels/bbh/texture.inc.c | 28 +- levels/bitdw/texture.inc.c | 16 +- levels/bitfs/texture.inc.c | 12 +- levels/bits/texture.inc.c | 12 +- levels/bob/texture.inc.c | 20 +- levels/bowser_1/texture.inc.c | 12 +- levels/bowser_2/texture.inc.c | 4 +- levels/bowser_3/texture.inc.c | 12 +- levels/castle_grounds/areas/1/12/model.inc.c | 8 +- levels/castle_grounds/areas/1/13/model.inc.c | 4 +- levels/castle_grounds/texture.inc.c | 12 +- levels/castle_inside/texture.inc.c | 172 +- levels/ccm/snowman_base/model.inc.c | 4 +- levels/ccm/texture.inc.c | 48 +- levels/cotmc/texture.inc.c | 20 +- levels/ddd/texture.inc.c | 20 +- levels/ending/leveldata.c | 1029 ++-------- levels/hmc/areas/1/painting.inc.c | 4 +- levels/hmc/texture.inc.c | 28 +- levels/intro/leveldata.c | 40 +- levels/jrb/texture.inc.c | 16 +- levels/lll/texture.inc.c | 132 +- levels/menu/leveldata.c | 920 +++------ levels/pss/texture.inc.c | 12 +- levels/rr/texture.inc.c | 12 +- levels/sl/texture.inc.c | 20 +- levels/ssl/areas/2/4/model.inc.c | 4 +- levels/ssl/texture.inc.c | 28 +- levels/ssl/tox_box/model.inc.c | 16 +- levels/thi/texture.inc.c | 8 +- levels/totwc/texture.inc.c | 16 +- levels/ttc/areas/1/movtext.inc.c | 4 +- levels/ttc/texture.inc.c | 8 +- levels/ttm/slide_exit_podium/model.inc.c | 4 +- levels/ttm/texture.inc.c | 32 +- levels/vcutm/texture.inc.c | 16 +- levels/wdw/texture.inc.c | 20 +- levels/wf/texture.inc.c | 24 +- levels/wmotr/texture.inc.c | 20 +- src/goddard/renderer.c | 100 +- tools/texture_converter.py | 69 + 175 files changed, 1919 insertions(+), 6055 deletions(-) create mode 100644 tools/texture_converter.py diff --git a/Makefile b/Makefile index 12c74cd3..5c8c69e1 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/Makefile.split b/Makefile.split index 609222f0..3f52ff7c 100644 --- a/Makefile.split +++ b/Makefile.split @@ -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..png" generates "texture." - -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 \ No newline at end of file diff --git a/actors/amp/model.inc.c b/actors/amp/model.inc.c index 094a6f12..73514b1b 100644 --- a/actors/amp/model.inc.c +++ b/actors/amp/model.inc.c @@ -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[] = { diff --git a/actors/blue_coin_switch/model.inc.c b/actors/blue_coin_switch/model.inc.c index f83d5a2a..bdafc4b5 100644 --- a/actors/blue_coin_switch/model.inc.c +++ b/actors/blue_coin_switch/model.inc.c @@ -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[] = { diff --git a/actors/blue_fish/model.inc.c b/actors/blue_fish/model.inc.c index a1a7da13..a2e2114d 100644 --- a/actors/blue_fish/model.inc.c +++ b/actors/blue_fish/model.inc.c @@ -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[] = { diff --git a/actors/bobomb/model.inc.c b/actors/bobomb/model.inc.c index 27aea98f..ff140060 100644 --- a/actors/bobomb/model.inc.c +++ b/actors/bobomb/model.inc.c @@ -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[] = { diff --git a/actors/bomb/model.inc.c b/actors/bomb/model.inc.c index 14e15a35..35cf8ae2 100644 --- a/actors/bomb/model.inc.c +++ b/actors/bomb/model.inc.c @@ -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[] = { diff --git a/actors/boo/model.inc.c b/actors/boo/model.inc.c index 40ce7824..1e6d2a92 100644 --- a/actors/boo/model.inc.c +++ b/actors/boo/model.inc.c @@ -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[] = { diff --git a/actors/boo_castle/model.inc.c b/actors/boo_castle/model.inc.c index 68c3a460..79953b72 100644 --- a/actors/boo_castle/model.inc.c +++ b/actors/boo_castle/model.inc.c @@ -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[] = { diff --git a/actors/book/model.inc.c b/actors/book/model.inc.c index 80b4f23d..edc2bbd7 100644 --- a/actors/book/model.inc.c +++ b/actors/book/model.inc.c @@ -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[] = { diff --git a/actors/bookend/model.inc.c b/actors/bookend/model.inc.c index 3796ec0d..146b6420 100644 --- a/actors/bookend/model.inc.c +++ b/actors/bookend/model.inc.c @@ -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( diff --git a/actors/bowser/model.inc.c b/actors/bowser/model.inc.c index c4f78399..a7b0d4e2 100644 --- a/actors/bowser/model.inc.c +++ b/actors/bowser/model.inc.c @@ -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( diff --git a/actors/bowser_flame/model.inc.c b/actors/bowser_flame/model.inc.c index 2551342e..29eeabfe 100644 --- a/actors/bowser_flame/model.inc.c +++ b/actors/bowser_flame/model.inc.c @@ -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[] = { diff --git a/actors/breakable_box/model.inc.c b/actors/breakable_box/model.inc.c index a4517715..af79b9c8 100644 --- a/actors/breakable_box/model.inc.c +++ b/actors/breakable_box/model.inc.c @@ -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[] = { diff --git a/actors/bub/model.inc.c b/actors/bub/model.inc.c index 12619be5..15406692 100644 --- a/actors/bub/model.inc.c +++ b/actors/bub/model.inc.c @@ -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[] = { diff --git a/actors/bubba/model.inc.c b/actors/bubba/model.inc.c index 1e9f31e5..07654508 100644 --- a/actors/bubba/model.inc.c +++ b/actors/bubba/model.inc.c @@ -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( diff --git a/actors/bubble/model.inc.c b/actors/bubble/model.inc.c index 777e312a..c7fc2cd9 100644 --- a/actors/bubble/model.inc.c +++ b/actors/bubble/model.inc.c @@ -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[] = { diff --git a/actors/bullet_bill/model.inc.c b/actors/bullet_bill/model.inc.c index 37635159..d02d378e 100644 --- a/actors/bullet_bill/model.inc.c +++ b/actors/bullet_bill/model.inc.c @@ -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[] = { diff --git a/actors/bully/model.inc.c b/actors/bully/model.inc.c index 5573946e..6509d0bb 100644 --- a/actors/bully/model.inc.c +++ b/actors/bully/model.inc.c @@ -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[] = { diff --git a/actors/burn_smoke/model.inc.c b/actors/burn_smoke/model.inc.c index bcf4fd6f..b0295e07 100644 --- a/actors/burn_smoke/model.inc.c +++ b/actors/burn_smoke/model.inc.c @@ -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[] = { diff --git a/actors/butterfly/model.inc.c b/actors/butterfly/model.inc.c index f4d8f133..e31a3a35 100644 --- a/actors/butterfly/model.inc.c +++ b/actors/butterfly/model.inc.c @@ -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[] = { diff --git a/actors/cannon_barrel/model.inc.c b/actors/cannon_barrel/model.inc.c index aee370dc..85b787fc 100644 --- a/actors/cannon_barrel/model.inc.c +++ b/actors/cannon_barrel/model.inc.c @@ -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[] = { diff --git a/actors/cannon_base/model.inc.c b/actors/cannon_base/model.inc.c index ebf45806..476faf63 100644 --- a/actors/cannon_base/model.inc.c +++ b/actors/cannon_base/model.inc.c @@ -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[] = { diff --git a/actors/cannon_lid/model.inc.c b/actors/cannon_lid/model.inc.c index 36edb684..81a76157 100644 --- a/actors/cannon_lid/model.inc.c +++ b/actors/cannon_lid/model.inc.c @@ -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[] = { diff --git a/actors/capswitch/model.inc.c b/actors/capswitch/model.inc.c index 5adca94a..d2b22363 100644 --- a/actors/capswitch/model.inc.c +++ b/actors/capswitch/model.inc.c @@ -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[] = { diff --git a/actors/chain_ball/model.inc.c b/actors/chain_ball/model.inc.c index 4754876f..5b784c5c 100644 --- a/actors/chain_ball/model.inc.c +++ b/actors/chain_ball/model.inc.c @@ -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[] = { diff --git a/actors/chain_chomp/model.inc.c b/actors/chain_chomp/model.inc.c index e7e39abf..45d6275d 100644 --- a/actors/chain_chomp/model.inc.c +++ b/actors/chain_chomp/model.inc.c @@ -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[] = { diff --git a/actors/chair/model.inc.c b/actors/chair/model.inc.c index ec0ad35d..326557bc 100644 --- a/actors/chair/model.inc.c +++ b/actors/chair/model.inc.c @@ -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( diff --git a/actors/checkerboard_platform/model.inc.c b/actors/checkerboard_platform/model.inc.c index 9a5685df..2caae94a 100644 --- a/actors/checkerboard_platform/model.inc.c +++ b/actors/checkerboard_platform/model.inc.c @@ -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[] = { diff --git a/actors/chillychief/model.inc.c b/actors/chillychief/model.inc.c index 1c5f4e4f..0faf455f 100644 --- a/actors/chillychief/model.inc.c +++ b/actors/chillychief/model.inc.c @@ -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[] = { diff --git a/actors/chuckya/model.inc.c b/actors/chuckya/model.inc.c index 2bc59908..b52e39d0 100644 --- a/actors/chuckya/model.inc.c +++ b/actors/chuckya/model.inc.c @@ -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[] = { diff --git a/actors/clam_shell/model.inc.c b/actors/clam_shell/model.inc.c index 4a9e57b7..49fc97b2 100644 --- a/actors/clam_shell/model.inc.c +++ b/actors/clam_shell/model.inc.c @@ -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( diff --git a/actors/coin/model.inc.c b/actors/coin/model.inc.c index 482a4e5c..985117bd 100644 --- a/actors/coin/model.inc.c +++ b/actors/coin/model.inc.c @@ -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[] = { diff --git a/actors/cyan_fish/model.inc.c b/actors/cyan_fish/model.inc.c index 3e646dae..4ff5ce22 100644 --- a/actors/cyan_fish/model.inc.c +++ b/actors/cyan_fish/model.inc.c @@ -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, diff --git a/actors/dirt/model.inc.c b/actors/dirt/model.inc.c index 7f646cfa..d897aefa 100644 --- a/actors/dirt/model.inc.c +++ b/actors/dirt/model.inc.c @@ -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[] = { diff --git a/actors/door/model.inc.c b/actors/door/model.inc.c index 0b39b7df..db1ce8d2 100644 --- a/actors/door/model.inc.c +++ b/actors/door/model.inc.c @@ -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[] = { diff --git a/actors/dorrie/model.inc.c b/actors/dorrie/model.inc.c index 6c9044d6..20840434 100644 --- a/actors/dorrie/model.inc.c +++ b/actors/dorrie/model.inc.c @@ -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( diff --git a/actors/exclamation_box/model.inc.c b/actors/exclamation_box/model.inc.c index 70dd506d..8c40c9f3 100644 --- a/actors/exclamation_box/model.inc.c +++ b/actors/exclamation_box/model.inc.c @@ -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[] = { diff --git a/actors/exclamation_box_outline/model.inc.c b/actors/exclamation_box_outline/model.inc.c index f0f2d4a9..2db36cae 100644 --- a/actors/exclamation_box_outline/model.inc.c +++ b/actors/exclamation_box_outline/model.inc.c @@ -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[] = { diff --git a/actors/explosion/model.inc.c b/actors/explosion/model.inc.c index 8f41b8fa..7c15a77b 100644 --- a/actors/explosion/model.inc.c +++ b/actors/explosion/model.inc.c @@ -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[] = { diff --git a/actors/eyerok/model.inc.c b/actors/eyerok/model.inc.c index 0b684c4c..32f575c6 100644 --- a/actors/eyerok/model.inc.c +++ b/actors/eyerok/model.inc.c @@ -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( diff --git a/actors/flame/model.inc.c b/actors/flame/model.inc.c index 6f2d277c..b59db55d 100644 --- a/actors/flame/model.inc.c +++ b/actors/flame/model.inc.c @@ -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[] = { diff --git a/actors/flyguy/model.inc.c b/actors/flyguy/model.inc.c index 05e38248..194f8295 100644 --- a/actors/flyguy/model.inc.c +++ b/actors/flyguy/model.inc.c @@ -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( diff --git a/actors/fwoosh/model.inc.c b/actors/fwoosh/model.inc.c index 3767cd8e..cd13ba3a 100644 --- a/actors/fwoosh/model.inc.c +++ b/actors/fwoosh/model.inc.c @@ -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[] = { diff --git a/actors/goomba/model.inc.c b/actors/goomba/model.inc.c index a68a9bff..6bcead34 100644 --- a/actors/goomba/model.inc.c +++ b/actors/goomba/model.inc.c @@ -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( diff --git a/actors/haunted_cage/model.inc.c b/actors/haunted_cage/model.inc.c index d763de20..120033aa 100644 --- a/actors/haunted_cage/model.inc.c +++ b/actors/haunted_cage/model.inc.c @@ -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[] = { diff --git a/actors/heart/model.inc.c b/actors/heart/model.inc.c index 0a79c76d..9c6b39cc 100644 --- a/actors/heart/model.inc.c +++ b/actors/heart/model.inc.c @@ -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[] = { diff --git a/actors/heave_ho/model.inc.c b/actors/heave_ho/model.inc.c index 7007ab0c..03af378d 100644 --- a/actors/heave_ho/model.inc.c +++ b/actors/heave_ho/model.inc.c @@ -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( diff --git a/actors/hoot/model.inc.c b/actors/hoot/model.inc.c index ebffc2a6..1dc7338c 100644 --- a/actors/hoot/model.inc.c +++ b/actors/hoot/model.inc.c @@ -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 diff --git a/actors/impact_ring/model.inc.c b/actors/impact_ring/model.inc.c index 64258252..18c579b3 100644 --- a/actors/impact_ring/model.inc.c +++ b/actors/impact_ring/model.inc.c @@ -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[] = { diff --git a/actors/impact_smoke/model.inc.c b/actors/impact_smoke/model.inc.c index 012cf6f6..e7039779 100644 --- a/actors/impact_smoke/model.inc.c +++ b/actors/impact_smoke/model.inc.c @@ -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[] = { diff --git a/actors/king_bobomb/model.inc.c b/actors/king_bobomb/model.inc.c index dc1171a8..47cbe9ac 100644 --- a/actors/king_bobomb/model.inc.c +++ b/actors/king_bobomb/model.inc.c @@ -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[] = { diff --git a/actors/klepto/model.inc.c b/actors/klepto/model.inc.c index 9f83b07a..c4af2169 100644 --- a/actors/klepto/model.inc.c +++ b/actors/klepto/model.inc.c @@ -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( diff --git a/actors/koopa/model.inc.c b/actors/koopa/model.inc.c index 6bf24187..5b458418 100644 --- a/actors/koopa/model.inc.c +++ b/actors/koopa/model.inc.c @@ -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( diff --git a/actors/koopa_flag/model.inc.c b/actors/koopa_flag/model.inc.c index a706dee2..6b212985 100644 --- a/actors/koopa_flag/model.inc.c +++ b/actors/koopa_flag/model.inc.c @@ -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( diff --git a/actors/koopa_shell/model.inc.c b/actors/koopa_shell/model.inc.c index 7e4042e2..bd7dcf08 100644 --- a/actors/koopa_shell/model.inc.c +++ b/actors/koopa_shell/model.inc.c @@ -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[] = { diff --git a/actors/lakitu_cameraman/model.inc.c b/actors/lakitu_cameraman/model.inc.c index 8db4d268..256975ef 100644 --- a/actors/lakitu_cameraman/model.inc.c +++ b/actors/lakitu_cameraman/model.inc.c @@ -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( diff --git a/actors/lakitu_enemy/model.inc.c b/actors/lakitu_enemy/model.inc.c index 0cc41831..c99b6c24 100644 --- a/actors/lakitu_enemy/model.inc.c +++ b/actors/lakitu_enemy/model.inc.c @@ -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( diff --git a/actors/leaves/model.inc.c b/actors/leaves/model.inc.c index fb5727f7..bdf3c910 100644 --- a/actors/leaves/model.inc.c +++ b/actors/leaves/model.inc.c @@ -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[] = { diff --git a/actors/mad_piano/model.inc.c b/actors/mad_piano/model.inc.c index 8240963e..960ad7c3 100644 --- a/actors/mad_piano/model.inc.c +++ b/actors/mad_piano/model.inc.c @@ -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( diff --git a/actors/manta/model.inc.c b/actors/manta/model.inc.c index 72462304..a0b6254f 100644 --- a/actors/manta/model.inc.c +++ b/actors/manta/model.inc.c @@ -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[] = { diff --git a/actors/mario/model.inc.c b/actors/mario/model.inc.c index 9d39ba24..f7a2b272 100644 --- a/actors/mario/model.inc.c +++ b/actors/mario/model.inc.c @@ -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[] = { diff --git a/actors/mario_cap/model.inc.c b/actors/mario_cap/model.inc.c index 84a7a963..f3e9246f 100644 --- a/actors/mario_cap/model.inc.c +++ b/actors/mario_cap/model.inc.c @@ -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[] = { diff --git a/actors/metal_box/model.inc.c b/actors/metal_box/model.inc.c index 29589223..90856e37 100644 --- a/actors/metal_box/model.inc.c +++ b/actors/metal_box/model.inc.c @@ -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[] = { diff --git a/actors/mips/model.inc.c b/actors/mips/model.inc.c index acbefd2f..1b35862c 100644 --- a/actors/mips/model.inc.c +++ b/actors/mips/model.inc.c @@ -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( diff --git a/actors/mist/model.inc.c b/actors/mist/model.inc.c index ef4d4bab..762a5ae9 100644 --- a/actors/mist/model.inc.c +++ b/actors/mist/model.inc.c @@ -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[] = { diff --git a/actors/moneybag/model.inc.c b/actors/moneybag/model.inc.c index 935aa123..859d42cc 100644 --- a/actors/moneybag/model.inc.c +++ b/actors/moneybag/model.inc.c @@ -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( diff --git a/actors/monty_mole/model.inc.c b/actors/monty_mole/model.inc.c index 6998aee0..2da7b5b6 100644 --- a/actors/monty_mole/model.inc.c +++ b/actors/monty_mole/model.inc.c @@ -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( diff --git a/actors/monty_mole_hole/model.inc.c b/actors/monty_mole_hole/model.inc.c index 8b4fe744..69792def 100644 --- a/actors/monty_mole_hole/model.inc.c +++ b/actors/monty_mole_hole/model.inc.c @@ -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[] = { diff --git a/actors/mr_i_eyeball/model.inc.c b/actors/mr_i_eyeball/model.inc.c index 2798aff8..dbe774f8 100644 --- a/actors/mr_i_eyeball/model.inc.c +++ b/actors/mr_i_eyeball/model.inc.c @@ -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[] = { diff --git a/actors/mr_i_iris/model.inc.c b/actors/mr_i_iris/model.inc.c index b617e879..33281f4d 100644 --- a/actors/mr_i_iris/model.inc.c +++ b/actors/mr_i_iris/model.inc.c @@ -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[] = { diff --git a/actors/mushroom_1up/model.inc.c b/actors/mushroom_1up/model.inc.c index 86f1a6de..d6e357df 100644 --- a/actors/mushroom_1up/model.inc.c +++ b/actors/mushroom_1up/model.inc.c @@ -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[] = { diff --git a/actors/peach/model.inc.c b/actors/peach/model.inc.c index 0514802f..9426449d 100644 --- a/actors/peach/model.inc.c +++ b/actors/peach/model.inc.c @@ -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[] = { diff --git a/actors/pebble/model.inc.c b/actors/pebble/model.inc.c index 725501a2..fd924ab4 100644 --- a/actors/pebble/model.inc.c +++ b/actors/pebble/model.inc.c @@ -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[] = { diff --git a/actors/penguin/model.inc.c b/actors/penguin/model.inc.c index ff9eed78..5de82d8f 100644 --- a/actors/penguin/model.inc.c +++ b/actors/penguin/model.inc.c @@ -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( diff --git a/actors/piranha_plant/model.inc.c b/actors/piranha_plant/model.inc.c index 31603f95..5fd81b3b 100644 --- a/actors/piranha_plant/model.inc.c +++ b/actors/piranha_plant/model.inc.c @@ -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[] = { diff --git a/actors/pokey/model.inc.c b/actors/pokey/model.inc.c index 995c6a19..84729944 100644 --- a/actors/pokey/model.inc.c +++ b/actors/pokey/model.inc.c @@ -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[] = { diff --git a/actors/poundable_pole/model.inc.c b/actors/poundable_pole/model.inc.c index 14f19f8e..613353ad 100644 --- a/actors/poundable_pole/model.inc.c +++ b/actors/poundable_pole/model.inc.c @@ -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[] = { diff --git a/actors/power_meter/model.inc.c b/actors/power_meter/model.inc.c index dd30c871..7165b2b5 100644 --- a/actors/power_meter/model.inc.c +++ b/actors/power_meter/model.inc.c @@ -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[] = { diff --git a/actors/purple_switch/model.inc.c b/actors/purple_switch/model.inc.c index dea765f0..8ce3fe97 100644 --- a/actors/purple_switch/model.inc.c +++ b/actors/purple_switch/model.inc.c @@ -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[] = { diff --git a/actors/sand/model.inc.c b/actors/sand/model.inc.c index 0dce0412..dd3e344e 100644 --- a/actors/sand/model.inc.c +++ b/actors/sand/model.inc.c @@ -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[] = { diff --git a/actors/scuttlebug/model.inc.c b/actors/scuttlebug/model.inc.c index 38fdf271..294e4eb6 100644 --- a/actors/scuttlebug/model.inc.c +++ b/actors/scuttlebug/model.inc.c @@ -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[] = { diff --git a/actors/seaweed/model.inc.c b/actors/seaweed/model.inc.c index 72a50866..8cbcf7ff 100644 --- a/actors/seaweed/model.inc.c +++ b/actors/seaweed/model.inc.c @@ -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[] = { diff --git a/actors/skeeter/model.inc.c b/actors/skeeter/model.inc.c index 190bb83d..ece01854 100644 --- a/actors/skeeter/model.inc.c +++ b/actors/skeeter/model.inc.c @@ -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[] = { diff --git a/actors/smoke/model.inc.c b/actors/smoke/model.inc.c index 1f581a08..c2cac7c7 100644 --- a/actors/smoke/model.inc.c +++ b/actors/smoke/model.inc.c @@ -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[] = { diff --git a/actors/snowman/model.inc.c b/actors/snowman/model.inc.c index 4cc5de38..8f21adc9 100644 --- a/actors/snowman/model.inc.c +++ b/actors/snowman/model.inc.c @@ -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( diff --git a/actors/snufit/model.inc.c b/actors/snufit/model.inc.c index 6a5dbbef..dd4f6ddc 100644 --- a/actors/snufit/model.inc.c +++ b/actors/snufit/model.inc.c @@ -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( diff --git a/actors/sparkle/model.inc.c b/actors/sparkle/model.inc.c index 2ecef672..b168dbf4 100644 --- a/actors/sparkle/model.inc.c +++ b/actors/sparkle/model.inc.c @@ -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[] = { diff --git a/actors/sparkle_animation/model.inc.c b/actors/sparkle_animation/model.inc.c index 13807216..25689c8f 100644 --- a/actors/sparkle_animation/model.inc.c +++ b/actors/sparkle_animation/model.inc.c @@ -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[] = { diff --git a/actors/spindrift/anims/anim_050006AC.inc.c b/actors/spindrift/anims/anim_050006AC.inc.c index 844f2e30..2ac56b64 100644 --- a/actors/spindrift/anims/anim_050006AC.inc.c +++ b/actors/spindrift/anims/anim_050006AC.inc.c @@ -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[] = { diff --git a/actors/springboard/model.inc.c b/actors/springboard/model.inc.c index 4297a688..34cc71e0 100644 --- a/actors/springboard/model.inc.c +++ b/actors/springboard/model.inc.c @@ -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[] = { diff --git a/actors/star/model.inc.c b/actors/star/model.inc.c index 0a4c9b28..ab74e07f 100644 --- a/actors/star/model.inc.c +++ b/actors/star/model.inc.c @@ -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[] = { diff --git a/actors/stomp_smoke/model.inc.c b/actors/stomp_smoke/model.inc.c index cad7c1c4..347692d6 100644 --- a/actors/stomp_smoke/model.inc.c +++ b/actors/stomp_smoke/model.inc.c @@ -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[] = { diff --git a/actors/sushi/model.inc.c b/actors/sushi/model.inc.c index f77c2c67..b673e307 100644 --- a/actors/sushi/model.inc.c +++ b/actors/sushi/model.inc.c @@ -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[] = { diff --git a/actors/swoop/model.inc.c b/actors/swoop/model.inc.c index fc99de1e..730382ee 100644 --- a/actors/swoop/model.inc.c +++ b/actors/swoop/model.inc.c @@ -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( diff --git a/actors/thwomp/model.inc.c b/actors/thwomp/model.inc.c index 7871d8cd..a348c632 100644 --- a/actors/thwomp/model.inc.c +++ b/actors/thwomp/model.inc.c @@ -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[] = { diff --git a/actors/toad/model.inc.c b/actors/toad/model.inc.c index ecdfbfd1..39bdf03c 100644 --- a/actors/toad/model.inc.c +++ b/actors/toad/model.inc.c @@ -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[] = { diff --git a/actors/tornado/model.inc.c b/actors/tornado/model.inc.c index afa1b950..ffc73f51 100644 --- a/actors/tornado/model.inc.c +++ b/actors/tornado/model.inc.c @@ -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( diff --git a/actors/treasure_chest/model.inc.c b/actors/treasure_chest/model.inc.c index f9aaad24..51b132ef 100644 --- a/actors/treasure_chest/model.inc.c +++ b/actors/treasure_chest/model.inc.c @@ -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[] = { diff --git a/actors/tree/model.inc.c b/actors/tree/model.inc.c index a09c3e7f..6328972e 100644 --- a/actors/tree/model.inc.c +++ b/actors/tree/model.inc.c @@ -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[] = { diff --git a/actors/ukiki/model.inc.c b/actors/ukiki/model.inc.c index a0e37836..e21e7905 100644 --- a/actors/ukiki/model.inc.c +++ b/actors/ukiki/model.inc.c @@ -22,24 +22,16 @@ static const Lights1 ukiki_seg5_lights_05007BA0 = gdSPDefLights1( UNUSED static const u64 ukiki_unused_1 = 1; // 0x05007BC0 -ALIGNED8 static const u8 ukiki_seg5_texture_05007BC0[] = { -#include "actors/ukiki/ukiki_face.rgba16.inc.c" -}; +ALIGNED8 static const u8 ukiki_seg5_texture_05007BC0[] = "actors/ukiki/ukiki_face.rgba16"; // 0x05008BC0 -ALIGNED8 static const u8 ukiki_seg5_texture_05008BC0[] = { -#include "actors/ukiki/ukiki_face_blink.rgba16.inc.c" -}; +ALIGNED8 static const u8 ukiki_seg5_texture_05008BC0[] = "actors/ukiki/ukiki_face_blink.rgba16"; // 0x05009BC0 -ALIGNED8 static const u8 ukiki_seg5_texture_05009BC0[] = { -#include "actors/ukiki/ukiki_butt.rgba16.inc.c" -}; +ALIGNED8 static const u8 ukiki_seg5_texture_05009BC0[] = "actors/ukiki/ukiki_butt.rgba16"; // 0x0500A3C0 -ALIGNED8 static const u8 ukiki_seg5_texture_0500A3C0[] = { -#include "actors/ukiki/ukiki_fur.rgba16.inc.c" -}; +ALIGNED8 static const u8 ukiki_seg5_texture_0500A3C0[] = "actors/ukiki/ukiki_fur.rgba16"; // 0x0500ABC0 static const Lights1 ukiki_seg5_lights_0500ABC0 = gdSPDefLights1( diff --git a/actors/unagi/model.inc.c b/actors/unagi/model.inc.c index a8cb4191..877b6a23 100644 --- a/actors/unagi/model.inc.c +++ b/actors/unagi/model.inc.c @@ -49,34 +49,22 @@ UNUSED static const Lights1 unagi_lights_unused8 = gdSPDefLights1( ); // 0x0500AF20 -ALIGNED8 static const u8 unagi_seg5_texture_0500AF20[] = { -#include "actors/unagi/unagi_body.rgba16.inc.c" -}; +ALIGNED8 static const u8 unagi_seg5_texture_0500AF20[] = "actors/unagi/unagi_body.rgba16"; // 0x0500B720 -ALIGNED8 static const u8 unagi_seg5_texture_0500B720[] = { -#include "actors/unagi/unagi_eye.rgba16.inc.c" -}; +ALIGNED8 static const u8 unagi_seg5_texture_0500B720[] = "actors/unagi/unagi_eye.rgba16"; // 0x0500B920 -ALIGNED8 static const u8 unagi_seg5_texture_0500B920[] = { -#include "actors/unagi/unagi_head_base.rgba16.inc.c" -}; +ALIGNED8 static const u8 unagi_seg5_texture_0500B920[] = "actors/unagi/unagi_head_base.rgba16"; // 0x0500C120 -ALIGNED8 static const u8 unagi_seg5_texture_0500C120[] = { -#include "actors/unagi/unagi_tooth.rgba16.inc.c" -}; +ALIGNED8 static const u8 unagi_seg5_texture_0500C120[] = "actors/unagi/unagi_tooth.rgba16"; // 0x0500C320 -ALIGNED8 static const u8 unagi_seg5_texture_0500C320[] = { -#include "actors/unagi/unagi_mouth.rgba16.inc.c" -}; +ALIGNED8 static const u8 unagi_seg5_texture_0500C320[] = "actors/unagi/unagi_mouth.rgba16"; // 0x0500C3A0 -ALIGNED8 static const u8 unagi_seg5_texture_0500C3A0[] = { -#include "actors/unagi/unagi_tail.rgba16.inc.c" -}; +ALIGNED8 static const u8 unagi_seg5_texture_0500C3A0[] = "actors/unagi/unagi_tail.rgba16"; // 0x0500CBA0 static const Vtx unagi_seg5_vertex_0500CBA0[] = { diff --git a/actors/walk_smoke/model.inc.c b/actors/walk_smoke/model.inc.c index af2596bb..f892edad 100644 --- a/actors/walk_smoke/model.inc.c +++ b/actors/walk_smoke/model.inc.c @@ -9,39 +9,25 @@ static const Vtx smoke_seg4_vertex_0401DE60[] = { }; // 0x0401DEA0 -ALIGNED8 static const u8 smoke_seg4_texture_0401DEA0[] = { -#include "actors/walk_smoke/walk_smoke_0.ia16.inc.c" -}; +ALIGNED8 static const u8 smoke_seg4_texture_0401DEA0[] = "actors/walk_smoke/walk_smoke_0.ia16"; // 0x0401E6A0 -ALIGNED8 static const u8 smoke_seg4_texture_0401E6A0[] = { -#include "actors/walk_smoke/walk_smoke_1.ia16.inc.c" -}; +ALIGNED8 static const u8 smoke_seg4_texture_0401E6A0[] = "actors/walk_smoke/walk_smoke_1.ia16"; // 0x0401EEA0 -ALIGNED8 static const u8 smoke_seg4_texture_0401EEA0[] = { -#include "actors/walk_smoke/walk_smoke_2.ia16.inc.c" -}; +ALIGNED8 static const u8 smoke_seg4_texture_0401EEA0[] = "actors/walk_smoke/walk_smoke_2.ia16"; // 0x0401F6A0 -ALIGNED8 static const u8 smoke_seg4_texture_0401F6A0[] = { -#include "actors/walk_smoke/walk_smoke_3.ia16.inc.c" -}; +ALIGNED8 static const u8 smoke_seg4_texture_0401F6A0[] = "actors/walk_smoke/walk_smoke_3.ia16"; // 0x0401FEA0 -ALIGNED8 static const u8 smoke_seg4_texture_0401FEA0[] = { -#include "actors/walk_smoke/walk_smoke_4.ia16.inc.c" -}; +ALIGNED8 static const u8 smoke_seg4_texture_0401FEA0[] = "actors/walk_smoke/walk_smoke_4.ia16"; // 0x040206A0 -ALIGNED8 static const u8 smoke_seg4_texture_040206A0[] = { -#include "actors/walk_smoke/walk_smoke_5.ia16.inc.c" -}; +ALIGNED8 static const u8 smoke_seg4_texture_040206A0[] = "actors/walk_smoke/walk_smoke_5.ia16"; // 0x04020EA0 -ALIGNED8 static const u8 smoke_seg4_texture_04020EA0[] = { -#include "actors/walk_smoke/walk_smoke_6.ia16.inc.c" -}; +ALIGNED8 static const u8 smoke_seg4_texture_04020EA0[] = "actors/walk_smoke/walk_smoke_6.ia16"; // 0x040216A0 - 0x04021718 const Gfx smoke_seg4_dl_040216A0[] = { diff --git a/actors/warp_pipe/model.inc.c b/actors/warp_pipe/model.inc.c index f428a0b5..9338bc07 100644 --- a/actors/warp_pipe/model.inc.c +++ b/actors/warp_pipe/model.inc.c @@ -95,9 +95,7 @@ static const Vtx warp_pipe_seg3_vertex_03007DC0[] = { }; // 0x03007E40 -ALIGNED8 static const u8 warp_pipe_seg3_texture_03007E40[] = { -#include "actors/warp_pipe/warp_pipe_side.rgba16.inc.c" -}; +ALIGNED8 static const u8 warp_pipe_seg3_texture_03007E40[] = "actors/warp_pipe/warp_pipe_side.rgba16"; // 0x03008E40 - 0x03008F98 const Gfx warp_pipe_seg3_dl_03008E40[] = { @@ -189,9 +187,7 @@ static const Vtx warp_pipe_seg3_vertex_03009128[] = { }; // 0x03009168 -ALIGNED8 static const u8 warp_pipe_seg3_texture_03009168[] = { -#include "actors/warp_pipe/warp_pipe_top.rgba16.inc.c" -}; +ALIGNED8 static const u8 warp_pipe_seg3_texture_03009168[] = "actors/warp_pipe/warp_pipe_top.rgba16"; // 0x03009968 - 0x03009A20 const Gfx warp_pipe_seg3_dl_03009968[] = { diff --git a/actors/water_bubble/model.inc.c b/actors/water_bubble/model.inc.c index 8db7688c..54974808 100644 --- a/actors/water_bubble/model.inc.c +++ b/actors/water_bubble/model.inc.c @@ -7,9 +7,7 @@ static const Lights1 water_bubble_seg5_lights_0500FE68 = gdSPDefLights1( ); // 0x0500FE80 -ALIGNED8 static const u8 water_bubble_seg5_texture_0500FE80[] = { -#include "actors/water_bubble/water_bubble.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_bubble_seg5_texture_0500FE80[] = "actors/water_bubble/water_bubble.rgba16"; // 0x05010680 static const Vtx water_bubble_seg5_vertex_05010680[] = { diff --git a/actors/water_mine/model.inc.c b/actors/water_mine/model.inc.c index a85c7216..c23ebea9 100644 --- a/actors/water_mine/model.inc.c +++ b/actors/water_mine/model.inc.c @@ -7,19 +7,13 @@ static const Lights1 water_mine_seg6_lights_0600A4E0 = gdSPDefLights1( ); // 0x0600A4F8 -ALIGNED8 static const u8 water_mine_seg6_texture_0600A4F8[] = { -#include "actors/water_mine/water_mine_left_side_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_mine_seg6_texture_0600A4F8[] = "actors/water_mine/water_mine_left_side_unused.rgba16"; // 0x0600B4F8 -ALIGNED8 static const u8 water_mine_seg6_texture_0600B4F8[] = { -#include "actors/water_mine/water_mine_right_side_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_mine_seg6_texture_0600B4F8[] = "actors/water_mine/water_mine_right_side_unused.rgba16"; // 0x0600C4F8 -ALIGNED8 static const u8 water_mine_seg6_texture_0600C4F8[] = { -#include "actors/water_mine/water_mine_spike_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_mine_seg6_texture_0600C4F8[] = "actors/water_mine/water_mine_spike_unused.rgba16"; // 0x0600CCF8 static const Vtx water_mine_seg6_vertex_0600CCF8[] = { diff --git a/actors/water_ring/model.inc.c b/actors/water_ring/model.inc.c index 9d7e548d..268e4290 100644 --- a/actors/water_ring/model.inc.c +++ b/actors/water_ring/model.inc.c @@ -7,9 +7,7 @@ static const Lights1 water_ring_seg6_lights_06012368 = gdSPDefLights1( ); // 0x06012380 -ALIGNED8 static const u8 water_ring_seg6_texture_06012380[] = { -#include "actors/water_ring/water_ring.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_ring_seg6_texture_06012380[] = "actors/water_ring/water_ring.rgba16"; // 0x06013380 static const Vtx water_ring_seg6_vertex_06013380[] = { diff --git a/actors/water_splash/model.inc.c b/actors/water_splash/model.inc.c index 0970d7e7..e2874e9c 100644 --- a/actors/water_splash/model.inc.c +++ b/actors/water_splash/model.inc.c @@ -9,44 +9,28 @@ static const Vtx water_splash_seg4_vertex_0402A588[] = { }; // 0x0402A5C8 -ALIGNED8 static const u8 water_splash_seg4_texture_0402A5C8[] = { -#include "actors/water_splash/water_splash_0.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_splash_seg4_texture_0402A5C8[] = "actors/water_splash/water_splash_0.rgba16"; // 0x0402B5C8 -ALIGNED8 static const u8 water_splash_seg4_texture_0402B5C8[] = { -#include "actors/water_splash/water_splash_1.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_splash_seg4_texture_0402B5C8[] = "actors/water_splash/water_splash_1.rgba16"; // 0x0402C5C8 -ALIGNED8 static const u8 water_splash_seg4_texture_0402C5C8[] = { -#include "actors/water_splash/water_splash_2.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_splash_seg4_texture_0402C5C8[] = "actors/water_splash/water_splash_2.rgba16"; // 0x0402D5C8 -ALIGNED8 static const u8 water_splash_seg4_texture_0402D5C8[] = { -#include "actors/water_splash/water_splash_3.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_splash_seg4_texture_0402D5C8[] = "actors/water_splash/water_splash_3.rgba16"; // 0x0402E5C8 -ALIGNED8 static const u8 water_splash_seg4_texture_0402E5C8[] = { -#include "actors/water_splash/water_splash_4.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_splash_seg4_texture_0402E5C8[] = "actors/water_splash/water_splash_4.rgba16"; // 0x0402F5C8 -ALIGNED8 static const u8 water_splash_seg4_texture_0402F5C8[] = { -#include "actors/water_splash/water_splash_5.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_splash_seg4_texture_0402F5C8[] = "actors/water_splash/water_splash_5.rgba16"; // 0x040305C8 -ALIGNED8 static const u8 water_splash_seg4_texture_040305C8[] = { -#include "actors/water_splash/water_splash_6.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_splash_seg4_texture_040305C8[] = "actors/water_splash/water_splash_6.rgba16"; // 0x040315C8 -ALIGNED8 static const u8 water_splash_seg4_texture_040315C8[] = { -#include "actors/water_splash/water_splash_7.rgba16.inc.c" -}; +ALIGNED8 static const u8 water_splash_seg4_texture_040315C8[] = "actors/water_splash/water_splash_7.rgba16"; // 0x040325C8 - 0x04032640 const Gfx water_splash_seg4_dl_040325C8[] = { diff --git a/actors/water_wave/model.inc.c b/actors/water_wave/model.inc.c index cd5c97cf..3edb05e3 100644 --- a/actors/water_wave/model.inc.c +++ b/actors/water_wave/model.inc.c @@ -9,24 +9,16 @@ static const Vtx water_wave_seg4_vertex_04025318[] = { }; // 0x04025358 -ALIGNED8 static const u8 water_wave_seg4_texture_04025358[] = { -#include "actors/water_wave/water_wave_0.ia16.inc.c" -}; +ALIGNED8 static const u8 water_wave_seg4_texture_04025358[] = "actors/water_wave/water_wave_0.ia16"; // 0x04025B58 -ALIGNED8 static const u8 water_wave_seg4_texture_04025B58[] = { -#include "actors/water_wave/water_wave_1.ia16.inc.c" -}; +ALIGNED8 static const u8 water_wave_seg4_texture_04025B58[] = "actors/water_wave/water_wave_1.ia16"; // 0x04026358 -ALIGNED8 static const u8 water_wave_seg4_texture_04026358[] = { -#include "actors/water_wave/water_wave_2.ia16.inc.c" -}; +ALIGNED8 static const u8 water_wave_seg4_texture_04026358[] = "actors/water_wave/water_wave_2.ia16"; // 0x04026B58 -ALIGNED8 static const u8 water_wave_seg4_texture_04026B58[] = { -#include "actors/water_wave/water_wave_3.ia16.inc.c" -}; +ALIGNED8 static const u8 water_wave_seg4_texture_04026B58[] = "actors/water_wave/water_wave_3.ia16"; // 0x04027358 - 0x040273A0 const Gfx water_wave_seg4_dl_04027358[] = { diff --git a/actors/whirlpool/model.inc.c b/actors/whirlpool/model.inc.c index 92ac7e15..38da7a4e 100644 --- a/actors/whirlpool/model.inc.c +++ b/actors/whirlpool/model.inc.c @@ -1,9 +1,7 @@ // Whirlpool // 0x05012848 -ALIGNED8 static const u8 whirlpool_seg5_texture_05012848[] = { -#include "actors/whirlpool/whirlpool.ia16.inc.c" -}; +ALIGNED8 static const u8 whirlpool_seg5_texture_05012848[] = "actors/whirlpool/whirlpool.ia16"; // 0x05013848 static const Vtx whirlpool_seg5_vertex_05013848[] = { diff --git a/actors/white_particle/model.inc.c b/actors/white_particle/model.inc.c index bda6340a..8fbf50eb 100644 --- a/actors/white_particle/model.inc.c +++ b/actors/white_particle/model.inc.c @@ -9,9 +9,7 @@ static const Vtx white_particle_vertex[] = { }; // 0x0302C6A0 -ALIGNED8 static const u8 white_particle_texture[] = { -#include "actors/white_particle/snow_particle.rgba16.inc.c" -}; +ALIGNED8 static const u8 white_particle_texture[] = "actors/white_particle/snow_particle.rgba16"; // 0x0302C8A0 - 0x0302C938 const Gfx white_particle_dl[] = { diff --git a/actors/white_particle_small/model.inc.c b/actors/white_particle_small/model.inc.c index 1d817710..68a26174 100644 --- a/actors/white_particle_small/model.inc.c +++ b/actors/white_particle_small/model.inc.c @@ -17,9 +17,7 @@ static const Vtx white_particle_small_unused_vertex[] = { }; // 0x04032780 -ALIGNED8 static const u8 white_particle_small_texture[] = { -#include "actors/white_particle_small/small_snow_particle.rgba16.inc.c" -}; +ALIGNED8 static const u8 white_particle_small_texture[] = "actors/white_particle_small/small_snow_particle.rgba16"; // 0x04032980 - 0x040329E0 const Gfx white_particle_small_dl_begin[] = { diff --git a/actors/whomp/model.inc.c b/actors/whomp/model.inc.c index d98c77dd..f365302e 100644 --- a/actors/whomp/model.inc.c +++ b/actors/whomp/model.inc.c @@ -5,24 +5,16 @@ UNUSED static const u64 whomp_unused_1 = 2; // 0x0601C360 -ALIGNED8 static const u8 whomp_seg6_texture_0601C360[] = { -#include "actors/whomp/whomp_back.rgba16.inc.c" -}; +ALIGNED8 static const u8 whomp_seg6_texture_0601C360[] = "actors/whomp/whomp_back.rgba16"; // 0x0601D360 -ALIGNED8 static const u8 whomp_seg6_texture_0601D360[] = { -#include "actors/whomp/whomp_face.rgba16.inc.c" -}; +ALIGNED8 static const u8 whomp_seg6_texture_0601D360[] = "actors/whomp/whomp_face.rgba16"; // 0x0601D360 -ALIGNED8 static const u8 whomp_seg6_texture_0601E360[] = { -#include "actors/whomp/whomp_hand.rgba16.inc.c" -}; +ALIGNED8 static const u8 whomp_seg6_texture_0601E360[] = "actors/whomp/whomp_hand.rgba16"; // 0x0601EB60 -ALIGNED8 static const u8 whomp_seg6_texture_0601EB60[] = { -#include "actors/whomp/whomp_surface.rgba16.inc.c" -}; +ALIGNED8 static const u8 whomp_seg6_texture_0601EB60[] = "actors/whomp/whomp_surface.rgba16"; // 0x0601F360 static const Lights1 whomp_seg6_lights_0601F360 = gdSPDefLights1( diff --git a/actors/wiggler_body/model.inc.c b/actors/wiggler_body/model.inc.c index 0b685b25..53413f13 100644 --- a/actors/wiggler_body/model.inc.c +++ b/actors/wiggler_body/model.inc.c @@ -1,39 +1,25 @@ // Wiggler Body // 0x05005A30 -ALIGNED8 static const u8 wiggler_seg5_texture_05005A30[] = { -#include "actors/wiggler/wiggler_segment_left_side.rgba16.inc.c" -}; +ALIGNED8 static const u8 wiggler_seg5_texture_05005A30[] = "actors/wiggler/wiggler_segment_left_side.rgba16"; // 0x05006A30 -ALIGNED8 static const u8 wiggler_seg5_texture_05006A30[] = { -#include "actors/wiggler/wiggler_segment_right_side.rgba16.inc.c" -}; +ALIGNED8 static const u8 wiggler_seg5_texture_05006A30[] = "actors/wiggler/wiggler_segment_right_side.rgba16"; // 0x05007A30 -ALIGNED8 static const u8 wiggler_seg5_texture_05007A30[] = { -#include "actors/wiggler/wiggler_eye.rgba16.inc.c" -}; +ALIGNED8 static const u8 wiggler_seg5_texture_05007A30[] = "actors/wiggler/wiggler_eye.rgba16"; // 0x05008230 -ALIGNED8 static const u8 wiggler_seg5_texture_05008230[] = { -#include "actors/wiggler/wiggler_flower.rgba16.inc.c" -}; +ALIGNED8 static const u8 wiggler_seg5_texture_05008230[] = "actors/wiggler/wiggler_flower.rgba16"; // 0x05008A30 -ALIGNED8 static const u8 wiggler_seg5_texture_05008A30[] = { -#include "actors/wiggler/wiggler_frown.rgba16.inc.c" -}; +ALIGNED8 static const u8 wiggler_seg5_texture_05008A30[] = "actors/wiggler/wiggler_frown.rgba16"; // 0x05009230 -ALIGNED8 static const u8 wiggler_seg5_texture_05009230[] = { -#include "actors/wiggler/wiggler_nose_left_side.rgba16.inc.c" -}; +ALIGNED8 static const u8 wiggler_seg5_texture_05009230[] = "actors/wiggler/wiggler_nose_left_side.rgba16"; // 0x0500A230 -ALIGNED8 static const u8 wiggler_seg5_texture_0500A230[] = { -#include "actors/wiggler/wiggler_nose_right_side.rgba16.inc.c" -}; +ALIGNED8 static const u8 wiggler_seg5_texture_0500A230[] = "actors/wiggler/wiggler_nose_right_side.rgba16"; // 0x0500B230 static const Lights1 wiggler_seg5_lights_0500B230 = gdSPDefLights1( diff --git a/actors/wooden_signpost/model.inc.c b/actors/wooden_signpost/model.inc.c index ec2ebd0b..691d6bb5 100644 --- a/actors/wooden_signpost/model.inc.c +++ b/actors/wooden_signpost/model.inc.c @@ -18,14 +18,10 @@ static const Vtx wooden_signpost_seg3_vertex_0302C958[] = { }; // 0x0302C9C8 -ALIGNED8 static const u8 wooden_signpost_seg3_texture_0302C9C8[] = { -#include "actors/wooden_signpost/wooden_signpost_back.rgba16.inc.c" -}; +ALIGNED8 static const u8 wooden_signpost_seg3_texture_0302C9C8[] = "actors/wooden_signpost/wooden_signpost_back.rgba16"; // 0x0302D1C8 -ALIGNED8 static const u8 wooden_signpost_seg3_texture_0302D1C8[] = { -#include "actors/wooden_signpost/wooden_signpost_front.rgba16.inc.c" -}; +ALIGNED8 static const u8 wooden_signpost_seg3_texture_0302D1C8[] = "actors/wooden_signpost/wooden_signpost_front.rgba16"; // 0x0302D9C8 - 0x0302DA48 const Gfx wooden_signpost_seg3_dl_0302D9C8[] = { diff --git a/actors/yellow_sphere/model.inc.c b/actors/yellow_sphere/model.inc.c index 99e2b6bb..837536a8 100644 --- a/actors/yellow_sphere/model.inc.c +++ b/actors/yellow_sphere/model.inc.c @@ -9,9 +9,7 @@ static const Vtx yellow_sphere_seg6_vertex_0601EB48[] = { }; // 0x0601EB88 -ALIGNED8 static const u8 yellow_sphere_seg6_texture_0601EB88[] = { -#include "actors/yellow_sphere/yellow_sphere.rgba16.inc.c" -}; +ALIGNED8 static const u8 yellow_sphere_seg6_texture_0601EB88[] = "actors/yellow_sphere/yellow_sphere.rgba16"; // 0x0601F388 - 0x0601F3C0 const Gfx yellow_sphere_seg6_dl_0601F388[] = { diff --git a/actors/yellow_sphere_small/model.inc.c b/actors/yellow_sphere_small/model.inc.c index 8b221b23..0c2853db 100644 --- a/actors/yellow_sphere_small/model.inc.c +++ b/actors/yellow_sphere_small/model.inc.c @@ -9,9 +9,7 @@ static const Vtx yellow_sphere_seg5_vertex_05000000[] = { }; // 0x05000040 -ALIGNED8 static const u8 yellow_sphere_seg5_texture_05000040[] = { -#include "actors/yellow_sphere_small/small_yellow_sphere.rgba16.inc.c" -}; +ALIGNED8 static const u8 yellow_sphere_seg5_texture_05000040[] = "actors/yellow_sphere_small/small_yellow_sphere.rgba16"; // 0x05000840 - 0x05000888 const Gfx yellow_sphere_seg5_dl_05000840[] = { diff --git a/actors/yoshi/model.inc.c b/actors/yoshi/model.inc.c index bf6a365b..99afb8e1 100644 --- a/actors/yoshi/model.inc.c +++ b/actors/yoshi/model.inc.c @@ -19,19 +19,13 @@ static const Lights1 yoshi_seg5_lights_0501C488 = gdSPDefLights1( ); // 0x0501C4A0 -ALIGNED8 static const u8 yoshi_seg5_texture_0501C4A0[] = { -#include "actors/yoshi/yoshi_eye.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_seg5_texture_0501C4A0[] = "actors/yoshi/yoshi_eye.rgba16"; // 0x0501C6A0 -ALIGNED8 static const u8 yoshi_seg5_texture_0501C6A0[] = { -#include "actors/yoshi/yoshi_eye_blink.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_seg5_texture_0501C6A0[] = "actors/yoshi/yoshi_eye_blink.rgba16"; // 0x0501C8A0 -ALIGNED8 static const u8 yoshi_seg5_texture_0501C8A0[] = { -#include "actors/yoshi/yoshi_nostril.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_seg5_texture_0501C8A0[] = "actors/yoshi/yoshi_nostril.rgba16"; // 0x0501CAA0 static const Vtx yoshi_seg5_vertex_0501CAA0[] = { diff --git a/actors/yoshi_egg/model.inc.c b/actors/yoshi_egg/model.inc.c index c76e154d..490ad19c 100644 --- a/actors/yoshi_egg/model.inc.c +++ b/actors/yoshi_egg/model.inc.c @@ -9,44 +9,28 @@ static const Vtx yoshi_egg_seg5_vertex_05005778[] = { }; // 0x050057B8 -ALIGNED8 static const u8 yoshi_egg_seg5_texture_050057B8[] = { -#include "actors/yoshi_egg/yoshi_egg_0_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_egg_seg5_texture_050057B8[] = "actors/yoshi_egg/yoshi_egg_0_unused.rgba16"; // 0x05005FB8 -ALIGNED8 static const u8 yoshi_egg_seg5_texture_05005FB8[] = { -#include "actors/yoshi_egg/yoshi_egg_1_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_egg_seg5_texture_05005FB8[] = "actors/yoshi_egg/yoshi_egg_1_unused.rgba16"; // 0x050067B8 -ALIGNED8 static const u8 yoshi_egg_seg5_texture_050067B8[] = { -#include "actors/yoshi_egg/yoshi_egg_2_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_egg_seg5_texture_050067B8[] = "actors/yoshi_egg/yoshi_egg_2_unused.rgba16"; // 0x05006FB8 -ALIGNED8 static const u8 yoshi_egg_seg5_texture_05006FB8[] = { -#include "actors/yoshi_egg/yoshi_egg_3_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_egg_seg5_texture_05006FB8[] = "actors/yoshi_egg/yoshi_egg_3_unused.rgba16"; // 0x050077B8 -ALIGNED8 static const u8 yoshi_egg_seg5_texture_050077B8[] = { -#include "actors/yoshi_egg/yoshi_egg_4_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_egg_seg5_texture_050077B8[] = "actors/yoshi_egg/yoshi_egg_4_unused.rgba16"; // 0x05007FB8 -ALIGNED8 static const u8 yoshi_egg_seg5_texture_05007FB8[] = { -#include "actors/yoshi_egg/yoshi_egg_5_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_egg_seg5_texture_05007FB8[] = "actors/yoshi_egg/yoshi_egg_5_unused.rgba16"; // 0x050087B8 -ALIGNED8 static const u8 yoshi_egg_seg5_texture_050087B8[] = { -#include "actors/yoshi_egg/yoshi_egg_6_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_egg_seg5_texture_050087B8[] = "actors/yoshi_egg/yoshi_egg_6_unused.rgba16"; // 0x05008FB8 -ALIGNED8 static const u8 yoshi_egg_seg5_texture_05008FB8[] = { -#include "actors/yoshi_egg/yoshi_egg_7_unused.rgba16.inc.c" -}; +ALIGNED8 static const u8 yoshi_egg_seg5_texture_05008FB8[] = "actors/yoshi_egg/yoshi_egg_7_unused.rgba16"; // 0x050097B8 - 0x05009820 const Gfx yoshi_egg_seg5_dl_050097B8[] = { diff --git a/bin/cave.c b/bin/cave.c index 56658cd6..336dac82 100644 --- a/bin/cave.c +++ b/bin/cave.c @@ -3,86 +3,52 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 cave_09000000[] = { -#include "textures/cave/hmc_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09000000[] = "textures/cave/hmc_textures.00000.rgba16"; // 0x09001000 -ALIGNED8 const u8 cave_09001000[] = { -#include "textures/cave/hmc_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09001000[] = "textures/cave/hmc_textures.01000.rgba16"; // 0x09001800 -ALIGNED8 const u8 cave_09001800[] = { -#include "textures/cave/hmc_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09001800[] = "textures/cave/hmc_textures.01800.rgba16"; // 0x09002800 -ALIGNED8 const u8 cave_09002800[] = { -#include "textures/cave/hmc_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09002800[] = "textures/cave/hmc_textures.02800.rgba16"; // 0x09003000 -ALIGNED8 const u8 cave_09003000[] = { -#include "textures/cave/hmc_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09003000[] = "textures/cave/hmc_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 cave_09003800[] = { -#include "textures/cave/hmc_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09003800[] = "textures/cave/hmc_textures.03800.rgba16"; // 0x09004800 -ALIGNED8 const u8 cave_09004800[] = { -#include "textures/cave/hmc_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09004800[] = "textures/cave/hmc_textures.04800.rgba16"; // 0x09005800 -ALIGNED8 const u8 cave_09005800[] = { -#include "textures/cave/hmc_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09005800[] = "textures/cave/hmc_textures.05800.rgba16"; // 0x09006800 -ALIGNED8 const u8 cave_09006800[] = { -#include "textures/cave/hmc_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09006800[] = "textures/cave/hmc_textures.06800.rgba16"; // 0x09007000 -ALIGNED8 const u8 cave_09007000[] = { -#include "textures/cave/hmc_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09007000[] = "textures/cave/hmc_textures.07000.rgba16"; // 0x09007800 -ALIGNED8 const u8 cave_09007800[] = { -#include "textures/cave/hmc_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09007800[] = "textures/cave/hmc_textures.07800.rgba16"; // 0x09008800 -ALIGNED8 const u8 cave_09008800[] = { -#include "textures/cave/hmc_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09008800[] = "textures/cave/hmc_textures.08800.rgba16"; // 0x09009800 -ALIGNED8 const u8 cave_09009800[] = { -#include "textures/cave/hmc_textures.09800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_09009800[] = "textures/cave/hmc_textures.09800.rgba16"; // 0x0900A000 -ALIGNED8 const u8 cave_0900A000[] = { -#include "textures/cave/hmc_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_0900A000[] = "textures/cave/hmc_textures.0A000.rgba16"; // 0x0900A800 -ALIGNED8 const u8 cave_0900A800[] = { -#include "textures/cave/hmc_textures.0A800.rgba16.inc.c" -}; +ALIGNED8 const u8 cave_0900A800[] = "textures/cave/hmc_textures.0A800.rgba16"; // 0x0900B800 -ALIGNED8 const u8 cave_0900B800[] = { -#include "textures/cave/hmc_textures.0B800.ia16.inc.c" -}; +ALIGNED8 const u8 cave_0900B800[] = "textures/cave/hmc_textures.0B800.ia16"; // 0x0900C000 -ALIGNED8 const u8 cave_0900C000[] = { -#include "textures/cave/hmc_textures.0C000.ia16.inc.c" -}; +ALIGNED8 const u8 cave_0900C000[] = "textures/cave/hmc_textures.0C000.ia16"; diff --git a/bin/effect.c b/bin/effect.c index fd6af43c..062fec94 100644 --- a/bin/effect.c +++ b/bin/effect.c @@ -7,24 +7,16 @@ UNUSED static const u64 effect_unused_0 = 0; // Flower (Unused) // 0x0B000008 -ALIGNED8 static const u8 effect_0B000008[] = { -#include "textures/effect/flower.00008.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B000008[] = "textures/effect/flower.00008.rgba16"; // 0x0B000808 -ALIGNED8 static const u8 effect_0B000808[] = { -#include "textures/effect/flower.00808.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B000808[] = "textures/effect/flower.00808.rgba16"; // 0x0B001008 -ALIGNED8 static const u8 effect_0B001008[] = { -#include "textures/effect/flower.01008.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B001008[] = "textures/effect/flower.01008.rgba16"; // 0x0B001808 -ALIGNED8 static const u8 effect_0B001808[] = { -#include "textures/effect/flower.01808.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B001808[] = "textures/effect/flower.01808.rgba16"; // 0x0B002008 const u8 *const flower_bubbles_textures_ptr_0B002008[] = { @@ -38,44 +30,28 @@ const u8 *const flower_bubbles_textures_ptr_0B002008[] = { // Lava Bubble // 0x0B002020 -ALIGNED8 static const u8 effect_0B002020[] = { -#include "textures/effect/lava_bubble.02020.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B002020[] = "textures/effect/lava_bubble.02020.rgba16"; // 0x0B002820 -ALIGNED8 static const u8 effect_0B002820[] = { -#include "textures/effect/lava_bubble.02820.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B002820[] = "textures/effect/lava_bubble.02820.rgba16"; // 0x0B003020 -ALIGNED8 static const u8 effect_0B003020[] = { -#include "textures/effect/lava_bubble.03020.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B003020[] = "textures/effect/lava_bubble.03020.rgba16"; // 0x0B003820 -ALIGNED8 static const u8 effect_0B003820[] = { -#include "textures/effect/lava_bubble.03820.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B003820[] = "textures/effect/lava_bubble.03820.rgba16"; // 0x0B004020 -ALIGNED8 static const u8 effect_0B004020[] = { -#include "textures/effect/lava_bubble.04020.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B004020[] = "textures/effect/lava_bubble.04020.rgba16"; // 0x0B004820 -ALIGNED8 static const u8 effect_0B004820[] = { -#include "textures/effect/lava_bubble.04820.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B004820[] = "textures/effect/lava_bubble.04820.rgba16"; // 0x0B005020 -ALIGNED8 static const u8 effect_0B005020[] = { -#include "textures/effect/lava_bubble.05020.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B005020[] = "textures/effect/lava_bubble.05020.rgba16"; // 0x0B005820 -ALIGNED8 static const u8 effect_0B005820[] = { -#include "textures/effect/lava_bubble.05820.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B005820[] = "textures/effect/lava_bubble.05820.rgba16"; // 0x0B006020 const u8 *const lava_bubble_ptr_0B006020[] = { @@ -93,9 +69,7 @@ const u8 *const lava_bubble_ptr_0B006020[] = { // Bubble // 0x0B006048 -ALIGNED8 static const u8 effect_0B006048[] = { -#include "textures/effect/bubble.06048.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B006048[] = "textures/effect/bubble.06048.rgba16"; // 0x0B006848 const u8 *const bubble_ptr_0B006848[] = { @@ -104,9 +78,7 @@ const u8 *const bubble_ptr_0B006848[] = { // Tiny Bubble // 0x0B00684C -ALIGNED8 static const u8 effect_0B00684C[] = { -#include "textures/effect/tiny_bubble.0684C.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B00684C[] = "textures/effect/tiny_bubble.0684C.rgba16"; // 0x0B006A50 - 0x0B006AB0 const Gfx tiny_bubble_dl_0B006A50[] = { @@ -134,9 +106,7 @@ const Gfx tiny_bubble_dl_0B006AB0[] = { }; // 0x0B006AD8 -ALIGNED8 static const u8 effect_0B006AD8[] = { -#include "textures/effect/tiny_bubble.06AD8.rgba16.inc.c" -}; +ALIGNED8 static const u8 effect_0B006AD8[] = "textures/effect/tiny_bubble.06AD8.rgba16"; // 0x0B006CD8 - 0x0B006D38 const Gfx tiny_bubble_dl_0B006CD8[] = { diff --git a/bin/fire.c b/bin/fire.c index ea0f5ec2..65702886 100644 --- a/bin/fire.c +++ b/bin/fire.c @@ -3,121 +3,73 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 fire_09000000[] = { -#include "textures/fire/lll_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09000000[] = "textures/fire/lll_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 fire_09000800[] = { -#include "textures/fire/lll_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09000800[] = "textures/fire/lll_textures.00800.rgba16"; // 0x09001000 -ALIGNED8 const u8 fire_09001000[] = { -#include "textures/fire/lll_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09001000[] = "textures/fire/lll_textures.01000.rgba16"; // 0x09001800 -ALIGNED8 const u8 fire_09001800[] = { -#include "textures/fire/lll_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09001800[] = "textures/fire/lll_textures.01800.rgba16"; // 0x09002000 -ALIGNED8 const u8 fire_09002000[] = { -#include "textures/fire/lll_textures.02000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09002000[] = "textures/fire/lll_textures.02000.rgba16"; // 0x09002800 -ALIGNED8 const u8 fire_09002800[] = { -#include "textures/fire/lll_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09002800[] = "textures/fire/lll_textures.02800.rgba16"; // 0x09003000 -ALIGNED8 const u8 fire_09003000[] = { -#include "textures/fire/lll_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09003000[] = "textures/fire/lll_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 fire_09003800[] = { -#include "textures/fire/lll_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09003800[] = "textures/fire/lll_textures.03800.rgba16"; // 0x09004000 -ALIGNED8 const u8 fire_09004000[] = { -#include "textures/fire/lll_textures.04000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09004000[] = "textures/fire/lll_textures.04000.rgba16"; // 0x09004800 -ALIGNED8 const u8 fire_09004800[] = { -#include "textures/fire/lll_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09004800[] = "textures/fire/lll_textures.04800.rgba16"; // 0x09005000 -ALIGNED8 const u8 fire_09005000[] = { -#include "textures/fire/lll_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09005000[] = "textures/fire/lll_textures.05000.rgba16"; // 0x09005800 -ALIGNED8 const u8 fire_09005800[] = { -#include "textures/fire/lll_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09005800[] = "textures/fire/lll_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 fire_09006000[] = { -#include "textures/fire/lll_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09006000[] = "textures/fire/lll_textures.06000.rgba16"; // 0x09006800 -ALIGNED8 const u8 fire_09006800[] = { -#include "textures/fire/lll_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09006800[] = "textures/fire/lll_textures.06800.rgba16"; // 0x09007000 -ALIGNED8 const u8 fire_09007000[] = { -#include "textures/fire/lll_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09007000[] = "textures/fire/lll_textures.07000.rgba16"; // 0x09007800 -ALIGNED8 const u8 fire_09007800[] = { -#include "textures/fire/lll_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09007800[] = "textures/fire/lll_textures.07800.rgba16"; // 0x09008000 -ALIGNED8 const u8 fire_09008000[] = { -#include "textures/fire/lll_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09008000[] = "textures/fire/lll_textures.08000.rgba16"; // 0x09008800 -ALIGNED8 const u8 fire_09008800[] = { -#include "textures/fire/lll_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09008800[] = "textures/fire/lll_textures.08800.rgba16"; // 0x09009000 -ALIGNED8 const u8 fire_09009000[] = { -#include "textures/fire/lll_textures.09000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09009000[] = "textures/fire/lll_textures.09000.rgba16"; // 0x09009800 -ALIGNED8 const u8 fire_09009800[] = { -#include "textures/fire/lll_textures.09800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_09009800[] = "textures/fire/lll_textures.09800.rgba16"; // 0x0900A000 -ALIGNED8 const u8 fire_0900A000[] = { -#include "textures/fire/lll_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_0900A000[] = "textures/fire/lll_textures.0A000.rgba16"; // 0x0900A800 -ALIGNED8 const u8 fire_0900A800[] = { -#include "textures/fire/lll_textures.0A800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_0900A800[] = "textures/fire/lll_textures.0A800.rgba16"; // 0x0900B000 -ALIGNED8 const u8 fire_0900B000[] = { -#include "textures/fire/lll_textures.0B000.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_0900B000[] = "textures/fire/lll_textures.0B000.rgba16"; // 0x0900B800 -ALIGNED8 const u8 fire_0900B800[] = { -#include "textures/fire/lll_textures.0B800.rgba16.inc.c" -}; +ALIGNED8 const u8 fire_0900B800[] = "textures/fire/lll_textures.0B800.rgba16"; diff --git a/bin/generic.c b/bin/generic.c index 4ce36975..6e4db144 100644 --- a/bin/generic.c +++ b/bin/generic.c @@ -3,111 +3,67 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 generic_09000000[] = { -#include "textures/generic/bob_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09000000[] = "textures/generic/bob_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 generic_09000800[] = { -#include "textures/generic/bob_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09000800[] = "textures/generic/bob_textures.00800.rgba16"; // 0x09001000 -ALIGNED8 const u8 generic_09001000[] = { -#include "textures/generic/bob_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09001000[] = "textures/generic/bob_textures.01000.rgba16"; // 0x09001800 -ALIGNED8 const u8 generic_09001800[] = { -#include "textures/generic/bob_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09001800[] = "textures/generic/bob_textures.01800.rgba16"; // 0x09002000 -ALIGNED8 const u8 generic_09002000[] = { -#include "textures/generic/bob_textures.02000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09002000[] = "textures/generic/bob_textures.02000.rgba16"; // 0x09002800 -ALIGNED8 const u8 generic_09002800[] = { -#include "textures/generic/bob_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09002800[] = "textures/generic/bob_textures.02800.rgba16"; // 0x09003000 -ALIGNED8 const u8 generic_09003000[] = { -#include "textures/generic/bob_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09003000[] = "textures/generic/bob_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 generic_09003800[] = { -#include "textures/generic/bob_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09003800[] = "textures/generic/bob_textures.03800.rgba16"; // 0x09004000 -ALIGNED8 const u8 generic_09004000[] = { -#include "textures/generic/bob_textures.04000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09004000[] = "textures/generic/bob_textures.04000.rgba16"; // 0x09004800 -ALIGNED8 const u8 generic_09004800[] = { -#include "textures/generic/bob_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09004800[] = "textures/generic/bob_textures.04800.rgba16"; // 0x09005000 -ALIGNED8 const u8 generic_09005000[] = { -#include "textures/generic/bob_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09005000[] = "textures/generic/bob_textures.05000.rgba16"; // 0x09005800 -ALIGNED8 const u8 generic_09005800[] = { -#include "textures/generic/bob_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09005800[] = "textures/generic/bob_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 generic_09006000[] = { -#include "textures/generic/bob_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09006000[] = "textures/generic/bob_textures.06000.rgba16"; // 0x09007000 -ALIGNED8 const u8 generic_09007000[] = { -#include "textures/generic/bob_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09007000[] = "textures/generic/bob_textures.07000.rgba16"; // 0x09007800 -ALIGNED8 const u8 generic_09007800[] = { -#include "textures/generic/bob_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09007800[] = "textures/generic/bob_textures.07800.rgba16"; // 0x09008000 -ALIGNED8 const u8 generic_09008000[] = { -#include "textures/generic/bob_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09008000[] = "textures/generic/bob_textures.08000.rgba16"; // 0x09008800 -ALIGNED8 const u8 generic_09008800[] = { -#include "textures/generic/bob_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09008800[] = "textures/generic/bob_textures.08800.rgba16"; // 0x09009000 -ALIGNED8 const u8 generic_09009000[] = { -#include "textures/generic/bob_textures.09000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09009000[] = "textures/generic/bob_textures.09000.rgba16"; // 0x09009800 -ALIGNED8 const u8 generic_09009800[] = { -#include "textures/generic/bob_textures.09800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_09009800[] = "textures/generic/bob_textures.09800.rgba16"; // 0x0900A000 -ALIGNED8 const u8 generic_0900A000[] = { -#include "textures/generic/bob_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_0900A000[] = "textures/generic/bob_textures.0A000.rgba16"; // 0x0900A800 -ALIGNED8 const u8 generic_0900A800[] = { -#include "textures/generic/bob_textures.0A800.rgba16.inc.c" -}; +ALIGNED8 const u8 generic_0900A800[] = "textures/generic/bob_textures.0A800.rgba16"; // 0x0900B000 -ALIGNED8 const u8 generic_0900B000[] = { -#include "textures/generic/bob_textures.0B000.ia16.inc.c" -}; +ALIGNED8 const u8 generic_0900B000[] = "textures/generic/bob_textures.0B000.ia16"; diff --git a/bin/grass.c b/bin/grass.c index 3df488d5..3ac8fd1f 100644 --- a/bin/grass.c +++ b/bin/grass.c @@ -3,121 +3,73 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 grass_09000000[] = { -#include "textures/grass/wf_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09000000[] = "textures/grass/wf_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 grass_09000800[] = { -#include "textures/grass/wf_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09000800[] = "textures/grass/wf_textures.00800.rgba16"; // 0x09001000 -ALIGNED8 const u8 grass_09001000[] = { -#include "textures/grass/wf_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09001000[] = "textures/grass/wf_textures.01000.rgba16"; // 0x09001800 -ALIGNED8 const u8 grass_09001800[] = { -#include "textures/grass/wf_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09001800[] = "textures/grass/wf_textures.01800.rgba16"; // 0x09002000 -ALIGNED8 const u8 grass_09002000[] = { -#include "textures/grass/wf_textures.02000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09002000[] = "textures/grass/wf_textures.02000.rgba16"; // 0x09002800 -ALIGNED8 const u8 grass_09002800[] = { -#include "textures/grass/wf_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09002800[] = "textures/grass/wf_textures.02800.rgba16"; // 0x09003000 -ALIGNED8 const u8 grass_09003000[] = { -#include "textures/grass/wf_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09003000[] = "textures/grass/wf_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 grass_09003800[] = { -#include "textures/grass/wf_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09003800[] = "textures/grass/wf_textures.03800.rgba16"; // 0x09004000 -ALIGNED8 const u8 grass_09004000[] = { -#include "textures/grass/wf_textures.04000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09004000[] = "textures/grass/wf_textures.04000.rgba16"; // 0x09004800 -ALIGNED8 const u8 grass_09004800[] = { -#include "textures/grass/wf_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09004800[] = "textures/grass/wf_textures.04800.rgba16"; // 0x09005000 -ALIGNED8 const u8 grass_09005000[] = { -#include "textures/grass/wf_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09005000[] = "textures/grass/wf_textures.05000.rgba16"; // 0x09005800 -ALIGNED8 const u8 grass_09005800[] = { -#include "textures/grass/wf_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09005800[] = "textures/grass/wf_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 grass_09006000[] = { -#include "textures/grass/wf_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09006000[] = "textures/grass/wf_textures.06000.rgba16"; // 0x09006800 -ALIGNED8 const u8 grass_09006800[] = { -#include "textures/grass/wf_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09006800[] = "textures/grass/wf_textures.06800.rgba16"; // 0x09007000 -ALIGNED8 const u8 grass_09007000[] = { -#include "textures/grass/wf_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09007000[] = "textures/grass/wf_textures.07000.rgba16"; // 0x09007800 -ALIGNED8 const u8 grass_09007800[] = { -#include "textures/grass/wf_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09007800[] = "textures/grass/wf_textures.07800.rgba16"; // 0x09008000 -ALIGNED8 const u8 grass_09008000[] = { -#include "textures/grass/wf_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09008000[] = "textures/grass/wf_textures.08000.rgba16"; // 0x09008800 -ALIGNED8 const u8 grass_09008800[] = { -#include "textures/grass/wf_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09008800[] = "textures/grass/wf_textures.08800.rgba16"; // 0x09009000 -ALIGNED8 const u8 grass_09009000[] = { -#include "textures/grass/wf_textures.09000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09009000[] = "textures/grass/wf_textures.09000.rgba16"; // 0x09009800 -ALIGNED8 const u8 grass_09009800[] = { -#include "textures/grass/wf_textures.09800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_09009800[] = "textures/grass/wf_textures.09800.rgba16"; // 0x0900A000 -ALIGNED8 const u8 grass_0900A000[] = { -#include "textures/grass/wf_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_0900A000[] = "textures/grass/wf_textures.0A000.rgba16"; // 0x0900A800 -ALIGNED8 const u8 grass_0900A800[] = { -#include "textures/grass/wf_textures.0A800.rgba16.inc.c" -}; +ALIGNED8 const u8 grass_0900A800[] = "textures/grass/wf_textures.0A800.rgba16"; // 0x0900B000 -ALIGNED8 const u8 grass_0900B000[] = { -#include "textures/grass/wf_textures.0B000.ia16.inc.c" -}; +ALIGNED8 const u8 grass_0900B000[] = "textures/grass/wf_textures.0B000.ia16"; // 0x0900B800 -ALIGNED8 const u8 grass_0900B800[] = { -#include "textures/grass/wf_textures.0B800.ia16.inc.c" -}; +ALIGNED8 const u8 grass_0900B800[] = "textures/grass/wf_textures.0B800.ia16"; diff --git a/bin/inside.c b/bin/inside.c index d668af33..091ee8a4 100644 --- a/bin/inside.c +++ b/bin/inside.c @@ -3,86 +3,52 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 inside_09000000[] = { -#include "textures/inside/inside_castle_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09000000[] = "textures/inside/inside_castle_textures.00000.rgba16"; // 0x09001000 -ALIGNED8 const u8 inside_09001000[] = { -#include "textures/inside/inside_castle_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09001000[] = "textures/inside/inside_castle_textures.01000.rgba16"; // 0x09002000 -ALIGNED8 const u8 inside_09002000[] = { -#include "textures/inside/inside_castle_textures.02000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09002000[] = "textures/inside/inside_castle_textures.02000.rgba16"; // 0x09003000 -ALIGNED8 const u8 inside_09003000[] = { -#include "textures/inside/inside_castle_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09003000[] = "textures/inside/inside_castle_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 inside_09003800[] = { -#include "textures/inside/inside_castle_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09003800[] = "textures/inside/inside_castle_textures.03800.rgba16"; // 0x09004000 -ALIGNED8 const u8 inside_09004000[] = { -#include "textures/inside/inside_castle_textures.04000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09004000[] = "textures/inside/inside_castle_textures.04000.rgba16"; // 0x09004800 -ALIGNED8 const u8 inside_09004800[] = { -#include "textures/inside/inside_castle_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09004800[] = "textures/inside/inside_castle_textures.04800.rgba16"; // 0x09005000 -ALIGNED8 const u8 inside_09005000[] = { -#include "textures/inside/inside_castle_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09005000[] = "textures/inside/inside_castle_textures.05000.rgba16"; // 0x09005800 -ALIGNED8 const u8 inside_09005800[] = { -#include "textures/inside/inside_castle_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09005800[] = "textures/inside/inside_castle_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 inside_09006000[] = { -#include "textures/inside/inside_castle_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09006000[] = "textures/inside/inside_castle_textures.06000.rgba16"; // 0x09007000 -ALIGNED8 const u8 inside_09007000[] = { -#include "textures/inside/inside_castle_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09007000[] = "textures/inside/inside_castle_textures.07000.rgba16"; // 0x09008000 -ALIGNED8 const u8 inside_09008000[] = { -#include "textures/inside/inside_castle_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09008000[] = "textures/inside/inside_castle_textures.08000.rgba16"; // 0x09008800 -ALIGNED8 const u8 inside_09008800[] = { -#include "textures/inside/inside_castle_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09008800[] = "textures/inside/inside_castle_textures.08800.rgba16"; // 0x09009000 -ALIGNED8 const u8 inside_09009000[] = { -#include "textures/inside/inside_castle_textures.09000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_09009000[] = "textures/inside/inside_castle_textures.09000.rgba16"; // 0x0900A000 -ALIGNED8 const u8 inside_0900A000[] = { -#include "textures/inside/inside_castle_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_0900A000[] = "textures/inside/inside_castle_textures.0A000.rgba16"; // 0x0900B000 -ALIGNED8 const u8 inside_0900B000[] = { -#include "textures/inside/inside_castle_textures.0B000.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_0900B000[] = "textures/inside/inside_castle_textures.0B000.rgba16"; // 0x0900B800 -ALIGNED8 const u8 inside_0900B800[] = { -#include "textures/inside/inside_castle_textures.0B800.rgba16.inc.c" -}; +ALIGNED8 const u8 inside_0900B800[] = "textures/inside/inside_castle_textures.0B800.rgba16"; diff --git a/bin/machine.c b/bin/machine.c index 95afb459..562827c5 100644 --- a/bin/machine.c +++ b/bin/machine.c @@ -3,86 +3,52 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 machine_09000000[] = { -#include "textures/machine/ttc_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09000000[] = "textures/machine/ttc_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 machine_09000800[] = { -#include "textures/machine/ttc_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09000800[] = "textures/machine/ttc_textures.00800.rgba16"; // 0x09001000 -ALIGNED8 const u8 machine_09001000[] = { -#include "textures/machine/ttc_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09001000[] = "textures/machine/ttc_textures.01000.rgba16"; // 0x09001800 -ALIGNED8 const u8 machine_09001800[] = { -#include "textures/machine/ttc_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09001800[] = "textures/machine/ttc_textures.01800.rgba16"; // 0x09002000 -ALIGNED8 const u8 machine_09002000[] = { -#include "textures/machine/ttc_textures.02000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09002000[] = "textures/machine/ttc_textures.02000.rgba16"; // 0x09002800 -ALIGNED8 const u8 machine_09002800[] = { -#include "textures/machine/ttc_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09002800[] = "textures/machine/ttc_textures.02800.rgba16"; // 0x09003000 -ALIGNED8 const u8 machine_09003000[] = { -#include "textures/machine/ttc_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09003000[] = "textures/machine/ttc_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 machine_09003800[] = { -#include "textures/machine/ttc_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09003800[] = "textures/machine/ttc_textures.03800.rgba16"; // 0x09004000 -ALIGNED8 const u8 machine_09004000[] = { -#include "textures/machine/ttc_textures.04000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09004000[] = "textures/machine/ttc_textures.04000.rgba16"; // 0x09005000 -ALIGNED8 const u8 machine_09005000[] = { -#include "textures/machine/ttc_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09005000[] = "textures/machine/ttc_textures.05000.rgba16"; // 0x09005800 -ALIGNED8 const u8 machine_09005800[] = { -#include "textures/machine/ttc_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09005800[] = "textures/machine/ttc_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 machine_09006000[] = { -#include "textures/machine/ttc_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09006000[] = "textures/machine/ttc_textures.06000.rgba16"; // 0x09006800 -ALIGNED8 const u8 machine_09006800[] = { -#include "textures/machine/ttc_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09006800[] = "textures/machine/ttc_textures.06800.rgba16"; // 0x09007000 -ALIGNED8 const u8 machine_09007000[] = { -#include "textures/machine/ttc_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09007000[] = "textures/machine/ttc_textures.07000.rgba16"; // 0x09007800 -ALIGNED8 const u8 machine_09007800[] = { -#include "textures/machine/ttc_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09007800[] = "textures/machine/ttc_textures.07800.rgba16"; // 0x09008000 -ALIGNED8 const u8 machine_09008000[] = { -#include "textures/machine/ttc_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09008000[] = "textures/machine/ttc_textures.08000.rgba16"; // 0x09008400 -ALIGNED8 const u8 machine_09008400[] = { -#include "textures/machine/ttc_textures.08400.rgba16.inc.c" -}; +ALIGNED8 const u8 machine_09008400[] = "textures/machine/ttc_textures.08400.rgba16"; diff --git a/bin/mountain.c b/bin/mountain.c index 8a675c39..87a16139 100644 --- a/bin/mountain.c +++ b/bin/mountain.c @@ -3,106 +3,64 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 mountain_09000000[] = { -#include "textures/mountain/ttm_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09000000[] = "textures/mountain/ttm_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 mountain_09000800[] = { -#include "textures/mountain/ttm_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09000800[] = "textures/mountain/ttm_textures.00800.rgba16"; // 0x09001800 -ALIGNED8 const u8 mountain_09001800[] = { -#include "textures/mountain/ttm_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09001800[] = "textures/mountain/ttm_textures.01800.rgba16"; // 0x09002800 -ALIGNED8 const u8 mountain_09002800[] = { -#include "textures/mountain/ttm_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09002800[] = "textures/mountain/ttm_textures.02800.rgba16"; // 0x09003000 -ALIGNED8 const u8 mountain_09003000[] = { -#include "textures/mountain/ttm_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09003000[] = "textures/mountain/ttm_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 mountain_09003800[] = { -#include "textures/mountain/ttm_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09003800[] = "textures/mountain/ttm_textures.03800.rgba16"; // 0x09004000 -ALIGNED8 const u8 mountain_09004000[] = { -#include "textures/mountain/ttm_textures.04000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09004000[] = "textures/mountain/ttm_textures.04000.rgba16"; // 0x09004800 -ALIGNED8 const u8 mountain_09004800[] = { -#include "textures/mountain/ttm_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09004800[] = "textures/mountain/ttm_textures.04800.rgba16"; // 0x09005000 -ALIGNED8 const u8 mountain_09005000[] = { -#include "textures/mountain/ttm_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09005000[] = "textures/mountain/ttm_textures.05000.rgba16"; // 0x09005800 -ALIGNED8 const u8 mountain_09005800[] = { -#include "textures/mountain/ttm_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09005800[] = "textures/mountain/ttm_textures.05800.rgba16"; // 0x09006800 -ALIGNED8 const u8 mountain_09006800[] = { -#include "textures/mountain/ttm_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09006800[] = "textures/mountain/ttm_textures.06800.rgba16"; // 0x09007000 -ALIGNED8 const u8 mountain_09007000[] = { -#include "textures/mountain/ttm_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09007000[] = "textures/mountain/ttm_textures.07000.rgba16"; // 0x09007800 -ALIGNED8 const u8 mountain_09007800[] = { -#include "textures/mountain/ttm_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09007800[] = "textures/mountain/ttm_textures.07800.rgba16"; // 0x09008000 -ALIGNED8 const u8 mountain_09008000[] = { -#include "textures/mountain/ttm_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09008000[] = "textures/mountain/ttm_textures.08000.rgba16"; // 0x09008800 -ALIGNED8 const u8 mountain_09008800[] = { -#include "textures/mountain/ttm_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09008800[] = "textures/mountain/ttm_textures.08800.rgba16"; // 0x09009800 -ALIGNED8 const u8 mountain_09009800[] = { -#include "textures/mountain/ttm_textures.09800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_09009800[] = "textures/mountain/ttm_textures.09800.rgba16"; // 0x0900A000 -ALIGNED8 const u8 mountain_0900A000[] = { -#include "textures/mountain/ttm_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_0900A000[] = "textures/mountain/ttm_textures.0A000.rgba16"; // 0x0900A800 -ALIGNED8 const u8 mountain_0900A800[] = { -#include "textures/mountain/ttm_textures.0A800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_0900A800[] = "textures/mountain/ttm_textures.0A800.rgba16"; // 0x0900B000 -ALIGNED8 const u8 mountain_0900B000[] = { -#include "textures/mountain/ttm_textures.0B000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_0900B000[] = "textures/mountain/ttm_textures.0B000.rgba16"; // 0x0900B800 -ALIGNED8 const u8 mountain_0900B800[] = { -#include "textures/mountain/ttm_textures.0B800.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_0900B800[] = "textures/mountain/ttm_textures.0B800.rgba16"; // 0x0900C000 -ALIGNED8 const u8 mountain_0900C000[] = { -#include "textures/mountain/ttm_textures.0C000.rgba16.inc.c" -}; +ALIGNED8 const u8 mountain_0900C000[] = "textures/mountain/ttm_textures.0C000.rgba16"; diff --git a/bin/outside.c b/bin/outside.c index 8de85134..04dfc447 100644 --- a/bin/outside.c +++ b/bin/outside.c @@ -3,107 +3,65 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 outside_09000000[] = { -#include "textures/outside/castle_grounds_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09000000[] = "textures/outside/castle_grounds_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 outside_09000800[] = { -#include "textures/outside/castle_grounds_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09000800[] = "textures/outside/castle_grounds_textures.00800.rgba16"; // 0x09001000 -ALIGNED8 const u8 outside_09001000[] = { -#include "textures/outside/castle_grounds_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09001000[] = "textures/outside/castle_grounds_textures.01000.rgba16"; // 0x09002000 -ALIGNED8 const u8 outside_09002000[] = { -#include "textures/outside/castle_grounds_textures.02000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09002000[] = "textures/outside/castle_grounds_textures.02000.rgba16"; // 0x09003000 -ALIGNED8 const u8 outside_09003000[] = { -#include "textures/outside/castle_grounds_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09003000[] = "textures/outside/castle_grounds_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 outside_09003800[] = { -#include "textures/outside/castle_grounds_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09003800[] = "textures/outside/castle_grounds_textures.03800.rgba16"; // 0x09004000 -ALIGNED8 const u8 outside_09004000[] = { -#include "textures/outside/castle_grounds_textures.04000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09004000[] = "textures/outside/castle_grounds_textures.04000.rgba16"; // 0x09004800 -ALIGNED8 const u8 outside_09004800[] = { -#include "textures/outside/castle_grounds_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09004800[] = "textures/outside/castle_grounds_textures.04800.rgba16"; // 0x09005800 -ALIGNED8 const u8 outside_09005800[] = { -#include "textures/outside/castle_grounds_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09005800[] = "textures/outside/castle_grounds_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 outside_09006000[] = { -#include "textures/outside/castle_grounds_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09006000[] = "textures/outside/castle_grounds_textures.06000.rgba16"; // 0x09006800 -ALIGNED8 const u8 outside_09006800[] = { -#include "textures/outside/castle_grounds_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09006800[] = "textures/outside/castle_grounds_textures.06800.rgba16"; // 0x09007800 -ALIGNED8 const u8 outside_09007800[] = { -#include "textures/outside/castle_grounds_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09007800[] = "textures/outside/castle_grounds_textures.07800.rgba16"; // 0x09008000 -ALIGNED8 const u8 outside_09008000[] = { -#include "textures/outside/castle_grounds_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09008000[] = "textures/outside/castle_grounds_textures.08000.rgba16"; // 0x09008800 -ALIGNED8 const u8 outside_09008800[] = { -#include "textures/outside/castle_grounds_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09008800[] = "textures/outside/castle_grounds_textures.08800.rgba16"; // 0x09009000 -ALIGNED8 const u8 outside_09009000[] = { -#include "textures/outside/castle_grounds_textures.09000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09009000[] = "textures/outside/castle_grounds_textures.09000.rgba16"; // 0x09009800 -ALIGNED8 const u8 outside_09009800[] = { -#include "textures/outside/castle_grounds_textures.09800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_09009800[] = "textures/outside/castle_grounds_textures.09800.rgba16"; // 0x0900A000 -ALIGNED8 const u8 outside_0900A000[] = { -#include "textures/outside/castle_grounds_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_0900A000[] = "textures/outside/castle_grounds_textures.0A000.rgba16"; // 0x0900A800 -ALIGNED8 const u8 outside_0900A800[] = { -#include "textures/outside/castle_grounds_textures.0A800.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_0900A800[] = "textures/outside/castle_grounds_textures.0A800.rgba16"; // 0x0900B000 -ALIGNED8 const u8 outside_0900B000[] = { -#include "textures/outside/castle_grounds_textures.0B000.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_0900B000[] = "textures/outside/castle_grounds_textures.0B000.rgba16"; // 0x0900B400 -ALIGNED8 const u8 outside_0900B400[] = { -#include "textures/outside/castle_grounds_textures.0B400.rgba16.inc.c" -}; +ALIGNED8 const u8 outside_0900B400[] = "textures/outside/castle_grounds_textures.0B400.rgba16"; // 0x0900BC00 -ALIGNED8 const u8 outside_0900BC00[] = { -#include "textures/outside/castle_grounds_textures.0BC00.ia16.inc.c" -}; +ALIGNED8 const u8 outside_0900BC00[] = "textures/outside/castle_grounds_textures.0BC00.ia16"; diff --git a/bin/segment2.c b/bin/segment2.c index a6756e95..83e56c97 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -6,1799 +6,915 @@ // SM64 (US/JP/EU) Segment 02 -ALIGNED8 static const u8 texture_hud_char_0[] = { -#include "textures/segment2/segment2.00000.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_0[] = "textures/segment2/segment2.00000.rgba16"; -ALIGNED8 static const u8 texture_hud_char_1[] = { -#include "textures/segment2/segment2.00200.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_1[] = "textures/segment2/segment2.00200.rgba16"; -ALIGNED8 static const u8 texture_hud_char_2[] = { -#include "textures/segment2/segment2.00400.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_2[] = "textures/segment2/segment2.00400.rgba16"; -ALIGNED8 static const u8 texture_hud_char_3[] = { -#include "textures/segment2/segment2.00600.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_3[] = "textures/segment2/segment2.00600.rgba16"; -ALIGNED8 static const u8 texture_hud_char_4[] = { -#include "textures/segment2/segment2.00800.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_4[] = "textures/segment2/segment2.00800.rgba16"; -ALIGNED8 static const u8 texture_hud_char_5[] = { -#include "textures/segment2/segment2.00A00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_5[] = "textures/segment2/segment2.00A00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_6[] = { -#include "textures/segment2/segment2.00C00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_6[] = "textures/segment2/segment2.00C00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_7[] = { -#include "textures/segment2/segment2.00E00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_7[] = "textures/segment2/segment2.00E00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_8[] = { -#include "textures/segment2/segment2.01000.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_8[] = "textures/segment2/segment2.01000.rgba16"; -ALIGNED8 static const u8 texture_hud_char_9[] = { -#include "textures/segment2/segment2.01200.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_9[] = "textures/segment2/segment2.01200.rgba16"; -ALIGNED8 static const u8 texture_hud_char_A[] = { -#include "textures/segment2/segment2.01400.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_A[] = "textures/segment2/segment2.01400.rgba16"; -ALIGNED8 static const u8 texture_hud_char_B[] = { -#include "textures/segment2/segment2.01600.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_B[] = "textures/segment2/segment2.01600.rgba16"; -ALIGNED8 static const u8 texture_hud_char_C[] = { -#include "textures/segment2/segment2.01800.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_C[] = "textures/segment2/segment2.01800.rgba16"; -ALIGNED8 static const u8 texture_hud_char_D[] = { -#include "textures/segment2/segment2.01A00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_D[] = "textures/segment2/segment2.01A00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_E[] = { -#include "textures/segment2/segment2.01C00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_E[] = "textures/segment2/segment2.01C00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_F[] = { -#include "textures/segment2/segment2.01E00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_F[] = "textures/segment2/segment2.01E00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_G[] = { -#include "textures/segment2/segment2.02000.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_G[] = "textures/segment2/segment2.02000.rgba16"; -ALIGNED8 static const u8 texture_hud_char_H[] = { -#include "textures/segment2/segment2.02200.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_H[] = "textures/segment2/segment2.02200.rgba16"; -ALIGNED8 static const u8 texture_hud_char_I[] = { -#include "textures/segment2/segment2.02400.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_I[] = "textures/segment2/segment2.02400.rgba16"; #if defined(VERSION_JP) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_hud_char_J[] = { -#include "textures/segment2/segment2.02600.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_J[] = "textures/segment2/segment2.02600.rgba16"; #endif -ALIGNED8 static const u8 texture_hud_char_K[] = { -#include "textures/segment2/segment2.02800.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_K[] = "textures/segment2/segment2.02800.rgba16"; -ALIGNED8 static const u8 texture_hud_char_L[] = { -#include "textures/segment2/segment2.02A00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_L[] = "textures/segment2/segment2.02A00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_M[] = { -#include "textures/segment2/segment2.02C00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_M[] = "textures/segment2/segment2.02C00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_N[] = { -#include "textures/segment2/segment2.02E00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_N[] = "textures/segment2/segment2.02E00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_O[] = { -#include "textures/segment2/segment2.03000.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_O[] = "textures/segment2/segment2.03000.rgba16"; -ALIGNED8 static const u8 texture_hud_char_P[] = { -#include "textures/segment2/segment2.03200.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_P[] = "textures/segment2/segment2.03200.rgba16"; #if defined(VERSION_JP) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_hud_char_Q[] = { -#include "textures/segment2/segment2.03400.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_Q[] = "textures/segment2/segment2.03400.rgba16"; #endif -ALIGNED8 static const u8 texture_hud_char_R[] = { -#include "textures/segment2/segment2.03600.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_R[] = "textures/segment2/segment2.03600.rgba16"; -ALIGNED8 static const u8 texture_hud_char_S[] = { -#include "textures/segment2/segment2.03800.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_S[] = "textures/segment2/segment2.03800.rgba16"; -ALIGNED8 static const u8 texture_hud_char_T[] = { -#include "textures/segment2/segment2.03A00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_T[] = "textures/segment2/segment2.03A00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_U[] = { -#include "textures/segment2/segment2.03C00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_U[] = "textures/segment2/segment2.03C00.rgba16"; #if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_hud_char_V[] = { -#include "textures/segment2/segment2.03E00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_V[] = "textures/segment2/segment2.03E00.rgba16"; #endif -ALIGNED8 static const u8 texture_hud_char_W[] = { -#include "textures/segment2/segment2.04000.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_W[] = "textures/segment2/segment2.04000.rgba16"; #if defined(VERSION_JP) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_hud_char_X[] = { -#include "textures/segment2/segment2.04200.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_X[] = "textures/segment2/segment2.04200.rgba16"; #endif -ALIGNED8 static const u8 texture_hud_char_Y[] = { -#include "textures/segment2/segment2.04400.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_Y[] = "textures/segment2/segment2.04400.rgba16"; #if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_hud_char_Z[] = { -#include "textures/segment2/segment2.04600.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_Z[] = "textures/segment2/segment2.04600.rgba16"; #endif -ALIGNED8 static const u8 texture_hud_char_apostrophe[] = { -#include "textures/segment2/segment2.04800.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_apostrophe[] = "textures/segment2/segment2.04800.rgba16"; -ALIGNED8 static const u8 texture_hud_char_double_quote[] = { -#include "textures/segment2/segment2.04A00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_double_quote[] = "textures/segment2/segment2.04A00.rgba16"; #ifdef VERSION_EU -ALIGNED8 static const u8 texture_hud_char_umlaut[] = { -#include "textures/segment2/segment2.umlaut.rgba16.inc.c"// EU ¨ -}; +ALIGNED8 static const u8 texture_hud_char_umlaut[] = "textures/segment2/segment2.umlaut.rgba16"// EU ¨; #endif #if defined(VERSION_JP) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_hud_char_exclamation[] = { -#include "textures/segment2/segment2.04C00.rgba16.inc.c"// JP ! -}; +ALIGNED8 static const u8 texture_hud_char_exclamation[] = "textures/segment2/segment2.04C00.rgba16"// JP !; -ALIGNED8 static const u8 texture_hud_char_double_exclamation[] = { -#include "textures/segment2/segment2.04E00.rgba16.inc.c"// JP !! -}; +ALIGNED8 static const u8 texture_hud_char_double_exclamation[] = "textures/segment2/segment2.04E00.rgba16"// JP !!; -ALIGNED8 static const u8 texture_hud_char_question[] = { -#include "textures/segment2/segment2.05000.rgba16.inc.c"// JP ? -}; +ALIGNED8 static const u8 texture_hud_char_question[] = "textures/segment2/segment2.05000.rgba16"// JP ?; -ALIGNED8 static const u8 texture_hud_char_ampersand[] = { -#include "textures/segment2/segment2.05200.rgba16.inc.c"// JP & -}; +ALIGNED8 static const u8 texture_hud_char_ampersand[] = "textures/segment2/segment2.05200.rgba16"// JP &; -ALIGNED8 static const u8 texture_hud_char_percent[] = { -#include "textures/segment2/segment2.05400.rgba16.inc.c"// JP % -}; +ALIGNED8 static const u8 texture_hud_char_percent[] = "textures/segment2/segment2.05400.rgba16"// JP %; #endif -ALIGNED8 static const u8 texture_hud_char_multiply[] = { -#include "textures/segment2/segment2.05600.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_multiply[] = "textures/segment2/segment2.05600.rgba16"; -ALIGNED8 static const u8 texture_hud_char_coin[] = { -#include "textures/segment2/segment2.05800.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_coin[] = "textures/segment2/segment2.05800.rgba16"; -ALIGNED8 static const u8 texture_hud_char_mario_head[] = { -#include "textures/segment2/segment2.05A00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_mario_head[] = "textures/segment2/segment2.05A00.rgba16"; -ALIGNED8 static const u8 texture_hud_char_star[] = { -#include "textures/segment2/segment2.05C00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_star[] = "textures/segment2/segment2.05C00.rgba16"; #if defined(VERSION_JP) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_hud_char_decimal_point[] = { -#include "textures/segment2/segment2.05E00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_decimal_point[] = "textures/segment2/segment2.05E00.rgba16"; #endif #if defined(VERSION_JP) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_hud_char_beta_key[] = { -#include "textures/segment2/segment2.06000.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_beta_key[] = "textures/segment2/segment2.06000.rgba16"; #endif -ALIGNED8 static const u8 texture_credits_char_3[] = { -#include "textures/segment2/segment2.06200.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_3[] = "textures/segment2/segment2.06200.rgba16"; -ALIGNED8 static const u8 texture_credits_char_4[] = { -#include "textures/segment2/segment2.06280.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_4[] = "textures/segment2/segment2.06280.rgba16"; -ALIGNED8 static const u8 texture_credits_char_6[] = { -#include "textures/segment2/segment2.06300.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_6[] = "textures/segment2/segment2.06300.rgba16"; -ALIGNED8 static const u8 texture_credits_char_A[] = { -#include "textures/segment2/segment2.06380.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_A[] = "textures/segment2/segment2.06380.rgba16"; -ALIGNED8 static const u8 texture_credits_char_B[] = { -#include "textures/segment2/segment2.06400.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_B[] = "textures/segment2/segment2.06400.rgba16"; -ALIGNED8 static const u8 texture_credits_char_C[] = { -#include "textures/segment2/segment2.06480.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_C[] = "textures/segment2/segment2.06480.rgba16"; -ALIGNED8 static const u8 texture_credits_char_D[] = { -#include "textures/segment2/segment2.06500.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_D[] = "textures/segment2/segment2.06500.rgba16"; -ALIGNED8 static const u8 texture_credits_char_E[] = { -#include "textures/segment2/segment2.06580.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_E[] = "textures/segment2/segment2.06580.rgba16"; -ALIGNED8 static const u8 texture_credits_char_F[] = { -#include "textures/segment2/segment2.06600.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_F[] = "textures/segment2/segment2.06600.rgba16"; -ALIGNED8 static const u8 texture_credits_char_G[] = { -#include "textures/segment2/segment2.06680.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_G[] = "textures/segment2/segment2.06680.rgba16"; -ALIGNED8 static const u8 texture_credits_char_H[] = { -#include "textures/segment2/segment2.06700.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_H[] = "textures/segment2/segment2.06700.rgba16"; -ALIGNED8 static const u8 texture_credits_char_I[] = { -#include "textures/segment2/segment2.06780.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_I[] = "textures/segment2/segment2.06780.rgba16"; -ALIGNED8 static const u8 texture_credits_char_J[] = { -#include "textures/segment2/segment2.06800.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_J[] = "textures/segment2/segment2.06800.rgba16"; -ALIGNED8 static const u8 texture_credits_char_K[] = { -#include "textures/segment2/segment2.06880.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_K[] = "textures/segment2/segment2.06880.rgba16"; -ALIGNED8 static const u8 texture_credits_char_L[] = { -#include "textures/segment2/segment2.06900.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_L[] = "textures/segment2/segment2.06900.rgba16"; -ALIGNED8 static const u8 texture_credits_char_M[] = { -#include "textures/segment2/segment2.06980.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_M[] = "textures/segment2/segment2.06980.rgba16"; -ALIGNED8 static const u8 texture_credits_char_N[] = { -#include "textures/segment2/segment2.06A00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_N[] = "textures/segment2/segment2.06A00.rgba16"; -ALIGNED8 static const u8 texture_credits_char_O[] = { -#include "textures/segment2/segment2.06A80.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_O[] = "textures/segment2/segment2.06A80.rgba16"; -ALIGNED8 static const u8 texture_credits_char_P[] = { -#include "textures/segment2/segment2.06B00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_P[] = "textures/segment2/segment2.06B00.rgba16"; -ALIGNED8 static const u8 texture_credits_char_Q[] = { -#include "textures/segment2/segment2.06B80.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_Q[] = "textures/segment2/segment2.06B80.rgba16"; -ALIGNED8 static const u8 texture_credits_char_R[] = { -#include "textures/segment2/segment2.06C00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_R[] = "textures/segment2/segment2.06C00.rgba16"; -ALIGNED8 static const u8 texture_credits_char_S[] = { -#include "textures/segment2/segment2.06C80.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_S[] = "textures/segment2/segment2.06C80.rgba16"; -ALIGNED8 static const u8 texture_credits_char_T[] = { -#include "textures/segment2/segment2.06D00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_T[] = "textures/segment2/segment2.06D00.rgba16"; -ALIGNED8 static const u8 texture_credits_char_U[] = { -#include "textures/segment2/segment2.06D80.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_U[] = "textures/segment2/segment2.06D80.rgba16"; -ALIGNED8 static const u8 texture_credits_char_V[] = { -#include "textures/segment2/segment2.06E00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_V[] = "textures/segment2/segment2.06E00.rgba16"; -ALIGNED8 static const u8 texture_credits_char_W[] = { -#include "textures/segment2/segment2.06E80.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_W[] = "textures/segment2/segment2.06E80.rgba16"; -ALIGNED8 static const u8 texture_credits_char_X[] = { -#include "textures/segment2/segment2.06F00.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_X[] = "textures/segment2/segment2.06F00.rgba16"; -ALIGNED8 static const u8 texture_credits_char_Y[] = { -#include "textures/segment2/segment2.06F80.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_Y[] = "textures/segment2/segment2.06F80.rgba16"; -ALIGNED8 static const u8 texture_credits_char_Z[] = { -#include "textures/segment2/segment2.07000.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_Z[] = "textures/segment2/segment2.07000.rgba16"; -ALIGNED8 static const u8 texture_credits_char_period[] = { -#include "textures/segment2/segment2.07080.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_credits_char_period[] = "textures/segment2/segment2.07080.rgba16"; // JP Small Font #if defined(VERSION_JP) || defined(VERSION_SH) -ALIGNED8 static const u8 texture_font_char_jp_0[] = { -#include "textures/segment2/segment2.07100.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_0[] = "textures/segment2/segment2.07100.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_1[] = { -#include "textures/segment2/segment2.07110.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_1[] = "textures/segment2/segment2.07110.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_2[] = { -#include "textures/segment2/segment2.07120.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_2[] = "textures/segment2/segment2.07120.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_3[] = { -#include "textures/segment2/segment2.07130.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_3[] = "textures/segment2/segment2.07130.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_4[] = { -#include "textures/segment2/segment2.07140.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_4[] = "textures/segment2/segment2.07140.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_5[] = { -#include "textures/segment2/segment2.07150.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_5[] = "textures/segment2/segment2.07150.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_6[] = { -#include "textures/segment2/segment2.07160.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_6[] = "textures/segment2/segment2.07160.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_7[] = { -#include "textures/segment2/segment2.07170.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_7[] = "textures/segment2/segment2.07170.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_8[] = { -#include "textures/segment2/segment2.07180.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_8[] = "textures/segment2/segment2.07180.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_9[] = { -#include "textures/segment2/segment2.07190.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_9[] = "textures/segment2/segment2.07190.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_A[] = { -#include "textures/segment2/segment2.071A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_A[] = "textures/segment2/segment2.071A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_B[] = { -#include "textures/segment2/segment2.071B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_B[] = "textures/segment2/segment2.071B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_C[] = { -#include "textures/segment2/segment2.071C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_C[] = "textures/segment2/segment2.071C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_D[] = { -#include "textures/segment2/segment2.071D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_D[] = "textures/segment2/segment2.071D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_E[] = { -#include "textures/segment2/segment2.071E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_E[] = "textures/segment2/segment2.071E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_F[] = { -#include "textures/segment2/segment2.071F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_F[] = "textures/segment2/segment2.071F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_G[] = { -#include "textures/segment2/segment2.07200.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_G[] = "textures/segment2/segment2.07200.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_H[] = { -#include "textures/segment2/segment2.07210.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_H[] = "textures/segment2/segment2.07210.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_I[] = { -#include "textures/segment2/segment2.07220.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_I[] = "textures/segment2/segment2.07220.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_J[] = { -#include "textures/segment2/segment2.07230.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_J[] = "textures/segment2/segment2.07230.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_K[] = { -#include "textures/segment2/segment2.07240.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_K[] = "textures/segment2/segment2.07240.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_L[] = { -#include "textures/segment2/segment2.07250.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_L[] = "textures/segment2/segment2.07250.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_M[] = { -#include "textures/segment2/segment2.07260.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_M[] = "textures/segment2/segment2.07260.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_N[] = { -#include "textures/segment2/segment2.07270.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_N[] = "textures/segment2/segment2.07270.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_O[] = { -#include "textures/segment2/segment2.07280.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_O[] = "textures/segment2/segment2.07280.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_P[] = { -#include "textures/segment2/segment2.07290.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_P[] = "textures/segment2/segment2.07290.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_Q[] = { -#include "textures/segment2/segment2.072A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_Q[] = "textures/segment2/segment2.072A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_R[] = { -#include "textures/segment2/segment2.072B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_R[] = "textures/segment2/segment2.072B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_S[] = { -#include "textures/segment2/segment2.072C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_S[] = "textures/segment2/segment2.072C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_T[] = { -#include "textures/segment2/segment2.072D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_T[] = "textures/segment2/segment2.072D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_U[] = { -#include "textures/segment2/segment2.072E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_U[] = "textures/segment2/segment2.072E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_V[] = { -#include "textures/segment2/segment2.072F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_V[] = "textures/segment2/segment2.072F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_W[] = { -#include "textures/segment2/segment2.07300.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_W[] = "textures/segment2/segment2.07300.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_X[] = { -#include "textures/segment2/segment2.07310.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_X[] = "textures/segment2/segment2.07310.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_Y[] = { -#include "textures/segment2/segment2.07320.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_Y[] = "textures/segment2/segment2.07320.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_Z[] = { -#include "textures/segment2/segment2.07330.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_Z[] = "textures/segment2/segment2.07330.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_long_vowel[] = { -#include "textures/segment2/segment2.07340.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_long_vowel[] = "textures/segment2/segment2.07340.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_exclamation[] = { -#include "textures/segment2/segment2.07350.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_exclamation[] = "textures/segment2/segment2.07350.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_dakuten[] = { -#include "textures/segment2/segment2.07360.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_dakuten[] = "textures/segment2/segment2.07360.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_handakuten[] = { -#include "textures/segment2/segment2.07370.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_handakuten[] = "textures/segment2/segment2.07370.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_percent[] = { -#include "textures/segment2/segment2.07380.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_percent[] = "textures/segment2/segment2.07380.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_question[] = { -#include "textures/segment2/segment2.07390.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_question[] = "textures/segment2/segment2.07390.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_left_right_arrow[] = { -#include "textures/segment2/segment2.073A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_left_right_arrow[] = "textures/segment2/segment2.073A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_open_parentheses[] = { -#include "textures/segment2/segment2.073B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_open_parentheses[] = "textures/segment2/segment2.073B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_close_open_parentheses[] = { -#include "textures/segment2/segment2.073C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_close_open_parentheses[] = "textures/segment2/segment2.073C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_close_parentheses[] = { -#include "textures/segment2/segment2.073D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_close_parentheses[] = "textures/segment2/segment2.073D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_coin[] = { -#include "textures/segment2/segment2.073E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_coin[] = "textures/segment2/segment2.073E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_multiply[] = { -#include "textures/segment2/segment2.073F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_multiply[] = "textures/segment2/segment2.073F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_star_filled[] = { -#include "textures/segment2/segment2.07400.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_star_filled[] = "textures/segment2/segment2.07400.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_star_hollow[] = { -#include "textures/segment2/segment2.07410.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_star_hollow[] = "textures/segment2/segment2.07410.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_a[] = { -#include "textures/segment2/segment2.07420.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_a[] = "textures/segment2/segment2.07420.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_i[] = { -#include "textures/segment2/segment2.07430.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_i[] = "textures/segment2/segment2.07430.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_u[] = { -#include "textures/segment2/segment2.07440.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_u[] = "textures/segment2/segment2.07440.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_c[] = { -#include "textures/segment2/segment2.07450.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_c[] = "textures/segment2/segment2.07450.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_o[] = { -#include "textures/segment2/segment2.07460.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_o[] = "textures/segment2/segment2.07460.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ka[] = { -#include "textures/segment2/segment2.07470.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ka[] = "textures/segment2/segment2.07470.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ki[] = { -#include "textures/segment2/segment2.07480.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ki[] = "textures/segment2/segment2.07480.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ku[] = { -#include "textures/segment2/segment2.07490.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ku[] = "textures/segment2/segment2.07490.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ke[] = { -#include "textures/segment2/segment2.074A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ke[] = "textures/segment2/segment2.074A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ko[] = { -#include "textures/segment2/segment2.074B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ko[] = "textures/segment2/segment2.074B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_sa[] = { -#include "textures/segment2/segment2.074C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_sa[] = "textures/segment2/segment2.074C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_shi[] = { -#include "textures/segment2/segment2.074D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_shi[] = "textures/segment2/segment2.074D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_su[] = { -#include "textures/segment2/segment2.074E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_su[] = "textures/segment2/segment2.074E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_se[] = { -#include "textures/segment2/segment2.074F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_se[] = "textures/segment2/segment2.074F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_so[] = { -#include "textures/segment2/segment2.07500.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_so[] = "textures/segment2/segment2.07500.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ta[] = { -#include "textures/segment2/segment2.07510.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ta[] = "textures/segment2/segment2.07510.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_chi[] = { -#include "textures/segment2/segment2.07520.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_chi[] = "textures/segment2/segment2.07520.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_tsu[] = { -#include "textures/segment2/segment2.07530.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_tsu[] = "textures/segment2/segment2.07530.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_te[] = { -#include "textures/segment2/segment2.07540.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_te[] = "textures/segment2/segment2.07540.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_to[] = { -#include "textures/segment2/segment2.07550.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_to[] = "textures/segment2/segment2.07550.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_na[] = { -#include "textures/segment2/segment2.07560.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_na[] = "textures/segment2/segment2.07560.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ni[] = { -#include "textures/segment2/segment2.07570.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ni[] = "textures/segment2/segment2.07570.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_nu[] = { -#include "textures/segment2/segment2.07580.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_nu[] = "textures/segment2/segment2.07580.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ne[] = { -#include "textures/segment2/segment2.07590.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ne[] = "textures/segment2/segment2.07590.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_no[] = { -#include "textures/segment2/segment2.075A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_no[] = "textures/segment2/segment2.075A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ha[] = { -#include "textures/segment2/segment2.075B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ha[] = "textures/segment2/segment2.075B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_hi[] = { -#include "textures/segment2/segment2.075C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_hi[] = "textures/segment2/segment2.075C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_hu[] = { -#include "textures/segment2/segment2.075D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_hu[] = "textures/segment2/segment2.075D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_he[] = { -#include "textures/segment2/segment2.075E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_he[] = "textures/segment2/segment2.075E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ho[] = { -#include "textures/segment2/segment2.075F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ho[] = "textures/segment2/segment2.075F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ma[] = { -#include "textures/segment2/segment2.07600.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ma[] = "textures/segment2/segment2.07600.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_mi[] = { -#include "textures/segment2/segment2.07610.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_mi[] = "textures/segment2/segment2.07610.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_mu[] = { -#include "textures/segment2/segment2.07620.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_mu[] = "textures/segment2/segment2.07620.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_me[] = { -#include "textures/segment2/segment2.07630.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_me[] = "textures/segment2/segment2.07630.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_mo[] = { -#include "textures/segment2/segment2.07640.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_mo[] = "textures/segment2/segment2.07640.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ya[] = { -#include "textures/segment2/segment2.07650.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ya[] = "textures/segment2/segment2.07650.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_yu[] = { -#include "textures/segment2/segment2.07660.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_yu[] = "textures/segment2/segment2.07660.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_yo[] = { -#include "textures/segment2/segment2.07670.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_yo[] = "textures/segment2/segment2.07670.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ra[] = { -#include "textures/segment2/segment2.07680.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ra[] = "textures/segment2/segment2.07680.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ri[] = { -#include "textures/segment2/segment2.07690.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ri[] = "textures/segment2/segment2.07690.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ru[] = { -#include "textures/segment2/segment2.076A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ru[] = "textures/segment2/segment2.076A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_re[] = { -#include "textures/segment2/segment2.076B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_re[] = "textures/segment2/segment2.076B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_ro[] = { -#include "textures/segment2/segment2.076C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_ro[] = "textures/segment2/segment2.076C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_wa[] = { -#include "textures/segment2/segment2.076D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_wa[] = "textures/segment2/segment2.076D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_wo[] = { -#include "textures/segment2/segment2.076E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_wo[] = "textures/segment2/segment2.076E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_n[] = { -#include "textures/segment2/segment2.076F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_n[] = "textures/segment2/segment2.076F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_e[] = { -#include "textures/segment2/segment2.07700.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_e[] = "textures/segment2/segment2.07700.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_tsu[] = { -#include "textures/segment2/segment2.07710.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_tsu[] = "textures/segment2/segment2.07710.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_ya[] = { -#include "textures/segment2/segment2.07720.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_ya[] = "textures/segment2/segment2.07720.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_yu[] = { -#include "textures/segment2/segment2.07730.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_yu[] = "textures/segment2/segment2.07730.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_yo[] = { -#include "textures/segment2/segment2.07740.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_yo[] = "textures/segment2/segment2.07740.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_a[] = { -#include "textures/segment2/segment2.07750.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_a[] = "textures/segment2/segment2.07750.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_i[] = { -#include "textures/segment2/segment2.07760.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_i[] = "textures/segment2/segment2.07760.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_o[] = { -#include "textures/segment2/segment2.07770.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_o[] = "textures/segment2/segment2.07770.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_u[] = { -#include "textures/segment2/segment2.07780.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_hiragana_small_u[] = "textures/segment2/segment2.07780.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_interpunct[] = { -#include "textures/segment2/segment2.07790.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_interpunct[] = "textures/segment2/segment2.07790.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_comma[] = { -#include "textures/segment2/segment2.077A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_comma[] = "textures/segment2/segment2.077A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_a[] = { -#include "textures/segment2/segment2.077B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_a[] = "textures/segment2/segment2.077B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_i[] = { -#include "textures/segment2/segment2.077C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_i[] = "textures/segment2/segment2.077C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_u[] = { -#include "textures/segment2/segment2.077D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_u[] = "textures/segment2/segment2.077D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_e[] = { -#include "textures/segment2/segment2.077E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_e[] = "textures/segment2/segment2.077E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_o[] = { -#include "textures/segment2/segment2.077F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_o[] = "textures/segment2/segment2.077F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ka[] = { -#include "textures/segment2/segment2.07800.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ka[] = "textures/segment2/segment2.07800.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ki[] = { -#include "textures/segment2/segment2.07810.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ki[] = "textures/segment2/segment2.07810.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ku[] = { -#include "textures/segment2/segment2.07820.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ku[] = "textures/segment2/segment2.07820.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ke[] = { -#include "textures/segment2/segment2.07830.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ke[] = "textures/segment2/segment2.07830.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ko[] = { -#include "textures/segment2/segment2.07840.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ko[] = "textures/segment2/segment2.07840.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_sa[] = { -#include "textures/segment2/segment2.07850.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_sa[] = "textures/segment2/segment2.07850.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_shi[] = { -#include "textures/segment2/segment2.07860.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_shi[] = "textures/segment2/segment2.07860.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_su[] = { -#include "textures/segment2/segment2.07870.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_su[] = "textures/segment2/segment2.07870.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_se[] = { -#include "textures/segment2/segment2.07880.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_se[] = "textures/segment2/segment2.07880.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_so[] = { -#include "textures/segment2/segment2.07890.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_so[] = "textures/segment2/segment2.07890.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ta[] = { -#include "textures/segment2/segment2.078A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ta[] = "textures/segment2/segment2.078A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_chi[] = { -#include "textures/segment2/segment2.078B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_chi[] = "textures/segment2/segment2.078B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_tsu[] = { -#include "textures/segment2/segment2.078C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_tsu[] = "textures/segment2/segment2.078C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_te[] = { -#include "textures/segment2/segment2.078D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_te[] = "textures/segment2/segment2.078D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_to[] = { -#include "textures/segment2/segment2.078E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_to[] = "textures/segment2/segment2.078E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_na[] = { -#include "textures/segment2/segment2.078F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_na[] = "textures/segment2/segment2.078F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ni[] = { -#include "textures/segment2/segment2.07900.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ni[] = "textures/segment2/segment2.07900.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_nu[] = { -#include "textures/segment2/segment2.07910.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_nu[] = "textures/segment2/segment2.07910.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ne[] = { -#include "textures/segment2/segment2.07920.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ne[] = "textures/segment2/segment2.07920.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_no[] = { -#include "textures/segment2/segment2.07930.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_no[] = "textures/segment2/segment2.07930.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ha[] = { -#include "textures/segment2/segment2.07940.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ha[] = "textures/segment2/segment2.07940.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_hi[] = { -#include "textures/segment2/segment2.07950.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_hi[] = "textures/segment2/segment2.07950.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_hu[] = { -#include "textures/segment2/segment2.07960.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_hu[] = "textures/segment2/segment2.07960.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_he[] = { -#include "textures/segment2/segment2.07970.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_he[] = "textures/segment2/segment2.07970.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ho[] = { -#include "textures/segment2/segment2.07980.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ho[] = "textures/segment2/segment2.07980.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ma[] = { -#include "textures/segment2/segment2.07990.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ma[] = "textures/segment2/segment2.07990.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_mi[] = { -#include "textures/segment2/segment2.079A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_mi[] = "textures/segment2/segment2.079A0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_mu[] = { -#include "textures/segment2/segment2.079B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_mu[] = "textures/segment2/segment2.079B0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_me[] = { -#include "textures/segment2/segment2.079C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_me[] = "textures/segment2/segment2.079C0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_mo[] = { -#include "textures/segment2/segment2.079D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_mo[] = "textures/segment2/segment2.079D0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ya[] = { -#include "textures/segment2/segment2.079E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ya[] = "textures/segment2/segment2.079E0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_yu[] = { -#include "textures/segment2/segment2.079F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_yu[] = "textures/segment2/segment2.079F0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_yo[] = { -#include "textures/segment2/segment2.07A00.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_yo[] = "textures/segment2/segment2.07A00.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ra[] = { -#include "textures/segment2/segment2.07A10.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ra[] = "textures/segment2/segment2.07A10.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ri[] = { -#include "textures/segment2/segment2.07A20.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ri[] = "textures/segment2/segment2.07A20.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ru[] = { -#include "textures/segment2/segment2.07A30.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ru[] = "textures/segment2/segment2.07A30.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_re[] = { -#include "textures/segment2/segment2.07A40.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_re[] = "textures/segment2/segment2.07A40.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_ro[] = { -#include "textures/segment2/segment2.07A50.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_ro[] = "textures/segment2/segment2.07A50.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_wa[] = { -#include "textures/segment2/segment2.07A60.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_wa[] = "textures/segment2/segment2.07A60.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_n[] = { -#include "textures/segment2/segment2.07A70.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_n[] = "textures/segment2/segment2.07A70.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_e[] = { -#include "textures/segment2/segment2.07A80.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_e[] = "textures/segment2/segment2.07A80.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_tsu[] = { -#include "textures/segment2/segment2.07A90.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_tsu[] = "textures/segment2/segment2.07A90.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_ya[] = { -#include "textures/segment2/segment2.07AA0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_ya[] = "textures/segment2/segment2.07AA0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_yu[] = { -#include "textures/segment2/segment2.07AB0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_yu[] = "textures/segment2/segment2.07AB0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_yo[] = { -#include "textures/segment2/segment2.07AC0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_yo[] = "textures/segment2/segment2.07AC0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_a[] = { -#include "textures/segment2/segment2.07AD0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_a[] = "textures/segment2/segment2.07AD0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_i[] = { -#include "textures/segment2/segment2.07AE0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_i[] = "textures/segment2/segment2.07AE0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_u[] = { -#include "textures/segment2/segment2.07AF0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_u[] = "textures/segment2/segment2.07AF0.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_katakana_small_o[] = { -#include "textures/segment2/segment2.07B00.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_katakana_small_o[] = "textures/segment2/segment2.07B00.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_double_quotation_open[] = { -#include "textures/segment2/segment2.07B10.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_double_quotation_open[] = "textures/segment2/segment2.07B10.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_double_quotation_close[] = { -#include "textures/segment2/segment2.07B20.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_double_quotation_close[] = "textures/segment2/segment2.07B20.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_wave_dash[] = { -#include "textures/segment2/segment2.07B30.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_wave_dash[] = "textures/segment2/segment2.07B30.ia1"; -ALIGNED8 static const u8 texture_font_char_jp_ellipsis[] = { -#include "textures/segment2/segment2.07B40.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_jp_ellipsis[] = "textures/segment2/segment2.07B40.ia1"; // EU Small Font #elif defined(VERSION_EU) -ALIGNED8 static const u8 texture_font_char_eu_0[] = { -#include "textures/segment2/font_graphics.05F00.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_0[] = "textures/segment2/font_graphics.05F00.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_1[] = { -#include "textures/segment2/font_graphics.05F10.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_1[] = "textures/segment2/font_graphics.05F10.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_2[] = { -#include "textures/segment2/font_graphics.05F20.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_2[] = "textures/segment2/font_graphics.05F20.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_3[] = { -#include "textures/segment2/font_graphics.05F30.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_3[] = "textures/segment2/font_graphics.05F30.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_4[] = { -#include "textures/segment2/font_graphics.05F40.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_4[] = "textures/segment2/font_graphics.05F40.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_5[] = { -#include "textures/segment2/font_graphics.05F50.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_5[] = "textures/segment2/font_graphics.05F50.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_6[] = { -#include "textures/segment2/font_graphics.05F60.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_6[] = "textures/segment2/font_graphics.05F60.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_7[] = { -#include "textures/segment2/font_graphics.05F70.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_7[] = "textures/segment2/font_graphics.05F70.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_8[] = { -#include "textures/segment2/font_graphics.05F80.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_8[] = "textures/segment2/font_graphics.05F80.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_9[] = { -#include "textures/segment2/font_graphics.05F90.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_9[] = "textures/segment2/font_graphics.05F90.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_A[] = { -#include "textures/segment2/font_graphics.05FA0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_A[] = "textures/segment2/font_graphics.05FA0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_B[] = { -#include "textures/segment2/font_graphics.05FB0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_B[] = "textures/segment2/font_graphics.05FB0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_C[] = { -#include "textures/segment2/font_graphics.05FC0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_C[] = "textures/segment2/font_graphics.05FC0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_D[] = { -#include "textures/segment2/font_graphics.05FD0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_D[] = "textures/segment2/font_graphics.05FD0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_E[] = { -#include "textures/segment2/font_graphics.05FE0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_E[] = "textures/segment2/font_graphics.05FE0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_F[] = { -#include "textures/segment2/font_graphics.05FF0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_F[] = "textures/segment2/font_graphics.05FF0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_G[] = { -#include "textures/segment2/font_graphics.06000.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_G[] = "textures/segment2/font_graphics.06000.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_H[] = { -#include "textures/segment2/font_graphics.06010.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_H[] = "textures/segment2/font_graphics.06010.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_I[] = { -#include "textures/segment2/font_graphics.06020.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_I[] = "textures/segment2/font_graphics.06020.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_J[] = { -#include "textures/segment2/font_graphics.06030.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_J[] = "textures/segment2/font_graphics.06030.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_K[] = { -#include "textures/segment2/font_graphics.06040.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_K[] = "textures/segment2/font_graphics.06040.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_L[] = { -#include "textures/segment2/font_graphics.06050.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_L[] = "textures/segment2/font_graphics.06050.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_M[] = { -#include "textures/segment2/font_graphics.06060.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_M[] = "textures/segment2/font_graphics.06060.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_N[] = { -#include "textures/segment2/font_graphics.06070.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_N[] = "textures/segment2/font_graphics.06070.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_O[] = { -#include "textures/segment2/font_graphics.06080.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_O[] = "textures/segment2/font_graphics.06080.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_P[] = { -#include "textures/segment2/font_graphics.06090.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_P[] = "textures/segment2/font_graphics.06090.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_Q[] = { -#include "textures/segment2/font_graphics.060A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_Q[] = "textures/segment2/font_graphics.060A0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_R[] = { -#include "textures/segment2/font_graphics.060B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_R[] = "textures/segment2/font_graphics.060B0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_S[] = { -#include "textures/segment2/font_graphics.060C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_S[] = "textures/segment2/font_graphics.060C0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_T[] = { -#include "textures/segment2/font_graphics.060D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_T[] = "textures/segment2/font_graphics.060D0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_U[] = { -#include "textures/segment2/font_graphics.060E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_U[] = "textures/segment2/font_graphics.060E0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_V[] = { -#include "textures/segment2/font_graphics.060F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_V[] = "textures/segment2/font_graphics.060F0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_W[] = { -#include "textures/segment2/font_graphics.06100.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_W[] = "textures/segment2/font_graphics.06100.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_X[] = { -#include "textures/segment2/font_graphics.06110.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_X[] = "textures/segment2/font_graphics.06110.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_Y[] = { -#include "textures/segment2/font_graphics.06120.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_Y[] = "textures/segment2/font_graphics.06120.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_Z[] = { -#include "textures/segment2/font_graphics.06130.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_Z[] = "textures/segment2/font_graphics.06130.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_a[] = { -#include "textures/segment2/font_graphics.06140.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_a[] = "textures/segment2/font_graphics.06140.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_b[] = { -#include "textures/segment2/font_graphics.06150.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_b[] = "textures/segment2/font_graphics.06150.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_c[] = { -#include "textures/segment2/font_graphics.06160.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_c[] = "textures/segment2/font_graphics.06160.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_d[] = { -#include "textures/segment2/font_graphics.06170.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_d[] = "textures/segment2/font_graphics.06170.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_e[] = { -#include "textures/segment2/font_graphics.06180.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_e[] = "textures/segment2/font_graphics.06180.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_f[] = { -#include "textures/segment2/font_graphics.06190.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_f[] = "textures/segment2/font_graphics.06190.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_g[] = { -#include "textures/segment2/font_graphics.061A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_g[] = "textures/segment2/font_graphics.061A0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_h[] = { -#include "textures/segment2/font_graphics.061B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_h[] = "textures/segment2/font_graphics.061B0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_i[] = { -#include "textures/segment2/font_graphics.061C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_i[] = "textures/segment2/font_graphics.061C0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_j[] = { -#include "textures/segment2/font_graphics.061D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_j[] = "textures/segment2/font_graphics.061D0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_k[] = { -#include "textures/segment2/font_graphics.061E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_k[] = "textures/segment2/font_graphics.061E0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_l[] = { -#include "textures/segment2/font_graphics.061F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_l[] = "textures/segment2/font_graphics.061F0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_m[] = { -#include "textures/segment2/font_graphics.06200.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_m[] = "textures/segment2/font_graphics.06200.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_n[] = { -#include "textures/segment2/font_graphics.06210.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_n[] = "textures/segment2/font_graphics.06210.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_o[] = { -#include "textures/segment2/font_graphics.06220.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_o[] = "textures/segment2/font_graphics.06220.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_p[] = { -#include "textures/segment2/font_graphics.06230.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_p[] = "textures/segment2/font_graphics.06230.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_q[] = { -#include "textures/segment2/font_graphics.06240.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_q[] = "textures/segment2/font_graphics.06240.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_r[] = { -#include "textures/segment2/font_graphics.06250.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_r[] = "textures/segment2/font_graphics.06250.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_s[] = { -#include "textures/segment2/font_graphics.06260.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_s[] = "textures/segment2/font_graphics.06260.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_t[] = { -#include "textures/segment2/font_graphics.06270.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_t[] = "textures/segment2/font_graphics.06270.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_u[] = { -#include "textures/segment2/font_graphics.06280.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_u[] = "textures/segment2/font_graphics.06280.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_v[] = { -#include "textures/segment2/font_graphics.06290.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_v[] = "textures/segment2/font_graphics.06290.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_w[] = { -#include "textures/segment2/font_graphics.062A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_w[] = "textures/segment2/font_graphics.062A0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_x[] = { -#include "textures/segment2/font_graphics.062B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_x[] = "textures/segment2/font_graphics.062B0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_y[] = { -#include "textures/segment2/font_graphics.062C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_y[] = "textures/segment2/font_graphics.062C0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_z[] = { -#include "textures/segment2/font_graphics.062D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_z[] = "textures/segment2/font_graphics.062D0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_left_right_arrow[] = { -#include "textures/segment2/font_graphics.062E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_left_right_arrow[] = "textures/segment2/font_graphics.062E0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_ampersand[] = { -#include "textures/segment2/font_graphics.062F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_ampersand[] = "textures/segment2/font_graphics.062F0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_exclamation[] = { -#include "textures/segment2/font_graphics.06300.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_exclamation[] = "textures/segment2/font_graphics.06300.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_coin[] = { -#include "textures/segment2/font_graphics.06310.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_coin[] = "textures/segment2/font_graphics.06310.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_multiply[] = { -#include "textures/segment2/font_graphics.06320.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_multiply[] = "textures/segment2/font_graphics.06320.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_open_parentheses[] = { -#include "textures/segment2/font_graphics.06330.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_open_parentheses[] = "textures/segment2/font_graphics.06330.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_close_open_parentheses[] = { -#include "textures/segment2/font_graphics.06340.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_close_open_parentheses[] = "textures/segment2/font_graphics.06340.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_close_parentheses[] = { -#include "textures/segment2/font_graphics.06350.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_close_parentheses[] = "textures/segment2/font_graphics.06350.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_tilde[] = { -#include "textures/segment2/font_graphics.06360.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_tilde[] = "textures/segment2/font_graphics.06360.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_period[] = { -#include "textures/segment2/font_graphics.06370.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_period[] = "textures/segment2/font_graphics.06370.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_percent[] = { -#include "textures/segment2/font_graphics.06380.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_percent[] = "textures/segment2/font_graphics.06380.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_interpunct[] = { -#include "textures/segment2/font_graphics.06390.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_interpunct[] = "textures/segment2/font_graphics.06390.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_comma[] = { -#include "textures/segment2/font_graphics.063A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_comma[] = "textures/segment2/font_graphics.063A0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_apostrophe[] = { -#include "textures/segment2/font_graphics.063B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_apostrophe[] = "textures/segment2/font_graphics.063B0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_question[] = { -#include "textures/segment2/font_graphics.063C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_question[] = "textures/segment2/font_graphics.063C0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_star_filled[] = { -#include "textures/segment2/font_graphics.063D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_star_filled[] = "textures/segment2/font_graphics.063D0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_star_hollow[] = { -#include "textures/segment2/font_graphics.063E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_star_hollow[] = "textures/segment2/font_graphics.063E0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_double_quote_open[] = { -#include "textures/segment2/font_graphics.063F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_double_quote_open[] = "textures/segment2/font_graphics.063F0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_double_quote_close[] = { -#include "textures/segment2/font_graphics.06400.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_double_quote_close[] = "textures/segment2/font_graphics.06400.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_colon[] = { -#include "textures/segment2/font_graphics.06410.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_colon[] = "textures/segment2/font_graphics.06410.ia1"; -ALIGNED8 static const u8 texture_font_char_EU_slash[] = { -#include "textures/segment2/font_graphics.06420.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_EU_slash[] = "textures/segment2/font_graphics.06420.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_A[] = { -#include "textures/segment2/font_graphics.06430.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_A[] = "textures/segment2/font_graphics.06430.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_B[] = { -#include "textures/segment2/font_graphics.06440.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_B[] = "textures/segment2/font_graphics.06440.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_C[] = { -#include "textures/segment2/font_graphics.06450.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_C[] = "textures/segment2/font_graphics.06450.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_Z[] = { -#include "textures/segment2/font_graphics.06460.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_Z[] = "textures/segment2/font_graphics.06460.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_R[] = { -#include "textures/segment2/font_graphics.06470.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_R[] = "textures/segment2/font_graphics.06470.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_C_up[] = { -#include "textures/segment2/font_graphics.06480.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_C_up[] = "textures/segment2/font_graphics.06480.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_C_down[] = { -#include "textures/segment2/font_graphics.06490.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_C_down[] = "textures/segment2/font_graphics.06490.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_C_left[] = { -#include "textures/segment2/font_graphics.064A0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_C_left[] = "textures/segment2/font_graphics.064A0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_button_C_right[] = { -#include "textures/segment2/font_graphics.064B0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_button_C_right[] = "textures/segment2/font_graphics.064B0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_umlaut[] = { -#include "textures/segment2/font_graphics.064C0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_umlaut[] = "textures/segment2/font_graphics.064C0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_circumflex[] = { -#include "textures/segment2/font_graphics.064D0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_circumflex[] = "textures/segment2/font_graphics.064D0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_grave[] = { -#include "textures/segment2/font_graphics.064E0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_grave[] = "textures/segment2/font_graphics.064E0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_acute[] = { -#include "textures/segment2/font_graphics.064F0.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_acute[] = "textures/segment2/font_graphics.064F0.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_cedilla[] = { -#include "textures/segment2/font_graphics.06500.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_cedilla[] = "textures/segment2/font_graphics.06500.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_unknown[] = { -#include "textures/segment2/font_graphics.06510.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_unknown[] = "textures/segment2/font_graphics.06510.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_Cedilla[] = { -#include "textures/segment2/font_graphics.06520.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_Cedilla[] = "textures/segment2/font_graphics.06520.ia1"; -ALIGNED8 static const u8 texture_font_char_eu_eszeet[] = { -#include "textures/segment2/font_graphics.06530.ia1.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_eu_eszeet[] = "textures/segment2/font_graphics.06530.ia1"; // US Small Font #else -ALIGNED8 static const u8 texture_font_char_us_0[] = { -#include "textures/segment2/font_graphics.05900.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_0[] = "textures/segment2/font_graphics.05900.ia4"; -ALIGNED8 static const u8 texture_font_char_us_1[] = { -#include "textures/segment2/font_graphics.05940.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_1[] = "textures/segment2/font_graphics.05940.ia4"; -ALIGNED8 static const u8 texture_font_char_us_2[] = { -#include "textures/segment2/font_graphics.05980.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_2[] = "textures/segment2/font_graphics.05980.ia4"; -ALIGNED8 static const u8 texture_font_char_us_3[] = { -#include "textures/segment2/font_graphics.059C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_3[] = "textures/segment2/font_graphics.059C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_4[] = { -#include "textures/segment2/font_graphics.05A00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_4[] = "textures/segment2/font_graphics.05A00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_5[] = { -#include "textures/segment2/font_graphics.05A40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_5[] = "textures/segment2/font_graphics.05A40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_6[] = { -#include "textures/segment2/font_graphics.05A80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_6[] = "textures/segment2/font_graphics.05A80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_7[] = { -#include "textures/segment2/font_graphics.05AC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_7[] = "textures/segment2/font_graphics.05AC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_8[] = { -#include "textures/segment2/font_graphics.05B00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_8[] = "textures/segment2/font_graphics.05B00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_9[] = { -#include "textures/segment2/font_graphics.05B40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_9[] = "textures/segment2/font_graphics.05B40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_A[] = { -#include "textures/segment2/font_graphics.05B80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_A[] = "textures/segment2/font_graphics.05B80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_B[] = { -#include "textures/segment2/font_graphics.05BC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_B[] = "textures/segment2/font_graphics.05BC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_C[] = { -#include "textures/segment2/font_graphics.05C00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_C[] = "textures/segment2/font_graphics.05C00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_D[] = { -#include "textures/segment2/font_graphics.05C40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_D[] = "textures/segment2/font_graphics.05C40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_E[] = { -#include "textures/segment2/font_graphics.05C80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_E[] = "textures/segment2/font_graphics.05C80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_F[] = { -#include "textures/segment2/font_graphics.05CC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_F[] = "textures/segment2/font_graphics.05CC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_G[] = { -#include "textures/segment2/font_graphics.05D00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_G[] = "textures/segment2/font_graphics.05D00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_H[] = { -#include "textures/segment2/font_graphics.05D40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_H[] = "textures/segment2/font_graphics.05D40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_I[] = { -#include "textures/segment2/font_graphics.05D80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_I[] = "textures/segment2/font_graphics.05D80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_J[] = { -#include "textures/segment2/font_graphics.05DC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_J[] = "textures/segment2/font_graphics.05DC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_K[] = { -#include "textures/segment2/font_graphics.05E00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_K[] = "textures/segment2/font_graphics.05E00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_L[] = { -#include "textures/segment2/font_graphics.05E40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_L[] = "textures/segment2/font_graphics.05E40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_M[] = { -#include "textures/segment2/font_graphics.05E80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_M[] = "textures/segment2/font_graphics.05E80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_N[] = { -#include "textures/segment2/font_graphics.05EC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_N[] = "textures/segment2/font_graphics.05EC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_O[] = { -#include "textures/segment2/font_graphics.05F00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_O[] = "textures/segment2/font_graphics.05F00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_P[] = { -#include "textures/segment2/font_graphics.05F40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_P[] = "textures/segment2/font_graphics.05F40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_Q[] = { -#include "textures/segment2/font_graphics.05F80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_Q[] = "textures/segment2/font_graphics.05F80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_R[] = { -#include "textures/segment2/font_graphics.05FC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_R[] = "textures/segment2/font_graphics.05FC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_S[] = { -#include "textures/segment2/font_graphics.06000.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_S[] = "textures/segment2/font_graphics.06000.ia4"; -ALIGNED8 static const u8 texture_font_char_us_T[] = { -#include "textures/segment2/font_graphics.06040.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_T[] = "textures/segment2/font_graphics.06040.ia4"; -ALIGNED8 static const u8 texture_font_char_us_U[] = { -#include "textures/segment2/font_graphics.06080.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_U[] = "textures/segment2/font_graphics.06080.ia4"; -ALIGNED8 static const u8 texture_font_char_us_V[] = { -#include "textures/segment2/font_graphics.060C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_V[] = "textures/segment2/font_graphics.060C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_W[] = { -#include "textures/segment2/font_graphics.06100.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_W[] = "textures/segment2/font_graphics.06100.ia4"; -ALIGNED8 static const u8 texture_font_char_us_X[] = { -#include "textures/segment2/font_graphics.06140.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_X[] = "textures/segment2/font_graphics.06140.ia4"; -ALIGNED8 static const u8 texture_font_char_us_Y[] = { -#include "textures/segment2/font_graphics.06180.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_Y[] = "textures/segment2/font_graphics.06180.ia4"; -ALIGNED8 static const u8 texture_font_char_us_Z[] = { -#include "textures/segment2/font_graphics.061C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_Z[] = "textures/segment2/font_graphics.061C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_a[] = { -#include "textures/segment2/font_graphics.06200.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_a[] = "textures/segment2/font_graphics.06200.ia4"; -ALIGNED8 static const u8 texture_font_char_us_b[] = { -#include "textures/segment2/font_graphics.06240.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_b[] = "textures/segment2/font_graphics.06240.ia4"; -ALIGNED8 static const u8 texture_font_char_us_c[] = { -#include "textures/segment2/font_graphics.06280.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_c[] = "textures/segment2/font_graphics.06280.ia4"; -ALIGNED8 static const u8 texture_font_char_us_d[] = { -#include "textures/segment2/font_graphics.062C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_d[] = "textures/segment2/font_graphics.062C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_e[] = { -#include "textures/segment2/font_graphics.06300.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_e[] = "textures/segment2/font_graphics.06300.ia4"; -ALIGNED8 static const u8 texture_font_char_us_f[] = { -#include "textures/segment2/font_graphics.06340.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_f[] = "textures/segment2/font_graphics.06340.ia4"; -ALIGNED8 static const u8 texture_font_char_us_g[] = { -#include "textures/segment2/font_graphics.06380.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_g[] = "textures/segment2/font_graphics.06380.ia4"; -ALIGNED8 static const u8 texture_font_char_us_h[] = { -#include "textures/segment2/font_graphics.063C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_h[] = "textures/segment2/font_graphics.063C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_i[] = { -#include "textures/segment2/font_graphics.06400.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_i[] = "textures/segment2/font_graphics.06400.ia4"; -ALIGNED8 static const u8 texture_font_char_us_j[] = { -#include "textures/segment2/font_graphics.06440.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_j[] = "textures/segment2/font_graphics.06440.ia4"; -ALIGNED8 static const u8 texture_font_char_us_k[] = { -#include "textures/segment2/font_graphics.06480.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_k[] = "textures/segment2/font_graphics.06480.ia4"; -ALIGNED8 static const u8 texture_font_char_us_l[] = { -#include "textures/segment2/font_graphics.064C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_l[] = "textures/segment2/font_graphics.064C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_m[] = { -#include "textures/segment2/font_graphics.06500.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_m[] = "textures/segment2/font_graphics.06500.ia4"; -ALIGNED8 static const u8 texture_font_char_us_n[] = { -#include "textures/segment2/font_graphics.06540.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_n[] = "textures/segment2/font_graphics.06540.ia4"; -ALIGNED8 static const u8 texture_font_char_us_o[] = { -#include "textures/segment2/font_graphics.06580.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_o[] = "textures/segment2/font_graphics.06580.ia4"; -ALIGNED8 static const u8 texture_font_char_us_p[] = { -#include "textures/segment2/font_graphics.065C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_p[] = "textures/segment2/font_graphics.065C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_q[] = { -#include "textures/segment2/font_graphics.06600.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_q[] = "textures/segment2/font_graphics.06600.ia4"; -ALIGNED8 static const u8 texture_font_char_us_r[] = { -#include "textures/segment2/font_graphics.06640.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_r[] = "textures/segment2/font_graphics.06640.ia4"; -ALIGNED8 static const u8 texture_font_char_us_s[] = { -#include "textures/segment2/font_graphics.06680.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_s[] = "textures/segment2/font_graphics.06680.ia4"; -ALIGNED8 static const u8 texture_font_char_us_t[] = { -#include "textures/segment2/font_graphics.066C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_t[] = "textures/segment2/font_graphics.066C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_u[] = { -#include "textures/segment2/font_graphics.06700.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_u[] = "textures/segment2/font_graphics.06700.ia4"; -ALIGNED8 static const u8 texture_font_char_us_v[] = { -#include "textures/segment2/font_graphics.06740.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_v[] = "textures/segment2/font_graphics.06740.ia4"; -ALIGNED8 static const u8 texture_font_char_us_w[] = { -#include "textures/segment2/font_graphics.06780.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_w[] = "textures/segment2/font_graphics.06780.ia4"; -ALIGNED8 static const u8 texture_font_char_us_x[] = { -#include "textures/segment2/font_graphics.067C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_x[] = "textures/segment2/font_graphics.067C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_y[] = { -#include "textures/segment2/font_graphics.06800.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_y[] = "textures/segment2/font_graphics.06800.ia4"; -ALIGNED8 static const u8 texture_font_char_us_z[] = { -#include "textures/segment2/font_graphics.06840.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_z[] = "textures/segment2/font_graphics.06840.ia4"; -ALIGNED8 static const u8 texture_font_char_us_left_right_arrow[] = { -#include "textures/segment2/font_graphics.06880.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_left_right_arrow[] = "textures/segment2/font_graphics.06880.ia4"; -ALIGNED8 static const u8 texture_font_char_us_exclamation[] = { -#include "textures/segment2/font_graphics.068C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_exclamation[] = "textures/segment2/font_graphics.068C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_coin[] = { -#include "textures/segment2/font_graphics.06900.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_coin[] = "textures/segment2/font_graphics.06900.ia4"; -ALIGNED8 static const u8 texture_font_char_us_multiply[] = { -#include "textures/segment2/font_graphics.06940.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_multiply[] = "textures/segment2/font_graphics.06940.ia4"; -ALIGNED8 static const u8 texture_font_char_us_open_parentheses[] = { -#include "textures/segment2/font_graphics.06980.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_open_parentheses[] = "textures/segment2/font_graphics.06980.ia4"; -ALIGNED8 static const u8 texture_font_char_us_close_open_parentheses[] = { -#include "textures/segment2/font_graphics.069C0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_close_open_parentheses[] = "textures/segment2/font_graphics.069C0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_close_parentheses[] = { -#include "textures/segment2/font_graphics.06A00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_close_parentheses[] = "textures/segment2/font_graphics.06A00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_tilde[] = { -#include "textures/segment2/font_graphics.06A40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_tilde[] = "textures/segment2/font_graphics.06A40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_period[] = { -#include "textures/segment2/font_graphics.06A80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_period[] = "textures/segment2/font_graphics.06A80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_percent[] = { -#include "textures/segment2/font_graphics.06AC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_percent[] = "textures/segment2/font_graphics.06AC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_interpunct[] = { -#include "textures/segment2/font_graphics.06B00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_interpunct[] = "textures/segment2/font_graphics.06B00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_comma[] = { -#include "textures/segment2/font_graphics.06B40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_comma[] = "textures/segment2/font_graphics.06B40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_apostrophe[] = { -#include "textures/segment2/font_graphics.06B80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_apostrophe[] = "textures/segment2/font_graphics.06B80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_question[] = { -#include "textures/segment2/font_graphics.06BC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_question[] = "textures/segment2/font_graphics.06BC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_star_filled[] = { -#include "textures/segment2/font_graphics.06C00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_star_filled[] = "textures/segment2/font_graphics.06C00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_star_hollow[] = { -#include "textures/segment2/font_graphics.06C40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_star_hollow[] = "textures/segment2/font_graphics.06C40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_double_quote_open[] = { -#include "textures/segment2/font_graphics.06C80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_double_quote_open[] = "textures/segment2/font_graphics.06C80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_double_quote_close[] = { -#include "textures/segment2/font_graphics.06CC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_double_quote_close[] = "textures/segment2/font_graphics.06CC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_ellipsis[] = { -#include "textures/segment2/font_graphics.06D00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_ellipsis[] = "textures/segment2/font_graphics.06D00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_slash[] = { -#include "textures/segment2/font_graphics.06D40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_slash[] = "textures/segment2/font_graphics.06D40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_ampersand[] = { -#include "textures/segment2/font_graphics.06D80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_ampersand[] = "textures/segment2/font_graphics.06D80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_A[] = { -#include "textures/segment2/font_graphics.06DC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_A[] = "textures/segment2/font_graphics.06DC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_B[] = { -#include "textures/segment2/font_graphics.06E00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_B[] = "textures/segment2/font_graphics.06E00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_C[] = { -#include "textures/segment2/font_graphics.06E40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_C[] = "textures/segment2/font_graphics.06E40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_Z[] = { -#include "textures/segment2/font_graphics.06E80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_Z[] = "textures/segment2/font_graphics.06E80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_R[] = { -#include "textures/segment2/font_graphics.06EC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_R[] = "textures/segment2/font_graphics.06EC0.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_C_up[] = { -#include "textures/segment2/font_graphics.06F00.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_C_up[] = "textures/segment2/font_graphics.06F00.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_C_down[] = { -#include "textures/segment2/font_graphics.06F40.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_C_down[] = "textures/segment2/font_graphics.06F40.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_C_left[] = { -#include "textures/segment2/font_graphics.06F80.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_C_left[] = "textures/segment2/font_graphics.06F80.ia4"; -ALIGNED8 static const u8 texture_font_char_us_button_C_right[] = { -#include "textures/segment2/font_graphics.06FC0.ia4.inc.c" -}; +ALIGNED8 static const u8 texture_font_char_us_button_C_right[] = "textures/segment2/font_graphics.06FC0.ia4"; #endif -ALIGNED8 static const u8 texture_hud_char_camera[] = { -#include "textures/segment2/segment2.07B50.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_camera[] = "textures/segment2/segment2.07B50.rgba16"; -ALIGNED8 static const u8 texture_hud_char_lakitu[] = { -#include "textures/segment2/segment2.07D50.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_lakitu[] = "textures/segment2/segment2.07D50.rgba16"; -ALIGNED8 static const u8 texture_hud_char_no_camera[] = { -#include "textures/segment2/segment2.07F50.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_no_camera[] = "textures/segment2/segment2.07F50.rgba16"; -ALIGNED8 static const u8 texture_hud_char_arrow_up[] = { -#include "textures/segment2/segment2.08150.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_arrow_up[] = "textures/segment2/segment2.08150.rgba16"; -ALIGNED8 static const u8 texture_hud_char_arrow_down[] = { -#include "textures/segment2/segment2.081D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_hud_char_arrow_down[] = "textures/segment2/segment2.081D0.rgba16"; // Main HUD print table 0x02008250-0x02008337 const u8 *const main_hud_lut[] = { @@ -2447,49 +1563,27 @@ const Gfx dl_billboard_num_9[] = { gsSPEndDisplayList(), }; -ALIGNED8 static const u8 texture_shadow_quarter_circle[] = { -#include "textures/segment2/shadow_quarter_circle.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_shadow_quarter_circle[] = "textures/segment2/shadow_quarter_circle.ia8"; -ALIGNED8 static const u8 texture_shadow_quarter_square[] = { -#include "textures/segment2/shadow_quarter_square.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_shadow_quarter_square[] = "textures/segment2/shadow_quarter_square.ia8"; -ALIGNED8 const u8 texture_transition_star_half[] = { -#include "textures/segment2/segment2.0F458.ia8.inc.c" -}; +ALIGNED8 const u8 texture_transition_star_half[] = "textures/segment2/segment2.0F458.ia8"; -ALIGNED8 const u8 texture_transition_circle_half[] = { -#include "textures/segment2/segment2.0FC58.ia8.inc.c" -}; +ALIGNED8 const u8 texture_transition_circle_half[] = "textures/segment2/segment2.0FC58.ia8"; -ALIGNED8 const u8 texture_transition_mario[] = { -#include "textures/segment2/segment2.10458.ia8.inc.c" -}; +ALIGNED8 const u8 texture_transition_mario[] = "textures/segment2/segment2.10458.ia8"; -ALIGNED8 const u8 texture_transition_bowser_half[] = { -#include "textures/segment2/segment2.11458.ia8.inc.c" -}; +ALIGNED8 const u8 texture_transition_bowser_half[] = "textures/segment2/segment2.11458.ia8"; -ALIGNED8 const u8 texture_waterbox_water[] = { -#include "textures/segment2/segment2.11C58.rgba16.inc.c" -}; +ALIGNED8 const u8 texture_waterbox_water[] = "textures/segment2/segment2.11C58.rgba16"; -ALIGNED8 const u8 texture_waterbox_jrb_water[] = { -#include "textures/segment2/segment2.12458.rgba16.inc.c" -}; +ALIGNED8 const u8 texture_waterbox_jrb_water[] = "textures/segment2/segment2.12458.rgba16"; -ALIGNED8 const u8 texture_waterbox_unknown_water[] = { -#include "textures/segment2/segment2.12C58.rgba16.inc.c" -}; +ALIGNED8 const u8 texture_waterbox_unknown_water[] = "textures/segment2/segment2.12C58.rgba16"; -ALIGNED8 const u8 texture_waterbox_mist[] = { -#include "textures/segment2/segment2.13458.ia16.inc.c" -}; +ALIGNED8 const u8 texture_waterbox_mist[] = "textures/segment2/segment2.13458.ia16"; -ALIGNED8 const u8 texture_waterbox_lava[] = { -#include "textures/segment2/segment2.13C58.rgba16.inc.c" -}; +ALIGNED8 const u8 texture_waterbox_lava[] = "textures/segment2/segment2.13C58.rgba16"; // Unreferenced light group static const Lights1 segment2_lights_unused = gdSPDefLights1( @@ -2663,9 +1757,7 @@ const Gfx dl_waterbox_end[] = { }; // 0x02014838 - 0x02014878 -ALIGNED8 static const u8 texture_ia8_up_arrow[] = { -#include "textures/segment2/segment2.14838.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_ia8_up_arrow[] = "textures/segment2/segment2.14838.ia8"; // 0x02014878 - 0x020148B0 const Gfx dl_ia8_up_arrow_begin[] = { diff --git a/bin/sky.c b/bin/sky.c index 861f7765..c91eeff4 100644 --- a/bin/sky.c +++ b/bin/sky.c @@ -3,75 +3,45 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 sky_09000000[] = { -#include "textures/sky/rr_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09000000[] = "textures/sky/rr_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 sky_09000800[] = { -#include "textures/sky/rr_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09000800[] = "textures/sky/rr_textures.00800.rgba16"; // 0x09001000 -ALIGNED8 const u8 sky_09001000[] = { -#include "textures/sky/rr_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09001000[] = "textures/sky/rr_textures.01000.rgba16"; // 0x09001800 -ALIGNED8 const u8 sky_09001800[] = { -#include "textures/sky/rr_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09001800[] = "textures/sky/rr_textures.01800.rgba16"; // 0x09002000 -ALIGNED8 const u8 sky_09002000[] = { -#include "textures/sky/rr_textures.02000.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09002000[] = "textures/sky/rr_textures.02000.rgba16"; // 0x09003000 -ALIGNED8 const u8 sky_09003000[] = { -#include "textures/sky/rr_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09003000[] = "textures/sky/rr_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 sky_09003800[] = { -#include "textures/sky/rr_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09003800[] = "textures/sky/rr_textures.03800.rgba16"; // 0x09004800 -ALIGNED8 const u8 sky_09004800[] = { -#include "textures/sky/rr_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09004800[] = "textures/sky/rr_textures.04800.rgba16"; // 0x09005000 -ALIGNED8 const u8 sky_09005000[] = { -#include "textures/sky/rr_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09005000[] = "textures/sky/rr_textures.05000.rgba16"; // 0x09005800 -ALIGNED8 const u8 sky_09005800[] = { -#include "textures/sky/rr_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09005800[] = "textures/sky/rr_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 sky_09006000[] = { -#include "textures/sky/rr_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09006000[] = "textures/sky/rr_textures.06000.rgba16"; -ALIGNED8 const u8 texture_metal_hole[] = { -#include "textures/sky/metal_hole.rgba16.inc.c" -}; +ALIGNED8 const u8 texture_metal_hole[] = "textures/sky/metal_hole.rgba16"; // 0x09007000 -ALIGNED8 const u8 sky_09007000[] = { -#include "textures/sky/rr_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09007000[] = "textures/sky/rr_textures.07000.rgba16"; // 0x09007800 -ALIGNED8 const u8 sky_09007800[] = { -#include "textures/sky/rr_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09007800[] = "textures/sky/rr_textures.07800.rgba16"; // 0x09008000 -ALIGNED8 const u8 sky_09008000[] = { -#include "textures/sky/rr_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 sky_09008000[] = "textures/sky/rr_textures.08000.rgba16"; diff --git a/bin/snow.c b/bin/snow.c index 5e8999f7..6484833d 100644 --- a/bin/snow.c +++ b/bin/snow.c @@ -3,91 +3,55 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 snow_09000000[] = { -#include "textures/snow/ccm_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09000000[] = "textures/snow/ccm_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 snow_09000800[] = { -#include "textures/snow/ccm_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09000800[] = "textures/snow/ccm_textures.00800.rgba16"; // 0x09001000 -ALIGNED8 const u8 snow_09001000[] = { -#include "textures/snow/ccm_textures.01000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09001000[] = "textures/snow/ccm_textures.01000.rgba16"; // 0x09002000 -ALIGNED8 const u8 snow_09002000[] = { -#include "textures/snow/ccm_textures.02000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09002000[] = "textures/snow/ccm_textures.02000.rgba16"; // 0x09002800 -ALIGNED8 const u8 snow_09002800[] = { -#include "textures/snow/ccm_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09002800[] = "textures/snow/ccm_textures.02800.rgba16"; // 0x09003000 -ALIGNED8 const u8 snow_09003000[] = { -#include "textures/snow/ccm_textures.03000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09003000[] = "textures/snow/ccm_textures.03000.rgba16"; // 0x09003800 -ALIGNED8 const u8 snow_09003800[] = { -#include "textures/snow/ccm_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09003800[] = "textures/snow/ccm_textures.03800.rgba16"; // 0x09004000 -ALIGNED8 const u8 snow_09004000[] = { -#include "textures/snow/ccm_textures.04000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09004000[] = "textures/snow/ccm_textures.04000.rgba16"; // 0x09004800 -ALIGNED8 const u8 snow_09004800[] = { -#include "textures/snow/ccm_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09004800[] = "textures/snow/ccm_textures.04800.rgba16"; // 0x09005000 -ALIGNED8 const u8 snow_09005000[] = { -#include "textures/snow/ccm_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09005000[] = "textures/snow/ccm_textures.05000.rgba16"; // 0x09005800 -ALIGNED8 const u8 snow_09005800[] = { -#include "textures/snow/ccm_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09005800[] = "textures/snow/ccm_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 snow_09006000[] = { -#include "textures/snow/ccm_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09006000[] = "textures/snow/ccm_textures.06000.rgba16"; // 0x09006800 -ALIGNED8 const u8 snow_09006800[] = { -#include "textures/snow/ccm_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09006800[] = "textures/snow/ccm_textures.06800.rgba16"; // 0x09007000 -ALIGNED8 const u8 snow_09007000[] = { -#include "textures/snow/ccm_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09007000[] = "textures/snow/ccm_textures.07000.rgba16"; // 0x09008000 -ALIGNED8 const u8 snow_09008000[] = { -#include "textures/snow/ccm_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09008000[] = "textures/snow/ccm_textures.08000.rgba16"; // 0x09008800 -ALIGNED8 const u8 snow_09008800[] = { -#include "textures/snow/ccm_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 snow_09008800[] = "textures/snow/ccm_textures.08800.rgba16"; // 0x09009000 -ALIGNED8 const u8 snow_09009000[] = { -#include "textures/snow/ccm_textures.09000.ia16.inc.c" -}; +ALIGNED8 const u8 snow_09009000[] = "textures/snow/ccm_textures.09000.ia16"; // 0x09009800 -ALIGNED8 const u8 snow_09009800[] = { -#include "textures/snow/ccm_textures.09800.ia16.inc.c" -}; +ALIGNED8 const u8 snow_09009800[] = "textures/snow/ccm_textures.09800.ia16"; diff --git a/bin/spooky.c b/bin/spooky.c index 391519ef..3d5ac8d7 100644 --- a/bin/spooky.c +++ b/bin/spooky.c @@ -3,87 +3,53 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 spooky_09000000[] = { -#include "textures/spooky/bbh_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09000000[] = "textures/spooky/bbh_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 spooky_09000800[] = { -#include "textures/spooky/bbh_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09000800[] = "textures/spooky/bbh_textures.00800.rgba16"; // 0x09001800 -ALIGNED8 const u8 spooky_09001800[] = { -#include "textures/spooky/bbh_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09001800[] = "textures/spooky/bbh_textures.01800.rgba16"; // 0x09002800 -ALIGNED8 const u8 spooky_09002800[] = { -#include "textures/spooky/bbh_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09002800[] = "textures/spooky/bbh_textures.02800.rgba16"; // 0x09003800 -ALIGNED8 const u8 spooky_09003800[] = { -#include "textures/spooky/bbh_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09003800[] = "textures/spooky/bbh_textures.03800.rgba16"; // 0x09004800 -ALIGNED8 const u8 spooky_09004800[] = { -#include "textures/spooky/bbh_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09004800[] = "textures/spooky/bbh_textures.04800.rgba16"; // 0x09005000 -ALIGNED8 const u8 spooky_09005000[] = { -#include "textures/spooky/bbh_textures.05000.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09005000[] = "textures/spooky/bbh_textures.05000.rgba16"; // 0x09006000 -ALIGNED8 const u8 spooky_09006000[] = { -#include "textures/spooky/bbh_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09006000[] = "textures/spooky/bbh_textures.06000.rgba16"; // 0x09006800 -ALIGNED8 const u8 spooky_09006800[] = { -#include "textures/spooky/bbh_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09006800[] = "textures/spooky/bbh_textures.06800.rgba16"; // 0x09007000 -ALIGNED8 const u8 spooky_09007000[] = { -#include "textures/spooky/bbh_textures.07000.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09007000[] = "textures/spooky/bbh_textures.07000.rgba16"; // 0x09008000 -ALIGNED8 const u8 spooky_09008000[] = { -#include "textures/spooky/bbh_textures.08000.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09008000[] = "textures/spooky/bbh_textures.08000.rgba16"; // 0x09008800 -ALIGNED8 const u8 spooky_09008800[] = { -#include "textures/spooky/bbh_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09008800[] = "textures/spooky/bbh_textures.08800.rgba16"; // 0x09009000 -ALIGNED8 const u8 spooky_09009000[] = { -#include "textures/spooky/bbh_textures.09000.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_09009000[] = "textures/spooky/bbh_textures.09000.rgba16"; // 0x0900A000 -ALIGNED8 const u8 spooky_0900A000[] = { -#include "textures/spooky/bbh_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 spooky_0900A000[] = "textures/spooky/bbh_textures.0A000.rgba16"; // 0x0900A800 -ALIGNED8 const u8 spooky_0900A800[] = { -#include "textures/spooky/bbh_textures.0A800.ia16.inc.c" -}; +ALIGNED8 const u8 spooky_0900A800[] = "textures/spooky/bbh_textures.0A800.ia16"; // 0x0900B000 -ALIGNED8 const u8 spooky_0900B000[] = { -#include "textures/spooky/bbh_textures.0B000.ia16.inc.c" -}; +ALIGNED8 const u8 spooky_0900B000[] = "textures/spooky/bbh_textures.0B000.ia16"; // 0x0900B800 -ALIGNED8 const u8 spooky_0900B800[] = { -#include "textures/spooky/bbh_textures.0B800.ia16.inc.c" -}; +ALIGNED8 const u8 spooky_0900B800[] = "textures/spooky/bbh_textures.0B800.ia16"; diff --git a/bin/title_screen_bg.c b/bin/title_screen_bg.c index e63233ab..aae649ac 100644 --- a/bin/title_screen_bg.c +++ b/bin/title_screen_bg.c @@ -72,44 +72,28 @@ const Gfx title_screen_bg_dl_0A000190[] = { }; // 0x0A0001C0 -ALIGNED8 static const u8 title_texture_0A0001C0[] = { -#include "textures/title_screen_bg/title_screen_bg.001C0.rgba16.inc.c" -}; +ALIGNED8 static const u8 title_texture_0A0001C0[] = "textures/title_screen_bg/title_screen_bg.001C0.rgba16"; // 0x0A000E40 -ALIGNED8 static const u8 title_texture_0A000E40[] = { -#include "textures/title_screen_bg/title_screen_bg.00E40.rgba16.inc.c" -}; +ALIGNED8 static const u8 title_texture_0A000E40[] = "textures/title_screen_bg/title_screen_bg.00E40.rgba16"; // 0x0A001AC0 -ALIGNED8 static const u8 title_texture_0A001AC0[] = { -#include "textures/title_screen_bg/title_screen_bg.01AC0.rgba16.inc.c" -}; +ALIGNED8 static const u8 title_texture_0A001AC0[] = "textures/title_screen_bg/title_screen_bg.01AC0.rgba16"; // 0x0A002740 -ALIGNED8 static const u8 title_texture_0A002740[] = { -#include "textures/title_screen_bg/title_screen_bg.02740.rgba16.inc.c" -}; +ALIGNED8 static const u8 title_texture_0A002740[] = "textures/title_screen_bg/title_screen_bg.02740.rgba16"; // 0x0A0033C0 -ALIGNED8 static const u8 title_texture_0A0033C0[] = { -#include "textures/title_screen_bg/title_screen_bg.033C0.rgba16.inc.c" -}; +ALIGNED8 static const u8 title_texture_0A0033C0[] = "textures/title_screen_bg/title_screen_bg.033C0.rgba16"; // 0x0A004040 -ALIGNED8 static const u8 title_texture_0A004040[] = { -#include "textures/title_screen_bg/title_screen_bg.04040.rgba16.inc.c" -}; +ALIGNED8 static const u8 title_texture_0A004040[] = "textures/title_screen_bg/title_screen_bg.04040.rgba16"; // 0x0A004CC0 -ALIGNED8 static const u8 title_texture_0A004CC0[] = { -#include "textures/title_screen_bg/title_screen_bg.04CC0.rgba16.inc.c" -}; +ALIGNED8 static const u8 title_texture_0A004CC0[] = "textures/title_screen_bg/title_screen_bg.04CC0.rgba16"; // 0x0A005940 -ALIGNED8 static const u8 title_texture_0A005940[] = { -#include "textures/title_screen_bg/title_screen_bg.05940.rgba16.inc.c" -}; +ALIGNED8 static const u8 title_texture_0A005940[] = "textures/title_screen_bg/title_screen_bg.05940.rgba16"; // 0x0A0065C0 const u8 *const mario_title_texture_table[] = { diff --git a/bin/water.c b/bin/water.c index a9588917..763e3e49 100644 --- a/bin/water.c +++ b/bin/water.c @@ -3,76 +3,46 @@ #include "make_const_nonconst.h" // 0x09000000 -ALIGNED8 const u8 water_09000000[] = { -#include "textures/water/jrb_textures.00000.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09000000[] = "textures/water/jrb_textures.00000.rgba16"; // 0x09000800 -ALIGNED8 const u8 water_09000800[] = { -#include "textures/water/jrb_textures.00800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09000800[] = "textures/water/jrb_textures.00800.rgba16"; // 0x09001800 -ALIGNED8 const u8 water_09001800[] = { -#include "textures/water/jrb_textures.01800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09001800[] = "textures/water/jrb_textures.01800.rgba16"; // 0x09002800 -ALIGNED8 const u8 water_09002800[] = { -#include "textures/water/jrb_textures.02800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09002800[] = "textures/water/jrb_textures.02800.rgba16"; // 0x09003800 -ALIGNED8 const u8 water_09003800[] = { -#include "textures/water/jrb_textures.03800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09003800[] = "textures/water/jrb_textures.03800.rgba16"; // 0x09004800 -ALIGNED8 const u8 water_09004800[] = { -#include "textures/water/jrb_textures.04800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09004800[] = "textures/water/jrb_textures.04800.rgba16"; // 0x09005800 -ALIGNED8 const u8 water_09005800[] = { -#include "textures/water/jrb_textures.05800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09005800[] = "textures/water/jrb_textures.05800.rgba16"; // 0x09006000 -ALIGNED8 const u8 water_09006000[] = { -#include "textures/water/jrb_textures.06000.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09006000[] = "textures/water/jrb_textures.06000.rgba16"; // 0x09006800 -ALIGNED8 const u8 water_09006800[] = { -#include "textures/water/jrb_textures.06800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09006800[] = "textures/water/jrb_textures.06800.rgba16"; // 0x09007800 -ALIGNED8 const u8 water_09007800[] = { -#include "textures/water/jrb_textures.07800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09007800[] = "textures/water/jrb_textures.07800.rgba16"; // 0x09008800 -ALIGNED8 const u8 water_09008800[] = { -#include "textures/water/jrb_textures.08800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09008800[] = "textures/water/jrb_textures.08800.rgba16"; // 0x09009000 -ALIGNED8 const u8 water_09009000[] = { -#include "textures/water/jrb_textures.09000.rgba16.inc.c" -}; +ALIGNED8 const u8 water_09009000[] = "textures/water/jrb_textures.09000.rgba16"; // 0x0900A000 -ALIGNED8 const u8 water_0900A000[] = { -#include "textures/water/jrb_textures.0A000.rgba16.inc.c" -}; +ALIGNED8 const u8 water_0900A000[] = "textures/water/jrb_textures.0A000.rgba16"; // 0x0900A800 -ALIGNED8 const u8 water_0900A800[] = { -#include "textures/water/jrb_textures.0A800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_0900A800[] = "textures/water/jrb_textures.0A800.rgba16"; // 0x0900B800 -ALIGNED8 const u8 water_0900B800[] = { -#include "textures/water/jrb_textures.0B800.rgba16.inc.c" -}; +ALIGNED8 const u8 water_0900B800[] = "textures/water/jrb_textures.0B800.rgba16"; diff --git a/levels/bbh/texture.inc.c b/levels/bbh/texture.inc.c index 0bafaa7c..15f97e38 100644 --- a/levels/bbh/texture.inc.c +++ b/levels/bbh/texture.inc.c @@ -1,34 +1,20 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 bbh_seg7_texture_07000000[] = { -#include "levels/bbh/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 bbh_seg7_texture_07000000[] = "levels/bbh/0.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 bbh_seg7_texture_07001000[] = { -#include "levels/bbh/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 bbh_seg7_texture_07001000[] = "levels/bbh/1.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 bbh_seg7_texture_07001800[] = { -#include "levels/bbh/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 bbh_seg7_texture_07001800[] = "levels/bbh/2.rgba16"; // 0x07002000 - 0x07003000 -ALIGNED8 static const u8 bbh_seg7_texture_07002000[] = { -#include "levels/bbh/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 bbh_seg7_texture_07002000[] = "levels/bbh/3.rgba16"; // 0x07003000 - 0x07003400 -ALIGNED8 static const u8 bbh_seg7_texture_07003000[] = { -#include "levels/bbh/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 bbh_seg7_texture_07003000[] = "levels/bbh/4.rgba16"; // 0x07003400 - 0x07004400 -ALIGNED8 static const u8 bbh_seg7_texture_07003400[] = { -#include "levels/bbh/5.rgba16.inc.c" -}; +ALIGNED8 static const u8 bbh_seg7_texture_07003400[] = "levels/bbh/5.rgba16"; // 0x07004400 - 0x07004800 -ALIGNED8 static const u8 bbh_seg7_texture_07004400[] = { -#include "levels/bbh/6.rgba16.inc.c" -}; +ALIGNED8 static const u8 bbh_seg7_texture_07004400[] = "levels/bbh/6.rgba16"; diff --git a/levels/bitdw/texture.inc.c b/levels/bitdw/texture.inc.c index 8f1a7a9a..2b8690d4 100644 --- a/levels/bitdw/texture.inc.c +++ b/levels/bitdw/texture.inc.c @@ -1,19 +1,11 @@ // 0x07000000 - 0x07000002 -ALIGNED8 static const u8 bitdw_seg7_texture_07000000[] = { -#include "levels/bitdw/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 bitdw_seg7_texture_07000000[] = "levels/bitdw/0.rgba16"; // 0x07000800 - 0x07000802 -ALIGNED8 static const u8 bitdw_seg7_texture_07000800[] = { -#include "levels/bitdw/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 bitdw_seg7_texture_07000800[] = "levels/bitdw/1.rgba16"; // 0x07001000 - 0x07001002 -ALIGNED8 static const u8 bitdw_seg7_texture_07001000[] = { -#include "levels/bitdw/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 bitdw_seg7_texture_07001000[] = "levels/bitdw/2.rgba16"; // 0x07001800 - 0x07001802 -ALIGNED8 static const u8 bitdw_seg7_texture_07001800[] = { -#include "levels/bitdw/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 bitdw_seg7_texture_07001800[] = "levels/bitdw/3.rgba16"; diff --git a/levels/bitfs/texture.inc.c b/levels/bitfs/texture.inc.c index 2651e7c4..9e08e8f2 100644 --- a/levels/bitfs/texture.inc.c +++ b/levels/bitfs/texture.inc.c @@ -1,14 +1,8 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 bitfs_seg7_texture_07000000[] = { -#include "levels/bitfs/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 bitfs_seg7_texture_07000000[] = "levels/bitfs/0.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 bitfs_seg7_texture_07001000[] = { -#include "levels/bitfs/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 bitfs_seg7_texture_07001000[] = "levels/bitfs/1.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 bitfs_seg7_texture_07001800[] = { -#include "levels/bitfs/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 bitfs_seg7_texture_07001800[] = "levels/bitfs/2.rgba16"; diff --git a/levels/bits/texture.inc.c b/levels/bits/texture.inc.c index 914694b2..4eff308e 100644 --- a/levels/bits/texture.inc.c +++ b/levels/bits/texture.inc.c @@ -1,14 +1,8 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 bits_seg7_texture_07000000[] = { -#include "levels/bits/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 bits_seg7_texture_07000000[] = "levels/bits/0.rgba16"; // 0x07001000 - 0x07002000 -ALIGNED8 static const u8 bits_seg7_texture_07001000[] = { -#include "levels/bits/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 bits_seg7_texture_07001000[] = "levels/bits/1.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 bits_seg7_texture_07002000[] = { -#include "levels/bits/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 bits_seg7_texture_07002000[] = "levels/bits/2.rgba16"; diff --git a/levels/bob/texture.inc.c b/levels/bob/texture.inc.c index 357527cf..4f7c9bde 100644 --- a/levels/bob/texture.inc.c +++ b/levels/bob/texture.inc.c @@ -1,24 +1,14 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 bob_seg7_texture_07000000[] = { -#include "levels/bob/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 bob_seg7_texture_07000000[] = "levels/bob/0.rgba16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 bob_seg7_texture_07000800[] = { -#include "levels/bob/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 bob_seg7_texture_07000800[] = "levels/bob/1.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 bob_seg7_texture_07001000[] = { -#include "levels/bob/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 bob_seg7_texture_07001000[] = "levels/bob/2.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 bob_seg7_texture_07001800[] = { -#include "levels/bob/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 bob_seg7_texture_07001800[] = "levels/bob/3.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 bob_seg7_texture_07002000[] = { -#include "levels/bob/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 bob_seg7_texture_07002000[] = "levels/bob/4.rgba16"; diff --git a/levels/bowser_1/texture.inc.c b/levels/bowser_1/texture.inc.c index 20465c94..88e2071c 100644 --- a/levels/bowser_1/texture.inc.c +++ b/levels/bowser_1/texture.inc.c @@ -1,14 +1,8 @@ // 0x07000000 - 0x07000002 -ALIGNED8 static const u8 bowser_1_seg7_texture_07000000[] = { -#include "levels/bowser_1/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 bowser_1_seg7_texture_07000000[] = "levels/bowser_1/0.rgba16"; // 0x07001000 - 0x07001002 -ALIGNED8 static const u8 bowser_1_seg7_texture_07001000[] = { -#include "levels/bowser_1/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 bowser_1_seg7_texture_07001000[] = "levels/bowser_1/1.rgba16"; // 0x07001800 - 0x07001802 -ALIGNED8 static const u8 bowser_1_seg7_texture_07001800[] = { -#include "levels/bowser_1/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 bowser_1_seg7_texture_07001800[] = "levels/bowser_1/2.rgba16"; diff --git a/levels/bowser_2/texture.inc.c b/levels/bowser_2/texture.inc.c index 9662bae1..98786cd4 100644 --- a/levels/bowser_2/texture.inc.c +++ b/levels/bowser_2/texture.inc.c @@ -1,4 +1,2 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 bowser_2_seg7_texture_07000000[] = { -#include "levels/bowser_2/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 bowser_2_seg7_texture_07000000[] = "levels/bowser_2/0.rgba16"; diff --git a/levels/bowser_3/texture.inc.c b/levels/bowser_3/texture.inc.c index c7360095..21c191e0 100644 --- a/levels/bowser_3/texture.inc.c +++ b/levels/bowser_3/texture.inc.c @@ -1,14 +1,8 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 bowser_3_seg7_texture_07000000[] = { -#include "levels/bowser_3/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 bowser_3_seg7_texture_07000000[] = "levels/bowser_3/0.rgba16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 bowser_3_seg7_texture_07000800[] = { -#include "levels/bowser_3/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 bowser_3_seg7_texture_07000800[] = "levels/bowser_3/1.rgba16"; // 0x07001000 - 0x07002000 -ALIGNED8 static const u8 bowser_3_seg7_texture_07001000[] = { -#include "levels/bowser_3/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 bowser_3_seg7_texture_07001000[] = "levels/bowser_3/2.rgba16"; diff --git a/levels/castle_grounds/areas/1/12/model.inc.c b/levels/castle_grounds/areas/1/12/model.inc.c index baa8677c..7864808f 100644 --- a/levels/castle_grounds/areas/1/12/model.inc.c +++ b/levels/castle_grounds/areas/1/12/model.inc.c @@ -18,14 +18,10 @@ static const Vtx castle_grounds_seg7_vertex_0700C9A8[] = { }; // 0x0700C9E8 - 0x0700D9E8 -ALIGNED8 static const u8 castle_grounds_seg7_texture_0700C9E8[] = { -#include "levels/castle_grounds/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 castle_grounds_seg7_texture_0700C9E8[] = "levels/castle_grounds/3.rgba16"; // 0x0700D9E8 - 0x0700E9E8 -ALIGNED8 static const u8 castle_grounds_seg7_texture_0700D9E8[] = { -#include "levels/castle_grounds/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 castle_grounds_seg7_texture_0700D9E8[] = "levels/castle_grounds/4.rgba16"; // 0x0700E9E8 - 0x0700EA20 static const Gfx castle_grounds_seg7_dl_0700E9E8[] = { diff --git a/levels/castle_grounds/areas/1/13/model.inc.c b/levels/castle_grounds/areas/1/13/model.inc.c index 01912ea5..2fad4951 100644 --- a/levels/castle_grounds/areas/1/13/model.inc.c +++ b/levels/castle_grounds/areas/1/13/model.inc.c @@ -1,6 +1,4 @@ -ALIGNED8 static const u8 castle_grounds_seg7_us_texture_0700EAE8[] = { -#include "levels/castle_grounds/5.ia8.inc.c" -}; +ALIGNED8 static const u8 castle_grounds_seg7_us_texture_0700EAE8[] = "levels/castle_grounds/5.ia8"; // 0x0700F2E8 const Gfx castle_grounds_seg7_us_dl_0700F2E8[] = { diff --git a/levels/castle_grounds/texture.inc.c b/levels/castle_grounds/texture.inc.c index d9f3feae..11857b6d 100644 --- a/levels/castle_grounds/texture.inc.c +++ b/levels/castle_grounds/texture.inc.c @@ -1,14 +1,8 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 castle_grounds_seg7_texture_07000000[] = { -#include "levels/castle_grounds/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 castle_grounds_seg7_texture_07000000[] = "levels/castle_grounds/0.rgba16"; // 0x07001000 - 0x07002000 -ALIGNED8 static const u8 castle_grounds_seg7_texture_07001000[] = { -#include "levels/castle_grounds/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 castle_grounds_seg7_texture_07001000[] = "levels/castle_grounds/1.rgba16"; // 0x07002000 - 0x07003000 -ALIGNED8 static const u8 castle_grounds_seg7_texture_07002000[] = { -#include "levels/castle_grounds/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 castle_grounds_seg7_texture_07002000[] = "levels/castle_grounds/2.rgba16"; diff --git a/levels/castle_inside/texture.inc.c b/levels/castle_inside/texture.inc.c index a0f40ca4..e62b6f9d 100644 --- a/levels/castle_inside/texture.inc.c +++ b/levels/castle_inside/texture.inc.c @@ -1,216 +1,130 @@ -ALIGNED8 static const u8 texture_castle_light[] = { -#include "levels/castle_inside/castle_light.ia16.inc.c" -}; +ALIGNED8 static const u8 texture_castle_light[] = "levels/castle_inside/castle_light.ia16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07000800[] = { -#include "levels/castle_inside/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07000800[] = "levels/castle_inside/1.rgba16"; // 0x07001000 - 0x07002000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07001000[] = { -#include "levels/castle_inside/2.ia16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07001000[] = "levels/castle_inside/2.ia16"; // 0x07002000 - 0x07003000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07002000[] = { -#include "levels/castle_inside/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07002000[] = "levels/castle_inside/3.rgba16"; // 0x07003000 - 0x07003800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07003000[] = { -#include "levels/castle_inside/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07003000[] = "levels/castle_inside/4.rgba16"; // 0x07003800 - 0x07004800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07003800[] = { -#include "levels/castle_inside/5.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07003800[] = "levels/castle_inside/5.rgba16"; // 0x07004800 - 0x07005800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07004800[] = { -#include "levels/castle_inside/6.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07004800[] = "levels/castle_inside/6.rgba16"; // 0x07005800 - 0x07006000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07005800[] = { -#include "levels/castle_inside/7.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07005800[] = "levels/castle_inside/7.rgba16"; // 0x07006000 - 0x07006800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07006000[] = { -#include "levels/castle_inside/8.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07006000[] = "levels/castle_inside/8.rgba16"; // 0x07006800 - 0x07007000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07006800[] = { -#include "levels/castle_inside/9.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07006800[] = "levels/castle_inside/9.rgba16"; // 0x07007000 - 0x07007800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07007000[] = { -#include "levels/castle_inside/10.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07007000[] = "levels/castle_inside/10.rgba16"; // 0x07007800 - 0x07008000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07007800[] = { -#include "levels/castle_inside/11.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07007800[] = "levels/castle_inside/11.rgba16"; // 0x07008000 - 0x07008800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07008000[] = { -#include "levels/castle_inside/12.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07008000[] = "levels/castle_inside/12.rgba16"; // 0x07008800 - 0x07009000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07008800[] = { -#include "levels/castle_inside/13.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07008800[] = "levels/castle_inside/13.rgba16"; // 0x07009000 - 0x07009800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07009000[] = { -#include "levels/castle_inside/14.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07009000[] = "levels/castle_inside/14.rgba16"; // 0x07009800 - 0x0700A000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07009800[] = { -#include "levels/castle_inside/15.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07009800[] = "levels/castle_inside/15.rgba16"; // 0x0700A000 - 0x0700A800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0700A000[] = { -#include "levels/castle_inside/16.ia16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0700A000[] = "levels/castle_inside/16.ia16"; // 0x0700A800 - 0x0700B800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0700A800[] = { -#include "levels/castle_inside/17.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0700A800[] = "levels/castle_inside/17.rgba16"; // 0x0700B800 - 0x0700C800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0700B800[] = { -#include "levels/castle_inside/18.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0700B800[] = "levels/castle_inside/18.rgba16"; // 0x0700C800 - 0x0700D800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0700C800[] = { -#include "levels/castle_inside/19.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0700C800[] = "levels/castle_inside/19.rgba16"; // 0x0700D800 - 0x0700E800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0700D800[] = { -#include "levels/castle_inside/20.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0700D800[] = "levels/castle_inside/20.rgba16"; // 0x0700E800 - 0x0700F800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0700E800[] = { -#include "levels/castle_inside/21.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0700E800[] = "levels/castle_inside/21.rgba16"; // 0x0700F800 - 0x07010800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0700F800[] = { -#include "levels/castle_inside/22.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0700F800[] = "levels/castle_inside/22.rgba16"; #ifdef VERSION_JP // 0x07010800 - 0x07011800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07010800[] = { -#include "levels/castle_inside/23.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07010800[] = "levels/castle_inside/23.rgba16"; // 0x07011800 - 0x0701200 -ALIGNED8 static const u8 inside_castle_seg7_texture_07011800[] = { -#include "levels/castle_inside/24.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07011800[] = "levels/castle_inside/24.rgba16"; #else // 0x07010800 - 0x07011800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07010800[] = { -#include "levels/castle_inside/23_us.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07010800[] = "levels/castle_inside/23_us.rgba16"; // 0x07011800 - 0x0701200 -ALIGNED8 static const u8 inside_castle_seg7_texture_07011800[] = { -#include "levels/castle_inside/24_us.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07011800[] = "levels/castle_inside/24_us.rgba16"; #endif // 0x07012800 - 0x07013800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07012800[] = { -#include "levels/castle_inside/25.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07012800[] = "levels/castle_inside/25.rgba16"; // 0x07013800 - 0x07014800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07013800[] = { -#include "levels/castle_inside/26.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07013800[] = "levels/castle_inside/26.rgba16"; // 0x07014800 - 0x07015800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07014800[] = { -#include "levels/castle_inside/27.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07014800[] = "levels/castle_inside/27.rgba16"; // 0x07015800 - 0x07016800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07015800[] = { -#include "levels/castle_inside/28.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07015800[] = "levels/castle_inside/28.rgba16"; // 0x07016800 - 0x07017000 -ALIGNED8 static const u8 inside_castle_seg7_texture_07016800[] = { -#include "levels/castle_inside/29.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07016800[] = "levels/castle_inside/29.rgba16"; // 0x07017000 - 0x07017800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07017000[] = { -#include "levels/castle_inside/30.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07017000[] = "levels/castle_inside/30.rgba16"; // 0x07017800 - 0x07018800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07017800[] = { -#include "levels/castle_inside/31.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07017800[] = "levels/castle_inside/31.rgba16"; // 0x07018800 - 0x07019800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07018800[] = { -#include "levels/castle_inside/32.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07018800[] = "levels/castle_inside/32.rgba16"; // 0x07019800 - 0x0701A800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07019800[] = { -#include "levels/castle_inside/33.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07019800[] = "levels/castle_inside/33.rgba16"; // 0x0701A800 - 0x0701B800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0701A800[] = { -#include "levels/castle_inside/34.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0701A800[] = "levels/castle_inside/34.rgba16"; // 0x0701B800 - 0x0701C800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0701B800[] = { -#include "levels/castle_inside/35.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0701B800[] = "levels/castle_inside/35.rgba16"; // 0x0701C800 - 0x0701D800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0701C800[] = { -#include "levels/castle_inside/36.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0701C800[] = "levels/castle_inside/36.rgba16"; // 0x0701D800 - 0x0701E800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0701D800[] = { -#include "levels/castle_inside/37.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0701D800[] = "levels/castle_inside/37.rgba16"; // 0x0701E800 - 0x0701F800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0701E800[] = { -#include "levels/castle_inside/38.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0701E800[] = "levels/castle_inside/38.rgba16"; // 0x0701F800 - 0x07020800 -ALIGNED8 static const u8 inside_castle_seg7_texture_0701F800[] = { -#include "levels/castle_inside/39.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_0701F800[] = "levels/castle_inside/39.rgba16"; // 0x07020800 - 0x07021800 -ALIGNED8 static const u8 inside_castle_seg7_texture_07020800[] = { -#include "levels/castle_inside/40.rgba16.inc.c" -}; +ALIGNED8 static const u8 inside_castle_seg7_texture_07020800[] = "levels/castle_inside/40.rgba16"; diff --git a/levels/ccm/snowman_base/model.inc.c b/levels/ccm/snowman_base/model.inc.c index dcc374ae..73df4f9d 100644 --- a/levels/ccm/snowman_base/model.inc.c +++ b/levels/ccm/snowman_base/model.inc.c @@ -5,9 +5,7 @@ static const Lights1 ccm_seg7_lights_07011940 = gdSPDefLights1( ); // 0x07011958 - 0x07012158 -ALIGNED8 static const u8 ccm_seg7_texture_07011958[] = { -#include "levels/ccm/12.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07011958[] = "levels/ccm/12.rgba16"; // 0x07012158 - 0x07012258 static const Vtx ccm_seg7_vertex_07012158[] = { diff --git a/levels/ccm/texture.inc.c b/levels/ccm/texture.inc.c index 0e674fdd..c3451710 100644 --- a/levels/ccm/texture.inc.c +++ b/levels/ccm/texture.inc.c @@ -1,59 +1,35 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 ccm_seg7_texture_07000000[] = { -#include "levels/ccm/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07000000[] = "levels/ccm/0.rgba16"; // 0x07000800 - 0x07000900 -ALIGNED8 static const u8 ccm_seg7_texture_07000800[] = { -#include "levels/ccm/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07000800[] = "levels/ccm/1.rgba16"; // 0x07000900 - 0x07001100 -ALIGNED8 static const u8 ccm_seg7_texture_07000900[] = { -#include "levels/ccm/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07000900[] = "levels/ccm/2.rgba16"; // 0x07001100 - 0x07001900 -ALIGNED8 static const u8 ccm_seg7_texture_07001100[] = { -#include "levels/ccm/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07001100[] = "levels/ccm/3.rgba16"; // 0x07001900 - 0x07002100 -ALIGNED8 static const u8 ccm_seg7_texture_07001900[] = { -#include "levels/ccm/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07001900[] = "levels/ccm/4.rgba16"; // 0x07002100 - 0x07002900 -ALIGNED8 static const u8 ccm_seg7_texture_07002100[] = { -#include "levels/ccm/5.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07002100[] = "levels/ccm/5.rgba16"; // 0x07002900 - 0x07003100 -ALIGNED8 static const u8 ccm_seg7_texture_07002900[] = { -#include "levels/ccm/6.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07002900[] = "levels/ccm/6.rgba16"; // 0x07003100 - 0x07003900 -ALIGNED8 static const u8 ccm_seg7_texture_07003100[] = { -#include "levels/ccm/7.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07003100[] = "levels/ccm/7.rgba16"; // 0x07003900 - 0x07003B00 -ALIGNED8 static const u8 ccm_seg7_texture_07003900[] = { -#include "levels/ccm/8.ia16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07003900[] = "levels/ccm/8.ia16"; // 0x07003B00 - 0x07004300 -ALIGNED8 static const u8 ccm_seg7_texture_07003B00[] = { -#include "levels/ccm/9.ia16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07003B00[] = "levels/ccm/9.ia16"; // 0x07004300 - 0x07004B00 -ALIGNED8 static const u8 ccm_seg7_texture_07004300[] = { -#include "levels/ccm/10.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07004300[] = "levels/ccm/10.rgba16"; // 0x07004B00 - 0x07005300 -ALIGNED8 static const u8 ccm_seg7_texture_07004B00[] = { -#include "levels/ccm/11.rgba16.inc.c" -}; +ALIGNED8 static const u8 ccm_seg7_texture_07004B00[] = "levels/ccm/11.rgba16"; diff --git a/levels/cotmc/texture.inc.c b/levels/cotmc/texture.inc.c index 68c8776e..16241609 100644 --- a/levels/cotmc/texture.inc.c +++ b/levels/cotmc/texture.inc.c @@ -1,24 +1,14 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 cotmc_seg7_texture_07000000[] = { -#include "levels/cotmc/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 cotmc_seg7_texture_07000000[] = "levels/cotmc/0.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 cotmc_seg7_texture_07001000[] = { -#include "levels/cotmc/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 cotmc_seg7_texture_07001000[] = "levels/cotmc/1.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 cotmc_seg7_texture_07001800[] = { -#include "levels/cotmc/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 cotmc_seg7_texture_07001800[] = "levels/cotmc/2.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 cotmc_seg7_texture_07002000[] = { -#include "levels/cotmc/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 cotmc_seg7_texture_07002000[] = "levels/cotmc/3.rgba16"; // 0x07002800 - 0x07003000 -ALIGNED8 static const u8 cotmc_seg7_texture_07002800[] = { -#include "levels/cotmc/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 cotmc_seg7_texture_07002800[] = "levels/cotmc/4.rgba16"; diff --git a/levels/ddd/texture.inc.c b/levels/ddd/texture.inc.c index 990e0aab..df58c3cd 100644 --- a/levels/ddd/texture.inc.c +++ b/levels/ddd/texture.inc.c @@ -1,24 +1,14 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 ddd_seg7_texture_07000000[] = { -#include "levels/ddd/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 ddd_seg7_texture_07000000[] = "levels/ddd/0.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 ddd_seg7_texture_07001000[] = { -#include "levels/ddd/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 ddd_seg7_texture_07001000[] = "levels/ddd/1.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 ddd_seg7_texture_07001800[] = { -#include "levels/ddd/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 ddd_seg7_texture_07001800[] = "levels/ddd/2.rgba16"; // 0x07002000 - 0x07003000 -ALIGNED8 static const u8 ddd_seg7_texture_07002000[] = { -#include "levels/ddd/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 ddd_seg7_texture_07002000[] = "levels/ddd/3.rgba16"; // 0x07003000 - 0x07003800 -ALIGNED8 static const u8 ddd_seg7_texture_07003000[] = { -#include "levels/ddd/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 ddd_seg7_texture_07003000[] = "levels/ddd/4.rgba16"; diff --git a/levels/ending/leveldata.c b/levels/ending/leveldata.c index 0ea6be6f..6c26ec29 100644 --- a/levels/ending/leveldata.c +++ b/levels/ending/leveldata.c @@ -9,835 +9,208 @@ #include "make_const_nonconst.h" -#ifdef VERSION_EU -#include "levels/ending/cake_eu.inc.c" - -// 0x07023000 - 0x07023FFF -ALIGNED8 static const u8 cake_end_texture_eu_35[] = { -#include "levels/ending/eu_023000.rgba16.inc.c" -}; - -// 0x07024000 - 0x07024FFF -ALIGNED8 static const u8 cake_end_texture_eu_36[] = { -#include "levels/ending/eu_024000.rgba16.inc.c" -}; - -// 0x07025000 - 0x07025FFF -ALIGNED8 static const u8 cake_end_texture_eu_37[] = { -#include "levels/ending/eu_025000.rgba16.inc.c" -}; - -// 0x07026000 - 0x07026FFF -ALIGNED8 static const u8 cake_end_texture_eu_38[] = { -#include "levels/ending/eu_026000.rgba16.inc.c" -}; - -// 0x07027000 - 0x07027FFF -ALIGNED8 static const u8 cake_end_texture_eu_39[] = { -#include "levels/ending/eu_027000.rgba16.inc.c" -}; - -// 0x07028000 - 0x07028FFF -ALIGNED8 static const u8 cake_end_texture_eu_40[] = { -#include "levels/ending/eu_028000.rgba16.inc.c" -}; - -// 0x07029000 - 0x070296D8 const Gfx dl_cake_end_screen[] = { gsDPPipeSync(), - gsDPSetCycleType(G_CYC_COPY), - gsDPSetTexturePersp(G_TP_NONE), - gsDPSetRenderMode(G_RM_NOOP, G_RM_NOOP2), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), - gsDPTileSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 6, G_TX_NOLOD), - gsDPSetTileSize(0, 0, 0, (64 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_0), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(0 << 2, 8 << 2, (0 + 63) << 2, (8 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_1), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(64 << 2, 8 << 2, (64 + 63) << 2, (8 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_2), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 8 << 2, (128 + 63) << 2, (8 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_3), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(192 << 2, 8 << 2, (192 + 63) << 2, (8 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_4), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(256 << 2, 8 << 2, (256 + 63) << 2, (8 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_5), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(0 << 2, 40 << 2, (0 + 63) << 2, (40 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_6), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(64 << 2, 40 << 2, (64 + 63) << 2, (40 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_7), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 40 << 2, (128 + 63) << 2, (40 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_8), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(192 << 2, 40 << 2, (192 + 63) << 2, (40 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_9), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(256 << 2, 40 << 2, (256 + 63) << 2, (40 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_10), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(0 << 2, 72 << 2, (0 + 63) << 2, (72 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_11), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(64 << 2, 72 << 2, (64 + 63) << 2, (72 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_12), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 72 << 2, (128 + 63) << 2, (72 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_13), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(192 << 2, 72 << 2, (192 + 63) << 2, (72 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_14), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(256 << 2, 72 << 2, (256 + 63) << 2, (72 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_15), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(0 << 2, 104 << 2, (0 + 63) << 2, (104 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_16), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(64 << 2, 104 << 2, (64 + 63) << 2, (104 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_17), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 104 << 2, (128 + 63) << 2, (104 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_18), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(192 << 2, 104 << 2, (192 + 63) << 2, (104 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_19), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(256 << 2, 104 << 2, (256 + 63) << 2, (104 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_20), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(0 << 2, 136 << 2, (0 + 63) << 2, (136 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_21), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(64 << 2, 136 << 2, (64 + 63) << 2, (136 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_22), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 136 << 2, (128 + 63) << 2, (136 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_23), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(192 << 2, 136 << 2, (192 + 63) << 2, (136 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_24), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(256 << 2, 136 << 2, (256 + 63) << 2, (136 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_25), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(0 << 2, 168 << 2, (0 + 63) << 2, (168 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_26), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(64 << 2, 168 << 2, (64 + 63) << 2, (168 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_27), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 168 << 2, (128 + 63) << 2, (168 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_28), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(192 << 2, 168 << 2, (192 + 63) << 2, (168 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_29), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(256 << 2, 168 << 2, (256 + 63) << 2, (168 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_30), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(0 << 2, 200 << 2, (0 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_31), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(64 << 2, 200 << 2, (64 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_32), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 200 << 2, (128 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_33), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(192 << 2, 200 << 2, (192 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_34), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(256 << 2, 200 << 2, (256 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), + //gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), + //gsDPSetRenderMode(G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2), + //gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + + //gsDPLoadTextureBlock(cake_end_texture_0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025800, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_1, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025840, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_2, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025880, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_3, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_070258C0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_4, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025900, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_5, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025940, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_6, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025980, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_7, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_070259C0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025A00, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_9, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025A40, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_10, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025A80, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_11, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025AC0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_12, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025B00, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_13, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025B40, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_14, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025B80, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_15, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025BC0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_16, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025C00, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_17, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025C40, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_18, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025C80, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_19, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025CC0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_20, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025D00, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_21, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025D40, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_22, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025D80, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_23, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025DC0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_24, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025E00, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_25, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025E40, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_26, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025E80, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_27, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025EC0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_28, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025F00, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_29, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025F40, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_30, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025F80, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_31, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07025FC0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_32, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026000, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_33, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026040, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_34, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026080, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_35, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_070260C0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_36, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026100, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_37, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026140, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_38, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026180, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_39, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_070261C0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_40, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026200, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_41, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026240, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_42, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026280, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_43, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_070262C0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_44, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026300, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_45, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026340, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_46, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_07026380, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPLoadTextureBlock(cake_end_texture_47, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), + //gsSPVertex(cake_end_vertex_070263C0, 4, 0), + //gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + //gsDPPipeSync(), + //gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + //gsSPSetGeometryMode(G_LIGHTING), + //gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + //gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), gsSPEndDisplayList(), }; - -// 0x070296D8 - 0x070296F8 -static const Gfx dl_cake_end_eu_070296D8[] = { - gsDPPipeSync(), - gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetTexturePersp(G_TP_PERSP), - gsSPEndDisplayList(), -}; - -// 0x070296F8 - 0x07029768 -const Gfx dl_cake_end_screen_eu_070296F8[] = { - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_38), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 200 << 2, (128 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_35), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 125 << 2, (128 + 63) << 2, (125 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsSPDisplayList(dl_cake_end_eu_070296D8), - gsSPEndDisplayList(), -}; - -// 0x07029768 - 0x070297D8 -const Gfx dl_cake_end_screen_eu_07029768[] = { - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_39), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 200 << 2, (128 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_36), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 125 << 2, (128 + 63) << 2, (125 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsSPDisplayList(dl_cake_end_eu_070296D8), - gsSPEndDisplayList(), -}; - -// 0x070297D8 - 0x07029848 -const Gfx dl_cake_end_screen_eu_070297D8[] = { - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_40), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 200 << 2, (128 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_37), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPTextureRectangle(128 << 2, 125 << 2, (128 + 63) << 2, (125 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsSPDisplayList(dl_cake_end_eu_070296D8), - gsSPEndDisplayList(), -}; - -// VERSION_EU -#else - -#include "levels/ending/cake.inc.c" - -// 0x07025800 - 0x07025840 -static const Vtx cake_end_vertex_07025800[] = { - {{{ 0, 220, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 220, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 240, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 240, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025840 - 0x07025880 -static const Vtx cake_end_vertex_07025840[] = { - {{{ 80, 220, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 220, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 240, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 240, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025880 - 0x070258C0 -static const Vtx cake_end_vertex_07025880[] = { - {{{ 160, 220, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 220, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 240, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 240, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x070258C0 - 0x07025900 -static const Vtx cake_end_vertex_070258C0[] = { - {{{ 240, 220, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 220, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 240, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 240, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025900 - 0x07025940 -static const Vtx cake_end_vertex_07025900[] = { - {{{ 0, 200, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 200, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 220, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 220, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025940 - 0x07025980 -static const Vtx cake_end_vertex_07025940[] = { - {{{ 80, 200, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 200, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 220, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 220, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025980 - 0x070259C0 -static const Vtx cake_end_vertex_07025980[] = { - {{{ 160, 200, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 200, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 220, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 220, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x070259C0 - 0x07025A00 -static const Vtx cake_end_vertex_070259C0[] = { - {{{ 240, 200, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 200, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 220, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 220, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025A00 - 0x07025A40 -static const Vtx cake_end_vertex_07025A00[] = { - {{{ 0, 180, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 180, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 200, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 200, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025A40 - 0x07025A80 -static const Vtx cake_end_vertex_07025A40[] = { - {{{ 80, 180, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 180, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 200, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 200, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025A80 - 0x07025AC0 -static const Vtx cake_end_vertex_07025A80[] = { - {{{ 160, 180, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 180, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 200, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 200, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025AC0 - 0x07025B00 -static const Vtx cake_end_vertex_07025AC0[] = { - {{{ 240, 180, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 180, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 200, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 200, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025B00 - 0x07025B40 -static const Vtx cake_end_vertex_07025B00[] = { - {{{ 0, 160, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 160, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 180, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 180, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025B40 - 0x07025B80 -static const Vtx cake_end_vertex_07025B40[] = { - {{{ 80, 160, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 160, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 180, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 180, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025B80 - 0x07025BC0 -static const Vtx cake_end_vertex_07025B80[] = { - {{{ 160, 160, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 160, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 180, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 180, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025BC0 - 0x07025C00 -static const Vtx cake_end_vertex_07025BC0[] = { - {{{ 240, 160, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 160, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 180, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 180, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025C00 - 0x07025C40 -static const Vtx cake_end_vertex_07025C00[] = { - {{{ 0, 140, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 140, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 160, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 160, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025C40 - 0x07025C80 -static const Vtx cake_end_vertex_07025C40[] = { - {{{ 80, 140, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 140, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 160, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 160, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025C80 - 0x07025CC0 -static const Vtx cake_end_vertex_07025C80[] = { - {{{ 160, 140, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 140, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 160, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 160, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025CC0 - 0x07025D00 -static const Vtx cake_end_vertex_07025CC0[] = { - {{{ 240, 140, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 140, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 160, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 160, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025D00 - 0x07025D40 -static const Vtx cake_end_vertex_07025D00[] = { - {{{ 0, 120, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 120, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 140, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 140, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025D40 - 0x07025D80 -static const Vtx cake_end_vertex_07025D40[] = { - {{{ 80, 120, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 120, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 140, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 140, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025D80 - 0x07025DC0 -static const Vtx cake_end_vertex_07025D80[] = { - {{{ 160, 120, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 120, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 140, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 140, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025DC0 - 0x07025E00 -static const Vtx cake_end_vertex_07025DC0[] = { - {{{ 240, 120, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 120, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 140, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 140, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025E00 - 0x07025E40 -static const Vtx cake_end_vertex_07025E00[] = { - {{{ 0, 100, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 100, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 120, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 120, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025E40 - 0x07025E80 -static const Vtx cake_end_vertex_07025E40[] = { - {{{ 80, 100, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 100, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 120, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 120, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025E80 - 0x07025EC0 -static const Vtx cake_end_vertex_07025E80[] = { - {{{ 160, 100, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 100, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 120, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 120, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025EC0 - 0x07025F00 -static const Vtx cake_end_vertex_07025EC0[] = { - {{{ 240, 100, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 100, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 120, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 120, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025F00 - 0x07025F40 -static const Vtx cake_end_vertex_07025F00[] = { - {{{ 0, 80, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 80, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 100, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 100, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025F40 - 0x07025F80 -static const Vtx cake_end_vertex_07025F40[] = { - {{{ 80, 80, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 80, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 100, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 100, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025F80 - 0x07025FC0 -static const Vtx cake_end_vertex_07025F80[] = { - {{{ 160, 80, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 80, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 100, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 100, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07025FC0 - 0x07026000 -static const Vtx cake_end_vertex_07025FC0[] = { - {{{ 240, 80, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 80, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 100, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 100, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026000 - 0x07026040 -static const Vtx cake_end_vertex_07026000[] = { - {{{ 0, 60, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 60, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 80, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 80, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026040 - 0x07026080 -static const Vtx cake_end_vertex_07026040[] = { - {{{ 80, 60, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 60, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 80, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 80, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026080 - 0x070260C0 -static const Vtx cake_end_vertex_07026080[] = { - {{{ 160, 60, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 60, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 80, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 80, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x070260C0 - 0x07026100 -static const Vtx cake_end_vertex_070260C0[] = { - {{{ 240, 60, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 60, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 80, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 80, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026100 - 0x07026140 -static const Vtx cake_end_vertex_07026100[] = { - {{{ 0, 40, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 40, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 60, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 60, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026140 - 0x07026180 -static const Vtx cake_end_vertex_07026140[] = { - {{{ 80, 40, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 40, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 60, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 60, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026180 - 0x070261C0 -static const Vtx cake_end_vertex_07026180[] = { - {{{ 160, 40, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 40, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 60, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 60, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x070261C0 - 0x07026200 -static const Vtx cake_end_vertex_070261C0[] = { - {{{ 240, 40, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 40, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 60, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 60, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026200 - 0x07026240 -static const Vtx cake_end_vertex_07026200[] = { - {{{ 0, 20, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 20, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 40, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 40, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026240 - 0x07026280 -static const Vtx cake_end_vertex_07026240[] = { - {{{ 80, 20, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 20, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 40, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 40, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026280 - 0x070262C0 -static const Vtx cake_end_vertex_07026280[] = { - {{{ 160, 20, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 20, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 40, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 40, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x070262C0 - 0x07026300 -static const Vtx cake_end_vertex_070262C0[] = { - {{{ 240, 20, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 20, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 40, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 40, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026300 - 0x07026340 -static const Vtx cake_end_vertex_07026300[] = { - {{{ 0, 0, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 0, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 20, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 20, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026340 - 0x07026380 -static const Vtx cake_end_vertex_07026340[] = { - {{{ 80, 0, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 0, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 20, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 20, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026380 - 0x070263C0 -static const Vtx cake_end_vertex_07026380[] = { - {{{ 160, 0, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 0, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 20, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 160, 20, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x070263C0 - 0x07026400 -static const Vtx cake_end_vertex_070263C0[] = { - {{{ 240, 0, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 0, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 320, 20, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 240, 20, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x07026400 - 0x07027350 -const Gfx dl_cake_end_screen[] = { - gsDPPipeSync(), - gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), - gsDPSetRenderMode(G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - - gsDPLoadTextureBlock(cake_end_texture_0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025800, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_1, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025840, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_2, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025880, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_3, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_070258C0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_4, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025900, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_5, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025940, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_6, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025980, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_7, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_070259C0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025A00, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_9, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025A40, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_10, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025A80, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_11, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025AC0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_12, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025B00, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_13, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025B40, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_14, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025B80, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_15, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025BC0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_16, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025C00, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_17, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025C40, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_18, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025C80, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_19, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025CC0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_20, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025D00, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_21, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025D40, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_22, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025D80, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_23, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025DC0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_24, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025E00, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_25, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025E40, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_26, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025E80, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_27, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025EC0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_28, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025F00, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_29, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025F40, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_30, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025F80, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_31, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07025FC0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_32, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026000, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_33, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026040, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_34, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026080, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_35, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_070260C0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_36, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026100, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_37, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026140, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_38, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026180, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_39, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_070261C0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_40, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026200, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_41, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026240, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_42, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026280, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_43, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_070262C0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_44, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026300, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_45, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026340, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_46, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_07026380, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPLoadTextureBlock(cake_end_texture_47, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(cake_end_vertex_070263C0, 4, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - - gsDPPipeSync(), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), - gsSPSetGeometryMode(G_LIGHTING), - gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), - gsSPEndDisplayList(), -}; -#endif diff --git a/levels/hmc/areas/1/painting.inc.c b/levels/hmc/areas/1/painting.inc.c index f2ff45df..d09f4020 100644 --- a/levels/hmc/areas/1/painting.inc.c +++ b/levels/hmc/areas/1/painting.inc.c @@ -501,9 +501,7 @@ UNUSED static const u64 hmc_unused_0 = 0; // 0x07024CE0 - 0x070254E0 -ALIGNED8 static const u8 hmc_seg7_texture_07024CE0[] = { -#include "levels/hmc/7.rgba16.inc.c" -}; +ALIGNED8 static const u8 hmc_seg7_texture_07024CE0[] = "levels/hmc/7.rgba16"; // 0x070254E0 - 0x07025518 static const Gfx hmc_seg7_painting_dl_070254E0[] = { diff --git a/levels/hmc/texture.inc.c b/levels/hmc/texture.inc.c index 51e8a10c..22a98c06 100644 --- a/levels/hmc/texture.inc.c +++ b/levels/hmc/texture.inc.c @@ -1,34 +1,20 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 hmc_seg7_texture_07000000[] = { -#include "levels/hmc/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 hmc_seg7_texture_07000000[] = "levels/hmc/0.rgba16"; // 0x07001000 - 0x07002000 -ALIGNED8 static const u8 hmc_seg7_texture_07001000[] = { -#include "levels/hmc/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 hmc_seg7_texture_07001000[] = "levels/hmc/1.rgba16"; // 0x07002000 - 0x07003000 -ALIGNED8 static const u8 hmc_seg7_texture_07002000[] = { -#include "levels/hmc/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 hmc_seg7_texture_07002000[] = "levels/hmc/2.rgba16"; // 0x07003000 - 0x07003800 -ALIGNED8 static const u8 hmc_seg7_texture_07003000[] = { -#include "levels/hmc/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 hmc_seg7_texture_07003000[] = "levels/hmc/3.rgba16"; // 0x07003800 - 0x07004000 -ALIGNED8 static const u8 hmc_seg7_texture_07003800[] = { -#include "levels/hmc/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 hmc_seg7_texture_07003800[] = "levels/hmc/4.rgba16"; // 0x07004000 - 0x07004800 -ALIGNED8 static const u8 hmc_seg7_texture_07004000[] = { -#include "levels/hmc/5.rgba16.inc.c" -}; +ALIGNED8 static const u8 hmc_seg7_texture_07004000[] = "levels/hmc/5.rgba16"; // 0x07004800 - 0x07005800 -ALIGNED8 static const u8 hmc_seg7_texture_07004800[] = { -#include "levels/hmc/6.rgba16.inc.c" -}; +ALIGNED8 static const u8 hmc_seg7_texture_07004800[] = "levels/hmc/6.rgba16"; diff --git a/levels/intro/leveldata.c b/levels/intro/leveldata.c index d5471c85..530538a3 100644 --- a/levels/intro/leveldata.c +++ b/levels/intro/leveldata.c @@ -2580,14 +2580,10 @@ static const Vtx intro_seg7_vertex_07007DF0[] = { }; // 0x07007EA0 - 0x07007EA2 -ALIGNED8 static const u8 intro_seg7_texture_07007EA0[] = { -#include "levels/intro/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 intro_seg7_texture_07007EA0[] = "levels/intro/0.rgba16"; // 0x070086A0 - 0x070086A2 -ALIGNED8 static const u8 intro_seg7_texture_070086A0[] = { -#include "levels/intro/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 intro_seg7_texture_070086A0[] = "levels/intro/1.rgba16"; // 0x07008EA0 - 0x07009E38 static const Gfx intro_seg7_dl_07008EA0[] = { @@ -3317,18 +3313,10 @@ Lights1 titletest_sm64_material_003_lights = gdSPDefLights1( 0x7F, 0x7F, 0x7F, 0xFE, 0xFE, 0xFE, 0x28, 0x28, 0x28); -u8 titletest_blue_rgba16[] = { - #include "levels/intro/blue.rgba16.inc.c" -}; -u8 titletest_darkerblue_rgba16[] = { - #include "levels/intro/darkerblue.rgba16.inc.c" -}; -u8 titletest_white_rgba16[] = { - #include "levels/intro/white.rgba16.inc.c" -}; -u8 titletest_grey_rgba16[] = { - #include "levels/intro/grey.rgba16.inc.c" -}; +u8 titletest_blue_rgba16[] = "levels/intro/blue.rgba16"; +u8 titletest_darkerblue_rgba16[] = "levels/intro/darkerblue.rgba16"; +u8 titletest_white_rgba16[] = "levels/intro/white.rgba16"; +u8 titletest_grey_rgba16[] = "levels/intro/grey.rgba16"; Vtx titletest_test_mesh_vtx_0[133] = { {{{1221, 451, -274},0, {-16, 496},{0x0, 0x42, 0x6D, 0xFF}}}, {{{1434, 440, -267},0, {38, 496},{0x0, 0x42, 0x6D, 0xFF}}}, @@ -5845,25 +5833,17 @@ static const Vtx intro_seg7_vertex_0700B460[] = { #ifdef VERSION_EU // 0x0700B4A0 - 0x0700B4A2 -ALIGNED8 static const u8 intro_seg7_texture_0700B4A0[] = { -#include "levels/intro/2_eu_copyright.rgba16.inc.c" -}; +ALIGNED8 static const u8 intro_seg7_texture_0700B4A0[] = "levels/intro/2_eu_copyright.rgba16"; // 0x0700C4A0 - 0x0700D4A0 -ALIGNED8 static const u8 intro_seg7_texture_0700C4A0[] = { -#include "levels/intro/3_eu_tm.rgba16.inc.c" -}; +ALIGNED8 static const u8 intro_seg7_texture_0700C4A0[] = "levels/intro/3_eu_tm.rgba16"; #else // 0x0700B4A0 - 0x0700B4A2 -ALIGNED8 static const u8 intro_seg7_texture_0700B4A0[] = { -#include "levels/intro/2_copyright.rgba16.inc.c" -}; +ALIGNED8 static const u8 intro_seg7_texture_0700B4A0[] = "levels/intro/2_copyright.rgba16"; // 0x0700C4A0 - 0x0700D4A0 -ALIGNED8 static const u8 intro_seg7_texture_0700C4A0[] = { -#include "levels/intro/3_tm.rgba16.inc.c" -}; +ALIGNED8 static const u8 intro_seg7_texture_0700C4A0[] = "levels/intro/3_tm.rgba16"; #endif // 0x0700C6A0 - 0x0700C790 diff --git a/levels/jrb/texture.inc.c b/levels/jrb/texture.inc.c index ee6df27e..417cc3eb 100644 --- a/levels/jrb/texture.inc.c +++ b/levels/jrb/texture.inc.c @@ -1,19 +1,11 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 jrb_seg7_texture_07000000[] = { -#include "levels/jrb/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 jrb_seg7_texture_07000000[] = "levels/jrb/0.rgba16"; // 0x07000800 - 0x07001800 -ALIGNED8 static const u8 jrb_seg7_texture_07000800[] = { -#include "levels/jrb/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 jrb_seg7_texture_07000800[] = "levels/jrb/1.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 jrb_seg7_texture_07001800[] = { -#include "levels/jrb/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 jrb_seg7_texture_07001800[] = "levels/jrb/2.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 jrb_seg7_texture_07002000[] = { -#include "levels/jrb/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 jrb_seg7_texture_07002000[] = "levels/jrb/3.rgba16"; diff --git a/levels/lll/texture.inc.c b/levels/lll/texture.inc.c index 1d7117d5..3c3d6c11 100644 --- a/levels/lll/texture.inc.c +++ b/levels/lll/texture.inc.c @@ -1,164 +1,98 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 lll_seg7_texture_07000000[] = { -#include "levels/lll/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07000000[] = "levels/lll/0.rgba16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 lll_seg7_texture_07000800[] = { -#include "levels/lll/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07000800[] = "levels/lll/1.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 lll_seg7_texture_07001000[] = { -#include "levels/lll/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07001000[] = "levels/lll/2.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 lll_seg7_texture_07001800[] = { -#include "levels/lll/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07001800[] = "levels/lll/3.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 lll_seg7_texture_07002000[] = { -#include "levels/lll/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07002000[] = "levels/lll/4.rgba16"; // 0x07002800 - 0x07003000 -ALIGNED8 static const u8 lll_seg7_texture_07002800[] = { -#include "levels/lll/5.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07002800[] = "levels/lll/5.rgba16"; // 0x07003000 - 0x07003800 -ALIGNED8 static const u8 lll_seg7_texture_07003000[] = { -#include "levels/lll/6.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07003000[] = "levels/lll/6.rgba16"; // 0x07003800 - 0x07004000 -ALIGNED8 static const u8 lll_seg7_texture_07003800[] = { -#include "levels/lll/7.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07003800[] = "levels/lll/7.rgba16"; // 0x07004000 - 0x07004800 -ALIGNED8 static const u8 lll_seg7_texture_07004000[] = { -#include "levels/lll/8.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07004000[] = "levels/lll/8.rgba16"; // 0x07004800 - 0x07005000 -ALIGNED8 static const u8 lll_seg7_texture_07004800[] = { -#include "levels/lll/9.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07004800[] = "levels/lll/9.rgba16"; // 0x07005000 - 0x07005800 -ALIGNED8 static const u8 lll_seg7_texture_07005000[] = { -#include "levels/lll/10.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07005000[] = "levels/lll/10.rgba16"; // 0x07005800 - 0x07006000 -ALIGNED8 static const u8 lll_seg7_texture_07005800[] = { -#include "levels/lll/11.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07005800[] = "levels/lll/11.rgba16"; // 0x07006000 - 0x07006800 -ALIGNED8 static const u8 lll_seg7_texture_07006000[] = { -#include "levels/lll/12.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07006000[] = "levels/lll/12.rgba16"; // 0x07006800 - 0x07007000 -ALIGNED8 static const u8 lll_seg7_texture_07006800[] = { -#include "levels/lll/13.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07006800[] = "levels/lll/13.rgba16"; // 0x07007000 - 0x07007800 -ALIGNED8 static const u8 lll_seg7_texture_07007000[] = { -#include "levels/lll/14.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07007000[] = "levels/lll/14.rgba16"; // 0x07007800 - 0x07008000 -ALIGNED8 static const u8 lll_seg7_texture_07007800[] = { -#include "levels/lll/15.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07007800[] = "levels/lll/15.rgba16"; // 0x07008000 - 0x07008800 -ALIGNED8 static const u8 lll_seg7_texture_07008000[] = { -#include "levels/lll/16.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07008000[] = "levels/lll/16.rgba16"; // 0x07008800 - 0x07009000 -ALIGNED8 static const u8 lll_seg7_texture_07008800[] = { -#include "levels/lll/17.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07008800[] = "levels/lll/17.rgba16"; // 0x07009000 - 0x07009800 -ALIGNED8 static const u8 lll_seg7_texture_07009000[] = { -#include "levels/lll/18.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07009000[] = "levels/lll/18.rgba16"; // 0x07009800 - 0x0700A000 -ALIGNED8 static const u8 lll_seg7_texture_07009800[] = { -#include "levels/lll/19.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_07009800[] = "levels/lll/19.rgba16"; // 0x0700A000 - 0x0700A800 -ALIGNED8 static const u8 lll_seg7_texture_0700A000[] = { -#include "levels/lll/20.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700A000[] = "levels/lll/20.rgba16"; // 0x0700A800 - 0x0700B000 -ALIGNED8 static const u8 lll_seg7_texture_0700A800[] = { -#include "levels/lll/21.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700A800[] = "levels/lll/21.rgba16"; // 0x0700B000 - 0x0700B800 -ALIGNED8 static const u8 lll_seg7_texture_0700B000[] = { -#include "levels/lll/22.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700B000[] = "levels/lll/22.rgba16"; // 0x0700B800 - 0x0700C000 -ALIGNED8 static const u8 lll_seg7_texture_0700B800[] = { -#include "levels/lll/23.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700B800[] = "levels/lll/23.rgba16"; // 0x0700C000 - 0x0700C800 -ALIGNED8 static const u8 lll_seg7_texture_0700C000[] = { -#include "levels/lll/24.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700C000[] = "levels/lll/24.rgba16"; // 0x0700C800 - 0x0700D000 -ALIGNED8 static const u8 lll_seg7_texture_0700C800[] = { -#include "levels/lll/25.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700C800[] = "levels/lll/25.rgba16"; // 0x0700D000 - 0x0700D200 -ALIGNED8 static const u8 lll_seg7_texture_0700D000[] = { -#include "levels/lll/26.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700D000[] = "levels/lll/26.rgba16"; // 0x0700D200 - 0x0700D400 -ALIGNED8 static const u8 lll_seg7_texture_0700D200[] = { -#include "levels/lll/27.ia16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700D200[] = "levels/lll/27.ia16"; // 0x0700D400 - 0x0700DC00 -ALIGNED8 static const u8 lll_seg7_texture_0700D400[] = { -#include "levels/lll/28.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700D400[] = "levels/lll/28.rgba16"; // 0x0700DC00 - 0x0700E400 -ALIGNED8 static const u8 lll_seg7_texture_0700DC00[] = { -#include "levels/lll/29.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700DC00[] = "levels/lll/29.rgba16"; // 0x0700E400 - 0x0700EC00 -ALIGNED8 static const u8 lll_seg7_texture_0700E400[] = { -#include "levels/lll/30.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700E400[] = "levels/lll/30.rgba16"; // 0x0700EC00 - 0x0700F400 -ALIGNED8 static const u8 lll_seg7_texture_0700EC00[] = { -#include "levels/lll/31.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700EC00[] = "levels/lll/31.rgba16"; // 0x0700F400 - 0x0700FC00 -ALIGNED8 static const u8 lll_seg7_texture_0700F400[] = { -#include "levels/lll/32.rgba16.inc.c" -}; +ALIGNED8 static const u8 lll_seg7_texture_0700F400[] = "levels/lll/32.rgba16"; diff --git a/levels/menu/leveldata.c b/levels/menu/leveldata.c index 4ccfea80..571b61c2 100644 --- a/levels/menu/leveldata.c +++ b/levels/menu/leveldata.c @@ -18,24 +18,16 @@ static const Lights1 lights_menu_save_button = gdSPDefLights1( ); // 0x07000018 - 0x07000818 -ALIGNED8 static const u8 texture_menu_stone[] = { -#include "levels/menu/main_menu_seg7.00018.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_stone[] = "levels/menu/main_menu_seg7.00018.rgba16"; // 0x07000818 - 0x07001018 -ALIGNED8 static const u8 texture_menu_dark_stone[] = { -#include "levels/menu/main_menu_seg7.00818.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_dark_stone[] = "levels/menu/main_menu_seg7.00818.rgba16"; // 0x07001018 - 0x07002018 -ALIGNED8 static const u8 texture_menu_mario_save[] = { -#include "levels/menu/main_menu_seg7.01018.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_mario_save[] = "levels/menu/main_menu_seg7.01018.rgba16"; // 0x07002018 - 0x07003018 -ALIGNED8 static const u8 texture_menu_mario_new[] = { -#include "levels/menu/main_menu_seg7.02018.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_mario_new[] = "levels/menu/main_menu_seg7.02018.rgba16"; // 0x07003018 - 0x07003118 static const Vtx vertex_menu_save_button_borders[] = { @@ -196,29 +188,19 @@ static const Lights1 lights_menu_main_button = gdSPDefLights1( ); // 0x07003468 - 0x07003468 -ALIGNED8 static const u8 texture_menu_erase[] = { -#include "levels/menu/main_menu_seg7.03468.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_erase[] = "levels/menu/main_menu_seg7.03468.rgba16"; // 0x07003C68 - 0x07003C68 -ALIGNED8 static const u8 texture_menu_copy[] = { -#include "levels/menu/main_menu_seg7.03C68.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_copy[] = "levels/menu/main_menu_seg7.03C68.rgba16"; // 0x07004468 - 0x07004468 -ALIGNED8 static const u8 texture_menu_file[] = { -#include "levels/menu/main_menu_seg7.04468.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_file[] = "levels/menu/main_menu_seg7.04468.rgba16"; // 0x07004C68 - 0x07004C68 -ALIGNED8 static const u8 texture_menu_score[] = { -#include "levels/menu/main_menu_seg7.04C68.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_score[] = "levels/menu/main_menu_seg7.04C68.rgba16"; // 0x07005468 - 0x07005468 -ALIGNED8 static const u8 texture_menu_sound[] = { -#include "levels/menu/main_menu_seg7.05468.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_sound[] = "levels/menu/main_menu_seg7.05468.rgba16"; // 0x07005C68 - 0x07005D68 static const Vtx vertex_menu_main_button_group1[] = { @@ -415,14 +397,10 @@ static const Vtx vertex_menu_hand[] = { }; // 0x07006328 - 0x07006B28 -ALIGNED8 static const u8 texture_menu_idle_hand[] = { -#include "levels/menu/main_menu_seg7.06328.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_idle_hand[] = "levels/menu/main_menu_seg7.06328.rgba16"; // 0x07006B28 - 0x07007328 -ALIGNED8 static const u8 texture_menu_grabbing_hand[] = { -#include "levels/menu/main_menu_seg7.06B28.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_grabbing_hand[] = "levels/menu/main_menu_seg7.06B28.rgba16"; // 0x07007328 - 0x070073A0 static const Gfx dl_menu_hand[] = { @@ -457,144 +435,88 @@ const Gfx dl_menu_grabbing_hand[] = { }; // 0x070073D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_hu[] = { -#include "levels/menu/main_menu_seg7.073D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_hu[] = "levels/menu/main_menu_seg7.073D0.rgba16"; // 0x070075D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_small_a[] = { -#include "levels/menu/main_menu_seg7.075D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_small_a[] = "levels/menu/main_menu_seg7.075D0.rgba16"; // 0x070077D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_i[] = { -#include "levels/menu/main_menu_seg7.077D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_i[] = "levels/menu/main_menu_seg7.077D0.rgba16"; // 0x070079D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_ru[] = { -#include "levels/menu/main_menu_seg7.079D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_ru[] = "levels/menu/main_menu_seg7.079D0.rgba16"; // 0x07007BD0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_se[] = { -#include "levels/menu/main_menu_seg7.07BD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_se[] = "levels/menu/main_menu_seg7.07BD0.rgba16"; // 0x07007DD0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_re[] = { -#include "levels/menu/main_menu_seg7.07DD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_re[] = "levels/menu/main_menu_seg7.07DD0.rgba16"; // 0x07007FD0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_ku[] = { -#include "levels/menu/main_menu_seg7.07FD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_ku[] = "levels/menu/main_menu_seg7.07FD0.rgba16"; // 0x070081D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_to[] = { -#include "levels/menu/main_menu_seg7.081D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_to[] = "levels/menu/main_menu_seg7.081D0.rgba16"; // 0x070083D0 -ALIGNED8 static const u8 texture_menu_hud_char_hiragana_wo[] = { -#include "levels/menu/main_menu_seg7.083D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_hiragana_wo[] = "levels/menu/main_menu_seg7.083D0.rgba16"; // 0x070085D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_ko[] = { -#include "levels/menu/main_menu_seg7.085D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_ko[] = "levels/menu/main_menu_seg7.085D0.rgba16"; // 0x070087D0 -ALIGNED8 static const u8 texture_menu_hud_char_kana_handakuten_pi[] = { -#include "levels/menu/main_menu_seg7.087D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_kana_handakuten_pi[] = "levels/menu/main_menu_seg7.087D0.rgba16"; // 0x070089D0 -ALIGNED8 static const u8 texture_menu_hud_char_choonpu[] = { -#include "levels/menu/main_menu_seg7.089D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_choonpu[] = "levels/menu/main_menu_seg7.089D0.rgba16"; // 0x07008BD0 -ALIGNED8 static const u8 texture_menu_hud_char_hiragana_su[] = { -#include "levels/menu/main_menu_seg7.08BD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_hiragana_su[] = "levels/menu/main_menu_seg7.08BD0.rgba16"; // 0x07008DD0 -ALIGNED8 static const u8 texture_menu_hud_char_hiragana_ru[] = { -#include "levels/menu/main_menu_seg7.08DD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_hiragana_ru[] = "levels/menu/main_menu_seg7.08DD0.rgba16"; // 0x07008FD0 -ALIGNED8 static const u8 texture_menu_hud_char_hiragana_ke[] = { -#include "levels/menu/main_menu_seg7.08FD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_hiragana_ke[] = "levels/menu/main_menu_seg7.08FD0.rgba16"; // 0x070091D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_ma[] = { -#include "levels/menu/main_menu_seg7.091D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_ma[] = "levels/menu/main_menu_seg7.091D0.rgba16"; // 0x070093D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_ri[] = { -#include "levels/menu/main_menu_seg7.093D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_ri[] = "levels/menu/main_menu_seg7.093D0.rgba16"; // 0x070095D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_o[] = { -#include "levels/menu/main_menu_seg7.095D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_o[] = "levels/menu/main_menu_seg7.095D0.rgba16"; // 0x070097D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_su[] = { -#include "levels/menu/main_menu_seg7.097D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_su[] = "levels/menu/main_menu_seg7.097D0.rgba16"; // 0x070099D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_a[] = { -#include "levels/menu/main_menu_seg7.099D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_a[] = "levels/menu/main_menu_seg7.099D0.rgba16"; // 0x07009BD0 -ALIGNED8 static const u8 texture_menu_hud_char_hiragana_mi[] = { -#include "levels/menu/main_menu_seg7.09BD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_hiragana_mi[] = "levels/menu/main_menu_seg7.09BD0.rgba16"; // 0x07009DD0 -ALIGNED8 static const u8 texture_menu_hud_char_hira_dakuten_do[] = { -#include "levels/menu/main_menu_seg7.09DD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_hira_dakuten_do[] = "levels/menu/main_menu_seg7.09DD0.rgba16"; // 0x07009FD0 -ALIGNED8 static const u8 texture_menu_hud_char_hiragana_no[] = { -#include "levels/menu/main_menu_seg7.09FD0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_hiragana_no[] = "levels/menu/main_menu_seg7.09FD0.rgba16"; // 0x0700A1D0 -ALIGNED8 static const u8 texture_menu_hud_char_question[] = { -#include "levels/menu/main_menu_seg7.0A1D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_question[] = "levels/menu/main_menu_seg7.0A1D0.rgba16"; // 0x0700A3D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_sa[] = { -#include "levels/menu/main_menu_seg7.0A3D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_sa[] = "levels/menu/main_menu_seg7.0A3D0.rgba16"; // 0x0700A5D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_u[] = { -#include "levels/menu/main_menu_seg7.0A5D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_u[] = "levels/menu/main_menu_seg7.0A5D0.rgba16"; // 0x0700A7D0 -ALIGNED8 static const u8 texture_menu_hud_char_katakana_n[] = { -#include "levels/menu/main_menu_seg7.0A7D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_katakana_n[] = "levels/menu/main_menu_seg7.0A7D0.rgba16"; // 0x0700A9D0 -ALIGNED8 static const u8 texture_menu_hud_char_kana_dakuten_do[] = { -#include "levels/menu/main_menu_seg7.0A9D0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_hud_char_kana_dakuten_do[] = "levels/menu/main_menu_seg7.0A9D0.rgba16"; // Menu HUD print table, only used in JP // 0x0700ABD0 @@ -612,941 +534,571 @@ const u8 *const menu_hud_lut[] = { UNUSED static const u64 menu_unused_0 = 0; // 0x0700AC48 -ALIGNED8 static const u8 texture_menu_font_char_jp_0[] = { -#include "levels/menu/main_menu_seg7.0AC48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_0[] = "levels/menu/main_menu_seg7.0AC48.ia8"; // 0x0700AC88 -ALIGNED8 static const u8 texture_menu_font_char_jp_1[] = { -#include "levels/menu/main_menu_seg7.0AC88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_1[] = "levels/menu/main_menu_seg7.0AC88.ia8"; // 0x0700ACC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_2[] = { -#include "levels/menu/main_menu_seg7.0ACC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_2[] = "levels/menu/main_menu_seg7.0ACC8.ia8"; // 0x0700AD08 -ALIGNED8 static const u8 texture_menu_font_char_jp_3[] = { -#include "levels/menu/main_menu_seg7.0AD08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_3[] = "levels/menu/main_menu_seg7.0AD08.ia8"; // 0x0700AD48 -ALIGNED8 static const u8 texture_menu_font_char_jp_4[] = { -#include "levels/menu/main_menu_seg7.0AD48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_4[] = "levels/menu/main_menu_seg7.0AD48.ia8"; // 0x0700AD88 -ALIGNED8 static const u8 texture_menu_font_char_jp_5[] = { -#include "levels/menu/main_menu_seg7.0AD88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_5[] = "levels/menu/main_menu_seg7.0AD88.ia8"; // 0x0700ADC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_6[] = { -#include "levels/menu/main_menu_seg7.0ADC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_6[] = "levels/menu/main_menu_seg7.0ADC8.ia8"; // 0x0700AE08 -ALIGNED8 static const u8 texture_menu_font_char_jp_7[] = { -#include "levels/menu/main_menu_seg7.0AE08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_7[] = "levels/menu/main_menu_seg7.0AE08.ia8"; // 0x0700AE48 -ALIGNED8 static const u8 texture_menu_font_char_jp_8[] = { -#include "levels/menu/main_menu_seg7.0AE48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_8[] = "levels/menu/main_menu_seg7.0AE48.ia8"; // 0x0700AE88 -ALIGNED8 static const u8 texture_menu_font_char_jp_9[] = { -#include "levels/menu/main_menu_seg7.0AE88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_9[] = "levels/menu/main_menu_seg7.0AE88.ia8"; // 0x0700AEC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_a[] = { -#include "levels/menu/main_menu_seg7.0AEC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_a[] = "levels/menu/main_menu_seg7.0AEC8.ia8"; // 0x0700AF08 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_i[] = { -#include "levels/menu/main_menu_seg7.0AF08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_i[] = "levels/menu/main_menu_seg7.0AF08.ia8"; // 0x0700AF48 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_u[] = { -#include "levels/menu/main_menu_seg7.0AF48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_u[] = "levels/menu/main_menu_seg7.0AF48.ia8"; // 0x0700AF88 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_c[] = { -#include "levels/menu/main_menu_seg7.0AF88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_c[] = "levels/menu/main_menu_seg7.0AF88.ia8"; // 0x0700AFC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_o[] = { -#include "levels/menu/main_menu_seg7.0AFC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_o[] = "levels/menu/main_menu_seg7.0AFC8.ia8"; // 0x0700B008 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ka[] = { -#include "levels/menu/main_menu_seg7.0B008.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ka[] = "levels/menu/main_menu_seg7.0B008.ia8"; // 0x0700B048 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ki[] = { -#include "levels/menu/main_menu_seg7.0B048.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ki[] = "levels/menu/main_menu_seg7.0B048.ia8"; // 0x0700B088 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ku[] = { -#include "levels/menu/main_menu_seg7.0B088.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ku[] = "levels/menu/main_menu_seg7.0B088.ia8"; // 0x0700B0C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ke[] = { -#include "levels/menu/main_menu_seg7.0B0C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ke[] = "levels/menu/main_menu_seg7.0B0C8.ia8"; // 0x0700B108 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ko[] = { -#include "levels/menu/main_menu_seg7.0B108.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ko[] = "levels/menu/main_menu_seg7.0B108.ia8"; // 0x0700B148 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_sa[] = { -#include "levels/menu/main_menu_seg7.0B148.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_sa[] = "levels/menu/main_menu_seg7.0B148.ia8"; // 0x0700B188 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_shi[] = { -#include "levels/menu/main_menu_seg7.0B188.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_shi[] = "levels/menu/main_menu_seg7.0B188.ia8"; // 0x0700B1C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_su[] = { -#include "levels/menu/main_menu_seg7.0B1C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_su[] = "levels/menu/main_menu_seg7.0B1C8.ia8"; // 0x0700B208 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_se[] = { -#include "levels/menu/main_menu_seg7.0B208.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_se[] = "levels/menu/main_menu_seg7.0B208.ia8"; // 0x0700B248 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_so[] = { -#include "levels/menu/main_menu_seg7.0B248.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_so[] = "levels/menu/main_menu_seg7.0B248.ia8"; // 0x0700B288 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ta[] = { -#include "levels/menu/main_menu_seg7.0B288.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ta[] = "levels/menu/main_menu_seg7.0B288.ia8"; // 0x0700B2C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_chi[] = { -#include "levels/menu/main_menu_seg7.0B2C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_chi[] = "levels/menu/main_menu_seg7.0B2C8.ia8"; // 0x0700B308 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_tsu[] = { -#include "levels/menu/main_menu_seg7.0B308.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_tsu[] = "levels/menu/main_menu_seg7.0B308.ia8"; // 0x0700B348 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_te[] = { -#include "levels/menu/main_menu_seg7.0B348.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_te[] = "levels/menu/main_menu_seg7.0B348.ia8"; // 0x0700B388 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_to[] = { -#include "levels/menu/main_menu_seg7.0B388.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_to[] = "levels/menu/main_menu_seg7.0B388.ia8"; // 0x0700B3C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_na[] = { -#include "levels/menu/main_menu_seg7.0B3C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_na[] = "levels/menu/main_menu_seg7.0B3C8.ia8"; // 0x0700B408 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ni[] = { -#include "levels/menu/main_menu_seg7.0B408.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ni[] = "levels/menu/main_menu_seg7.0B408.ia8"; // 0x0700B448 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_nu[] = { -#include "levels/menu/main_menu_seg7.0B448.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_nu[] = "levels/menu/main_menu_seg7.0B448.ia8"; // 0x0700B488 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ne[] = { -#include "levels/menu/main_menu_seg7.0B488.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ne[] = "levels/menu/main_menu_seg7.0B488.ia8"; // 0x0700B4C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_no[] = { -#include "levels/menu/main_menu_seg7.0B4C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_no[] = "levels/menu/main_menu_seg7.0B4C8.ia8"; // 0x0700B508 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ha[] = { -#include "levels/menu/main_menu_seg7.0B508.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ha[] = "levels/menu/main_menu_seg7.0B508.ia8"; // 0x0700B548 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_hi[] = { -#include "levels/menu/main_menu_seg7.0B548.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_hi[] = "levels/menu/main_menu_seg7.0B548.ia8"; // 0x0700B588 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_hu[] = { -#include "levels/menu/main_menu_seg7.0B588.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_hu[] = "levels/menu/main_menu_seg7.0B588.ia8"; // 0x0700B5C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_he[] = { -#include "levels/menu/main_menu_seg7.0B5C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_he[] = "levels/menu/main_menu_seg7.0B5C8.ia8"; // 0x0700B608 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ho[] = { -#include "levels/menu/main_menu_seg7.0B608.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ho[] = "levels/menu/main_menu_seg7.0B608.ia8"; // 0x0700B648 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ma[] = { -#include "levels/menu/main_menu_seg7.0B648.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ma[] = "levels/menu/main_menu_seg7.0B648.ia8"; // 0x0700B688 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_mi[] = { -#include "levels/menu/main_menu_seg7.0B688.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_mi[] = "levels/menu/main_menu_seg7.0B688.ia8"; // 0x0700B6C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_mu[] = { -#include "levels/menu/main_menu_seg7.0B6C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_mu[] = "levels/menu/main_menu_seg7.0B6C8.ia8"; // 0x0700B708 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_me[] = { -#include "levels/menu/main_menu_seg7.0B708.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_me[] = "levels/menu/main_menu_seg7.0B708.ia8"; // 0x0700B748 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_mo[] = { -#include "levels/menu/main_menu_seg7.0B748.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_mo[] = "levels/menu/main_menu_seg7.0B748.ia8"; // 0x0700B788 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ya[] = { -#include "levels/menu/main_menu_seg7.0B788.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ya[] = "levels/menu/main_menu_seg7.0B788.ia8"; // 0x0700B7C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_yu[] = { -#include "levels/menu/main_menu_seg7.0B7C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_yu[] = "levels/menu/main_menu_seg7.0B7C8.ia8"; // 0x0700B808 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_yo[] = { -#include "levels/menu/main_menu_seg7.0B808.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_yo[] = "levels/menu/main_menu_seg7.0B808.ia8"; // 0x0700B848 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ra[] = { -#include "levels/menu/main_menu_seg7.0B848.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ra[] = "levels/menu/main_menu_seg7.0B848.ia8"; // 0x0700B888 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ri[] = { -#include "levels/menu/main_menu_seg7.0B888.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ri[] = "levels/menu/main_menu_seg7.0B888.ia8"; // 0x0700B8C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ru[] = { -#include "levels/menu/main_menu_seg7.0B8C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ru[] = "levels/menu/main_menu_seg7.0B8C8.ia8"; // 0x0700B908 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_re[] = { -#include "levels/menu/main_menu_seg7.0B908.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_re[] = "levels/menu/main_menu_seg7.0B908.ia8"; // 0x0700B948 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ro[] = { -#include "levels/menu/main_menu_seg7.0B948.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_ro[] = "levels/menu/main_menu_seg7.0B948.ia8"; // 0x0700B988 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_wa[] = { -#include "levels/menu/main_menu_seg7.0B988.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_wa[] = "levels/menu/main_menu_seg7.0B988.ia8"; // 0x0700B9C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_wo[] = { -#include "levels/menu/main_menu_seg7.0B9C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_wo[] = "levels/menu/main_menu_seg7.0B9C8.ia8"; // 0x0700BA08 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_n[] = { -#include "levels/menu/main_menu_seg7.0BA08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_n[] = "levels/menu/main_menu_seg7.0BA08.ia8"; // 0x0700BA48 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_a[] = { -#include "levels/menu/main_menu_seg7.0BA48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_a[] = "levels/menu/main_menu_seg7.0BA48.ia8"; // 0x0700BA88 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_i[] = { -#include "levels/menu/main_menu_seg7.0BA88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_i[] = "levels/menu/main_menu_seg7.0BA88.ia8"; // 0x0700BAC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_u[] = { -#include "levels/menu/main_menu_seg7.0BAC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_u[] = "levels/menu/main_menu_seg7.0BAC8.ia8"; // 0x0700BB08 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_e[] = { -#include "levels/menu/main_menu_seg7.0BB08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_e[] = "levels/menu/main_menu_seg7.0BB08.ia8"; // 0x0700BB48 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_o[] = { -#include "levels/menu/main_menu_seg7.0BB48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_o[] = "levels/menu/main_menu_seg7.0BB48.ia8"; // 0x0700BB88 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_ka[] = { -#include "levels/menu/main_menu_seg7.0BB88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_ka[] = "levels/menu/main_menu_seg7.0BB88.ia8"; // 0x0700BBC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_yu[] = { -#include "levels/menu/main_menu_seg7.0BBC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_yu[] = "levels/menu/main_menu_seg7.0BBC8.ia8"; // 0x0700BC08 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_yo[] = { -#include "levels/menu/main_menu_seg7.0BC08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_yo[] = "levels/menu/main_menu_seg7.0BC08.ia8"; // 0x0700BC48 -ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_tsu[] = { -#include "levels/menu/main_menu_seg7.0BC48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_hiragana_small_tsu[] = "levels/menu/main_menu_seg7.0BC48.ia8"; // 0x0700BC88 -ALIGNED8 static const u8 texture_menu_font_char_jp_handakuten[] = { -#include "levels/menu/main_menu_seg7.0BC88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_handakuten[] = "levels/menu/main_menu_seg7.0BC88.ia8"; // 0x0700BCC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_dakuten[] = { -#include "levels/menu/main_menu_seg7.0BCC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_dakuten[] = "levels/menu/main_menu_seg7.0BCC8.ia8"; // 0x0700BD08 -ALIGNED8 static const u8 texture_menu_font_char_jp_long_vowel[] = { -#include "levels/menu/main_menu_seg7.0BD08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_long_vowel[] = "levels/menu/main_menu_seg7.0BD08.ia8"; // 0x0700BD48 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_a[] = { -#include "levels/menu/main_menu_seg7.0BD48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_a[] = "levels/menu/main_menu_seg7.0BD48.ia8"; // 0x0700BD88 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_i[] = { -#include "levels/menu/main_menu_seg7.0BD88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_i[] = "levels/menu/main_menu_seg7.0BD88.ia8"; // 0x0700BDC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_u[] = { -#include "levels/menu/main_menu_seg7.0BDC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_u[] = "levels/menu/main_menu_seg7.0BDC8.ia8"; // 0x0700BE08 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_e[] = { -#include "levels/menu/main_menu_seg7.0BE08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_e[] = "levels/menu/main_menu_seg7.0BE08.ia8"; // 0x0700BE48 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_o[] = { -#include "levels/menu/main_menu_seg7.0BE48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_o[] = "levels/menu/main_menu_seg7.0BE48.ia8"; // 0x0700BE88 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ka[] = { -#include "levels/menu/main_menu_seg7.0BE88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ka[] = "levels/menu/main_menu_seg7.0BE88.ia8"; // 0x0700BEC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ki[] = { -#include "levels/menu/main_menu_seg7.0BEC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ki[] = "levels/menu/main_menu_seg7.0BEC8.ia8"; // 0x0700BF08 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ku[] = { -#include "levels/menu/main_menu_seg7.0BF08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ku[] = "levels/menu/main_menu_seg7.0BF08.ia8"; // 0x0700BF48 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ke[] = { -#include "levels/menu/main_menu_seg7.0BF48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ke[] = "levels/menu/main_menu_seg7.0BF48.ia8"; // 0x0700BF88 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ko[] = { -#include "levels/menu/main_menu_seg7.0BF88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ko[] = "levels/menu/main_menu_seg7.0BF88.ia8"; // 0x0700BFC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_sa[] = { -#include "levels/menu/main_menu_seg7.0BFC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_sa[] = "levels/menu/main_menu_seg7.0BFC8.ia8"; // 0x0700C008 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_shi[] = { -#include "levels/menu/main_menu_seg7.0C008.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_shi[] = "levels/menu/main_menu_seg7.0C008.ia8"; // 0x0700C048 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_su[] = { -#include "levels/menu/main_menu_seg7.0C048.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_su[] = "levels/menu/main_menu_seg7.0C048.ia8"; // 0x0700C088 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_se[] = { -#include "levels/menu/main_menu_seg7.0C088.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_se[] = "levels/menu/main_menu_seg7.0C088.ia8"; // 0x0700C0C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_so[] = { -#include "levels/menu/main_menu_seg7.0C0C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_so[] = "levels/menu/main_menu_seg7.0C0C8.ia8"; // 0x0700C108 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ta[] = { -#include "levels/menu/main_menu_seg7.0C108.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ta[] = "levels/menu/main_menu_seg7.0C108.ia8"; // 0x0700C148 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_chi[] = { -#include "levels/menu/main_menu_seg7.0C148.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_chi[] = "levels/menu/main_menu_seg7.0C148.ia8"; // 0x0700C188 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_tsu[] = { -#include "levels/menu/main_menu_seg7.0C188.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_tsu[] = "levels/menu/main_menu_seg7.0C188.ia8"; // 0x0700C1C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_te[] = { -#include "levels/menu/main_menu_seg7.0C1C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_te[] = "levels/menu/main_menu_seg7.0C1C8.ia8"; // 0x0700C208 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_to[] = { -#include "levels/menu/main_menu_seg7.0C208.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_to[] = "levels/menu/main_menu_seg7.0C208.ia8"; // 0x0700C248 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_na[] = { -#include "levels/menu/main_menu_seg7.0C248.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_na[] = "levels/menu/main_menu_seg7.0C248.ia8"; // 0x0700C288 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ni[] = { -#include "levels/menu/main_menu_seg7.0C288.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ni[] = "levels/menu/main_menu_seg7.0C288.ia8"; // 0x0700C2C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_nu[] = { -#include "levels/menu/main_menu_seg7.0C2C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_nu[] = "levels/menu/main_menu_seg7.0C2C8.ia8"; // 0x0700C308 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ne[] = { -#include "levels/menu/main_menu_seg7.0C308.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ne[] = "levels/menu/main_menu_seg7.0C308.ia8"; // 0x0700C348 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_no[] = { -#include "levels/menu/main_menu_seg7.0C348.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_no[] = "levels/menu/main_menu_seg7.0C348.ia8"; // 0x0700C388 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ha[] = { -#include "levels/menu/main_menu_seg7.0C388.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ha[] = "levels/menu/main_menu_seg7.0C388.ia8"; // 0x0700C3C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_hi[] = { -#include "levels/menu/main_menu_seg7.0C3C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_hi[] = "levels/menu/main_menu_seg7.0C3C8.ia8"; // 0x0700C408 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_hu[] = { -#include "levels/menu/main_menu_seg7.0C408.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_hu[] = "levels/menu/main_menu_seg7.0C408.ia8"; // 0x0700C448 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_he[] = { -#include "levels/menu/main_menu_seg7.0C448.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_he[] = "levels/menu/main_menu_seg7.0C448.ia8"; // 0x0700C488 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ho[] = { -#include "levels/menu/main_menu_seg7.0C488.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ho[] = "levels/menu/main_menu_seg7.0C488.ia8"; // 0x0700C4C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ma[] = { -#include "levels/menu/main_menu_seg7.0C4C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ma[] = "levels/menu/main_menu_seg7.0C4C8.ia8"; // 0x0700C508 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_mi[] = { -#include "levels/menu/main_menu_seg7.0C508.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_mi[] = "levels/menu/main_menu_seg7.0C508.ia8"; // 0x0700C548 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_mu[] = { -#include "levels/menu/main_menu_seg7.0C548.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_mu[] = "levels/menu/main_menu_seg7.0C548.ia8"; // 0x0700C588 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_me[] = { -#include "levels/menu/main_menu_seg7.0C588.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_me[] = "levels/menu/main_menu_seg7.0C588.ia8"; // 0x0700C5C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_mo[] = { -#include "levels/menu/main_menu_seg7.0C5C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_mo[] = "levels/menu/main_menu_seg7.0C5C8.ia8"; // 0x0700C608 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ya[] = { -#include "levels/menu/main_menu_seg7.0C608.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ya[] = "levels/menu/main_menu_seg7.0C608.ia8"; // 0x0700C648 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_yu[] = { -#include "levels/menu/main_menu_seg7.0C648.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_yu[] = "levels/menu/main_menu_seg7.0C648.ia8"; // 0x0700C688 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_yo[] = { -#include "levels/menu/main_menu_seg7.0C688.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_yo[] = "levels/menu/main_menu_seg7.0C688.ia8"; // 0x0700C6C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ra[] = { -#include "levels/menu/main_menu_seg7.0C6C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ra[] = "levels/menu/main_menu_seg7.0C6C8.ia8"; // 0x0700C708 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ri[] = { -#include "levels/menu/main_menu_seg7.0C708.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ri[] = "levels/menu/main_menu_seg7.0C708.ia8"; // 0x0700C748 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ru[] = { -#include "levels/menu/main_menu_seg7.0C748.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ru[] = "levels/menu/main_menu_seg7.0C748.ia8"; // 0x0700C788 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_re[] = { -#include "levels/menu/main_menu_seg7.0C788.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_re[] = "levels/menu/main_menu_seg7.0C788.ia8"; // 0x0700C7C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ro[] = { -#include "levels/menu/main_menu_seg7.0C7C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_ro[] = "levels/menu/main_menu_seg7.0C7C8.ia8"; // 0x0700C808 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_wa[] = { -#include "levels/menu/main_menu_seg7.0C808.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_wa[] = "levels/menu/main_menu_seg7.0C808.ia8"; // 0x0700C848 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_wo[] = { -#include "levels/menu/main_menu_seg7.0C848.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_wo[] = "levels/menu/main_menu_seg7.0C848.ia8"; // 0x0700C888 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_n[] = { -#include "levels/menu/main_menu_seg7.0C888.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_n[] = "levels/menu/main_menu_seg7.0C888.ia8"; // 0x0700C8C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_a[] = { -#include "levels/menu/main_menu_seg7.0C8C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_a[] = "levels/menu/main_menu_seg7.0C8C8.ia8"; // 0x0700C908 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_i[] = { -#include "levels/menu/main_menu_seg7.0C908.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_i[] = "levels/menu/main_menu_seg7.0C908.ia8"; // 0x0700C948 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_u[] = { -#include "levels/menu/main_menu_seg7.0C948.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_u[] = "levels/menu/main_menu_seg7.0C948.ia8"; // 0x0700C988 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_e[] = { -#include "levels/menu/main_menu_seg7.0C988.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_e[] = "levels/menu/main_menu_seg7.0C988.ia8"; // 0x0700C9C8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_o[] = { -#include "levels/menu/main_menu_seg7.0C9C8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_o[] = "levels/menu/main_menu_seg7.0C9C8.ia8"; // 0x0700CA08 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_ka[] = { -#include "levels/menu/main_menu_seg7.0CA08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_ka[] = "levels/menu/main_menu_seg7.0CA08.ia8"; // 0x0700CA48 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_yu[] = { -#include "levels/menu/main_menu_seg7.0CA48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_yu[] = "levels/menu/main_menu_seg7.0CA48.ia8"; // 0x0700CA88 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_yo[] = { -#include "levels/menu/main_menu_seg7.0CA88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_yo[] = "levels/menu/main_menu_seg7.0CA88.ia8"; // 0x0700CAC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_tsu[] = { -#include "levels/menu/main_menu_seg7.0CAC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_katakana_small_tsu[] = "levels/menu/main_menu_seg7.0CAC8.ia8"; // 0x0700CB08 -ALIGNED8 static const u8 texture_menu_font_char_jp_A[] = { -#include "levels/menu/main_menu_seg7.0CB08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_A[] = "levels/menu/main_menu_seg7.0CB08.ia8"; // 0x0700CB48 -ALIGNED8 static const u8 texture_menu_font_char_jp_B[] = { -#include "levels/menu/main_menu_seg7.0CB48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_B[] = "levels/menu/main_menu_seg7.0CB48.ia8"; // 0x0700CB88 -ALIGNED8 static const u8 texture_menu_font_char_jp_C[] = { -#include "levels/menu/main_menu_seg7.0CB88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_C[] = "levels/menu/main_menu_seg7.0CB88.ia8"; // 0x0700CBC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_D[] = { -#include "levels/menu/main_menu_seg7.0CBC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_D[] = "levels/menu/main_menu_seg7.0CBC8.ia8"; // 0x0700CC08 -ALIGNED8 static const u8 texture_menu_font_char_jp_coin[] = { -#include "levels/menu/main_menu_seg7.0CC08.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_coin[] = "levels/menu/main_menu_seg7.0CC08.ia8"; // 0x0700CC48 -ALIGNED8 static const u8 texture_menu_font_char_jp_star_filled[] = { -#include "levels/menu/main_menu_seg7.0CC48.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_star_filled[] = "levels/menu/main_menu_seg7.0CC48.ia8"; // 0x0700CC88 -ALIGNED8 static const u8 texture_menu_font_char_jp_multiply[] = { -#include "levels/menu/main_menu_seg7.0CC88.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_multiply[] = "levels/menu/main_menu_seg7.0CC88.ia8"; // 0x0700CCC8 -ALIGNED8 static const u8 texture_menu_font_char_jp_exclamation[] = { -#include "levels/menu/main_menu_seg7.0CCC8.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_jp_exclamation[] = "levels/menu/main_menu_seg7.0CCC8.ia8"; #else // 0x0700AC40 -ALIGNED8 static const u8 texture_menu_font_char_0[] = { -#include "levels/menu/main_menu_seg7_us.0AC40.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_0[] = "levels/menu/main_menu_seg7_us.0AC40.ia8"; // 0x0700AC80 -ALIGNED8 static const u8 texture_menu_font_char_1[] = { -#include "levels/menu/main_menu_seg7_us.0AC80.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_1[] = "levels/menu/main_menu_seg7_us.0AC80.ia8"; // 0x0700ACC0 -ALIGNED8 static const u8 texture_menu_font_char_2[] = { -#include "levels/menu/main_menu_seg7_us.0ACC0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_2[] = "levels/menu/main_menu_seg7_us.0ACC0.ia8"; // 0x0700AD00 -ALIGNED8 static const u8 texture_menu_font_char_3[] = { -#include "levels/menu/main_menu_seg7_us.0AD00.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_3[] = "levels/menu/main_menu_seg7_us.0AD00.ia8"; // 0x0700AD40 -ALIGNED8 static const u8 texture_menu_font_char_4[] = { -#include "levels/menu/main_menu_seg7_us.0AD40.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_4[] = "levels/menu/main_menu_seg7_us.0AD40.ia8"; // 0x0700AD80 -ALIGNED8 static const u8 texture_menu_font_char_5[] = { -#include "levels/menu/main_menu_seg7_us.0AD80.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_5[] = "levels/menu/main_menu_seg7_us.0AD80.ia8"; // 0x0700ADC0 -ALIGNED8 static const u8 texture_menu_font_char_6[] = { -#include "levels/menu/main_menu_seg7_us.0ADC0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_6[] = "levels/menu/main_menu_seg7_us.0ADC0.ia8"; // 0x0700AE00 -ALIGNED8 static const u8 texture_menu_font_char_7[] = { -#include "levels/menu/main_menu_seg7_us.0AE00.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_7[] = "levels/menu/main_menu_seg7_us.0AE00.ia8"; // 0x0700AE40 -ALIGNED8 static const u8 texture_menu_font_char_8[] = { -#include "levels/menu/main_menu_seg7_us.0AE40.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_8[] = "levels/menu/main_menu_seg7_us.0AE40.ia8"; // 0x0700AE80 -ALIGNED8 static const u8 texture_menu_font_char_9[] = { -#include "levels/menu/main_menu_seg7_us.0AE80.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_9[] = "levels/menu/main_menu_seg7_us.0AE80.ia8"; // 0x0700AEC0 -ALIGNED8 static const u8 texture_menu_font_char_A[] = { -#include "levels/menu/main_menu_seg7_us.0AEC0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_A[] = "levels/menu/main_menu_seg7_us.0AEC0.ia8"; // 0x0700AF00 -ALIGNED8 static const u8 texture_menu_font_char_B[] = { -#include "levels/menu/main_menu_seg7_us.0AF00.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_B[] = "levels/menu/main_menu_seg7_us.0AF00.ia8"; // 0x0700AF40 -ALIGNED8 static const u8 texture_menu_font_char_C[] = { -#include "levels/menu/main_menu_seg7_us.0AF40.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_C[] = "levels/menu/main_menu_seg7_us.0AF40.ia8"; #ifdef VERSION_EU // 0x0700AF80 -ALIGNED8 static const u8 texture_menu_font_char_D[] = { -#include "levels/menu/main_menu_seg7_eu.0AF80.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_D[] = "levels/menu/main_menu_seg7_eu.0AF80.ia8"; #else // 0x0700AF80 -ALIGNED8 static const u8 texture_menu_font_char_D[] = { -#include "levels/menu/main_menu_seg7_us.0AF80.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_D[] = "levels/menu/main_menu_seg7_us.0AF80.ia8"; #endif // 0x0700AFC0 -ALIGNED8 static const u8 texture_menu_font_char_E[] = { -#include "levels/menu/main_menu_seg7_us.0AFC0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_E[] = "levels/menu/main_menu_seg7_us.0AFC0.ia8"; // 0x0700B000 -ALIGNED8 static const u8 texture_menu_font_char_F[] = { -#include "levels/menu/main_menu_seg7_us.0B000.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_F[] = "levels/menu/main_menu_seg7_us.0B000.ia8"; // 0x0700B040 -ALIGNED8 static const u8 texture_menu_font_char_G[] = { -#include "levels/menu/main_menu_seg7_us.0B040.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_G[] = "levels/menu/main_menu_seg7_us.0B040.ia8"; // 0x0700B080 -ALIGNED8 static const u8 texture_menu_font_char_H[] = { -#include "levels/menu/main_menu_seg7_us.0B080.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_H[] = "levels/menu/main_menu_seg7_us.0B080.ia8"; // 0x0700B0C0 -ALIGNED8 static const u8 texture_menu_font_char_I[] = { -#include "levels/menu/main_menu_seg7_us.0B0C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_I[] = "levels/menu/main_menu_seg7_us.0B0C0.ia8"; // 0x0700B100 -ALIGNED8 static const u8 texture_menu_font_char_J[] = { -#include "levels/menu/main_menu_seg7_us.0B100.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_J[] = "levels/menu/main_menu_seg7_us.0B100.ia8"; // 0x0700B140 -ALIGNED8 static const u8 texture_menu_font_char_K[] = { -#include "levels/menu/main_menu_seg7_us.0B140.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_K[] = "levels/menu/main_menu_seg7_us.0B140.ia8"; // 0x0700B180 -ALIGNED8 static const u8 texture_menu_font_char_L[] = { -#include "levels/menu/main_menu_seg7_us.0B180.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_L[] = "levels/menu/main_menu_seg7_us.0B180.ia8"; // 0x0700B1C0 -ALIGNED8 static const u8 texture_menu_font_char_M[] = { -#include "levels/menu/main_menu_seg7_us.0B1C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_M[] = "levels/menu/main_menu_seg7_us.0B1C0.ia8"; // 0x0700B200 -ALIGNED8 static const u8 texture_menu_font_char_N[] = { -#include "levels/menu/main_menu_seg7_us.0B200.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_N[] = "levels/menu/main_menu_seg7_us.0B200.ia8"; // 0x0700B240 -ALIGNED8 static const u8 texture_menu_font_char_O[] = { -#include "levels/menu/main_menu_seg7_us.0B240.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_O[] = "levels/menu/main_menu_seg7_us.0B240.ia8"; // 0x0700B280 -ALIGNED8 static const u8 texture_menu_font_char_P[] = { -#include "levels/menu/main_menu_seg7_us.0B280.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_P[] = "levels/menu/main_menu_seg7_us.0B280.ia8"; // 0x0700B2C0 -ALIGNED8 static const u8 texture_menu_font_char_Q[] = { -#include "levels/menu/main_menu_seg7_us.0B2C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_Q[] = "levels/menu/main_menu_seg7_us.0B2C0.ia8"; // 0x0700B300 -ALIGNED8 static const u8 texture_menu_font_char_R[] = { -#include "levels/menu/main_menu_seg7_us.0B300.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_R[] = "levels/menu/main_menu_seg7_us.0B300.ia8"; // 0x0700B340 -ALIGNED8 static const u8 texture_menu_font_char_S[] = { -#include "levels/menu/main_menu_seg7_us.0B340.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_S[] = "levels/menu/main_menu_seg7_us.0B340.ia8"; // 0x0700B380 -ALIGNED8 static const u8 texture_menu_font_char_T[] = { -#include "levels/menu/main_menu_seg7_us.0B380.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_T[] = "levels/menu/main_menu_seg7_us.0B380.ia8"; // 0x0700B3C0 -ALIGNED8 static const u8 texture_menu_font_char_U[] = { -#include "levels/menu/main_menu_seg7_us.0B3C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_U[] = "levels/menu/main_menu_seg7_us.0B3C0.ia8"; // 0x0700B400 -ALIGNED8 static const u8 texture_menu_font_char_V[] = { -#include "levels/menu/main_menu_seg7_us.0B400.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_V[] = "levels/menu/main_menu_seg7_us.0B400.ia8"; // 0x0700B440 -ALIGNED8 static const u8 texture_menu_font_char_W[] = { -#include "levels/menu/main_menu_seg7_us.0B440.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_W[] = "levels/menu/main_menu_seg7_us.0B440.ia8"; // 0x0700B480 -ALIGNED8 static const u8 texture_menu_font_char_X[] = { -#include "levels/menu/main_menu_seg7_us.0B480.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_X[] = "levels/menu/main_menu_seg7_us.0B480.ia8"; // 0x0700B4C0 -ALIGNED8 static const u8 texture_menu_font_char_Y[] = { -#include "levels/menu/main_menu_seg7_us.0B4C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_Y[] = "levels/menu/main_menu_seg7_us.0B4C0.ia8"; // 0x0700B500 -ALIGNED8 static const u8 texture_menu_font_char_Z[] = { -#include "levels/menu/main_menu_seg7_us.0B500.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_Z[] = "levels/menu/main_menu_seg7_us.0B500.ia8"; // 0x0700B540 -ALIGNED8 static const u8 texture_menu_font_char_coin[] = { -#include "levels/menu/main_menu_seg7_us.0B540.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_coin[] = "levels/menu/main_menu_seg7_us.0B540.ia8"; // 0x0700B580 -ALIGNED8 static const u8 texture_menu_font_char_multiply[] = { -#include "levels/menu/main_menu_seg7_us.0B580.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_multiply[] = "levels/menu/main_menu_seg7_us.0B580.ia8"; // 0x0700B5C0 -ALIGNED8 static const u8 texture_menu_font_char_star_filled[] = { -#include "levels/menu/main_menu_seg7_us.0B5C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_star_filled[] = "levels/menu/main_menu_seg7_us.0B5C0.ia8"; // 0x0700B600 -ALIGNED8 static const u8 texture_menu_font_char_dash[] = { -#include "levels/menu/main_menu_seg7_us.0B600.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_dash[] = "levels/menu/main_menu_seg7_us.0B600.ia8"; #ifdef VERSION_EU // 0x0700B640 -ALIGNED8 static const u8 texture_menu_font_char_comma[] = { -#include "levels/menu/main_menu_seg7_eu.0B640.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_comma[] = "levels/menu/main_menu_seg7_eu.0B640.ia8"; // 0x0700B680 -ALIGNED8 static const u8 texture_menu_font_char_apostrophe[] = { -#include "levels/menu/main_menu_seg7_eu.0B680.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_apostrophe[] = "levels/menu/main_menu_seg7_eu.0B680.ia8"; #else // 0x0700B640 -ALIGNED8 static const u8 texture_menu_font_char_comma[] = { -#include "levels/menu/main_menu_seg7_us.0B640.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_comma[] = "levels/menu/main_menu_seg7_us.0B640.ia8"; // 0x0700B680 -ALIGNED8 static const u8 texture_menu_font_char_apostrophe[] = { -#include "levels/menu/main_menu_seg7_us.0B680.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_apostrophe[] = "levels/menu/main_menu_seg7_us.0B680.ia8"; #endif // 0x0700B6C0 -ALIGNED8 static const u8 texture_menu_font_char_exclamation[] = { -#include "levels/menu/main_menu_seg7_us.0B6C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_exclamation[] = "levels/menu/main_menu_seg7_us.0B6C0.ia8"; // 0x0700B700 -ALIGNED8 static const u8 texture_menu_font_char_question[] = { -#include "levels/menu/main_menu_seg7_us.0B700.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_question[] = "levels/menu/main_menu_seg7_us.0B700.ia8"; // 0x0700B740 -ALIGNED8 static const u8 texture_menu_font_char_mface1[] = { -#include "levels/menu/main_menu_seg7_us.0B740.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_mface1[] = "levels/menu/main_menu_seg7_us.0B740.ia8"; // 0x0700B780 -ALIGNED8 static const u8 texture_menu_font_char_mface2[] = { -#include "levels/menu/main_menu_seg7_us.0B780.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_mface2[] = "levels/menu/main_menu_seg7_us.0B780.ia8"; // 0x0700B7C0 -ALIGNED8 static const u8 texture_menu_font_char_period[] = { -#include "levels/menu/main_menu_seg7_us.0B7C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_period[] = "levels/menu/main_menu_seg7_us.0B7C0.ia8"; // 0x0700B800 -ALIGNED8 static const u8 texture_menu_font_char_ampersand[] = { -#include "levels/menu/main_menu_seg7_us.0B800.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_ampersand[] = "levels/menu/main_menu_seg7_us.0B800.ia8"; #endif #ifdef VERSION_EU // 0x0700B840 -ALIGNED8 static const u8 texture_menu_font_char_umlaut[] = { -#include "levels/menu/main_menu_seg7_eu.0B840.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_umlaut[] = "levels/menu/main_menu_seg7_eu.0B840.ia8"; // 0x0700B880 -ALIGNED8 static const u8 texture_menu_font_char_cedilla_mayus[] = { -#include "levels/menu/main_menu_seg7_eu.0B880.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_cedilla_mayus[] = "levels/menu/main_menu_seg7_eu.0B880.ia8"; // 0x0700B8C0 -ALIGNED8 static const u8 texture_menu_font_char_colon[] = { -#include "levels/menu/main_menu_seg7_eu.0B8C0.ia8.inc.c" -}; +ALIGNED8 static const u8 texture_menu_font_char_colon[] = "levels/menu/main_menu_seg7_eu.0B8C0.ia8"; #endif // Menu small font print table @@ -1723,36 +1275,24 @@ UNUSED static const u64 menu_unused_1 = 0; #ifdef VERSION_EU // 0x0700BDA0 - 0x0700CDA0 -ALIGNED8 static const u8 texture_menu_course_upper[] = { -#include "levels/menu/main_menu_seg7_eu.0BDA0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_course_upper[] = "levels/menu/main_menu_seg7_eu.0BDA0.rgba16"; // 0x0700CDA0 - 0x0700DDA0 -ALIGNED8 static const u8 texture_menu_niveau_upper[] = { -#include "levels/menu/main_menu_seg7_eu.0CDA0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_niveau_upper[] = "levels/menu/main_menu_seg7_eu.0CDA0.rgba16"; // 0x0700DDA0 - 0x0700EDA0 -ALIGNED8 static const u8 texture_menu_kurs_upper[] = { -#include "levels/menu/main_menu_seg7_eu.0DDA0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_kurs_upper[] = "levels/menu/main_menu_seg7_eu.0DDA0.rgba16"; // 0x0700EDA0 - 0x0700FDA0 -ALIGNED8 static const u8 texture_menu_course_lower[] = { -#include "levels/menu/main_menu_seg7_eu.0EDA0.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_course_lower[] = "levels/menu/main_menu_seg7_eu.0EDA0.rgba16"; #else // 0x0700D1A8 - 0x0700E1A8 -ALIGNED8 static const u8 texture_menu_course_upper[] = { -#include "levels/menu/main_menu_seg7.0D1A8.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_course_upper[] = "levels/menu/main_menu_seg7.0D1A8.rgba16"; // 0x0700E1A8 - 0x0700F1A8 -ALIGNED8 static const u8 texture_menu_course_lower[] = { -#include "levels/menu/main_menu_seg7.0E1A8.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_menu_course_lower[] = "levels/menu/main_menu_seg7.0E1A8.rgba16"; #endif // 0x0700F1A8 - 0x0700F1E8 diff --git a/levels/pss/texture.inc.c b/levels/pss/texture.inc.c index 37955f28..8ffc9b07 100644 --- a/levels/pss/texture.inc.c +++ b/levels/pss/texture.inc.c @@ -1,14 +1,8 @@ // 0x07000000 - 0x07000002 -ALIGNED8 static const u8 pss_seg7_texture_07000000[] = { -#include "levels/pss/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 pss_seg7_texture_07000000[] = "levels/pss/0.rgba16"; // 0x07000800 - 0x07000802 -ALIGNED8 static const u8 pss_seg7_texture_07000800[] = { -#include "levels/pss/1.ia16.inc.c" -}; +ALIGNED8 static const u8 pss_seg7_texture_07000800[] = "levels/pss/1.ia16"; // 0x07001000 - 0x07001002 -ALIGNED8 static const u8 pss_seg7_texture_07001000[] = { -#include "levels/pss/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 pss_seg7_texture_07001000[] = "levels/pss/2.rgba16"; diff --git a/levels/rr/texture.inc.c b/levels/rr/texture.inc.c index c57ea13b..983255c7 100644 --- a/levels/rr/texture.inc.c +++ b/levels/rr/texture.inc.c @@ -1,14 +1,8 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 texture_quarter_flying_carpet[] = { -#include "levels/rr/quarter_flying_carpet.rgba16.inc.c" -}; +ALIGNED8 static const u8 texture_quarter_flying_carpet[] = "levels/rr/quarter_flying_carpet.rgba16"; // 0x07000800 - 0x07001800 -ALIGNED8 static const u8 rr_seg7_texture_07000800[] = { -#include "levels/rr/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 rr_seg7_texture_07000800[] = "levels/rr/1.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 rr_seg7_texture_07001800[] = { -#include "levels/rr/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 rr_seg7_texture_07001800[] = "levels/rr/2.rgba16"; diff --git a/levels/sl/texture.inc.c b/levels/sl/texture.inc.c index e3079f40..39bc7246 100644 --- a/levels/sl/texture.inc.c +++ b/levels/sl/texture.inc.c @@ -1,24 +1,14 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 sl_seg7_texture_07000000[] = { -#include "levels/sl/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 sl_seg7_texture_07000000[] = "levels/sl/0.rgba16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 sl_seg7_texture_07000800[] = { -#include "levels/sl/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 sl_seg7_texture_07000800[] = "levels/sl/1.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 sl_seg7_texture_07001000[] = { -#include "levels/sl/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 sl_seg7_texture_07001000[] = "levels/sl/2.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 sl_seg7_texture_07001800[] = { -#include "levels/sl/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 sl_seg7_texture_07001800[] = "levels/sl/3.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 sl_seg7_texture_07002000[] = { -#include "levels/sl/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 sl_seg7_texture_07002000[] = "levels/sl/4.rgba16"; diff --git a/levels/ssl/areas/2/4/model.inc.c b/levels/ssl/areas/2/4/model.inc.c index bc58a62e..6c2ac4f4 100644 --- a/levels/ssl/areas/2/4/model.inc.c +++ b/levels/ssl/areas/2/4/model.inc.c @@ -7,9 +7,7 @@ static const Lights1 ssl_lights_quicksand_pit = gdSPDefLights1( ); // 0x07004018 - 0x07004818 -ALIGNED8 const u8 ssl_quicksand[] = { -#include "levels/ssl/7.rgba16.inc.c" -}; +ALIGNED8 const u8 ssl_quicksand[] = "levels/ssl/7.rgba16"; // 0x07004818 - 0x07004860 const Gfx ssl_dl_quicksand_pit_begin[] = { diff --git a/levels/ssl/texture.inc.c b/levels/ssl/texture.inc.c index 3b145fa5..bba0488d 100644 --- a/levels/ssl/texture.inc.c +++ b/levels/ssl/texture.inc.c @@ -1,34 +1,20 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 ssl_seg7_texture_07000000[] = { -#include "levels/ssl/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_07000000[] = "levels/ssl/0.rgba16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 ssl_seg7_texture_07000800[] = { -#include "levels/ssl/1.ia16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_07000800[] = "levels/ssl/1.ia16"; // 0x07001000 - 0x07001800 -ALIGNED8 const u8 ssl_pyramid_sand[] = { -#include "levels/ssl/2.rgba16.inc.c" -}; +ALIGNED8 const u8 ssl_pyramid_sand[] = "levels/ssl/2.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 ssl_seg7_texture_07001800[] = { -#include "levels/ssl/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_07001800[] = "levels/ssl/3.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 ssl_seg7_texture_07002000[] = { -#include "levels/ssl/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_07002000[] = "levels/ssl/4.rgba16"; // 0x07002800 - 0x07003800 -ALIGNED8 static const u8 ssl_seg7_texture_07002800[] = { -#include "levels/ssl/5.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_07002800[] = "levels/ssl/5.rgba16"; // 0x07003800 - 0x07004000 -ALIGNED8 static const u8 ssl_seg7_texture_07003800[] = { -#include "levels/ssl/6.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_07003800[] = "levels/ssl/6.rgba16"; diff --git a/levels/ssl/tox_box/model.inc.c b/levels/ssl/tox_box/model.inc.c index f5fb66d0..61f03bad 100644 --- a/levels/ssl/tox_box/model.inc.c +++ b/levels/ssl/tox_box/model.inc.c @@ -5,24 +5,16 @@ static const Lights1 ssl_seg7_lights_0700BF90 = gdSPDefLights1( ); // 0x0700BFA8 - 0x0700C7A8 -ALIGNED8 static const u8 ssl_seg7_texture_0700BFA8[] = { -#include "levels/ssl/8.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_0700BFA8[] = "levels/ssl/8.rgba16"; // 0x0700C7A8 - 0x0700D7A8 -ALIGNED8 static const u8 ssl_seg7_texture_0700C7A8[] = { -#include "levels/ssl/9.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_0700C7A8[] = "levels/ssl/9.rgba16"; // 0x0700D7A8 - 0x0700E7A8 -ALIGNED8 static const u8 ssl_seg7_texture_0700D7A8[] = { -#include "levels/ssl/10.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_0700D7A8[] = "levels/ssl/10.rgba16"; // 0x0700E7A8 - 0x0700F7A8 -ALIGNED8 static const u8 ssl_seg7_texture_0700E7A8[] = { -#include "levels/ssl/11.rgba16.inc.c" -}; +ALIGNED8 static const u8 ssl_seg7_texture_0700E7A8[] = "levels/ssl/11.rgba16"; // 0x0700F7A8 - 0x0700F898 static const Vtx ssl_seg7_vertex_0700F7A8[] = { diff --git a/levels/thi/texture.inc.c b/levels/thi/texture.inc.c index fd73bf42..f3952a77 100644 --- a/levels/thi/texture.inc.c +++ b/levels/thi/texture.inc.c @@ -1,9 +1,5 @@ // 0x07000000 - 0x07000002 -ALIGNED8 static const u8 thi_seg7_texture_07000000[] = { -#include "levels/thi/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 thi_seg7_texture_07000000[] = "levels/thi/0.rgba16"; // 0x07000800 - 0x07000802 -ALIGNED8 static const u8 thi_seg7_texture_07000800[] = { -#include "levels/thi/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 thi_seg7_texture_07000800[] = "levels/thi/1.rgba16"; diff --git a/levels/totwc/texture.inc.c b/levels/totwc/texture.inc.c index 91e22689..561b0eb1 100644 --- a/levels/totwc/texture.inc.c +++ b/levels/totwc/texture.inc.c @@ -1,19 +1,11 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 totwc_seg7_texture_07000000[] = { -#include "levels/totwc/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 totwc_seg7_texture_07000000[] = "levels/totwc/0.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 totwc_seg7_texture_07001000[] = { -#include "levels/totwc/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 totwc_seg7_texture_07001000[] = "levels/totwc/1.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 totwc_seg7_texture_07001800[] = { -#include "levels/totwc/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 totwc_seg7_texture_07001800[] = "levels/totwc/2.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 totwc_seg7_texture_07002000[] = { -#include "levels/totwc/3.ia16.inc.c" -}; +ALIGNED8 static const u8 totwc_seg7_texture_07002000[] = "levels/totwc/3.ia16"; diff --git a/levels/ttc/areas/1/movtext.inc.c b/levels/ttc/areas/1/movtext.inc.c index 897a0259..37e8c82e 100644 --- a/levels/ttc/areas/1/movtext.inc.c +++ b/levels/ttc/areas/1/movtext.inc.c @@ -5,9 +5,7 @@ static const Lights1 ttc_lights_surface_treadmill = gdSPDefLights1( ); // 0x07015F90 - 0x07016790 -ALIGNED8 const u8 ttc_yellow_triangle[] = { -#include "levels/ttc/2.rgba16.inc.c" -}; +ALIGNED8 const u8 ttc_yellow_triangle[] = "levels/ttc/2.rgba16"; // 0x07016790 - 0x07016808 const Gfx ttc_dl_surface_treadmill_begin[] = { diff --git a/levels/ttc/texture.inc.c b/levels/ttc/texture.inc.c index c7dfb516..671b814a 100644 --- a/levels/ttc/texture.inc.c +++ b/levels/ttc/texture.inc.c @@ -1,9 +1,5 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 ttc_seg7_texture_07000000[] = { -#include "levels/ttc/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttc_seg7_texture_07000000[] = "levels/ttc/0.rgba16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 ttc_seg7_texture_07000800[] = { -#include "levels/ttc/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttc_seg7_texture_07000800[] = "levels/ttc/1.rgba16"; diff --git a/levels/ttm/slide_exit_podium/model.inc.c b/levels/ttm/slide_exit_podium/model.inc.c index 3b39c911..664b237a 100644 --- a/levels/ttm/slide_exit_podium/model.inc.c +++ b/levels/ttm/slide_exit_podium/model.inc.c @@ -17,9 +17,7 @@ static const Lights1 ttm_seg7_lights_0702AD18 = gdSPDefLights1( ); // 0x0702AD30 - 0x0702B530 -ALIGNED8 static const u8 ttm_seg7_texture_0702AD30[] = { -#include "levels/ttm/8.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_0702AD30[] = "levels/ttm/8.rgba16"; // 0x0702B530 - 0x0702B570 static const Vtx ttm_seg7_vertex_0702B530[] = { diff --git a/levels/ttm/texture.inc.c b/levels/ttm/texture.inc.c index b1f02d37..a4ff0f5b 100644 --- a/levels/ttm/texture.inc.c +++ b/levels/ttm/texture.inc.c @@ -1,39 +1,23 @@ // 0x07000000 - 0x07001000 -ALIGNED8 static const u8 ttm_seg7_texture_07000000[] = { -#include "levels/ttm/0.ia16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_07000000[] = "levels/ttm/0.ia16"; // 0x07000800 - 0x07001800 -ALIGNED8 static const u8 ttm_seg7_texture_07000800[] = { -#include "levels/ttm/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_07000800[] = "levels/ttm/1.rgba16"; // 0x07001000 - 0x07002000 -ALIGNED8 static const u8 ttm_seg7_texture_07001000[] = { -#include "levels/ttm/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_07001000[] = "levels/ttm/2.rgba16"; // 0x07001800 - 0x07002800 -ALIGNED8 static const u8 ttm_seg7_texture_07001800[] = { -#include "levels/ttm/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_07001800[] = "levels/ttm/3.rgba16"; // 0x07002000 - 0x07003000 -ALIGNED8 static const u8 ttm_seg7_texture_07002000[] = { -#include "levels/ttm/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_07002000[] = "levels/ttm/4.rgba16"; // 0x07002800 - 0x07003800 -ALIGNED8 static const u8 ttm_seg7_texture_07002800[] = { -#include "levels/ttm/5.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_07002800[] = "levels/ttm/5.rgba16"; // 0x07003000 - 0x07004000 -ALIGNED8 static const u8 ttm_seg7_texture_07003000[] = { -#include "levels/ttm/6.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_07003000[] = "levels/ttm/6.rgba16"; // 0x07004000 - 0x07005000 -ALIGNED8 static const u8 ttm_seg7_texture_07004000[] = { -#include "levels/ttm/7.rgba16.inc.c" -}; +ALIGNED8 static const u8 ttm_seg7_texture_07004000[] = "levels/ttm/7.rgba16"; diff --git a/levels/vcutm/texture.inc.c b/levels/vcutm/texture.inc.c index 40640dc5..8f31c504 100644 --- a/levels/vcutm/texture.inc.c +++ b/levels/vcutm/texture.inc.c @@ -1,19 +1,11 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 vcutm_seg7_texture_07000000[] = { -#include "levels/vcutm/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 vcutm_seg7_texture_07000000[] = "levels/vcutm/0.rgba16"; // 0x07000800 - 0x07001800 -ALIGNED8 static const u8 vcutm_seg7_texture_07000800[] = { -#include "levels/vcutm/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 vcutm_seg7_texture_07000800[] = "levels/vcutm/1.rgba16"; // 0x07001800 - 0x07002800 -ALIGNED8 static const u8 vcutm_seg7_texture_07001800[] = { -#include "levels/vcutm/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 vcutm_seg7_texture_07001800[] = "levels/vcutm/2.rgba16"; // 0x07002800 - 0x07003000 -ALIGNED8 static const u8 vcutm_seg7_texture_07002800[] = { -#include "levels/vcutm/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 vcutm_seg7_texture_07002800[] = "levels/vcutm/3.rgba16"; diff --git a/levels/wdw/texture.inc.c b/levels/wdw/texture.inc.c index e730692f..084c82fa 100644 --- a/levels/wdw/texture.inc.c +++ b/levels/wdw/texture.inc.c @@ -1,24 +1,14 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 wdw_seg7_texture_07000000[] = { -#include "levels/wdw/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 wdw_seg7_texture_07000000[] = "levels/wdw/0.rgba16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 wdw_seg7_texture_07000800[] = { -#include "levels/wdw/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 wdw_seg7_texture_07000800[] = "levels/wdw/1.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 wdw_seg7_texture_07001000[] = { -#include "levels/wdw/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 wdw_seg7_texture_07001000[] = "levels/wdw/2.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 wdw_seg7_texture_07001800[] = { -#include "levels/wdw/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 wdw_seg7_texture_07001800[] = "levels/wdw/3.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 wdw_seg7_texture_07002000[] = { -#include "levels/wdw/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 wdw_seg7_texture_07002000[] = "levels/wdw/4.rgba16"; diff --git a/levels/wf/texture.inc.c b/levels/wf/texture.inc.c index 7a432682..a7c78cf2 100644 --- a/levels/wf/texture.inc.c +++ b/levels/wf/texture.inc.c @@ -1,29 +1,17 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 wf_seg7_texture_07000000[] = { -#include "levels/wf/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 wf_seg7_texture_07000000[] = "levels/wf/0.rgba16"; // 0x07000800 - 0x07001000 -ALIGNED8 static const u8 wf_seg7_texture_07000800[] = { -#include "levels/wf/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 wf_seg7_texture_07000800[] = "levels/wf/1.rgba16"; // 0x07001000 - 0x07001800 -ALIGNED8 static const u8 wf_seg7_texture_07001000[] = { -#include "levels/wf/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 wf_seg7_texture_07001000[] = "levels/wf/2.rgba16"; // 0x07001800 - 0x07002000 -ALIGNED8 static const u8 wf_seg7_texture_07001800[] = { -#include "levels/wf/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 wf_seg7_texture_07001800[] = "levels/wf/3.rgba16"; // 0x07002000 - 0x07002800 -ALIGNED8 static const u8 wf_seg7_texture_07002000[] = { -#include "levels/wf/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 wf_seg7_texture_07002000[] = "levels/wf/4.rgba16"; // 0x07002800 - 0x07002900 -ALIGNED8 static const u8 wf_seg7_texture_07002800[] = { -#include "levels/wf/5.ia8.inc.c" -}; +ALIGNED8 static const u8 wf_seg7_texture_07002800[] = "levels/wf/5.ia8"; diff --git a/levels/wmotr/texture.inc.c b/levels/wmotr/texture.inc.c index 2c2f21d8..55b79002 100644 --- a/levels/wmotr/texture.inc.c +++ b/levels/wmotr/texture.inc.c @@ -1,24 +1,14 @@ // 0x07000000 - 0x07000800 -ALIGNED8 static const u8 wmotr_seg7_texture_07000000[] = { -#include "levels/wmotr/0.rgba16.inc.c" -}; +ALIGNED8 static const u8 wmotr_seg7_texture_07000000[] = "levels/wmotr/0.rgba16"; // 0x07000800 - 0x07000C00 -ALIGNED8 static const u8 wmotr_seg7_texture_07000800[] = { -#include "levels/wmotr/1.rgba16.inc.c" -}; +ALIGNED8 static const u8 wmotr_seg7_texture_07000800[] = "levels/wmotr/1.rgba16"; // 0x07000C00 - 0x07001400 -ALIGNED8 static const u8 wmotr_seg7_texture_07000C00[] = { -#include "levels/wmotr/2.rgba16.inc.c" -}; +ALIGNED8 static const u8 wmotr_seg7_texture_07000C00[] = "levels/wmotr/2.rgba16"; // 0x07001400 - 0x07001600 -ALIGNED8 static const u8 wmotr_seg7_texture_07001400[] = { -#include "levels/wmotr/3.rgba16.inc.c" -}; +ALIGNED8 static const u8 wmotr_seg7_texture_07001400[] = "levels/wmotr/3.rgba16"; // 0x07001600 - 0x07001800 -ALIGNED8 static const u8 wmotr_seg7_texture_07001600[] = { -#include "levels/wmotr/4.rgba16.inc.c" -}; +ALIGNED8 static const u8 wmotr_seg7_texture_07001600[] = "levels/wmotr/4.rgba16"; diff --git a/src/goddard/renderer.c b/src/goddard/renderer.c index 3d2a8356..5672162c 100644 --- a/src/goddard/renderer.c +++ b/src/goddard/renderer.c @@ -227,81 +227,45 @@ static Gfx gd_texture1_dummy_aligner1[] = { // @ 801A8728 gsSPEndDisplayList(), }; -ALIGNED8 static u8 gd_texture_hand_open[] = { -#include "textures/intro_raw/hand_open.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_hand_open[] = "textures/intro_raw/hand_open.rgba16"; static Gfx gd_texture2_dummy_aligner1[] = { gsSPEndDisplayList() }; -ALIGNED8 static u8 gd_texture_hand_closed[] = { -#include "textures/intro_raw/hand_closed.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_hand_closed[] = "textures/intro_raw/hand_closed.rgba16"; -ALIGNED8 static u8 gd_texture_red_star_0[] = { -#include "textures/intro_raw/red_star_0.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_red_star_0[] = "textures/intro_raw/red_star_0.rgba16"; -ALIGNED8 static u8 gd_texture_red_star_1[] = { -#include "textures/intro_raw/red_star_1.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_red_star_1[] = "textures/intro_raw/red_star_1.rgba16"; -ALIGNED8 static u8 gd_texture_red_star_2[] = { -#include "textures/intro_raw/red_star_2.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_red_star_2[] = "textures/intro_raw/red_star_2.rgba16"; -ALIGNED8 static u8 gd_texture_red_star_3[] = { -#include "textures/intro_raw/red_star_3.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_red_star_3[] = "textures/intro_raw/red_star_3.rgba16"; -ALIGNED8 static u8 gd_texture_red_star_4[] = { -#include "textures/intro_raw/red_star_4.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_red_star_4[] = "textures/intro_raw/red_star_4.rgba16"; -ALIGNED8 static u8 gd_texture_red_star_5[] = { -#include "textures/intro_raw/red_star_5.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_red_star_5[] = "textures/intro_raw/red_star_5.rgba16"; -ALIGNED8 static u8 gd_texture_red_star_6[] = { -#include "textures/intro_raw/red_star_6.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_red_star_6[] = "textures/intro_raw/red_star_6.rgba16"; -ALIGNED8 static u8 gd_texture_red_star_7[] = { -#include "textures/intro_raw/red_star_7.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_red_star_7[] = "textures/intro_raw/red_star_7.rgba16"; -ALIGNED8 static u8 gd_texture_white_star_0[] = { -#include "textures/intro_raw/white_star_0.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_white_star_0[] = "textures/intro_raw/white_star_0.rgba16"; -ALIGNED8 static u8 gd_texture_white_star_1[] = { -#include "textures/intro_raw/white_star_1.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_white_star_1[] = "textures/intro_raw/white_star_1.rgba16"; -ALIGNED8 static u8 gd_texture_white_star_2[] = { -#include "textures/intro_raw/white_star_2.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_white_star_2[] = "textures/intro_raw/white_star_2.rgba16"; -ALIGNED8 static u8 gd_texture_white_star_3[] = { -#include "textures/intro_raw/white_star_3.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_white_star_3[] = "textures/intro_raw/white_star_3.rgba16"; -ALIGNED8 static u8 gd_texture_white_star_4[] = { -#include "textures/intro_raw/white_star_4.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_white_star_4[] = "textures/intro_raw/white_star_4.rgba16"; -ALIGNED8 static u8 gd_texture_white_star_5[] = { -#include "textures/intro_raw/white_star_5.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_white_star_5[] = "textures/intro_raw/white_star_5.rgba16"; -ALIGNED8 static u8 gd_texture_white_star_6[] = { -#include "textures/intro_raw/white_star_6.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_white_star_6[] = "textures/intro_raw/white_star_6.rgba16"; -ALIGNED8 static u8 gd_texture_white_star_7[] = { -#include "textures/intro_raw/white_star_7.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_white_star_7[] = "textures/intro_raw/white_star_7.rgba16"; static Vtx_t gd_vertex_star[] = { {{-64, 0, 0}, 0, { 0, 992}, {0x00, 0x00, 0x7F}}, @@ -470,32 +434,20 @@ static Gfx *gd_silver_star_dl_array[] = { gd_dl_silver_star_7, }; -ALIGNED8 static u8 gd_texture_sparkle_0[] = { -#include "textures/intro_raw/sparkle_0.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_sparkle_0[] = "textures/intro_raw/sparkle_0.rgba16"; -ALIGNED8 static u8 gd_texture_sparkle_1[] = { -#include "textures/intro_raw/sparkle_1.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_sparkle_1[] = "textures/intro_raw/sparkle_1.rgba16"; -ALIGNED8 static u8 gd_texture_sparkle_2[] = { -#include "textures/intro_raw/sparkle_2.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_sparkle_2[] = "textures/intro_raw/sparkle_2.rgba16"; -ALIGNED8 static u8 gd_texture_sparkle_3[] = { -#include "textures/intro_raw/sparkle_3.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_sparkle_3[] = "textures/intro_raw/sparkle_3.rgba16"; -ALIGNED8 static u8 gd_texture_sparkle_4[] = { -#include "textures/intro_raw/sparkle_4.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_sparkle_4[] = "textures/intro_raw/sparkle_4.rgba16"; //! No reference to this texture. Two DL's uses the same previous texture // instead of using this texture. // Fixed via setting TEXTURE_FIX to 1. -ALIGNED8 static u8 gd_texture_sparkle_5[] = { -#include "textures/intro_raw/sparkle_5.rgba16.inc.c" -}; +ALIGNED8 static u8 gd_texture_sparkle_5[] = "textures/intro_raw/sparkle_5.rgba16"; static Vtx_t gd_vertex_sparkle[] = { {{ -32, 0, 0}, 0, { 0, 1984}, { 0x00, 0x00, 0x7F, 0x00}}, @@ -682,9 +634,7 @@ static Gfx gd_texture3_dummy_aligner1[] = { gsSPEndDisplayList(), }; -ALIGNED8 static u8 gd_texture_mario_face_shine[] = { -#include "textures/intro_raw/mario_face_shine.ia8.inc.c" -}; +ALIGNED8 static u8 gd_texture_mario_face_shine[] = "textures/intro_raw/mario_face_shine.ia8"; static Gfx gd_dl_mario_face_shine[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), diff --git a/tools/texture_converter.py b/tools/texture_converter.py new file mode 100644 index 00000000..7cd5345a --- /dev/null +++ b/tools/texture_converter.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 + +import sys +import os +import os.path +import glob +import re +from pathlib import Path + +prefixes = ["ALIGNED8 static const u8", "static const u8", "ALIGNED8 static u8", "ALIGNED8 u8", "ALIGNED8 const u8", "u8"] + +def parse_model(file, lines): + searchInclude = False + searchLineIndex = 0 + searchLineOriginal = "" + needsReplace = False + includePath = "" + for lineIndex, uline in enumerate(lines, 0): + line = uline.strip() + if not searchInclude: + for prefix in prefixes: + if line.rstrip().startswith(prefix) and "[] = {" in line: + searchInclude = True + searchLineIndex = lineIndex + searchLineOriginal = line + else: + if line.startswith("#include"): + includePath = line.replace("#include ", "").replace(".inc.c", "") + elif line.endswith("};") and includePath != "": + lines[searchLineIndex] = searchLineOriginal.replace("[] = {", f"[] = {includePath};") + lines[searchLineIndex + 1] = "" + lines[searchLineIndex + 2] = "\n" + searchInclude = False + searchLineIndex = 0 + searchLineOriginal = "" + needsReplace = True + includePath = "" + else: + searchInclude = False + nfile = os.path.abspath(file.replace("\\", "/").replace("Render96ex/", "Render96ex/overwriten/")) + npath = os.path.dirname(nfile) + + if needsReplace: + if not os.path.isdir(npath): + os.makedirs(npath) + f = open(nfile, "w") + f.writelines(lines) + f.close() + +if not len(sys.argv) > 0: + path = f"{str(Path(__file__).resolve().parents[1])}/**/*.c" + + print(f"Converting repo textures this may take a long time") + + for file in glob.iglob(path, recursive=True): + try: + if not "\\build" in file: + parse_model(file, open(file, 'r').readlines()) + except Exception as err: + print(f"Error on {file}") + print(err) +else: + file = sys.argv[1] + try: + print(f"Converting {file} textures") + parse_model(file, open(file, 'r').readlines()) + except Exception as err: + print(f"Error on {file}") + print(err)