mirror
/
SpaghettiKart
mirror of https://github.com/HarbourMasters/SpaghettiKart
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linkage for the ceremony_data file (#478) 

* Linkage for the ceremony_data file

Cleaned up all but 1 undefined symbol from the 0x0B range. The one
 leftover may be something from texture_tkmk00. Or atleast, that's
 what I think. Can't say for certain

* Startup logo linkage

Cleaned up a bunch of unused items from assets.json too

Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran 2023-10-28 00:18:20 -04:00 committed by GitHub
parent 716b926260
commit c17d5c76c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 1827 additions and 1246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Makefile
View File

@ -215,7 +215,7 @@ COURSE_DIRS := $(shell find courses -mindepth 1 -type d)
TEXTURES_DIR = textures TEXTURES_DIR = textures
TEXTURE_DIRS := textures/common TEXTURE_DIRS := textures/common
ALL_DIRS = $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(COURSE_DIRS) include $(ASM_DIRS) $(ALL_KARTS_DIRS) $(TEXTURES_DIR)/raw \ ALL_DIRS = $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(COURSE_DIRS) include $(ASM_DIRS) $(TEXTURES_DIR)/raw \
$(TEXTURES_DIR)/standalone $(TEXTURES_DIR)/startup_logo $(TEXTURES_DIR)/crash_screen $(TEXTURES_DIR)/trophy $(TEXTURES_DIR)/courses \ $(TEXTURES_DIR)/standalone $(TEXTURES_DIR)/startup_logo $(TEXTURES_DIR)/crash_screen $(TEXTURES_DIR)/trophy $(TEXTURES_DIR)/courses \
$(TEXTURE_DIRS) $(TEXTURE_DIRS)/tlut $(BIN_DIR)) $(TEXTURE_DIRS) $(TEXTURE_DIRS)/tlut $(BIN_DIR))
@ -452,27 +452,6 @@ $(BUILD_DIR)/src/crash_screen.o: src/crash_screen.c
$(V)$(CC) -c $(CFLAGS) -o $@ $< $(V)$(CC) -c $(CFLAGS) -o $@ $<
$(PYTHON) tools/set_o32abi_bit.py $@ $(PYTHON) tools/set_o32abi_bit.py $@
$(BUILD_DIR)/src/ending/ceremony_data.inc.o: src/ending/ceremony_data.inc.c
@$(PRINT) "$(GREEN)Compiling Trophy Model: $(BLUE)$@ $(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/trophy/reflection_map_brass.rgba16.inc.c -g textures/trophy/reflection_map_brass.rgba16.png -f rgba16 -s u8
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/trophy/reflection_map_silver.rgba16.inc.c -g textures/trophy/reflection_map_silver.rgba16.png -f rgba16 -s u8
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/trophy/reflection_map_gold.rgba16.inc.c -g textures/trophy/reflection_map_gold.rgba16.png -f rgba16 -s u8
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/trophy/podium1.rgba16.inc.c -g textures/trophy/podium1.rgba16.png -f rgba16 -s u8
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/trophy/podium2.rgba16.inc.c -g textures/trophy/podium2.rgba16.png -f rgba16 -s u8
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/trophy/podium3.rgba16.inc.c -g textures/trophy/podium3.rgba16.png -f rgba16 -s u8
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(PYTHON) tools/set_o32abi_bit.py $@
$(BUILD_DIR)/src/data/startup_logo.inc.o: src/data/startup_logo.inc.c
@$(PRINT) "$(GREEN)Compiling Startup Logo: $(BLUE)$@ $(NO_COL)\n"
$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/startup_logo/reflection_map_gold.rgba16.inc.c -g textures/startup_logo/reflection_map_gold.rgba16.png -f rgba16 -s u8
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(PYTHON) tools/set_o32abi_bit.py $@
#==============================================================================# #==============================================================================#
# Common Textures Segment Generation # # Common Textures Segment Generation #
#==============================================================================# #==============================================================================#
@ -626,29 +605,39 @@ endif
# Compile Trophy and Podium Models # # Compile Trophy and Podium Models #
#==============================================================================# #==============================================================================#
$(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.o: $(BUILD_DIR)/src/ending/ceremony_data.inc.o LDFLAGS += -R $(BUILD_DIR)/src/ending/ceremony_data.inc.elf
%/ceremony_data.inc.elf: %/ceremony_data.inc.o
$(V)$(LD) -t -e 0 -Ttext=0B000000 -Map $@.map -o $@ $< --no-check-sections
%/ceremony_data.inc.bin: %/ceremony_data.inc.elf
$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
%/ceremony_data.inc.mio0: %/ceremony_data.inc.bin
@$(PRINT) "$(GREEN)Compressing Trophy Model: $(BLUE)$@ $(NO_COL)\n" @$(PRINT) "$(GREEN)Compressing Trophy Model: $(BLUE)$@ $(NO_COL)\n"
$(V)$(LD) -t -e 0 -Ttext=0B000000 -Map $(BUILD_DIR)/src/ending/ceremony_data.inc.elf.map -o $(BUILD_DIR)/src/ending/ceremony_data.inc.elf $(BUILD_DIR)/src/ending/ceremony_data.inc.o --no-check-sections $(V)$(MIO0TOOL) -c $< $@
$(V)$(EXTRACT_DATA_FOR_MIO) $(BUILD_DIR)/src/ending/ceremony_data.inc.elf $(BUILD_DIR)/src/ending/ceremony_data.inc.bin
$(V)$(MIO0TOOL) -c $(BUILD_DIR)/src/ending/ceremony_data.inc.bin $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0
printf ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel ceremony_data\n\n.incbin \"$(BUILD_DIR)/src/ending/ceremony_data.inc.mio0\"\n\n.balign 16\nglabel data_821D10_end\n" > $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.s
$(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.o $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.s
%/ceremony_data.inc.mio0.s: %/ceremony_data.inc.mio0
printf ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel ceremony_data\n\n.incbin \"$<\"\n\n.balign 16\nglabel data_821D10_end\n" > $@
#==============================================================================# #==============================================================================#
# Compile Startup Logo # # Compile Startup Logo #
#==============================================================================# #==============================================================================#
$(BUILD_DIR)/src/data/startup_logo.inc.mio0.o: src/data/startup_logo.inc.c LDFLAGS += -R $(BUILD_DIR)/src/data/startup_logo.inc.elf
@$(PRINT) "$(GREEN)Compressing Startup Logo: $(BLUE)$@ $(NO_COL)\n"
$(V)$(LD) -t -e 0 -Ttext=06000000 -Map $(BUILD_DIR)/src/data/startup_logo.inc.elf.map -o $(BUILD_DIR)/src/data/startup_logo.inc.elf $(BUILD_DIR)/src/data/startup_logo.inc.o --no-check-sections
$(V)$(EXTRACT_DATA_FOR_MIO) $(BUILD_DIR)/src/data/startup_logo.inc.elf $(BUILD_DIR)/src/data/startup_logo.inc.bin
$(V)$(MIO0TOOL) -c $(BUILD_DIR)/src/data/startup_logo.inc.bin $(BUILD_DIR)/src/data/startup_logo.inc.mio0
printf ".include \"macros.inc\"\n\n.data\n\n\n\n.balign 4\n\n\nglabel startup_logo\n\n.incbin \"$(BUILD_DIR)/src/data/startup_logo.inc.mio0\"\n\n.balign 16\n\nglabel data_825800_end\n" > $(BUILD_DIR)/src/data/startup_logo.inc.mio0.s
$(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/data/startup_logo.inc.mio0.o $(BUILD_DIR)/src/data/startup_logo.inc.mio0.s
%/startup_logo.inc.elf: %/startup_logo.inc.o
$(V)$(LD) -t -e 0 -Ttext=06000000 -Map $@.map -o $@ $< --no-check-sections
%/startup_logo.inc.bin: %/startup_logo.inc.elf
$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
%/startup_logo.inc.mio0: %/startup_logo.inc.bin
@$(PRINT) "$(GREEN)Compressing Startup Logo Model: $(BLUE)$@ $(NO_COL)\n"
$(V)$(MIO0TOOL) -c $< $@
%/startup_logo.inc.mio0.s: %/startup_logo.inc.mio0
printf ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel startup_logo\n\n.incbin \"$<\"\n\n.balign 16\n\nglabel data_825800_end\n" > $@
#==============================================================================# #==============================================================================#
# Compile Common Textures # # Compile Common Textures #
@ -681,7 +670,7 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)
$(V)$(CPP) $(CPPFLAGS) -DBUILD_DIR=$(BUILD_DIR) -MMD -MP -MT $@ -MF $@.d -o $@ $< $(V)$(CPP) $(CPPFLAGS) -DBUILD_DIR=$(BUILD_DIR) -MMD -MP -MT $@ -MF $@.d -o $@ $<
# Link MK64 ELF file # Link MK64 ELF file
$(ELF): $(O_FILES) $(COURSE_DATA_TARGETS) $(COURSE_MIO0_OBJ_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/src/data/startup_logo.inc.mio0.o $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.o $(BUILD_DIR)/src/data/common_textures.inc.mio0.o $(COURSE_GEOGRAPHY_TARGETS) undefined_syms.txt $(ELF): $(O_FILES) $(COURSE_DATA_TARGETS) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/src/data/startup_logo.inc.mio0.o $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.o $(BUILD_DIR)/src/data/common_textures.inc.mio0.o $(COURSE_GEOGRAPHY_TARGETS) undefined_syms.txt
@$(PRINT) "$(GREEN)Linking ELF file: $(BLUE)$@ $(NO_COL)\n" @$(PRINT) "$(GREEN)Linking ELF file: $(BLUE)$@ $(NO_COL)\n"
$(V)$(LD) $(LDFLAGS) -o $@ $(V)$(LD) $(LDFLAGS) -o $@

126
Makefile.split
View File

@ -1,129 +1,5 @@
MUSIC_DIR = music
COURSE_NAMES := \
mario_raceway \
choco_mountain \
bowsers_castle \
banshee_boardwalk \
yoshi_valley \
frappe_snowland \
koopa_troopa_beach \
royal_raceway \
luigi_raceway \
moo_moo_farm \
toads_turnpike \
kalimari_desert \
sherbet_land \
rainbow_road \
wario_stadium \
block_fort \
skyscraper \
double_deck \
dks_jungle_parkway \
big_donut
# COURSE_DL_NAMES := $(addprefix course_,$(addsuffix _dl,$(COURSE_NAMES)))
# COURSE_DL_MIO0_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .mio0,$(COURSE_DL_NAMES)))
# COURSE_DL_MIO0_OBJ_FILES := $(COURSE_DL_MIO0_FILES:.mio0=.mio0.o)
# COURSE_VERTEX_NAMES := $(addprefix course_,$(addsuffix _vertex,$(COURSE_NAMES)))
# COURSE_VERTEX_MIO0_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .mio0,$(COURSE_VERTEX_NAMES)))
COURSE_MIO0_OBJ_FILES := $(COURSE_DL_MIO0_OBJ_FILES)
OTHER_DATA_MIO0_NAMES := \
data_821D10 \
data_825800
OTHER_DATA_MIO0_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .mio0,$(OTHER_DATA_MIO0_NAMES)))
TEXTURE_DATA_MIO0_NAMES := \
texture_68EB50 \
texture_68EDA0 \
texture_68EFF0 \
texture_68F248 \
texture_68F4A8 \
texture_68F700 \
texture_68F96C \
texture_68FBCC \
texture_68FE20 \
texture_69004C \
texture_690284 \
texture_6904C4 \
texture_690708 \
texture_690960 \
texture_690BBC \
texture_690DF8 \
texture_6913CC \
texture_691714 \
texture_691AAC \
texture_691D98 \
texture_692088 \
texture_6923D8 \
texture_6925E8 \
texture_692888 \
texture_692CC0 \
texture_69333C \
texture_693790
TEXTURE_DATA_MIO0_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .mio0,$(TEXTURE_DATA_MIO0_NAMES)))
STANDALONE_TEXTURE_MIO0_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.mio0,$(wildcard $(TEXTURES_DIR)/standalone/*.png))) STANDALONE_TEXTURE_MIO0_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.mio0,$(wildcard $(TEXTURES_DIR)/standalone/*.png)))
RAW_TEXTURE_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%,$(wildcard $(TEXTURES_DIR)/raw/*.png))) RAW_TEXTURE_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%,$(wildcard $(TEXTURES_DIR)/raw/*.png)))
KARTS_DIR := bin/karts MIO0_FILES := $(STANDALONE_TEXTURE_MIO0_FILES)
ALL_KARTS_DIRS := $(wildcard $(KARTS_DIR)/*)
KART_TEXTURE_MIO0_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.bin,%.mio0,$(wildcard $(KARTS_DIR)/*/*.bin)))
MIO0_FILES := $(OTHER_DATA_MIO0_FILES) $(TEXTURE_DATA_MIO0_FILES) $(STANDALONE_TEXTURE_MIO0_FILES) $(KART_TEXTURE_MIO0_FILES)
MUSIC_FILES = \
$(MUSIC_DIR)/seq_00.m64 \
$(MUSIC_DIR)/seq_01.m64 \
$(MUSIC_DIR)/seq_02.m64 \
$(MUSIC_DIR)/seq_03.m64 \
$(MUSIC_DIR)/seq_04.m64 \
$(MUSIC_DIR)/seq_05.m64 \
$(MUSIC_DIR)/seq_06.m64 \
$(MUSIC_DIR)/seq_07.m64 \
$(MUSIC_DIR)/seq_08.m64 \
$(MUSIC_DIR)/seq_09.m64 \
$(MUSIC_DIR)/seq_0A.m64 \
$(MUSIC_DIR)/seq_0B.m64 \
$(MUSIC_DIR)/seq_0C.m64 \
$(MUSIC_DIR)/seq_0D.m64 \
$(MUSIC_DIR)/seq_0E.m64 \
$(MUSIC_DIR)/seq_0F.m64 \
$(MUSIC_DIR)/seq_10.m64 \
$(MUSIC_DIR)/seq_11.m64 \
$(MUSIC_DIR)/seq_12.m64 \
$(MUSIC_DIR)/seq_13.m64 \
$(MUSIC_DIR)/seq_14.m64 \
$(MUSIC_DIR)/seq_15.m64 \
$(MUSIC_DIR)/seq_16.m64 \
$(MUSIC_DIR)/seq_17.m64 \
$(MUSIC_DIR)/seq_18.m64 \
$(MUSIC_DIR)/seq_19.m64 \
$(MUSIC_DIR)/seq_1A.m64 \
$(MUSIC_DIR)/seq_1B.m64 \
$(MUSIC_DIR)/seq_1C.m64 \
$(MUSIC_DIR)/seq_1D.m64 \
$(MUSIC_DIR)/seq_1E.m64 \
$(MUSIC_DIR)/seq_1F.m64 \
$(MUSIC_DIR)/seq_20.m64 \
$(MUSIC_DIR)/seq_21.m64
# SEGMENTED ADDRESSES
$(BUILD_DIR)/src/startup_logo.inc.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/src/trophy_model.inc.elf: SEGMENT_ADDRESS := 0x0B000000
# COURSES
$(BUILD_DIR)/courses/sherbet_land/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/courses/wario_stadium/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000
$(BUILD_DIR)/courses/luigi_raceway/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000

4
asm/non_matchings/code_8006E9C0/func_8006F008.s
View File

@ -195,8 +195,8 @@ glabel L8006F1AC
/* 06FDDC 8006F1DC 10000160 */ b .L8006F760 /* 06FDDC 8006F1DC 10000160 */ b .L8006F760
/* 06FDE0 8006F1E0 A42BD2E8 */ sh $t3, %lo(D_8018D2E8)($at) /* 06FDE0 8006F1E0 A42BD2E8 */ sh $t3, %lo(D_8018D2E8)($at)
glabel L8006F1E4 glabel L8006F1E4
/* 06FDE4 8006F1E4 3C040F0D */ lui $a0, %hi(D_0F0D0E50) # $a0, 0xf0d /* 06FDE4 8006F1E4 3C040F0D */ lui $a0, %hi(gTextureGhosts) # $a0, 0xf0d
/* 06FDE8 8006F1E8 24840E50 */ addiu $a0, %lo(D_0F0D0E50) # addiu $a0, $a0, 0xe50 /* 06FDE8 8006F1E8 24840E50 */ addiu $a0, %lo(gTextureGhosts) # addiu $a0, $a0, 0xe50
/* 06FDEC 8006F1EC 24054CC2 */ li $a1, 19650 /* 06FDEC 8006F1EC 24054CC2 */ li $a1, 19650
/* 06FDF0 8006F1F0 0C0AA13D */ jal dma_textures /* 06FDF0 8006F1F0 0C0AA13D */ jal dma_textures
/* 06FDF4 8006F1F4 3406D980 */ li $a2, 55680 /* 06FDF4 8006F1F4 3406D980 */ li $a2, 55680

154
assets.json
View File

@ -59,82 +59,9 @@
"bin/lib/PR/f3d/F3DEX_data.bin": {"meta":{"size": "0x800"}, "offsets": {"us":["0x0F4900", "0x0"]}}, "bin/lib/PR/f3d/F3DEX_data.bin": {"meta":{"size": "0x800"}, "offsets": {"us":["0x0F4900", "0x0"]}},
"bin/lib/PR/f3d/F3DLX_data.bin": {"meta":{"size": "0x800"}, "offsets": {"us":["0x0F5100", "0x0"]}}, "bin/lib/PR/f3d/F3DLX_data.bin": {"meta":{"size": "0x800"}, "offsets": {"us":["0x0F5100", "0x0"]}},
"bin/lib/PR/audio/aspMain_data.bin": {"meta":{"size": "0x300"}, "offsets": {"us":["0x0F5900", "0x0"]}}, "bin/lib/PR/audio/aspMain_data.bin": {"meta":{"size": "0x300"}, "offsets": {"us":["0x0F5900", "0x0"]}},
"bin/common_textures.bin": {"meta":{"size": "0x2D158"}, "offsets":{"us":["0x132B50","0x0"]}},
"bin/mk64.u.128480.bin": {"meta":{"size": "0x2660"}, "offsets":{"us":["0x128480","0x0"]}},
"bin/mk64.u.6A0ABC.bin": {"meta":{"size": "0x72304"}, "offsets":{"us":["0x6A0ABC","0x0"]}},
"bin/mk64.u.724220.bin": {"meta":{"size": "0x5810"}, "offsets":{"us":["0x724220","0x0"]}},
"bin/data_821D10.bin": {"meta":{"size": "0x8D88"}, "offsets":{"us":["0x821D10","0x0"]}},
"textures/trophy/reflection_map_brass.rgba16.png": {"meta":{"dims":[32,32]}, "offsets":{"us":["0x821D10", "0x4670"]}},
"textures/trophy/reflection_map_silver.rgba16.png": {"meta":{"dims":[32,32]}, "offsets":{"us":["0x821D10", "0x4E70"]}},
"textures/trophy/reflection_map_gold.rgba16.png": {"meta":{"dims":[32,32]}, "offsets":{"us":["0x821D10", "0x5670"]}},
"textures/trophy/podium1.rgba16.png": {"meta":{"dims":[32,32]}, "offsets":{"us":["0x821D10", "0x6BD0"]}},
"textures/trophy/podium2.rgba16.png": {"meta":{"dims":[32,32]}, "offsets":{"us":["0x821D10", "0x7760"]}},
"textures/trophy/podium3.rgba16.png": {"meta":{"dims":[32,32]}, "offsets":{"us":["0x821D10", "0x8070"]}},
"bin/data_825800.bin": {"meta":{"size": "0x9480"}, "offsets":{"us":["0x825800","0x0"]}},
"textures/startup_logo/reflection_map_gold.rgba16.png": {"meta":{"dims":[32,32]}, "offsets":{"us":["0x825800", "0x8A48"]}},
"bin/course_mario_raceway_dl.bin": {"meta":{"size": "0x3150"}, "offsets":{"us":["0x8284D0","0x0"]}},
"bin/course_choco_mountain_dl.bin": {"meta":{"size": "0x2920"}, "offsets":{"us":["0x82B620","0x0"]}},
"bin/course_bowsers_castle_dl.bin": {"meta":{"size": "0x3E80"}, "offsets":{"us":["0x82DF40","0x0"]}},
"bin/course_banshee_boardwalk_dl.bin": {"meta":{"size": "0x3DE0"}, "offsets":{"us":["0x831DC0","0x0"]}},
"bin/course_yoshi_valley_dl.bin": {"meta":{"size": "0x9BA0"}, "offsets":{"us":["0x835BA0","0x0"]}},
"bin/course_frappe_snowland_dl.bin": {"meta":{"size": "0x3700"}, "offsets":{"us":["0x83F740","0x0"]}},
"bin/course_koopa_troopa_beach_dl.bin": {"meta":{"size": "0x7D90"}, "offsets":{"us":["0x842E40","0x0"]}},
"bin/course_royal_raceway_dl.bin": {"meta":{"size": "0x3D10"}, "offsets":{"us":["0x84ABD0","0x0"]}},
"bin/course_luigi_raceway_dl.bin": {"meta":{"size": "0x4540"}, "offsets":{"us":["0x84E8E0","0x0"]}},
"bin/course_moo_moo_farm_dl.bin": {"meta":{"size": "0x5060"}, "offsets":{"us":["0x852E20","0x0"]}},
"bin/course_toads_turnpike_dl.bin": {"meta":{"size": "0xE820"}, "offsets":{"us":["0x857E80","0x0"]}},
"bin/course_kalimari_desert_dl.bin": {"meta":{"size": "0x8650"}, "offsets":{"us":["0x8666A0","0x0"]}},
"bin/course_sherbet_land_dl.bin": {"meta":{"size": "0x3D10"}, "offsets":{"us":["0x86ECF0","0x0"]}},
"bin/course_rainbow_road_dl.bin": {"meta":{"size": "0xDAA0"}, "offsets":{"us":["0x872A00","0x0"]}},
"bin/course_wario_stadium_dl.bin": {"meta":{"size": "0x5190"}, "offsets":{"us":["0x8804A0","0x0"]}},
"bin/course_block_fort_dl.bin": {"meta":{"size": "0x150"}, "offsets":{"us":["0x885630","0x0"]}},
"bin/course_skyscraper_dl.bin": {"meta":{"size": "0x120"}, "offsets":{"us":["0x885780","0x0"]}},
"bin/course_double_deck_dl.bin": {"meta":{"size": "0x170"}, "offsets":{"us":["0x8858A0","0x0"]}},
"bin/course_dks_jungle_parkway_dl.bin": {"meta":{"size": "0x7240"}, "offsets":{"us":["0x885A10","0x0"]}},
"bin/course_big_donut_dl.bin": {"meta":{"size": "0x120"}, "offsets":{"us":["0x88CC50","0x0"]}},
"bin/course_mario_raceway_vertex.bin": {"meta":{"size": "0xBB00"}, "offsets":{"us":["0x88FA10","0x0"]}},
"bin/course_mario_raceway_packed.bin": {"meta":{"size": "0x240C"}, "offsets":{"us":["0x899104","0x0"]}},
"bin/course_choco_mountain_vertex.bin": {"meta":{"size": "0xC130"}, "offsets":{"us":["0x89B510","0x0"]}},
"bin/course_choco_mountain_packed.bin": {"meta":{"size": "0x207C"}, "offsets":{"us":["0x8A55C4","0x0"]}},
"bin/course_bowsers_castle_vertex.bin": {"meta":{"size": "0x11FF0"}, "offsets":{"us":["0x8A7640","0x0"]}},
"bin/course_bowsers_castle_packed.bin": {"meta":{"size": "0x3C88"}, "offsets":{"us":["0x8B59A8","0x0"]}},
"bin/course_banshee_boardwalk_vertex.bin": {"meta":{"size": "0x8EE0"}, "offsets":{"us":["0x8B9630","0x0"]}},
"bin/course_banshee_boardwalk_packed.bin": {"meta":{"size": "0x25F8"}, "offsets":{"us":["0x8BFF18","0x0"]}},
"bin/course_yoshi_valley_vertex.bin": {"meta":{"size": "0xA3F0"}, "offsets":{"us":["0x8C2510","0x0"]}},
"bin/course_yoshi_valley_packed.bin": {"meta":{"size": "0x2660"}, "offsets":{"us":["0x8CA2A0","0x0"]}},
"bin/course_frappe_snowland_vertex.bin": {"meta":{"size": "0xC550"}, "offsets":{"us":["0x8CC900","0x0"]}},
"bin/course_frappe_snowland_packed.bin": {"meta":{"size": "0x282C"}, "offsets":{"us":["0x8D6624","0x0"]}},
"bin/course_koopa_troopa_beach_vertex.bin": {"meta":{"size": "0x13540"}, "offsets":{"us":["0x8D8E50","0x0"]}},
"bin/course_koopa_troopa_beach_packed.bin": {"meta":{"size": "0x37C8"}, "offsets":{"us":["0x8E8BC8","0x0"]}},
"bin/course_royal_raceway_vertex.bin": {"meta":{"size": "0x122B0"}, "offsets":{"us":["0x8EC390","0x0"]}},
"bin/course_royal_raceway_packed.bin": {"meta":{"size": "0x3650"}, "offsets":{"us":["0x8FAFF0","0x0"]}},
"bin/course_luigi_raceway_vertex.bin": {"meta":{"size": "0xCDA0"}, "offsets":{"us":["0x8FE640","0x0"]}},
"bin/course_luigi_raceway_packed.bin": {"meta":{"size": "0x35A0"}, "offsets":{"us":["0x907E40","0x0"]}},
"bin/course_moo_moo_farm_vertex.bin": {"meta":{"size": "0x105A0"}, "offsets":{"us":["0x90B3E0","0x0"]}},
"bin/course_moo_moo_farm_packed.bin": {"meta":{"size": "0x2AB4"}, "offsets":{"us":["0x918ECC","0x0"]}},
"bin/course_toads_turnpike_vertex.bin": {"meta":{"size": "0xD2F0"}, "offsets":{"us":["0x91B980","0x0"]}},
"bin/course_toads_turnpike_packed.bin": {"meta":{"size": "0x2D20"}, "offsets":{"us":["0x925F50","0x0"]}},
"bin/course_kalimari_desert_vertex.bin": {"meta":{"size": "0xE360"}, "offsets":{"us":["0x928C70","0x0"]}},
"bin/course_kalimari_desert_packed.bin": {"meta":{"size": "0x2FCC"}, "offsets":{"us":["0x934004","0x0"]}},
"bin/course_sherbet_land_vertex.bin": {"meta":{"size": "0x5C90"}, "offsets":{"us":["0x936FD0","0x0"]}},
"bin/course_sherbet_land_packed.bin": {"meta":{"size": "0x1298"}, "offsets":{"us":["0x93B9C8","0x0"]}},
"bin/course_rainbow_road_vertex.bin": {"meta":{"size": "0x6C60"}, "offsets":{"us":["0x93CC60","0x0"]}},
"bin/course_rainbow_road_packed.bin": {"meta":{"size": "0x1204"}, "offsets":{"us":["0x9426BC","0x0"]}},
"bin/course_wario_stadium_vertex.bin": {"meta":{"size": "0xDEC0"}, "offsets":{"us":["0x9438C0","0x0"]}},
"bin/course_wario_stadium_packed.bin": {"meta":{"size": "0x34F4"}, "offsets":{"us":["0x94E28C","0x0"]}},
"bin/course_block_fort_vertex.bin": {"meta":{"size": "0x2110"}, "offsets":{"us":["0x951780","0x0"]}},
"bin/course_block_fort_packed.bin": {"meta":{"size": "0x838"}, "offsets":{"us":["0x953058","0x0"]}},
"bin/course_skyscraper_vertex.bin": {"meta":{"size": "0x1D90"}, "offsets":{"us":["0x953890","0x0"]}},
"bin/course_skyscraper_packed.bin": {"meta":{"size": "0x718"}, "offsets":{"us":["0x954F08","0x0"]}},
"bin/course_double_deck_vertex.bin": {"meta":{"size": "0x1050"}, "offsets":{"us":["0x955620","0x0"]}},
"bin/course_double_deck_packed.bin": {"meta":{"size": "0x37C"}, "offsets":{"us":["0x9562F4","0x0"]}},
"bin/course_dks_jungle_parkway_vertex.bin": {"meta":{"size": "0xD880"}, "offsets":{"us":["0x956670","0x0"]}},
"bin/course_dks_jungle_parkway_packed.bin": {"meta":{"size": "0x3424"}, "offsets":{"us":["0x960ACC","0x0"]}},
"bin/course_big_donut_vertex.bin": {"meta":{"size": "0x2370"}, "offsets":{"us":["0x963EF0","0x0"]}},
"bin/course_big_donut_packed.bin": {"meta":{"size": "0x7EC"}, "offsets":{"us":["0x965A74","0x0"]}},
"bin/audiobanks.us.bin": {"meta":{"size": "0x13840"}, "offsets":{"us":["0x966260","0x0"],"eu-final":["0x966380","0x0"]}}, "bin/audiobanks.us.bin": {"meta":{"size": "0x13840"}, "offsets":{"us":["0x966260","0x0"],"eu-final":["0x966380","0x0"]}},
"bin/audiobanks.eu.bin": {"meta":{"size": "0x13840"}, "offsets":{"eu-1.0":["0x966460","0x0"]}}, "bin/audiobanks.eu.bin": {"meta":{"size": "0x13840"}, "offsets":{"eu-1.0":["0x966460","0x0"]}},
"bin/mk64.u.979AA0.bin": {"meta":{"size": "0x24C4C0"}, "offsets":{"us":["0x979AA0","0x0"]}}, "bin/audiotables.bin": {"meta":{"size": "0x24C4C0"}, "offsets":{"us":["0x979AA0","0x0"]}},
"music/00_seq_00.m64": {"meta":{"size":"0x2830"}, "offsets": {"us":["0xBC6060", "0x0"]}}, "music/00_seq_00.m64": {"meta":{"size":"0x2830"}, "offsets": {"us":["0xBC6060", "0x0"]}},
"music/01_title_screen.m64": {"meta":{"size":"0x1B30"}, "offsets": {"us":["0xBC8890", "0x0"]}}, "music/01_title_screen.m64": {"meta":{"size":"0x1B30"}, "offsets": {"us":["0xBC8890", "0x0"]}},
@ -198,64 +125,6 @@
"music/eu/28_staff_roll.m64": {"meta":{"size":"0x2750"}, "offsets": {"eu-1.0":["0xBE5FE0", "0x0"],"eu-final":["0xBE5EA0", "0x0"]}}, "music/eu/28_staff_roll.m64": {"meta":{"size":"0x2750"}, "offsets": {"eu-1.0":["0xBE5FE0", "0x0"],"eu-final":["0xBE5EA0", "0x0"]}},
"music/eu/29_award_ceremony_4th_8th.m64": {"meta":{"size":"0x0C80"}, "offsets": {"eu-1.0":["0xBE8730", "0x0"],"eu-final":["0xBE8680", "0x0"]}}, "music/eu/29_award_ceremony_4th_8th.m64": {"meta":{"size":"0x0C80"}, "offsets": {"eu-1.0":["0xBE8730", "0x0"],"eu-final":["0xBE8680", "0x0"]}},
"bin/texture_68EB50.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68EB50","0x0"]}},
"bin/texture_68EDA0.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68EDA0","0x0"]}},
"bin/texture_68EFF0.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68EFF0","0x0"]}},
"bin/texture_68F248.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68F248","0x0"]}},
"bin/texture_68F4A8.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68F4A8","0x0"]}},
"bin/texture_68F700.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68F700","0x0"]}},
"bin/texture_68F96C.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68F96C","0x0"]}},
"bin/texture_68FBCC.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68FBCC","0x0"]}},
"bin/texture_68FE20.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x68FE20","0x0"]}},
"bin/texture_69004C.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x69004C","0x0"]}},
"bin/texture_690284.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x690284","0x0"]}},
"bin/texture_6904C4.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x6904C4","0x0"]}},
"bin/texture_690708.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x690708","0x0"]}},
"bin/texture_690960.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x690960","0x0"]}},
"bin/texture_690BBC.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x690BBC","0x0"]}},
"bin/texture_690DF8.bin": {"meta":{"size": "0x400"}, "offsets":{"us":["0x690DF8","0x0"]}},
"bin/texture_6913CC.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6913CC","0x0"]}},
"bin/texture_691714.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x691714","0x0"]}},
"bin/texture_691AAC.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x691AAC","0x0"]}},
"bin/texture_691D98.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x691D98","0x0"]}},
"bin/texture_692088.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x692088","0x0"]}},
"bin/texture_6923D8.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6923D8","0x0"]}},
"bin/texture_6925E8.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6925E8","0x0"]}},
"bin/texture_692888.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x692888","0x0"]}},
"bin/texture_692CC0.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x692CC0","0x0"]}},
"bin/texture_69333C.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69333C","0x0"]}},
"bin/texture_693790.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x693790","0x0"]}},
"bin/texture_695BA4.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x695BA4","0x0"]}},
"bin/texture_695EE4.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x695EE4","0x0"]}},
"bin/texture_6961E0.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6961E0","0x0"]}},
"bin/texture_696488.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x696488","0x0"]}},
"bin/texture_6967FC.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6967FC","0x0"]}},
"bin/texture_696BAC.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x696BAC","0x0"]}},
"bin/texture_696E3C.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x696E3C","0x0"]}},
"bin/texture_697138.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x697138","0x0"]}},
"bin/texture_69743C.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69743C","0x0"]}},
"bin/texture_6977F0.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6977F0","0x0"]}},
"bin/texture_697B10.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x697B10","0x0"]}},
"bin/texture_697E80.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x697E80","0x0"]}},
"bin/texture_69811C.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69811C","0x0"]}},
"bin/texture_698378.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x698378","0x0"]}},
"bin/texture_69859C.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69859C","0x0"]}},
"bin/texture_6987FC.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6987FC","0x0"]}},
"bin/texture_698A40.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x698A40","0x0"]}},
"bin/texture_698C60.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x698C60","0x0"]}},
"bin/texture_698E38.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x698E38","0x0"]}},
"bin/texture_698FF4.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x698FF4","0x0"]}},
"bin/texture_6991F8.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6991F8","0x0"]}},
"bin/texture_699500.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x699500","0x0"]}},
"bin/texture_69F158.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69F158","0x0"]}},
"bin/texture_69F390.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69F390","0x0"]}},
"bin/texture_69F5E4.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69F5E4","0x0"]}},
"bin/texture_69F9C0.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69F9C0","0x0"]}},
"bin/texture_69FD6C.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69FD6C","0x0"]}},
"bin/texture_69FF30.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x69FF30","0x0"]}},
"bin/texture_6A010C.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6A010C","0x0"]}},
"bin/texture_6A0350.bin": {"meta":{"size": "0x800"}, "offsets":{"us":["0x6A0350","0x0"]}},
"bin/gTexturePlayerSelect.rgba16.tkmk00": {"meta":{"size":"0xC00"}, "offsets": {"us":["0x7FA3C0", "0x0"]}}, "bin/gTexturePlayerSelect.rgba16.tkmk00": {"meta":{"size":"0xC00"}, "offsets": {"us":["0x7FA3C0", "0x0"]}},
"bin/gTextureOption.rgba16.tkmk00": {"meta":{"size":"0x900"}, "offsets": {"us":["0x7FAFC0", "0x0"]}}, "bin/gTextureOption.rgba16.tkmk00": {"meta":{"size":"0x900"}, "offsets": {"us":["0x7FAFC0", "0x0"]}},
@ -664,17 +533,6 @@
"textures/standalone/question_mark_yellow.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x691030", "0x00000"]}}, "textures/standalone/question_mark_yellow.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x691030", "0x00000"]}},
"textures/common/132B50_04C68_tlut.rgba16.png": {"meta":{"dims":[8,29]}, "offsets": {"us":["0x132B50", "0x04C68"]}},
"textures/6913CC_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x6913CC", "0x00000"]}},
"textures/691714_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x691714", "0x00000"]}},
"textures/691AAC_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x691AAC", "0x00000"]}},
"textures/691D98_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x691D98", "0x00000"]}},
"textures/692088_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x692088", "0x00000"]}},
"textures/6923D8_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x6923D8", "0x00000"]}},
"textures/6925E8_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x6925E8", "0x00000"]}},
"textures/692888_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x692888", "0x00000"]}},
"textures/692CC0_00000.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":["0x4C68", "0x132B50"]}, "offsets": {"us":["0x692CC0", "0x00000"]}},
"textures/standalone/shrub.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x692F3C", "0x00000"]}}, "textures/standalone/shrub.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x692F3C", "0x00000"]}},
"textures/standalone/texture_6997E0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6997E0", "0x00000"]}}, "textures/standalone/texture_6997E0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x6997E0", "0x00000"]}},
@ -1207,13 +1065,5 @@
"textures/gTextureGoldStripe.rgba16.png": {"meta":{"dims":[256,15], "alpha":"0x01"}, "offsets": {"us":["0x8202C0", "0x0"]}}, "textures/gTextureGoldStripe.rgba16.png": {"meta":{"dims":[256,15], "alpha":"0x01"}, "offsets": {"us":["0x8202C0", "0x0"]}},
"textures/gTextureWhiteStripe.rgba16.png": {"meta":{"dims":[256,10], "alpha":"0x01"}, "offsets": {"us":["0x8209C0", "0x0"]}}, "textures/gTextureWhiteStripe.rgba16.png": {"meta":{"dims":[256,10], "alpha":"0x01"}, "offsets": {"us":["0x8209C0", "0x0"]}},
"textures/gTexturePinkBar.rgba16.png": {"meta":{"dims":[90,16], "alpha":"0x01"}, "offsets": {"us":["0x820AC0", "0x0"]}}, "textures/gTexturePinkBar.rgba16.png": {"meta":{"dims":[90,16], "alpha":"0x01"}, "offsets": {"us":["0x820AC0", "0x0"]}},
"textures/gTextureGoldBar.rgba16.png": {"meta":{"dims":[256,40], "alpha":"0x01"}, "offsets": {"us":["0x820FC0", "0x0"]}}, "textures/gTextureGoldBar.rgba16.png": {"meta":{"dims":[256,40], "alpha":"0x01"}, "offsets": {"us":["0x820FC0", "0x0"]}}
"textures/821D10_04670.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x821D10", "0x04670"]}},
"textures/821D10_04E70.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x821D10", "0x04E70"]}},
"textures/821D10_05670.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x821D10", "0x05670"]}},
"textures/821D10_06BD0.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x821D10", "0x06BD0"]}},
"textures/821D10_07760.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x821D10", "0x07760"]}},
"textures/821D10_08070.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x821D10", "0x08070"]}},
"textures/825800_08A48.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x825800", "0x08A48"]}}
} }

18
assets/blueshell.json
View File

@ -1,11 +1,11 @@
{ {
"gTLUTBlueShell": {"output_dir": "blueshell", "rom_offset": "0x132B50", "block_offset": "0x05038", "width": 16, "height": 16, "type": "rgba16"}, "gTLUTBlueShell": {"output_dir": "blueshell", "rom_offset": "0x132B50", "block_offset": "0x05038", "width": 16, "height": 16, "type": "rgba16"},
"gTextureBlueShell01": {"output_dir": "blueshell", "rom_offset": "0x68FE20", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, "gTextureBlueShell0": {"output_dir": "blueshell", "rom_offset": "0x68FE20", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"},
"gTextureBlueShell02": {"output_dir": "blueshell", "rom_offset": "0x69004C", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, "gTextureBlueShell1": {"output_dir": "blueshell", "rom_offset": "0x69004C", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"},
"gTextureBlueShell03": {"output_dir": "blueshell", "rom_offset": "0x690284", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, "gTextureBlueShell2": {"output_dir": "blueshell", "rom_offset": "0x690284", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"},
"gTextureBlueShell04": {"output_dir": "blueshell", "rom_offset": "0x6904C4", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, "gTextureBlueShell3": {"output_dir": "blueshell", "rom_offset": "0x6904C4", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"},
"gTextureBlueShell05": {"output_dir": "blueshell", "rom_offset": "0x690708", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, "gTextureBlueShell4": {"output_dir": "blueshell", "rom_offset": "0x690708", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"},
"gTextureBlueShell06": {"output_dir": "blueshell", "rom_offset": "0x690960", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, "gTextureBlueShell5": {"output_dir": "blueshell", "rom_offset": "0x690960", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"},
"gTextureBlueShell07": {"output_dir": "blueshell", "rom_offset": "0x690BBC", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, "gTextureBlueShell6": {"output_dir": "blueshell", "rom_offset": "0x690BBC", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"},
"gTextureBlueShell08": {"output_dir": "blueshell", "rom_offset": "0x690DF8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"} "gTextureBlueShell7": {"output_dir": "blueshell", "rom_offset": "0x690DF8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}
} }

8
assets/ending_ceremony.json Normal file
View File

@ -0,0 +1,8 @@
{
"gTextureReflectionMapBrass": {"output_dir": "ending_ceremony", "rom_offset": "0x821D10", "block_offset": "0x4670", "width": 32, "height": 32, "type": "rgba16"},
"gTextureReflectionMapSilver": {"output_dir": "ending_ceremony", "rom_offset": "0x821D10", "block_offset": "0x4E70", "width": 32, "height": 32, "type": "rgba16"},
"gTextureReflectionMapGold": {"output_dir": "ending_ceremony", "rom_offset": "0x821D10", "block_offset": "0x5670", "width": 32, "height": 32, "type": "rgba16"},
"gTexturePodium1": {"output_dir": "ending_ceremony", "rom_offset": "0x821D10", "block_offset": "0x6BD0", "width": 32, "height": 32, "type": "rgba16"},
"gTexturePodium2": {"output_dir": "ending_ceremony", "rom_offset": "0x821D10", "block_offset": "0x7760", "width": 32, "height": 32, "type": "rgba16"},
"gTexturePodium3": {"output_dir": "ending_ceremony", "rom_offset": "0x821D10", "block_offset": "0x8070", "width": 32, "height": 32, "type": "rgba16"}
}

18
assets/greenshell.json
View File

@ -1,11 +1,11 @@
{ {
"gTLUTGreenShell": {"output_dir": "greenshell", "rom_offset": "0x132B50", "block_offset": "0x04E38", "width": 16, "height": 16, "type": "rgba16"}, "gTLUTGreenShell": {"output_dir": "greenshell", "rom_offset": "0x132B50", "block_offset": "0x04E38", "width": 16, "height": 16, "type": "rgba16"},
"gTextureGreenShell01": {"output_dir": "greenshell", "rom_offset": "0x68EB50", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, "gTextureGreenShell0": {"output_dir": "greenshell", "rom_offset": "0x68EB50", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"},
"gTextureGreenShell02": {"output_dir": "greenshell", "rom_offset": "0x68EDA0", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, "gTextureGreenShell1": {"output_dir": "greenshell", "rom_offset": "0x68EDA0", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"},
"gTextureGreenShell03": {"output_dir": "greenshell", "rom_offset": "0x68EFF0", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, "gTextureGreenShell2": {"output_dir": "greenshell", "rom_offset": "0x68EFF0", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"},
"gTextureGreenShell04": {"output_dir": "greenshell", "rom_offset": "0x68F248", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, "gTextureGreenShell3": {"output_dir": "greenshell", "rom_offset": "0x68F248", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"},
"gTextureGreenShell05": {"output_dir": "greenshell", "rom_offset": "0x68F4A8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, "gTextureGreenShell4": {"output_dir": "greenshell", "rom_offset": "0x68F4A8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"},
"gTextureGreenShell06": {"output_dir": "greenshell", "rom_offset": "0x68F700", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, "gTextureGreenShell5": {"output_dir": "greenshell", "rom_offset": "0x68F700", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"},
"gTextureGreenShell07": {"output_dir": "greenshell", "rom_offset": "0x68F96C", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, "gTextureGreenShell6": {"output_dir": "greenshell", "rom_offset": "0x68F96C", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"},
"gTextureGreenShell08": {"output_dir": "greenshell", "rom_offset": "0x68FBCC", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"} "gTextureGreenShell7": {"output_dir": "greenshell", "rom_offset": "0x68FBCC", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}
} }

43
assets/include/blueshell.mk
View File

@ -1,35 +1,40 @@
BLUE_SHELL_DIR := assets/blueshell BLUESHELL_DIR := assets/blueshell
BLUE_SHELL_PALETTE := $(BLUE_SHELL_DIR)/gTLUTBlueShell.png BLUESHELL_PALETTE := $(BLUESHELL_DIR)/gTLUTBlueShell.png
BLUE_SHELL_FRAMES := \ BLUESHELL_FRAMES := \
$(BLUE_SHELL_DIR)/gTextureBlueShell1.png \ $(BLUESHELL_DIR)/gTextureBlueShell0.png \
$(BLUE_SHELL_DIR)/gTextureBlueShell2.png \ $(BLUESHELL_DIR)/gTextureBlueShell1.png \
$(BLUE_SHELL_DIR)/gTextureBlueShell3.png \ $(BLUESHELL_DIR)/gTextureBlueShell2.png \
$(BLUE_SHELL_DIR)/gTextureBlueShell4.png \ $(BLUESHELL_DIR)/gTextureBlueShell3.png \
$(BLUE_SHELL_DIR)/gTextureBlueShell5.png \ $(BLUESHELL_DIR)/gTextureBlueShell4.png \
$(BLUE_SHELL_DIR)/gTextureBlueShell6.png \ $(BLUESHELL_DIR)/gTextureBlueShell5.png \
$(BLUE_SHELL_DIR)/gTextureBlueShell7.png \ $(BLUESHELL_DIR)/gTextureBlueShell6.png \
$(BLUE_SHELL_DIR)/gTextureBlueShell8.png $(BLUESHELL_DIR)/gTextureBlueShell7.png
BLUE_SHELL_EXPORT_SENTINEL := $(BLUE_SHELL_DIR)/.export BLUESHELL_EXPORT_SENTINEL := $(BLUESHELL_DIR)/.export
$(BLUE_SHELL_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(BLUESHELL_FRAMES:%.png=%.mio0)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BLUE_SHELL_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(BLUE_SHELL_PALETTE:%.png=%.inc.c) $(BLUESHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(BLUE_SHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png $(BLUESHELL_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUESHELL_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(BLUESHELL_PALETTE:%.png=%.inc.c)
$(BLUESHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16
$(BLUE_SHELL_FRAMES) $(BLUE_SHELL_PALETTE): $(BLUE_SHELL_EXPORT_SENTINEL) ; $(BLUESHELL_FRAMES) $(BLUESHELL_PALETTE): $(BLUESHELL_EXPORT_SENTINEL) ;
$(BLUE_SHELL_EXPORT_SENTINEL): $(ASSET_DIR)/blueshell.json $(BLUESHELL_EXPORT_SENTINEL): $(ASSET_DIR)/blueshell.json
$(ASSET_EXTRACT) $(BASEROM) $< $(ASSET_EXTRACT) $(BASEROM) $<
touch $@ touch $@
.PHONY: distclean_blueshell .PHONY: distclean_blueshell
distclean_blueshell: distclean_blueshell:
rm -rf $(BLUE_SHELL_DIR) rm -rf $(BLUESHELL_DIR)
distclean_assets: distclean_blueshell distclean_assets: distclean_blueshell

30
assets/include/ending_ceremony.mk Normal file
View File

@ -0,0 +1,30 @@
ENDING_CEREMONY := assets/ending_ceremony
TROHPY_PNG := \
$(ENDING_CEREMONY)/gTextureReflectionMapBrass.png \
$(ENDING_CEREMONY)/gTextureReflectionMapSilver.png \
$(ENDING_CEREMONY)/gTextureReflectionMapGold.png
PODIUM_PNG := \
$(ENDING_CEREMONY)/gTexturePodium1.png \
$(ENDING_CEREMONY)/gTexturePodium2.png \
$(ENDING_CEREMONY)/gTexturePodium3.png
ENDING_CEREMONY_EXPORT_SENTINEL := $(ENDING_CEREMONY)/.export
$(BUILD_DIR)/src/ending/ceremony_data.inc.o: $(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c)
$(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16
$(TROHPY_PNG) $(PODIUM_PNG): $(ENDING_CEREMONY_EXPORT_SENTINEL) ;
$(ENDING_CEREMONY_EXPORT_SENTINEL): $(ASSET_DIR)/ending_ceremony.json
$(ASSET_EXTRACT) $(BASEROM) $<
touch $@
.PHONY: distclean_ending_ceremony
distclean_ending_ceremony:
rm -rf $(ENDING_CEREMONY)
distclean_assets: distclean_ending_ceremony

25
assets/include/greenshell.mk
View File

@ -3,19 +3,24 @@ GREENSHELL_DIR := assets/greenshell
GREENSHELL_PALETTE := $(GREENSHELL_DIR)/gTLUTGreenShell.png GREENSHELL_PALETTE := $(GREENSHELL_DIR)/gTLUTGreenShell.png
GREENSHELL_FRAMES := \ GREENSHELL_FRAMES := \
$(GREENSHELL_DIR)/gTextureGreenShell01.png \ $(GREENSHELL_DIR)/gTextureGreenShell0.png \
$(GREENSHELL_DIR)/gTextureGreenShell02.png \ $(GREENSHELL_DIR)/gTextureGreenShell1.png \
$(GREENSHELL_DIR)/gTextureGreenShell03.png \ $(GREENSHELL_DIR)/gTextureGreenShell2.png \
$(GREENSHELL_DIR)/gTextureGreenShell04.png \ $(GREENSHELL_DIR)/gTextureGreenShell3.png \
$(GREENSHELL_DIR)/gTextureGreenShell05.png \ $(GREENSHELL_DIR)/gTextureGreenShell4.png \
$(GREENSHELL_DIR)/gTextureGreenShell06.png \ $(GREENSHELL_DIR)/gTextureGreenShell5.png \
$(GREENSHELL_DIR)/gTextureGreenShell07.png \ $(GREENSHELL_DIR)/gTextureGreenShell6.png \
$(GREENSHELL_DIR)/gTextureGreenShell08.png $(GREENSHELL_DIR)/gTextureGreenShell7.png
GREENSHELL_EXPORT_SENTINEL := $(GREENSHELL_DIR)/.export GREENSHELL_EXPORT_SENTINEL := $(GREENSHELL_DIR)/.export
$(GREENSHELL_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(GREENSHELL_FRAMES:%.png=%.mio0)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(GREENSHELL_PALETTE)
$(GREENSHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(GREENSHELL_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(GREENSHELL_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(GREENSHELL_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(GREENSHELL_PALETTE:%.png=%.inc.c)

6
assets/include/lakitu/bluelight.mk
View File

@ -14,8 +14,10 @@ $(BLUELIGHT_DIR)/gTextureLakituBlueLight8.png
BLUELIGHT_EXPORT_SENTINEL := $(BLUELIGHT_DIR)/.export BLUELIGHT_EXPORT_SENTINEL := $(BLUELIGHT_DIR)/.export
$(BLUELIGHT_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(BLUELIGHT_FRAMES:%.png=%.bin)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BLUELIGHT_PALETTE)
$(BLUELIGHT_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUELIGHT_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(BLUELIGHT_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(BLUELIGHT_PALETTE:%.png=%.inc.c)

6
assets/include/lakitu/checkeredflag.mk
View File

@ -38,8 +38,10 @@ $(CHECKEREDFLAG_DIR)/gTextureLakituCheckeredFlag32.png
CHECKEREDFLAG_EXPORT_SENTINEL := $(CHECKEREDFLAG_DIR)/.export CHECKEREDFLAG_EXPORT_SENTINEL := $(CHECKEREDFLAG_DIR)/.export
$(CHECKEREDFLAG_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(CHECKEREDFLAG_FRAMES:%.png=%.bin)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(CHECKEREDFLAG_PALETTE)
$(CHECKEREDFLAG_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(CHECKEREDFLAG_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c)

6
assets/include/lakitu/finallap.mk
View File

@ -22,8 +22,10 @@ $(FINALLAP_DIR)/gTextureLakituFinalLap16.png
FINALLAP_EXPORT_SENTINEL := $(FINALLAP_DIR)/.export FINALLAP_EXPORT_SENTINEL := $(FINALLAP_DIR)/.export
$(FINALLAP_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FINALLAP_FRAMES:%.png=%.bin)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FINALLAP_PALETTE)
$(FINALLAP_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINALLAP_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(FINALLAP_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(FINALLAP_PALETTE:%.png=%.inc.c)

6
assets/include/lakitu/fishing.mk
View File

@ -10,8 +10,10 @@ $(FISHING_DIR)/gTextureLakituFishing4.png
FISHING_EXPORT_SENTINEL := $(FISHING_DIR)/.export FISHING_EXPORT_SENTINEL := $(FISHING_DIR)/.export
$(FISHING_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FISHING_FRAMES:%.png=%.bin)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FISHING_PALETTE)
$(FISHING_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FISHING_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(FISHING_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(FISHING_PALETTE:%.png=%.inc.c)

6
assets/include/lakitu/nolights.mk
View File

@ -14,8 +14,10 @@ $(NOLIGHTS_DIR)/gTextureLakituNoLights8.png
NOLIGHTS_EXPORT_SENTINEL := $(NOLIGHTS_DIR)/.export NOLIGHTS_EXPORT_SENTINEL := $(NOLIGHTS_DIR)/.export
$(NOLIGHTS_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(NOLIGHTS_FRAMES:%.png=%.bin)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(NOLIGHTS_PALETTE)
$(NOLIGHTS_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(NOLIGHTS_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(NOLIGHTS_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(NOLIGHTS_PALETTE:%.png=%.inc.c)

6
assets/include/lakitu/redlights.mk
View File

@ -22,8 +22,10 @@ $(REDLIGHTS_DIR)/gTextureLakituRedLights16.png
REDLIGHTS_EXPORT_SENTINEL := $(REDLIGHTS_DIR)/.export REDLIGHTS_EXPORT_SENTINEL := $(REDLIGHTS_DIR)/.export
$(REDLIGHTS_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(REDLIGHTS_FRAMES:%.png=%.bin)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(REDLIGHTS_PALETTE)
$(REDLIGHTS_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REDLIGHTS_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(REDLIGHTS_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(REDLIGHTS_PALETTE:%.png=%.inc.c)

6
assets/include/lakitu/reverse.mk
View File

@ -22,8 +22,10 @@ $(REVERSE_DIR)/gTextureLakituReverse16.png
REVERSE_EXPORT_SENTINEL := $(REVERSE_DIR)/.export REVERSE_EXPORT_SENTINEL := $(REVERSE_DIR)/.export
$(REVERSE_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(REVERSE_FRAMES:%.png=%.bin)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(REVERSE_PALETTE)
$(REVERSE_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REVERSE_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(REVERSE_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(REVERSE_PALETTE:%.png=%.inc.c)

6
assets/include/lakitu/secondlap.mk
View File

@ -22,8 +22,10 @@ $(SECONDLAP_DIR)/gTextureLakituSecondLap16.png
SECONDLAP_EXPORT_SENTINEL := $(SECONDLAP_DIR)/.export SECONDLAP_EXPORT_SENTINEL := $(SECONDLAP_DIR)/.export
$(SECONDLAP_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(SECONDLAP_FRAMES:%.png=%.bin)
$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(SECONDLAP_PALETTE)
$(SECONDLAP_FRAMES:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(SECONDLAP_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(SECONDLAP_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(SECONDLAP_PALETTE:%.png=%.inc.c)

22
assets/include/startup_logo.mk Normal file
View File

@ -0,0 +1,22 @@
STARTUP_LOGO := assets/startup_logo
REFLECTION_MAP := $(STARTUP_LOGO)/gTextureReflectionMapGold.png
STARTUP_LOGO_EXPORT_SENTINEL := $(STARTUP_LOGO)/.export
$(BUILD_DIR)/src/data/startup_logo.inc.o: $(REFLECTION_MAP:%.png=%.inc.c)
$(REFLECTION_MAP:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16
$(REFLECTION_MAP): $(STARTUP_LOGO_EXPORT_SENTINEL) ;
$(STARTUP_LOGO_EXPORT_SENTINEL): $(ASSET_DIR)/startup_logo.json
$(ASSET_EXTRACT) $(BASEROM) $<
touch $@
.PHONY: distclean_startup_logo
distclean_startup_logo:
rm -rf $(STARTUP_LOGO)
distclean_assets: distclean_startup_logo

47
assets/include/trees.mk Normal file
View File

@ -0,0 +1,47 @@
TREES_DIR := assets/trees
# The Tree palette is really really strange. There's only 8x29 (232) entires as opposed to the usual 16x16 (256) that TLUTs have.
# So we do something a little strange. We extract 2 versions of the TLUT.
# gTLUTTrees is 16x16, meaning that is has some other TLUT data filling out the backend. This is the one used to extract/import the rest of
# the tree pictures
# gTLUTTreesImport is 8x29. Only used as an inc.c file.
TREES_PALETTE_IMPORT := $(TREES_DIR)/gTLUTTreesImport.png
TREES_PALETTE := $(TREES_DIR)/gTLUTTrees.png
TREES_PNG := \
$(TREES_DIR)/gTextureTrees1.png \
$(TREES_DIR)/gTextureTrees2.png \
$(TREES_DIR)/gTextureTrees3.png \
$(TREES_DIR)/gTextureTrees4Left.png \
$(TREES_DIR)/gTextureTrees4Right.png \
$(TREES_DIR)/gTextureTrees5Left.png \
$(TREES_DIR)/gTextureTrees5Right.png \
$(TREES_DIR)/gTextureTrees6.png \
$(TREES_DIR)/gTextureTrees7.png
TREES_EXPORT_SENTINEL := $(TREES_DIR)/.export
$(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(TREES_PNG:%.png=%.mio0)
$(TREES_PNG:%.png=%.mio0): %.mio0 : %.bin
$(MIO0TOOL) -c $< $@
$(TREES_PNG:%.png=%.bin): %.bin : %.png
$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(TREES_PALETTE)
$(BUILD_DIR)/src/data/common_textures.inc.o: $(TREES_PALETTE_IMPORT:%.png=%.inc.c)
$(TREES_PALETTE:%.png=%.inc.c) $(TREES_PALETTE_IMPORT:%.png=%.inc.c): %.inc.c : %.png
$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16
$(TREES_PNG) $(TREES_PALETTE) $(TREES_PALETTE_IMPORT): $(TREES_EXPORT_SENTINEL) ;
$(TREES_EXPORT_SENTINEL): $(ASSET_DIR)/trees.json
$(ASSET_EXTRACT) $(BASEROM) $<
touch $@
.PHONY: distclean_trees
distclean_trees:
rm -rf $(TREES_DIR)
distclean_assets: distclean_trees

3
assets/startup_logo.json Normal file
View File

@ -0,0 +1,3 @@
{
"gTextureReflectionMapGold": {"output_dir": "startup_logo", "rom_offset": "0x825800", "block_offset": "0x8A48", "width": 32, "height": 32, "type": "rgba16"}
}

13
assets/trees.json Normal file
View File

@ -0,0 +1,13 @@
{
"gTLUTTreesImport": {"output_dir": "trees", "rom_offset": "0x132B50", "block_offset": "0x04C68", "width": 8, "height": 29, "type": "rgba16"},
"gTLUTTrees": {"output_dir": "trees", "rom_offset": "0x132B50", "block_offset": "0x04C68", "width": 16, "height": 16, "type": "rgba16"},
"gTextureTrees1": {"output_dir": "trees", "rom_offset": "0x6913CC", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"},
"gTextureTrees2": {"output_dir": "trees", "rom_offset": "0x691714", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"},
"gTextureTrees3": {"output_dir": "trees", "rom_offset": "0x691AAC", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"},
"gTextureTrees4Left": {"output_dir": "trees", "rom_offset": "0x691D98", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"},
"gTextureTrees4Right": {"output_dir": "trees", "rom_offset": "0x692088", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"},
"gTextureTrees5Left": {"output_dir": "trees", "rom_offset": "0x6923D8", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"},
"gTextureTrees5Right": {"output_dir": "trees", "rom_offset": "0x6925E8", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"},
"gTextureTrees6": {"output_dir": "trees", "rom_offset": "0x692888", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"},
"gTextureTrees7": {"output_dir": "trees", "rom_offset": "0x692CC0", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"}
}

52
courses/all_course_offsets.h Normal file
View File

@ -0,0 +1,52 @@
#ifndef ALL_COURSE_OFFSETS_H
#define ALL_COURSE_OFFSETS_H
#include "course_offsets.h"
extern Gfx *banshee_boardwalk_dls[];
extern Gfx *bowsers_castle_dls[];
extern Gfx *choco_mountain_dls[];
extern Gfx *kalimari_desert_dls[];
extern Gfx *luigi_raceway_dls[];
extern Gfx *mario_raceway_dls[];
extern Gfx *moo_moo_farm_dls[];
extern Gfx *royal_raceway_dls[];
extern Gfx *sherbet_land_dls[];
extern Gfx *sherbet_land_dls_2[];
extern Gfx *wario_stadium_dls[];
extern Gfx toads_turnpike_dl_0[];
extern Gfx toads_turnpike_dl_1[];
extern Gfx toads_turnpike_dl_2[];
extern Gfx toads_turnpike_dl_3[];
extern Gfx toads_turnpike_dl_4[];
extern Gfx toads_turnpike_dl_5[];
extern Gfx toads_turnpike_dl_6[];
extern Gfx toads_turnpike_dl_7[];
extern Gfx toads_turnpike_dl_8[];
extern Gfx toads_turnpike_dl_9[];
extern Gfx toads_turnpike_dl_10[];
extern Gfx toads_turnpike_dl_11[];
extern course_texture banshee_boardwalk_textures[];
extern course_texture big_donut_textures[];
extern course_texture block_fort_textures[];
extern course_texture bowsers_castle_textures[];
extern course_texture choco_mountain_textures[];
extern course_texture dks_jungle_parkway_textures[];
extern course_texture double_deck_textures[];
extern course_texture frappe_snowland_textures[];
extern course_texture kalimari_desert_textures[];
extern course_texture koopa_troopa_beach_textures[];
extern course_texture luigi_raceway_textures[];
extern course_texture mario_raceway_textures[];
extern course_texture moo_moo_farm_textures[];
extern course_texture rainbow_road_textures[];
extern course_texture royal_raceway_textures[];
extern course_texture sherbet_land_textures[];
extern course_texture skyscraper_textures[];
extern course_texture toads_turnpike_textures[];
extern course_texture wario_stadium_textures[];
extern course_texture yoshi_valley_textures[];
#endif

19
courses/courseTable.h
View File

@ -5,6 +5,25 @@
#include <macros.h> #include <macros.h>
#include "types.h" #include "types.h"
// dlRomStart, vertexRomStart, & vertexStart, are u8* because mio0 compressed.
struct CourseTable {
u8 *dlRomStart; // 0x00 ROM start for segment 6 DL data
u8 *dlRomEnd; // 0x04 ROM end for segment 6 DL data
u8 *vertexRomStart; // 0x08 ROM start for segment 4 vertex data
u8 *vertexRomEnd; // 0x0C ROM end for segment 7?
u8 *offsetRomStart; // 0x10 ROM start for uncompressed segment 9 texture and DL addresses
u8 *offsetRomEnd; // 0x14 ROM end for uncompressed segment 9 texture and DL addresses
mk64_Vtx *vertexStart; // 0x18 segmented address of vertex data
u32 vertexCount; // 0x1C number of vertices in vertex data
u8 *packedStart; // 0x20 packed display list start address
uintptr_t finalDisplaylistOffset; // 0x24
u32 *textures; // 0x20 segmented address of textures table
u16 unknown1; // 0x2C
u16 padding; // 0x2E
};
extern struct CourseTable gCourseTable[];
// todo: These should probably be ptr's instead of array's? // todo: These should probably be ptr's instead of array's?
extern u8 _course_mario_raceway_dl_mio0SegmentRomStart[]; extern u8 _course_mario_raceway_dl_mio0SegmentRomStart[];
extern u8 _course_mario_raceway_dl_mio0SegmentRomEnd[]; extern u8 _course_mario_raceway_dl_mio0SegmentRomEnd[];

2
courses/courseTable.inc.c
View File

@ -5,7 +5,7 @@
#include "all_course_model.h" #include "all_course_model.h"
#include "all_course_packed.h" #include "all_course_packed.h"
struct courseTable gCourseTable[] = {{ struct CourseTable gCourseTable[] = {{
_course_mario_raceway_dl_mio0SegmentRomStart, _course_mario_raceway_dl_mio0SegmentRomEnd, _course_mario_raceway_dl_mio0SegmentRomStart, _course_mario_raceway_dl_mio0SegmentRomEnd,
_mario_raceway_vertexSegmentRomStart, _mario_raceway_vertexSegmentRomEnd, _mario_raceway_vertexSegmentRomStart, _mario_raceway_vertexSegmentRomEnd,
_course_mario_raceway_offsetsSegmentRomStart, _course_mario_raceway_offsetsSegmentRomEnd, _course_mario_raceway_offsetsSegmentRomStart, _course_mario_raceway_offsetsSegmentRomEnd,

3
courses/sherbet_land/course_offsets.inc.c
View File

@ -100,6 +100,9 @@ const Gfx *sherbet_land_dls[] = {
d_course_sherbet_land_dl_25A0, d_course_sherbet_land_dl_25A0,
d_course_sherbet_land_dl_2530, d_course_sherbet_land_dl_2530,
d_course_sherbet_land_dl_25F8, d_course_sherbet_land_dl_25F8,
};
const Gfx *sherbet_land_dls_2[] = {
d_course_sherbet_land_dl_26D0, d_course_sherbet_land_dl_26D0,
d_course_sherbet_land_dl_28A0, d_course_sherbet_land_dl_28A0,
d_course_sherbet_land_dl_27F0, d_course_sherbet_land_dl_27F0,

2
data/data_0DD0A0_1.s
View File

@ -44,7 +44,7 @@ glabel gCoursePathTable
.word nullPath, nullPath, nullPath, nullPath .word nullPath, nullPath, nullPath, nullPath
.word d_course_dks_jungle_parkway_unknown_waypoints, nullPath, nullPath, nullPath .word d_course_dks_jungle_parkway_unknown_waypoints, nullPath, nullPath, nullPath
.word nullPath, nullPath, nullPath, nullPath .word nullPath, nullPath, nullPath, nullPath
.word D_0B008AA8, D_0B008B68, D_0B008C20, D_0B008CE0 .word ending_sequence, ending_sequence2, ending_sequence3, ending_sequence4
glabel D_800DC8D0 glabel D_800DC8D0
.word d_course_mario_raceway_track_waypoints, nullPath, nullPath, nullPath .word d_course_mario_raceway_track_waypoints, nullPath, nullPath, nullPath

11
data/data_825800.s
View File

@ -1,11 +0,0 @@
# Mario Kart 64 (U) disassembly and split file
# generated by n64split v0.4a - N64 ROM splitter
.include "macros.inc"
.data
.align 2, 0x00
glabel data_825800
.incbin "bin/data_825800.mio0"
glabel data_825800_end

539
data/other_textures.h Normal file
View File

@ -0,0 +1,539 @@
#ifndef OTHER_TEXTURES_H
#define OTHER_TEXTURES_H
extern u8 gTextureSignShellShot0[];
extern u8 gTextureSignShellShot1[];
extern u8 gTextureGrayCheckerboard[];
extern u8 gTextureGrayCobblestone[];
extern u8 gTexture64275C[];
extern u8 gTexture64286C[];
extern u8 gTexture642978[];
extern u8 gTextureSignBlue64[];
extern u8 gTextureCheckerboardYellowPink[];
extern u8 gTexture64313C[];
extern u8 gTextureCheckerbordYellowBlue[];
extern u8 gTexture643430[];
extern u8 gTexture643A34[];
extern u8 gTexture643B3C[];
extern u8 gTexture6442D4[];
extern u8 gTexture64440C[];
extern u8 gTexture6446AC[];
extern u8 gTexture6447C4[];
extern u8 gTextureCheckerboardBlackWhite[];
extern u8 gTexture6449D4[];
extern u8 gTexture645134[];
extern u8 gTexture645660[];
extern u8 gTexture6457D8[];
extern u8 gTextureCheckerboardBlueGreen[];
extern u8 gTextureNumberYellowBlue1[];
extern u8 gTextureNumberYellowBlue2[];
extern u8 gTextureNumberYellowBlue3[];
extern u8 gTextureNumberYellowBlue4[];
extern u8 gTexture64619C[];
extern u8 gTexture6462C0[];
extern u8 gTexture64647C[];
extern u8 gTexture646CA8[];
extern u8 gTexture6473E4[];
extern u8 gTexture647994[];
extern u8 gTexture647F4C[];
extern u8 gTexture648508[];
extern u8 gTextureGrass1[];
extern u8 gTextureWoodDoor0[];
extern u8 gTextureWoodDoor1[];
extern u8 gTextureGrass2[];
extern u8 gTextureMooMooFarmSignLeft[];
extern u8 gTextureMooMooFarmSignRight[];
extern u8 gTexture64ACAC[];
extern u8 gTexture64AF50[];
extern u8 gTexture64B090[];
extern u8 gTexture64B3F8[];
extern u8 gTexture64B54C[];
extern u8 gTexture64B8D8[];
extern u8 gTexture64BA50[];
extern u8 gTexture64BB60[];
extern u8 gTexture64BCCC[];
extern u8 gTexture64C11C[];
extern u8 gTexture64C7B4[];
extern u8 gTexture64CC20[];
extern u8 gTextureSignMergingLanes[];
extern u8 gTextureGrass3[];
extern u8 gTextureGrass4[];
extern u8 gTextureGrass5[];
extern u8 gTextureGrass6[];
extern u8 gTextureSignNintendo0[];
extern u8 gTextureSignNintendo1[];
extern u8 gTextureGrass7[];
extern u8 gTexture64F9E8[];
extern u8 gTexture64FBF4[];
extern u8 gTexture64FE68[];
extern u8 gTextureWoodBridgeSlats[];
extern u8 gTextureFlagRed[];
extern u8 gTexture65100C[];
extern u8 gTexture65112C[];
extern u8 gTexture65127C[];
extern u8 gTexture651428[];
extern u8 gTexture651984[];
extern u8 gTexture651B20[];
extern u8 gTexture651F40[];
extern u8 gTexture6522E0[];
extern u8 gTexture6528DC[];
extern u8 gTexture652B54[];
extern u8 gTexture65315C[];
extern u8 gTexture653608[];
extern u8 gTexture653DB0[];
extern u8 gTexture654460[];
extern u8 gTexture654F74[];
extern u8 gTexture655998[];
extern u8 gTexture655F38[];
extern u8 gTexture656AF4[];
extern u8 gTexture6575C8[];
extern u8 gTexture658370[];
extern u8 gTexture65912C[];
extern u8 gTexture659EE8[];
extern u8 gTexture65ADE0[];
extern u8 gTexture65BB3C[];
extern u8 gTexture65C8DC[];
extern u8 gTexture65D5D4[];
extern u8 gTexture65E2EC[];
extern u8 gTexture65E59C[];
extern u8 gTexture65EAEC[];
extern u8 gTexture65EE38[];
extern u8 gTexture65FB18[];
extern u8 gTextureSignPinkArrow[];
extern u8 gTextureCrownJewelBlue[];
extern u8 gTextureCrown[];
extern u8 gTextureCrownJewelPink[];
extern u8 gTexture6607C0[];
extern u8 gTexture6608C8[];
extern u8 gTexture6609D0[];
extern u8 gTexture660D8C[];
extern u8 gTextureRoofTile[];
extern u8 gTextureCastleBricks[];
extern u8 gTextureCastleBridge[];
extern u8 gTextureGrass8[];
extern u8 gTextureGrass9[];
extern u8 gTexture66262C[];
extern u8 gTexture662924[];
extern u8 gTexture662A34[];
extern u8 gTextureSignToadYellow[];
extern u8 gTextureSignToadGreen[];
extern u8 gTextureSignToadRed[];
extern u8 gTexture663F90[];
extern u8 gTexture6640B4[];
extern u8 gTexture6642A4[];
extern u8 gTexture664408[];
extern u8 gTexture6646B8[];
extern u8 gTextureSignKoopaAir0[];
extern u8 gTextureSignKoopaAir1[];
extern u8 gTextureBricksRed[];
extern u8 gTexture665C0C[];
extern u8 gTexture6661AC[];
extern u8 gTexture6663A4[];
extern u8 gTextureSignBowser0[];
extern u8 gTextureSignBowser1[];
extern u8 gTextureGrass10[];
extern u8 gTextureGrass11[];
extern u8 gTexture667BAC[];
extern u8 gTexture668228[];
extern u8 gTexture668358[];
extern u8 gTexture6684F8[];
extern u8 gTexture668608[];
extern u8 gTexture668728[];
extern u8 gTexture668920[];
extern u8 gTextureGrass12[];
extern u8 gTexture669570[];
extern u8 gTexture66A3DC[];
extern u8 gTexture66ABA4[];
extern u8 gTexture66AEB8[];
extern u8 gTextureSignLuigiFace0[];
extern u8 gTextureSignLuigiFace1[];
extern u8 gTextureSignLuigis0[];
extern u8 gTextureSignLuigis1[];
extern u8 gTextureSignMarioStar0[];
extern u8 gTextureSignMarioStar1[];
extern u8 gTexture66C7A8[];
extern u8 gTexture66C8F4[];
extern u8 gTexture66CA98[];
extern u8 gTexture66CD64[];
extern u8 gTexture66D024[];
extern u8 gTextureFlagRed2[];
extern u8 gTexture66D698[];
extern u8 gTextureCheckerboardPink[];
extern u8 gTexture66DB60[];
extern u8 gTexture66DD38[];
extern u8 gTextureSignNintendoRed0[];
extern u8 gTextureSignNintendoRed1[];
extern u8 gTexture66E608[];
extern u8 gTexture66EBF0[];
extern u8 gTexture66ED38[];
extern u8 gTextureStainglassPeach0[];
extern u8 gTextureStainglassPeach1[];
extern u8 gTexture670AC8[];
extern u8 gTexture671A88[];
extern u8 gTextureRailroadTrack[];
extern u8 gTextureRailroadCrossingTrack[];
extern u8 gTexture67291C[];
extern u8 gTextureRainbow[];
extern u8 gTexture673118[];
extern u8 gTexture6733CC[];
extern u8 gTexture6735DC[];
extern u8 gTexture673990[];
extern u8 gTexture673C68[];
extern u8 gTexture673FF8[];
extern u8 gTexture674354[];
extern u8 gTexture6747C4[];
extern u8 gTexture67490C[];
extern u8 gTexture674B28[];
extern u8 gTexture674D58[];
extern u8 gTexture675064[];
extern u8 gTexture675220[];
extern u8 gTexture675434[];
extern u8 gTextureRoad0[];
extern u8 gTextureRoad1[];
extern u8 gTextureRoad2[];
extern u8 gTextureRoad3[];
extern u8 gTextureRoad4[];
extern u8 gTextureRoad5[];
extern u8 gTextureRoadFinish0[];
extern u8 gTextureRoadFinish1[];
extern u8 gTexture676C6C[];
extern u8 gTexture676D7C[];
extern u8 gTexture676EA8[];
extern u8 gTexture676FB0[];
extern u8 gTexture6774D8[];
extern u8 gTexture6775EC[];
extern u8 gTextureFenceBarbedWire[];
extern u8 gTexture677A40[];
extern u8 gTextureSignFallingRocks[];
extern u8 gTextureSignBackside[];
extern u8 gTexture677F04[];
extern u8 gTexture678118[];
extern u8 gTexture67842C[];
extern u8 gTexture67893C[];
extern u8 gTexture678CC8[];
extern u8 gTexture679258[];
extern u8 gTexture67973C[];
extern u8 gTexture679C04[];
extern u8 gTexture679D34[];
extern u8 gTextureStarOutline[];
extern u8 gTexture67A1B8[];
extern u8 gTexture67A370[];
extern u8 gTexture67A91C[];
extern u8 gTexture67ADF0[];
extern u8 gTexture67B388[];
extern u8 gTexture67B75C[];
extern u8 gTexture67B864[];
extern u8 gTexture67B9B0[];
extern u8 gTexture67BBD8[];
extern u8 gTexture67BEE8[];
extern u8 gTextureSandFinish[];
extern u8 gTextureWaves0[];
extern u8 gTextureWaves1[];
extern u8 gTextureWaves2[];
extern u8 gTexture67D304[];
extern u8 gTexture67DC20[];
extern u8 gTexture67E010[];
extern u8 gTexture67E428[];
extern u8 gTexture67EEAC[];
extern u8 gTexture67EFEC[];
extern u8 gTexture67F15C[];
extern u8 gTexture67F450[];
extern u8 gTextureSignWarioFace[];
extern u8 gTexture67FE0C[];
extern u8 gTextureSignWelcome0[];
extern u8 gTextureSignWelcome1[];
extern u8 gTextureSignWoodenBack0[];
extern u8 gTextureSignWoodenBack1[];
extern u8 gTextureWheelSteamEngine[];
extern u8 gTextureWheelSteamEngineReal[];
extern u8 gTexture68272C[];
extern u8 gTexture682928[];
extern u8 gTexture682B24[];
extern u8 gTexture682D20[];
extern u8 gTexture682F1C[];
extern u8 gTexture683118[];
extern u8 gTexture683314[];
extern u8 gTexture6835F0[];
extern u8 gTexture683844[];
extern u8 gTextureFencePostWooden[];
extern u8 gTexture6846DC[];
extern u8 gTextureFenceRope[];
extern u8 gTexture685108[];
extern u8 gTextureSignWoodRedArrow[];
extern u8 gTexture685AC0[];
extern u8 gTextureSignGreenArrow[];
extern u8 gTexture6864E8[];
extern u8 gTexture686CF0[];
extern u8 gTexture6875A8[];
extern u8 gTexture687EE8[];
extern u8 gTexture68876C[];
extern u8 gTexture689230[];
extern u8 gTexture689C00[];
extern u8 gTexture68A484[];
extern u8 gTexture68AC5C[];
extern u8 gTexture68B6A4[];
extern u8 gTexture68BE6C[];
extern u8 gTexture68C310[];
extern u8 gTexture68C620[];
extern u8 gTexture68C79C[];
extern u8 gTexture68C944[];
extern u8 gTexture68CA94[];
extern u8 gTexture68CC0C[];
extern u8 gTexture68CDA0[];
extern u8 gTextureSignYoshi[];
extern u8 gTextureCheckerboardBlueGray[];
extern u8 gTexture68D834[];
extern u8 gTexture68D940[];
extern u8 gTexture68DEC0[];
extern u8 gTexture68E2D0[];
extern u8 gTextureGreenShell0[];
extern u8 gTextureGreenShell1[];
extern u8 gTextureGreenShell2[];
extern u8 gTextureGreenShell3[];
extern u8 gTextureGreenShell4[];
extern u8 gTextureGreenShell5[];
extern u8 gTextureGreenShell6[];
extern u8 gTextureGreenShell7[];
extern u8 gTextureBlueShell0[];
extern u8 gTextureBlueShell1[];
extern u8 gTextureBlueShell2[];
extern u8 gTextureBlueShell3[];
extern u8 gTextureBlueShell4[];
extern u8 gTextureBlueShell5[];
extern u8 gTextureBlueShell6[];
extern u8 gTextureBlueShell7[];
extern u8 gTextureQuestionMarkYellow[];
extern u8 gTextureTrees1[];
extern u8 gTextureTrees2[];
extern u8 gTextureTrees3[];
extern u8 gTextureTrees4Left[];
extern u8 gTextureTrees4Right[];
extern u8 gTextureTrees5Left[];
extern u8 gTextureTrees5Right[];
extern u8 gTextureTrees6[];
extern u8 gTextureTrees7[];
extern u8 gTextureShrub[];
extern u8 gTextureFrappeSnowlandTreeLeft[];
extern u8 gTextureFrappeSnowlandTreeRight[];
extern u8 gTextureCow01Left[];
extern u8 gTextureCow01Right[];
extern u8 gTextureCow02Left[];
extern u8 gTextureCow02Right[];
extern u8 gTextureCow03Left[];
extern u8 gTextureCow03Right[];
extern u8 gTextureCow04Left[];
extern u8 gTextureCow04Right[];
extern u8 gTextureCow05Left[];
extern u8 gTextureCow05Right[];
extern u8 gTextureCactus1Left[];
extern u8 gTextureCactus1Right[];
extern u8 gTextureCactus2Left[];
extern u8 gTextureCactus2Right[];
extern u8 gTextureCactus3[];
extern u8 gTextureFinishLineBanner1[];
extern u8 gTextureFinishLineBanner2[];
extern u8 gTextureFinishLineBanner3[];
extern u8 gTextureFinishLineBanner4[];
extern u8 gTextureFinishLineBanner5[];
extern u8 gTextureFinishLineBanner6[];
extern u8 gTextureFinishLineBanner7[];
extern u8 gTextureFinishLineBanner8[];
extern u8 gTexturePiranhaPlant1[];
extern u8 gTexturePiranhaPlant2[];
extern u8 gTexturePiranhaPlant3[];
extern u8 gTexturePiranhaPlant4[];
extern u8 gTexturePiranhaPlant5[];
extern u8 gTexturePiranhaPlant6[];
extern u8 gTexturePiranhaPlant7[];
extern u8 gTexturePiranhaPlant8[];
extern u8 gTexturePiranhaPlant9[];
extern u8 gTexture6997E0[];
extern u8 gTextureDksJungleParkwayKiwanoFruit1[];
extern u8 gTextureDksJungleParkwayKiwanoFruit2[];
extern u8 gTextureDksJungleParkwayKiwanoFruit3[];
extern u8 gTextureKartShadow[];
extern u8 gTexture69B03C[];
extern u8 gTexture69B140[];
extern u8 gTexture69B378[];
extern u8 gTexture69B960[];
extern u8 gTexture69BA28[];
extern u8 gTextureBoingExclamation[];
extern u8 gTexture69BE6C[];
extern u8 gTexture69BF54[];
extern u8 gTexture69C090[];
extern u8 gTexture69C1E8[];
extern u8 gTexture69C354[];
extern u8 gTexture69C4E4[];
extern u8 gTexture69C80C[];
extern u8 gTexture69C9C4[];
extern u8 gTexture69CB84[];
extern u8 gTexture69CCEC[];
extern u8 gTexture69CEB8[];
extern u8 gTexture69D148[];
extern u8 gTexture69D4E0[];
extern u8 gTexture69D8FC[];
extern u8 gTexture69DCB4[];
extern u8 gTexture69DFA0[];
extern u8 gTexture69E25C[];
extern u8 gTexture69E518[];
extern u8 gTexture69E7A8[];
extern u8 gTexture69EA18[];
extern u8 gTexture69EC54[];
extern u8 gTexture69EE38[];
extern u8 gTexture69EFE0[];
extern u8 gTextureOnomatopoeiaCrash1[];
extern u8 gTextureOnomatopoeiaCrash2[];
extern u8 gTextureOnomatopoeiaWhrrrr1[];
extern u8 gTextureOnomatopoeiaWhrrrr2[];
extern u8 gTextureOnomatopoeiaPoomp1[];
extern u8 gTextureOnomatopoeiaPoomp2[];
extern u8 gTextureBalloon1[];
extern u8 gTextureBalloon2[];
extern u8 gTextureLightningBolt0[];
extern u8 gTextureLightningBolt1[];
extern u8 gTextureLakituNoLights1[];
extern u8 gTextureLakituNoLights2[];
extern u8 gTextureLakituNoLights3[];
extern u8 gTextureLakituNoLights4[];
extern u8 gTextureLakituNoLights5[];
extern u8 gTextureLakituNoLights6[];
extern u8 gTextureLakituNoLights7[];
extern u8 gTextureLakituNoLights8[];
extern u8 gTextureLakituRedLights01[];
extern u8 gTextureLakituRedLights02[];
extern u8 gTextureLakituRedLights03[];
extern u8 gTextureLakituRedLights04[];
extern u8 gTextureLakituRedLights05[];
extern u8 gTextureLakituRedLights06[];
extern u8 gTextureLakituRedLights07[];
extern u8 gTextureLakituRedLights08[];
extern u8 gTextureLakituRedLights09[];
extern u8 gTextureLakituRedLights10[];
extern u8 gTextureLakituRedLights11[];
extern u8 gTextureLakituRedLights12[];
extern u8 gTextureLakituRedLights13[];
extern u8 gTextureLakituRedLights14[];
extern u8 gTextureLakituRedLights15[];
extern u8 gTextureLakituRedLights16[];
extern u8 gTextureLakituBlueLight1[];
extern u8 gTextureLakituBlueLight2[];
extern u8 gTextureLakituBlueLight3[];
extern u8 gTextureLakituBlueLight4[];
extern u8 gTextureLakituBlueLight5[];
extern u8 gTextureLakituBlueLight6[];
extern u8 gTextureLakituBlueLight7[];
extern u8 gTextureLakituBlueLight8[];
extern u8 gTextureLakituCheckeredFlag01[];
extern u8 gTextureLakituCheckeredFlag02[];
extern u8 gTextureLakituCheckeredFlag03[];
extern u8 gTextureLakituCheckeredFlag04[];
extern u8 gTextureLakituCheckeredFlag05[];
extern u8 gTextureLakituCheckeredFlag06[];
extern u8 gTextureLakituCheckeredFlag07[];
extern u8 gTextureLakituCheckeredFlag08[];
extern u8 gTextureLakituCheckeredFlag09[];
extern u8 gTextureLakituCheckeredFlag10[];
extern u8 gTextureLakituCheckeredFlag11[];
extern u8 gTextureLakituCheckeredFlag12[];
extern u8 gTextureLakituCheckeredFlag13[];
extern u8 gTextureLakituCheckeredFlag14[];
extern u8 gTextureLakituCheckeredFlag15[];
extern u8 gTextureLakituCheckeredFlag16[];
extern u8 gTextureLakituCheckeredFlag17[];
extern u8 gTextureLakituCheckeredFlag18[];
extern u8 gTextureLakituCheckeredFlag19[];
extern u8 gTextureLakituCheckeredFlag20[];
extern u8 gTextureLakituCheckeredFlag21[];
extern u8 gTextureLakituCheckeredFlag22[];
extern u8 gTextureLakituCheckeredFlag23[];
extern u8 gTextureLakituCheckeredFlag24[];
extern u8 gTextureLakituCheckeredFlag25[];
extern u8 gTextureLakituCheckeredFlag26[];
extern u8 gTextureLakituCheckeredFlag27[];
extern u8 gTextureLakituCheckeredFlag28[];
extern u8 gTextureLakituCheckeredFlag29[];
extern u8 gTextureLakituCheckeredFlag30[];
extern u8 gTextureLakituCheckeredFlag31[];
extern u8 gTextureLakituCheckeredFlag32[];
extern u8 gTextureLakituSecondLap01[];
extern u8 gTextureLakituSecondLap02[];
extern u8 gTextureLakituSecondLap03[];
extern u8 gTextureLakituSecondLap04[];
extern u8 gTextureLakituSecondLap05[];
extern u8 gTextureLakituSecondLap06[];
extern u8 gTextureLakituSecondLap07[];
extern u8 gTextureLakituSecondLap08[];
extern u8 gTextureLakituSecondLap09[];
extern u8 gTextureLakituSecondLap10[];
extern u8 gTextureLakituSecondLap11[];
extern u8 gTextureLakituSecondLap12[];
extern u8 gTextureLakituSecondLap13[];
extern u8 gTextureLakituSecondLap14[];
extern u8 gTextureLakituSecondLap15[];
extern u8 gTextureLakituSecondLap16[];
extern u8 gTextureLakituFinalLap01[];
extern u8 gTextureLakituFinalLap02[];
extern u8 gTextureLakituFinalLap03[];
extern u8 gTextureLakituFinalLap04[];
extern u8 gTextureLakituFinalLap05[];
extern u8 gTextureLakituFinalLap06[];
extern u8 gTextureLakituFinalLap07[];
extern u8 gTextureLakituFinalLap08[];
extern u8 gTextureLakituFinalLap09[];
extern u8 gTextureLakituFinalLap10[];
extern u8 gTextureLakituFinalLap11[];
extern u8 gTextureLakituFinalLap12[];
extern u8 gTextureLakituFinalLap13[];
extern u8 gTextureLakituFinalLap14[];
extern u8 gTextureLakituFinalLap15[];
extern u8 gTextureLakituFinalLap16[];
extern u8 gTextureLakituReverse01[];
extern u8 gTextureLakituReverse02[];
extern u8 gTextureLakituReverse03[];
extern u8 gTextureLakituReverse04[];
extern u8 gTextureLakituReverse05[];
extern u8 gTextureLakituReverse06[];
extern u8 gTextureLakituReverse07[];
extern u8 gTextureLakituReverse08[];
extern u8 gTextureLakituReverse09[];
extern u8 gTextureLakituReverse10[];
extern u8 gTextureLakituReverse11[];
extern u8 gTextureLakituReverse12[];
extern u8 gTextureLakituReverse13[];
extern u8 gTextureLakituReverse14[];
extern u8 gTextureLakituReverse15[];
extern u8 gTextureLakituReverse16[];
extern u8 gTextureLakituFishing1[];
extern u8 gTextureLakituFishing2[];
extern u8 gTextureLakituFishing3[];
extern u8 gTextureLakituFishing4[];
extern u8 gTextureGhosts[];
extern u8 gTextureExhaust0[];
extern u8 gTextureExhaust1[];
extern u8 gTextureExhaust2[];
extern u8 gTextureExhaust3[];
extern u8 gTextureExhaust4[];
extern u8 gTextureExhaust5[];
extern u8 gTextureLogoMarioKart64[];
extern u8 gTextureCourseOutlineMarioRaceway[];
extern u8 gTextureCourseOutlineChocoMountain[];
extern u8 gTextureCourseOutlineBowsersCastle[];
extern u8 gTextureCourseOutlineBansheeBoardwalk[];
extern u8 gTextureCourseOutlineYoshiValley[];
extern u8 gTextureCourseOutlineFrappeSnowland[];
extern u8 gTextureCourseOutlineKoopaTroopaBeach[];
extern u8 gTextureCourseOutlineRoyalRaceway[];
extern u8 gTextureCourseOutlineLuigiRaceway[];
extern u8 gTextureCourseOutlineMooMooFarm[];
extern u8 gTextureCourseOutlineToadsTurnpike[];
extern u8 gTextureCourseOutlineKalimariDesert[];
extern u8 gTextureCourseOutlineSherbetLand[];
extern u8 gTextureCourseOutlineRainbowRoad[];
extern u8 gTextureCourseOutlineWarioStadium[];
extern u8 gTextureCourseOutlineBlockFort[];
extern u8 gTextureCourseOutlineSkyscraper[];
extern u8 gTextureCourseOutlineDoubleDeck[];
extern u8 gTextureCourseOutlineDksJungleParkway[];
extern u8 gTextureCourseOutlineBigDonut[];
#endif

563
data/other_textures.s
View File

@ -1148,108 +1148,108 @@ glabel gTexture68E2D0
.incbin "textures/standalone/texture_68E2D0.rgba16.mio0" .incbin "textures/standalone/texture_68E2D0.rgba16.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68EB50 glabel gTextureGreenShell0
.incbin "bin/texture_68EB50.mio0" .incbin "assets/greenshell/gTextureGreenShell0.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68EDA0 glabel gTextureGreenShell1
.incbin "bin/texture_68EDA0.mio0" .incbin "assets/greenshell/gTextureGreenShell1.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68EFF0 glabel gTextureGreenShell2
.incbin "bin/texture_68EFF0.mio0" .incbin "assets/greenshell/gTextureGreenShell2.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68F248 glabel gTextureGreenShell3
.incbin "bin/texture_68F248.mio0" .incbin "assets/greenshell/gTextureGreenShell3.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68F4A8 glabel gTextureGreenShell4
.incbin "bin/texture_68F4A8.mio0" .incbin "assets/greenshell/gTextureGreenShell4.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68F700 glabel gTextureGreenShell5
.incbin "bin/texture_68F700.mio0" .incbin "assets/greenshell/gTextureGreenShell5.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68F96C glabel gTextureGreenShell6
.incbin "bin/texture_68F96C.mio0" .incbin "assets/greenshell/gTextureGreenShell6.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68FBCC glabel gTextureGreenShell7
.incbin "bin/texture_68FBCC.mio0" .incbin "assets/greenshell/gTextureGreenShell7.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture68FE20 glabel gTextureBlueShell0
.incbin "bin/texture_68FE20.mio0" .incbin "assets/blueshell/gTextureBlueShell0.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture69004C glabel gTextureBlueShell1
.incbin "bin/texture_69004C.mio0" .incbin "assets/blueshell/gTextureBlueShell1.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture690284 glabel gTextureBlueShell2
.incbin "bin/texture_690284.mio0" .incbin "assets/blueshell/gTextureBlueShell2.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture6904C4 glabel gTextureBlueShell3
.incbin "bin/texture_6904C4.mio0" .incbin "assets/blueshell/gTextureBlueShell3.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture690708 glabel gTextureBlueShell4
.incbin "bin/texture_690708.mio0" .incbin "assets/blueshell/gTextureBlueShell4.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture690960 glabel gTextureBlueShell5
.incbin "bin/texture_690960.mio0" .incbin "assets/blueshell/gTextureBlueShell5.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture690BBC glabel gTextureBlueShell6
.incbin "bin/texture_690BBC.mio0" .incbin "assets/blueshell/gTextureBlueShell6.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture690DF8 glabel gTextureBlueShell7
.incbin "bin/texture_690DF8.mio0" .incbin "assets/blueshell/gTextureBlueShell7.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTextureQuestionMarkYellow glabel gTextureQuestionMarkYellow
.incbin "textures/standalone/question_mark_yellow.rgba16.mio0" .incbin "textures/standalone/question_mark_yellow.rgba16.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture6913CC glabel gTextureTrees1
.incbin "bin/texture_6913CC.mio0" .incbin "assets/trees/gTextureTrees1.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture691714 glabel gTextureTrees2
.incbin "bin/texture_691714.mio0" .incbin "assets/trees/gTextureTrees2.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture691AAC glabel gTextureTrees3
.incbin "bin/texture_691AAC.mio0" .incbin "assets/trees/gTextureTrees3.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture691D98 glabel gTextureTrees4Left
.incbin "bin/texture_691D98.mio0" .incbin "assets/trees/gTextureTrees4Left.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture692088 glabel gTextureTrees4Right
.incbin "bin/texture_692088.mio0" .incbin "assets/trees/gTextureTrees4Right.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture6923D8 glabel gTextureTrees5Left
.incbin "bin/texture_6923D8.mio0" .incbin "assets/trees/gTextureTrees5Left.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture6925E8 glabel gTextureTrees5Right
.incbin "bin/texture_6925E8.mio0" .incbin "assets/trees/gTextureTrees5Right.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture692888 glabel gTextureTrees6
.incbin "bin/texture_692888.mio0" .incbin "assets/trees/gTextureTrees6.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTexture692CC0 glabel gTextureTrees7
.incbin "bin/texture_692CC0.mio0" .incbin "assets/trees/gTextureTrees7.mio0"
.balign 4, 0x00 .balign 4, 0x00
glabel gTextureShrub glabel gTextureShrub
@ -1567,8 +1567,469 @@ glabel gTextureLightningBolt0
glabel gTextureLightningBolt1 glabel gTextureLightningBolt1
.incbin "textures/standalone/lightning_zap_1.ia8.mio0" .incbin "textures/standalone/lightning_zap_1.ia8.mio0"
.balign 16, 0x00
glabel gTextureLakituNoLights1
.incbin "assets/lakitu/nolights/gTextureLakituNoLights1.bin"
.balign 4, 0x00 .balign 4, 0x00
.incbin "bin/mk64.u.6A0ABC.bin" glabel gTextureLakituNoLights2
.incbin "assets/lakitu/nolights/gTextureLakituNoLights2.bin"
.balign 4, 0x00
glabel gTextureLakituNoLights3
.incbin "assets/lakitu/nolights/gTextureLakituNoLights3.bin"
.balign 4, 0x00
glabel gTextureLakituNoLights4
.incbin "assets/lakitu/nolights/gTextureLakituNoLights4.bin"
.balign 4, 0x00
glabel gTextureLakituNoLights5
.incbin "assets/lakitu/nolights/gTextureLakituNoLights5.bin"
.balign 4, 0x00
glabel gTextureLakituNoLights6
.incbin "assets/lakitu/nolights/gTextureLakituNoLights6.bin"
.balign 4, 0x00
glabel gTextureLakituNoLights7
.incbin "assets/lakitu/nolights/gTextureLakituNoLights7.bin"
.balign 4, 0x00
glabel gTextureLakituNoLights8
.incbin "assets/lakitu/nolights/gTextureLakituNoLights8.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights01
.incbin "assets/lakitu/redlights/gTextureLakituRedLights01.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights02
.incbin "assets/lakitu/redlights/gTextureLakituRedLights02.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights03
.incbin "assets/lakitu/redlights/gTextureLakituRedLights03.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights04
.incbin "assets/lakitu/redlights/gTextureLakituRedLights04.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights05
.incbin "assets/lakitu/redlights/gTextureLakituRedLights05.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights06
.incbin "assets/lakitu/redlights/gTextureLakituRedLights06.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights07
.incbin "assets/lakitu/redlights/gTextureLakituRedLights07.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights08
.incbin "assets/lakitu/redlights/gTextureLakituRedLights08.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights09
.incbin "assets/lakitu/redlights/gTextureLakituRedLights09.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights10
.incbin "assets/lakitu/redlights/gTextureLakituRedLights10.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights11
.incbin "assets/lakitu/redlights/gTextureLakituRedLights11.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights12
.incbin "assets/lakitu/redlights/gTextureLakituRedLights12.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights13
.incbin "assets/lakitu/redlights/gTextureLakituRedLights13.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights14
.incbin "assets/lakitu/redlights/gTextureLakituRedLights14.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights15
.incbin "assets/lakitu/redlights/gTextureLakituRedLights15.bin"
.balign 4, 0x00
glabel gTextureLakituRedLights16
.incbin "assets/lakitu/redlights/gTextureLakituRedLights16.bin"
.balign 4, 0x00
glabel gTextureLakituBlueLight1
.incbin "assets/lakitu/bluelight/gTextureLakituBlueLight1.bin"
.balign 4, 0x00
glabel gTextureLakituBlueLight2
.incbin "assets/lakitu/bluelight/gTextureLakituBlueLight2.bin"
.balign 4, 0x00
glabel gTextureLakituBlueLight3
.incbin "assets/lakitu/bluelight/gTextureLakituBlueLight3.bin"
.balign 4, 0x00
glabel gTextureLakituBlueLight4
.incbin "assets/lakitu/bluelight/gTextureLakituBlueLight4.bin"
.balign 4, 0x00
glabel gTextureLakituBlueLight5
.incbin "assets/lakitu/bluelight/gTextureLakituBlueLight5.bin"
.balign 4, 0x00
glabel gTextureLakituBlueLight6
.incbin "assets/lakitu/bluelight/gTextureLakituBlueLight6.bin"
.balign 4, 0x00
glabel gTextureLakituBlueLight7
.incbin "assets/lakitu/bluelight/gTextureLakituBlueLight7.bin"
.balign 4, 0x00
glabel gTextureLakituBlueLight8
.incbin "assets/lakitu/bluelight/gTextureLakituBlueLight8.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag01
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag01.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag02
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag02.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag03
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag03.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag04
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag04.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag05
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag05.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag06
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag06.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag07
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag07.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag08
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag08.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag09
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag09.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag10
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag10.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag11
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag11.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag12
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag12.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag13
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag13.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag14
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag14.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag15
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag15.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag16
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag16.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag17
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag17.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag18
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag18.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag19
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag19.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag20
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag20.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag21
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag21.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag22
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag22.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag23
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag23.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag24
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag24.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag25
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag25.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag26
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag26.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag27
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag27.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag28
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag28.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag29
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag29.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag30
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag30.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag31
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag31.bin"
.balign 4, 0x00
glabel gTextureLakituCheckeredFlag32
.incbin "assets/lakitu/checkeredflag/gTextureLakituCheckeredFlag32.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap01
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap01.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap02
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap02.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap03
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap03.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap04
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap04.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap05
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap05.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap06
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap06.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap07
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap07.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap08
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap08.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap09
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap09.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap10
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap10.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap11
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap11.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap12
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap12.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap13
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap13.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap14
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap14.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap15
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap15.bin"
.balign 4, 0x00
glabel gTextureLakituSecondLap16
.incbin "assets/lakitu/secondlap/gTextureLakituSecondLap16.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap01
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap01.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap02
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap02.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap03
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap03.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap04
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap04.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap05
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap05.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap06
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap06.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap07
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap07.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap08
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap08.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap09
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap09.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap10
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap10.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap11
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap11.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap12
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap12.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap13
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap13.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap14
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap14.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap15
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap15.bin"
.balign 4, 0x00
glabel gTextureLakituFinalLap16
.incbin "assets/lakitu/finallap/gTextureLakituFinalLap16.bin"
.balign 4, 0x00
glabel gTextureLakituReverse01
.incbin "assets/lakitu/reverse/gTextureLakituReverse01.bin"
.balign 4, 0x00
glabel gTextureLakituReverse02
.incbin "assets/lakitu/reverse/gTextureLakituReverse02.bin"
.balign 4, 0x00
glabel gTextureLakituReverse03
.incbin "assets/lakitu/reverse/gTextureLakituReverse03.bin"
.balign 4, 0x00
glabel gTextureLakituReverse04
.incbin "assets/lakitu/reverse/gTextureLakituReverse04.bin"
.balign 4, 0x00
glabel gTextureLakituReverse05
.incbin "assets/lakitu/reverse/gTextureLakituReverse05.bin"
.balign 4, 0x00
glabel gTextureLakituReverse06
.incbin "assets/lakitu/reverse/gTextureLakituReverse06.bin"
.balign 4, 0x00
glabel gTextureLakituReverse07
.incbin "assets/lakitu/reverse/gTextureLakituReverse07.bin"
.balign 4, 0x00
glabel gTextureLakituReverse08
.incbin "assets/lakitu/reverse/gTextureLakituReverse08.bin"
.balign 4, 0x00
glabel gTextureLakituReverse09
.incbin "assets/lakitu/reverse/gTextureLakituReverse09.bin"
.balign 4, 0x00
glabel gTextureLakituReverse10
.incbin "assets/lakitu/reverse/gTextureLakituReverse10.bin"
.balign 4, 0x00
glabel gTextureLakituReverse11
.incbin "assets/lakitu/reverse/gTextureLakituReverse11.bin"
.balign 4, 0x00
glabel gTextureLakituReverse12
.incbin "assets/lakitu/reverse/gTextureLakituReverse12.bin"
.balign 4, 0x00
glabel gTextureLakituReverse13
.incbin "assets/lakitu/reverse/gTextureLakituReverse13.bin"
.balign 4, 0x00
glabel gTextureLakituReverse14
.incbin "assets/lakitu/reverse/gTextureLakituReverse14.bin"
.balign 4, 0x00
glabel gTextureLakituReverse15
.incbin "assets/lakitu/reverse/gTextureLakituReverse15.bin"
.balign 4, 0x00
glabel gTextureLakituReverse16
.incbin "assets/lakitu/reverse/gTextureLakituReverse16.bin"
.balign 4, 0x00
glabel gTextureLakituFishing1
.incbin "assets/lakitu/fishing/gTextureLakituFishing1.bin"
.balign 4, 0x00
glabel gTextureLakituFishing2
.incbin "assets/lakitu/fishing/gTextureLakituFishing2.bin"
.balign 4, 0x00
glabel gTextureLakituFishing3
.incbin "assets/lakitu/fishing/gTextureLakituFishing3.bin"
.balign 4, 0x00
glabel gTextureLakituFishing4
.incbin "assets/lakitu/fishing/gTextureLakituFishing4.bin"
.balign 4, 0x00 .balign 4, 0x00
glabel gTextureGhosts glabel gTextureGhosts

2
data/sound_data/audiotables.s
View File

@ -5,5 +5,5 @@
.section .data .section .data
.incbin "bin/mk64.u.979AA0.bin" # Audiotables and data .incbin "bin/audiotables.bin" # Audiotables and data

46
include/types.h
View File

@ -109,50 +109,4 @@ struct UnkStruct_800DDB68 {
s32 *D_800ED620; s32 *D_800ED628; s32 *D_800ED630; s32 *D_800ED638; s32 *D_800ED620; s32 *D_800ED628; s32 *D_800ED630; s32 *D_800ED638;
}; };
typedef struct {
s8 ob[3];
s8 unk;
} coursePath;
// dlRomStart, vertexRomStart, & vertexStart, are u8* because mio0 compressed.
struct courseTable {
u8 *dlRomStart; // 0x00 ROM start for segment 6 DL data
u8 *dlRomEnd; // 0x04 ROM end for segment 6 DL data
u8 *vertexRomStart; // 0x08 ROM start for segment 4 vertex data
u8 *vertexRomEnd; // 0x0C ROM end for segment 7?
u8 *offsetRomStart; // 0x10 ROM start for uncompressed segment 9 texture and DL addresses
u8 *offsetRomEnd; // 0x14 ROM end for uncompressed segment 9 texture and DL addresses
mk64_Vtx *vertexStart; // 0x18 segmented address of vertex data
u32 vertexCount; // 0x1C number of vertices in vertex data
u8 *packedStart; // 0x20 packed display list start address
uintptr_t finalDisplaylistOffset; // 0x24
u32 *textures; // 0x20 segmented address of textures table
u16 unknown1; // 0x2C
u16 padding; // 0x2E
};
extern mk64_Vtx d_course_mario_raceway_vertex[];
extern mk64_Vtx d_course_choco_mountain_vertex[];
extern mk64_Vtx d_course_bowsers_castle_vertex[];
extern mk64_Vtx d_course_banshee_boardwalk_vertex[];
extern mk64_Vtx d_course_yoshi_valley_vertex[];
extern mk64_Vtx d_course_frappe_snowland_vertex[];
extern mk64_Vtx d_course_koopa_troopa_beach_vertex[];
extern mk64_Vtx d_course_royal_raceway_vertex[];
extern mk64_Vtx d_course_luigi_raceway_vertex[];
extern mk64_Vtx d_course_moo_moo_farm_vertex[];
extern mk64_Vtx d_course_toads_turnpike_vertex[];
extern mk64_Vtx d_course_kalimari_desert_vertex[];
extern mk64_Vtx d_course_sherbet_land_vertex[];
extern mk64_Vtx d_course_rainbow_road_vertex[];
extern mk64_Vtx d_course_wario_stadium_vertex[];
extern mk64_Vtx d_course_block_fort_vertex[];
extern mk64_Vtx d_course_skyscraper_vertex[];
extern mk64_Vtx d_course_double_deck_vertex[];
extern mk64_Vtx d_course_dks_jungle_parkway_vertex[];
extern mk64_Vtx d_course_big_donut_vertex[];
extern struct courseTable gCourseTable[];
#endif /* TYPES_H */ #endif /* TYPES_H */

2
rename_sym.sh
View File

@ -10,4 +10,4 @@ fi
#echo "Replace $1 with $2?" #echo "Replace $1 with $2?"
#read #read
grep -rl "$1" asm/**/*.s data/*.s src/*.c src/audio/*.c src/*.h src/os/*.{c,h} courses/**/*.{c,h} undefined_syms.txt | xargs sed -i "s/\b$1\b/$2/g" grep -rl "$1" asm/**/*.s data/*.s src/**/*.c src/audio/*.c src/**/*.h src/os/*.{c,h} courses/**/*.{c,h} undefined_syms.txt | xargs sed -i "s/\b$1\b/$2/g"

76
src/code_800029B0.c
View File

@ -21,7 +21,9 @@
#include "render_courses.h" #include "render_courses.h"
#include "main.h" #include "main.h"
#include "courses/all_course_data.h" #include "courses/all_course_data.h"
#include "courses/all_course_packed.h"
#include "menus.h" #include "menus.h"
#include "data/other_textures.h"
extern s32 D_802BA038; extern s32 D_802BA038;
extern s16 D_802BA048; extern s16 D_802BA048;
@ -305,14 +307,16 @@ void func_80003040(void) {
destroy_all_actors(); destroy_all_actors();
switch (gCurrentCourseId) { switch (gCurrentCourseId) {
case COURSE_MARIO_RACEWAY: case COURSE_MARIO_RACEWAY:
dma_textures(D_0F04F45C, 0x35B, 0x800); dma_textures(gTextureTrees1, 0x35B, 0x800);
spawn_foliage(d_course_mario_raceway_tree_spawns); spawn_foliage(d_course_mario_raceway_tree_spawns);
break; break;
case COURSE_BOWSER_CASTLE: case COURSE_BOWSER_CASTLE:
find_vtx_and_set_colours(0x7001350, 0x32, 0, 0, 0); // d_course_bowsers_castle_packed_dl_1350
find_vtx_and_set_colours(0x07001350, 0x32, 0, 0, 0);
break; break;
case COURSE_BANSHEE_BOARDWALK: case COURSE_BANSHEE_BOARDWALK:
find_vtx_and_set_colours(0x7000878, -0x80, 0, 0, 0); // d_course_banshee_boardwalk_packed_dl_878
find_vtx_and_set_colours(0x07000878, -0x80, 0, 0, 0);
break; break;
case COURSE_YOSHI_VALLEY: case COURSE_YOSHI_VALLEY:
vec3f_set(position, -2300.0f, 0.0f, 634.0f); vec3f_set(position, -2300.0f, 0.0f, 634.0f);
@ -320,28 +324,33 @@ void func_80003040(void) {
addActorToEmptySlot(position, rotation, velocity, ACTOR_YOSHI_VALLEY_EGG); addActorToEmptySlot(position, rotation, velocity, ACTOR_YOSHI_VALLEY_EGG);
break; break;
case COURSE_MOO_MOO_FARM: case COURSE_MOO_MOO_FARM:
dma_textures(D_0F04FE28, 0x3E8, 0x800); dma_textures(gTextureTrees4Left, 0x3E8, 0x800);
dma_textures(D_0F050118, 0x3E8, 0x800); dma_textures(gTextureTrees4Right, 0x3E8, 0x800);
dma_textures(D_0F051C54, 0x400, 0x800); dma_textures(gTextureCow01Left, 0x400, 0x800);
dma_textures(D_0F051FD8, 0x400, 0x800); dma_textures(gTextureCow01Right, 0x400, 0x800);
dma_textures(D_0F05232C, 0x400, 0x800); dma_textures(gTextureCow02Left, 0x400, 0x800);
dma_textures(D_0F0526B8, 0x400, 0x800); dma_textures(gTextureCow02Right, 0x400, 0x800);
dma_textures(D_0F052A20, 0x400, 0x800); dma_textures(gTextureCow03Left, 0x400, 0x800);
dma_textures(D_0F052D3C, 0x400, 0x800); dma_textures(gTextureCow03Right, 0x400, 0x800);
dma_textures(D_0F05300C, 0x400, 0x800); dma_textures(gTextureCow04Left, 0x400, 0x800);
dma_textures(D_0F0532F8, 0x400, 0x800); dma_textures(gTextureCow04Right, 0x400, 0x800);
dma_textures(D_0F05363C, 0x400, 0x800); dma_textures(gTextureCow05Left, 0x400, 0x800);
dma_textures(D_0F053950, 0x400, 0x800); dma_textures(gTextureCow05Right, 0x400, 0x800);
spawn_foliage(d_course_moo_moo_farm_tree_spawn); spawn_foliage(d_course_moo_moo_farm_tree_spawn);
break; break;
case COURSE_SHERBET_LAND: case COURSE_SHERBET_LAND:
find_vtx_and_set_colours(0x7001EB8, -0x4C, 0xFF, 0xFF, 0xFF); // d_course_sherbet_land_packed_dl_1EB8
find_vtx_and_set_colours(0x7002308, -0x6A, 0xFF, 0xFF, 0xFF); find_vtx_and_set_colours(0x07001EB8, -0x4C, 0xFF, 0xFF, 0xFF);
// d_course_sherbet_land_packed_dl_2308
find_vtx_and_set_colours(0x07002308, -0x6A, 0xFF, 0xFF, 0xFF);
break; break;
case COURSE_RAINBOW_ROAD: case COURSE_RAINBOW_ROAD:
find_vtx_and_set_colours(0x7002068, -0x6A, 0xFF, 0xFF, 0xFF); // d_course_rainbow_road_packed_dl_2068
find_vtx_and_set_colours(0x7001E18, -0x6A, 0xFF, 0xFF, 0xFF); find_vtx_and_set_colours(0x07002068, -0x6A, 0xFF, 0xFF, 0xFF);
find_vtx_and_set_colours(0x7001318, -1, 0xFF, 0xFF, 0); // d_course_rainbow_road_packed_dl_1E18
find_vtx_and_set_colours(0x07001E18, -0x6A, 0xFF, 0xFF, 0xFF);
// d_course_rainbow_road_packed_dl_1318
find_vtx_and_set_colours(0x07001318, -1, 0xFF, 0xFF, 0);
break; break;
case COURSE_WARIO_STADIUM: case COURSE_WARIO_STADIUM:
vec3f_set(position, -131.0f, 83.0f, 286.0f); vec3f_set(position, -131.0f, 83.0f, 286.0f);
@ -350,17 +359,26 @@ void func_80003040(void) {
addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN); addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN);
vec3f_set(position, -2622.0f, 79.0f, 739.0f); vec3f_set(position, -2622.0f, 79.0f, 739.0f);
addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN); addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN);
find_vtx_and_set_colours(0x7000C50, 0x64, 0xFF, 0xFF, 0xFF); // d_course_wario_stadium_packed_dl_C50
find_vtx_and_set_colours(0x7000BD8, 0x64, 0xFF, 0xFF, 0xFF); find_vtx_and_set_colours(0x07000C50, 0x64, 0xFF, 0xFF, 0xFF);
find_vtx_and_set_colours(0x7000B60, 0x64, 0xFF, 0xFF, 0xFF); // d_course_wario_stadium_packed_dl_BD8
find_vtx_and_set_colours(0x7000AE8, 0x64, 0xFF, 0xFF, 0xFF); find_vtx_and_set_colours(0x07000BD8, 0x64, 0xFF, 0xFF, 0xFF);
find_vtx_and_set_colours(0x7000CC8, 0x64, 0xFF, 0xFF, 0xFF); // d_course_wario_stadium_packed_dl_B60
find_vtx_and_set_colours(0x7000D50, 0x64, 0xFF, 0xFF, 0xFF); find_vtx_and_set_colours(0x07000B60, 0x64, 0xFF, 0xFF, 0xFF);
find_vtx_and_set_colours(0x7000DD0, 0x64, 0xFF, 0xFF, 0xFF); // d_course_wario_stadium_packed_dl_AE8
find_vtx_and_set_colours(0x7000E48, 0x64, 0xFF, 0xFF, 0xFF); find_vtx_and_set_colours(0x07000AE8, 0x64, 0xFF, 0xFF, 0xFF);
// d_course_wario_stadium_packed_dl_CC8
find_vtx_and_set_colours(0x07000CC8, 0x64, 0xFF, 0xFF, 0xFF);
// d_course_wario_stadium_packed_dl_D50
find_vtx_and_set_colours(0x07000D50, 0x64, 0xFF, 0xFF, 0xFF);
// d_course_wario_stadium_packed_dl_DD0
find_vtx_and_set_colours(0x07000DD0, 0x64, 0xFF, 0xFF, 0xFF);
// d_course_wario_stadium_packed_dl_E48
find_vtx_and_set_colours(0x07000E48, 0x64, 0xFF, 0xFF, 0xFF);
break; break;
case COURSE_DK_JUNGLE: case COURSE_DK_JUNGLE:
find_vtx_and_set_colours(0x7003FA8, 0x78, 0xFF, 0xFF, 0xFF); // d_course_dks_jungle_parkway_packed_dl_3FA8
find_vtx_and_set_colours(0x07003FA8, 0x78, 0xFF, 0xFF, 0xFF);
break; break;
default: default:
break; break;

59
src/code_80057C60.c
View File

@ -25,6 +25,7 @@
#include "objects.h" #include "objects.h"
#include "bomb_kart.h" #include "bomb_kart.h"
#include "menus.h" #include "menus.h"
#include "data/other_textures.h"
// WARNING: this macro is undef'd at the end of this file // WARNING: this macro is undef'd at the end of this file
@ -2529,48 +2530,6 @@ void func_8005D1F4(s32 arg0)
} }
} }
// todo: Import?
// Appears to be balloons
extern u8 D_0F05D1E8[]; // unk
extern u8 D_0F05D420[]; // unk
extern u8 D_0F05D674[]; // unk
extern u8 D_0F05DA50[]; // unk
extern u8 D_0F05DDFC[]; // unk
extern u8 D_0F05DFC0[]; // unk
extern u8 D_0F05E19C[]; // balloon top?
extern u8 D_0F05E3E0[]; // balloon bottom?
extern u8 gTexture69B03C[];
extern u8 gTexture69B140[];
extern u8 gTexture69B378[];
extern u8 gTexture69B960[];
extern u8 gTexture69BA28[];
extern u8 gTexture69C1E8[];
extern u8 gTexture69C354[];
extern u8 gTexture69C4E4[];
extern u8 gTexture69C80C[];
extern u8 gTexture69C9C4[];
extern u8 gTexture69CB84[];
extern u8 gTexture69CCEC[];
extern u8 gTexture69CEB8[];
extern u8 gTexture69D148[];
extern u8 gTexture69D4E0[];
extern u8 gTexture69D8FC[];
extern u8 gTexture69DCB4[];
extern u8 gTexture69DFA0[];
extern u8 gTexture69E25C[];
extern u8 gTexture69E518[];
extern u8 gTexture69E7A8[];
extern u8 gTexture69EA18[];
extern u8 gTexture69EC54[];
extern u8 gTexture69EE38[];
extern u8 gTexture69EFE0[];
extern u8 gTextureBoingExclamation[];
extern u8 gTextureKartShadow[];
extern u8 gTextureLightningBolt0[];
extern u8 gTextureLightningBolt1[];
// Appears to load GP Mode race staging balloons and kart shadows. // Appears to load GP Mode race staging balloons and kart shadows.
void func_8005D290(void) { void func_8005D290(void) {
D_8018D488 = dma_textures(gTexture69C80C, 0x400, 0x400); D_8018D488 = dma_textures(gTexture69C80C, 0x400, 0x400);
@ -2584,16 +2543,16 @@ void func_8005D290(void) {
D_8018D494 = dma_textures(gTexture69C4E4, 0x400, 0x400); D_8018D494 = dma_textures(gTexture69C4E4, 0x400, 0x400);
D_8018D490 = D_8018D48C; D_8018D490 = D_8018D48C;
D_8018D498 = dma_textures(gTexture69B378, 0x1000, 0x1000); D_8018D498 = dma_textures(gTexture69B378, 0x1000, 0x1000);
D_8018D4BC = dma_textures(D_0F05E19C, 0x800, 0x800); D_8018D4BC = dma_textures(gTextureBalloon1, 0x800, 0x800);
D_8018D4C0 = dma_textures(D_0F05E3E0, 0x800, 0x800); D_8018D4C0 = dma_textures(gTextureBalloon2, 0x800, 0x800);
D_8018D49C = dma_textures(gTexture69C9C4, 0x200, 0x200); D_8018D49C = dma_textures(gTexture69C9C4, 0x200, 0x200);
D_8018D4A0 = dma_textures(gTextureBoingExclamation, 0x800, 0x800); D_8018D4A0 = dma_textures(gTextureBoingExclamation, 0x800, 0x800);
D_8018D4A4 = dma_textures(D_0F05DDFC, 0x800, 0x800); D_8018D4A4 = dma_textures(gTextureOnomatopoeiaPoomp1, 0x800, 0x800);
D_8018D4A8 = dma_textures(D_0F05DFC0, 0x800, 0x800); D_8018D4A8 = dma_textures(gTextureOnomatopoeiaPoomp2, 0x800, 0x800);
D_8018D4AC = dma_textures(D_0F05D674, 0x800, 0x800); D_8018D4AC = dma_textures(gTextureOnomatopoeiaWhrrrr1, 0x800, 0x800);
D_8018D4B0 = dma_textures(D_0F05DA50, 0x800, 0x800); D_8018D4B0 = dma_textures(gTextureOnomatopoeiaWhrrrr2, 0x800, 0x800);
D_8018D4B4 = dma_textures(D_0F05D1E8, 0x800, 0x800); D_8018D4B4 = dma_textures(gTextureOnomatopoeiaCrash1, 0x800, 0x800);
D_8018D4B8 = dma_textures(D_0F05D420, 0x800, 0x800); D_8018D4B8 = dma_textures(gTextureOnomatopoeiaCrash2, 0x800, 0x800);
D_8018D438 = dma_textures(gTexture69CB84, 0x800, 0x800); D_8018D438 = dma_textures(gTexture69CB84, 0x800, 0x800);
D_8018D43C = dma_textures(gTexture69CCEC, 0x800, 0x800); D_8018D43C = dma_textures(gTexture69CCEC, 0x800, 0x800);
D_8018D440 = dma_textures(gTexture69CEB8, 0x800, 0x800); D_8018D440 = dma_textures(gTexture69CEB8, 0x800, 0x800);

3
src/code_8006E9C0.c
View File

@ -16,6 +16,7 @@
#include "courses/all_course_data.h" #include "courses/all_course_data.h"
#include "main.h" #include "main.h"
#include "menus.h" #include "menus.h"
#include "data/other_textures.h"
void init_object_list(void) { void init_object_list(void) {
@ -316,7 +317,7 @@ block_26:
D_8018D2E8 = 0x0030; D_8018D2E8 = 0x0030;
break; break;
case 3: case 3:
D_80165880 = dma_textures(D_0F0D0E50, 0x00004CC2U, 0x0000D980U); D_80165880 = dma_textures(gTextureGhosts, 0x00004CC2U, 0x0000D980U);
D_8018D2A0 = 0.016f; D_8018D2A0 = 0.016f;
D_8018D2C0.unk0 = 0x0106; D_8018D2C0.unk0 = 0x0106;
D_8018D2E0 = 0x0037; D_8018D2E0 = 0x0037;

1
src/code_8006E9C0.h
View File

@ -32,7 +32,6 @@ extern s16 D_800E5520[];
extern s16 D_800E5548[]; extern s16 D_800E5548[];
extern u8 *gCourseOutlineTextures[0x14]; extern u8 *gCourseOutlineTextures[0x14];
extern s8 *gTextureLogoMarioKart64;
extern s16 D_80165730; extern s16 D_80165730;
extern s16 D_80165740; extern s16 D_80165740;
extern s16 D_80165748; extern s16 D_80165748;

42
src/code_80071F00.c
View File

@ -28,7 +28,9 @@
#include "code_80091750.h" #include "code_80091750.h"
#include "podium_ceremony_actors.h" #include "podium_ceremony_actors.h"
#include "courses/all_course_data.h" #include "courses/all_course_data.h"
#include "src/ending/ceremony_data.inc.h"
#include "menus.h" #include "menus.h"
#include "data/other_textures.h"
// TODO: unused? // TODO: unused?
f32 D_800E43B0[] = { f32 D_800E43B0[] = {
@ -3075,7 +3077,6 @@ void func_800791F0(s32 objectIndex, s32 playerId) {
func_800C9018(playerId, 0x0100FA28); func_800C9018(playerId, 0x0100FA28);
} }
extern u8 *D_0F05EB50;
extern s16 D_801656F0; extern s16 D_801656F0;
extern s32 D_8018D168; extern s32 D_8018D168;
extern s32 D_8018D180; extern s32 D_8018D180;
@ -3085,7 +3086,7 @@ void func_800792D8(s32 objectIndex, s32 arg1) {
D_801656F0 = 0; D_801656F0 = 0;
D_8018D168 = 0; D_8018D168 = 0;
} }
init_texture_object(objectIndex, (u8 *) gTLUTLakituCountdown, (u8 *) &D_0F05EB50, 0x38U, (u16) 0x00000048); init_texture_object(objectIndex, (u8 *) gTLUTLakituCountdown, gTextureLakituNoLights1, 0x38U, (u16) 0x00000048);
gObjectList[objectIndex].vertex = D_0D005EB0; gObjectList[objectIndex].vertex = D_0D005EB0;
gObjectList[objectIndex].sizeScaling = 0.15f; gObjectList[objectIndex].sizeScaling = 0.15f;
set_object_flag_unk_054_false(objectIndex, 0x00000010); set_object_flag_unk_054_false(objectIndex, 0x00000010);
@ -3177,7 +3178,6 @@ void func_80079380(s32 objectIndex, s32 arg1) {
} }
} }
extern u8 *D_0F07E350;
//extern s32 D_8018C028; //extern s32 D_8018C028;
extern u16 D_800E6834[][4]; // static extern u16 D_800E6834[][4]; // static
@ -3185,7 +3185,7 @@ void func_8007963C(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0; Objects *temp_v0;
func_800791F0(objectIndex, playerIndex); func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, gTLUTLakituCheckeredFlag, (u8 *) &D_0F07E350, 0x48U, (u16) 0x00000038); init_texture_object(objectIndex, gTLUTLakituCheckeredFlag, gTextureLakituCheckeredFlag01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex]; temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028; temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = D_0D006730; temp_v0->vertex = D_0D006730;
@ -3260,11 +3260,9 @@ void func_8007993C(s32 objectIndex, Player *player) {
func_800722CC(objectIndex, 2); func_800722CC(objectIndex, 2);
} }
extern u8 D_0F0CCF50;
void func_800799A8(s32 objectIndex, s32 arg1) { void func_800799A8(s32 objectIndex, s32 arg1) {
func_800791F0(objectIndex, arg1); func_800791F0(objectIndex, arg1);
init_texture_object(objectIndex, gTLUTLakituFishing, &D_0F0CCF50, 0x38U, (u16) 0x00000048); init_texture_object(objectIndex, gTLUTLakituFishing, gTextureLakituFishing1, 0x38U, (u16) 0x00000048);
gObjectList[objectIndex].vertex = D_0D005F30; gObjectList[objectIndex].vertex = D_0D005F30;
gObjectList[objectIndex].sizeScaling = 0.15f; gObjectList[objectIndex].sizeScaling = 0.15f;
func_80086E70(objectIndex); func_80086E70(objectIndex);
@ -3433,14 +3431,13 @@ void func_80079D44(s32 objectIndex, s32 playerId) {
func_80079A5C(objectIndex, temp_s1); func_80079A5C(objectIndex, temp_s1);
} }
extern u8 *D_0F09DB50[];
extern u16 D_800E694C[]; extern u16 D_800E694C[];
void func_8007A060(s32 objectIndex, s32 playerIndex) { void func_8007A060(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0; Objects *temp_v0;
func_800791F0(objectIndex, playerIndex); func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, gTLUTLakituSecondLap, (u8 *) D_0F09DB50, 0x48U, (u16) 0x00000038); init_texture_object(objectIndex, gTLUTLakituSecondLap, gTextureLakituSecondLap01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex]; temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028; temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = D_0D006730; temp_v0->vertex = D_0D006730;
@ -3484,13 +3481,11 @@ void func_8007A124(s32 objectIndex, s32 playerIndex) {
} }
} }
extern u8 *D_0F0AD750;
void func_8007A228(s32 objectIndex, s32 playerIndex) { void func_8007A228(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0; Objects *temp_v0;
func_800791F0(objectIndex, playerIndex); func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, gTLUTLakituFinalLap, (u8 *)&D_0F0AD750, 0x48U, (u16) 0x00000038); init_texture_object(objectIndex, gTLUTLakituFinalLap, gTextureLakituFinalLap01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex]; temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028; temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = D_0D006730; temp_v0->vertex = D_0D006730;
@ -3534,13 +3529,12 @@ void func_8007A2EC(s32 objectIndex, s32 playerIndex) {
} }
} }
extern u8 D_0F0BD350[];
extern u16 D_800E69B0[][4]; // static? extern u16 D_800E69B0[][4]; // static?
void func_8007A3F0(s32 objectIndex, s32 arg1) { void func_8007A3F0(s32 objectIndex, s32 arg1) {
f32 var = 5000.0f; f32 var = 5000.0f;
func_800791F0(objectIndex, arg1); func_800791F0(objectIndex, arg1);
init_texture_object(objectIndex, gTLUTLakituReverse, D_0F0BD350, 0x48U, (u16) 0x00000038); init_texture_object(objectIndex, gTLUTLakituReverse, gTextureLakituReverse01, 0x48U, (u16) 0x00000038);
gObjectList[objectIndex].activeTexture = D_8018C028; gObjectList[objectIndex].activeTexture = D_8018C028;
gObjectList[objectIndex].vertex = D_0D006730; gObjectList[objectIndex].vertex = D_0D006730;
gObjectList[objectIndex].pos[2] = var; gObjectList[objectIndex].pos[2] = var;
@ -4749,7 +4743,7 @@ void func_8007CC00(void) {
void func_8007CE0C(s32 objectIndex) { void func_8007CE0C(s32 objectIndex) {
Objects *temp_s0; Objects *temp_s0;
init_texture_object(objectIndex, d_course_banshee_boardwalk_boo_tlut, D_0F0D0E50, 0x30U, (u16) 0x00000028); init_texture_object(objectIndex, d_course_banshee_boardwalk_boo_tlut, gTextureGhosts, 0x30U, (u16) 0x00000028);
temp_s0 = &gObjectList[objectIndex]; temp_s0 = &gObjectList[objectIndex];
temp_s0->itemDisplay = 0x1C; temp_s0->itemDisplay = 0x1C;
temp_s0->pos[0] = 0.0f; temp_s0->pos[0] = 0.0f;
@ -8301,15 +8295,15 @@ void func_800861E0(void) {
void func_8008629C(s32 objectIndex, s32 arg1) { void func_8008629C(s32 objectIndex, s32 arg1) {
switch (arg1) { /* irregular */ switch (arg1) { /* irregular */
case 0: case 0:
gObjectList[objectIndex].unk_070 = D_0B0075F0; gObjectList[objectIndex].unk_070 = podium_dl3;
gObjectList[objectIndex].unk_04C = 0x00000038; gObjectList[objectIndex].unk_04C = 0x00000038;
break; break;
case 1: case 1:
gObjectList[objectIndex].unk_070 = D_0B008040; gObjectList[objectIndex].unk_070 = podium2_dl3;
gObjectList[objectIndex].unk_04C = 0x0000002B; gObjectList[objectIndex].unk_04C = 0x0000002B;
break; break;
case 2: case 2:
gObjectList[objectIndex].unk_070 = D_0B008A90; gObjectList[objectIndex].unk_070 = podium3_dl3;
gObjectList[objectIndex].unk_04C = 0x0000001E; gObjectList[objectIndex].unk_04C = 0x0000001E;
break; break;
default: default:
@ -8411,13 +8405,13 @@ void func_80086700(s32 objectIndex) {
if (gCCSelection < CC_150) { if (gCCSelection < CC_150) {
switch (D_802874D8.unk1D) { /* switch 1; irregular */ switch (D_802874D8.unk1D) { /* switch 1; irregular */
case 0: /* switch 1 */ case 0: /* switch 1 */
gObjectList[objectIndex].unk_070 = D_0B0069D8; gObjectList[objectIndex].unk_070 = gold_trophy_dl10;
break; break;
case 1: /* switch 1 */ case 1: /* switch 1 */
gObjectList[objectIndex].unk_070 = D_0B006A78; gObjectList[objectIndex].unk_070 = gold_trophy_dl12;
break; break;
case 2: /* switch 1 */ case 2: /* switch 1 */
gObjectList[objectIndex].unk_070 = D_0B006B18; gObjectList[objectIndex].unk_070 = gold_trophy_dl14;
break; break;
default: /* switch 1 */ default: /* switch 1 */
break; break;
@ -8425,13 +8419,13 @@ void func_80086700(s32 objectIndex) {
} else { } else {
switch (D_802874D8.unk1D) { /* irregular */ switch (D_802874D8.unk1D) { /* irregular */
case 0: case 0:
gObjectList[objectIndex].unk_070 = D_0B006A28; gObjectList[objectIndex].unk_070 = gold_trophy_dl11;
break; break;
case 1: case 1:
gObjectList[objectIndex].unk_070 = D_0B006AC8; gObjectList[objectIndex].unk_070 = gold_trophy_dl13;
break; break;
case 2: case 2:
gObjectList[objectIndex].unk_070 = D_0B006B68; gObjectList[objectIndex].unk_070 = gold_trophy_dl15;
break; break;
default: default:
break; break;

15
src/code_80071F00.h
View File

@ -371,9 +371,6 @@ void func_80086D80(void);
s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq); s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq);
s32 osRecvMesg(OSMesgQueue*, OSMesg*, s32); s32 osRecvMesg(OSMesgQueue*, OSMesg*, s32);
// from other_textures.s
extern u8 D_0F0D0E50[]; // gTextureGhosts
// Seemingly a pointer to Lakitu texture(s) // Seemingly a pointer to Lakitu texture(s)
extern u8 *D_8018C028; extern u8 *D_8018C028;
// Seemingly a list of textures for Lakitu // Seemingly a list of textures for Lakitu
@ -404,18 +401,6 @@ extern s32 D_8018D1EC;
extern s32 D_8018D224; extern s32 D_8018D224;
extern u8* D_8018D490; extern u8* D_8018D490;
// Trophy DLs I think?
// trophy_model.inc.c
extern Gfx D_0B0069D8[];
extern Gfx D_0B006A28[];
extern Gfx D_0B006A78[];
extern Gfx D_0B006AC8[];
extern Gfx D_0B006B18[];
extern Gfx D_0B006B68[];
extern Gfx D_0B0075F0[];
extern Gfx D_0B008040[];
extern Gfx D_0B008A90[];
// This is either 3 Vec3s as separate variables or an array of s16's or an array of vec3s. // This is either 3 Vec3s as separate variables or an array of s16's or an array of vec3s.
// The other entries appear to be unused. // The other entries appear to be unused.
// data/data_code_80071F00_2.s // data/data_code_80071F00_2.s

3
src/code_80091750.c
View File

@ -24,6 +24,7 @@
#include "save_data.h" #include "save_data.h"
#include "podium_ceremony_actors.h" #include "podium_ceremony_actors.h"
#include "skybox_and_splitscreen.h" #include "skybox_and_splitscreen.h"
#include "src/data/startup_logo.inc.h"
// TODO: Move gGfxPool out of main.h // TODO: Move gGfxPool out of main.h
// Unfortunately that's not a small effort due to weird import structure in this project // Unfortunately that's not a small effort due to weird import structure in this project
#include "main.h" #include "main.h"
@ -2571,7 +2572,7 @@ void func_800942D0(void) {
gSPMatrix(gDisplayListHead++, test++, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPMatrix(gDisplayListHead++, test++, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2); gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2);
gDPSetEnvColor(gDisplayListHead++, 0x00, 0x00, 0x00, thing); gDPSetEnvColor(gDisplayListHead++, 0x00, 0x00, 0x00, thing);
gSPDisplayList(gDisplayListHead++, D_06009410); gSPDisplayList(gDisplayListHead++, startup_texture_dl4);
gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
} }
} }

2
src/code_80091750.h
View File

@ -343,8 +343,6 @@ void func_800AF740(struct_8018D9E0_entry*);
/* This is where I'd put my static data, if I had any */ /* This is where I'd put my static data, if I had any */
extern Gfx D_06009410[];
extern s32 D_800DDB24; extern s32 D_800DDB24;
extern s16 D_80164478[]; extern s16 D_80164478[];
extern u8 *D_8018D9BC; extern u8 *D_8018D9BC;

4
src/data/common_textures.inc.c
View File

@ -633,7 +633,7 @@ Gfx common_model_flat_banana[] = {
// tlut size 8x29 // tlut size 8x29
// todo: What is this? // todo: What is this?
s8 D_0D004C68[] = { s8 D_0D004C68[] = {
#include "textures/common/132B50_04C68_tlut.rgba16.inc.c" #include "assets/trees/gTLUTTreesImport.inc.c"
}; };
s8 gTLUTGreenShell[] = { s8 gTLUTGreenShell[] = {
@ -644,8 +644,6 @@ s8 gTLUTBlueShell[] = {
#include "assets/blueshell/gTLUTBlueShell.inc.c" #include "assets/blueshell/gTLUTBlueShell.inc.c"
}; };
//s32 fileSplitPad[4] = { 0 };
Vtx D_0D005238[] = { Vtx D_0D005238[] = {
{{{ 3, 6, 0}, 0, {1984, 0}, {0xff, 0xff, 0xff, 0xff}}}, {{{ 3, 6, 0}, 0, {1984, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -3, 6, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}}, {{{ -3, 6, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},

3
src/data/data_segment2.inc.c
View File

@ -3,6 +3,7 @@
#include <PR/ultratypes.h> #include <PR/ultratypes.h>
#include <PR/gbi.h> #include <PR/gbi.h>
#include "data_segment2.h" #include "data_segment2.h"
#include "src/data/startup_logo.inc.h"
Gfx D_02007650[] = { Gfx D_02007650[] = {
gsDPPipeSync(), gsDPPipeSync(),
@ -444,7 +445,7 @@ Gfx D_02007F60[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH),
gsDPPipeSync(), gsDPPipeSync(),
gsSPDisplayList(D_060093F8), gsSPDisplayList(startup_texture_dl3),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };

58
src/data/startup_logo.inc.c
View File

@ -1,6 +1,6 @@
#include "types.h" #include "types.h"
static Vtx startup_logo[] = { Vtx startup_logo[] = {
{{{ 482, -124, 50}, 0, {0, 0}, {0xc9, 0x97, 0x00, 0xff}}}, {{{ 482, -124, 50}, 0, {0, 0}, {0xc9, 0x97, 0x00, 0xff}}},
{{{ 482, -124, -50}, 0, {0, 0}, {0xc9, 0x97, 0x00, 0xff}}}, {{{ 482, -124, -50}, 0, {0, 0}, {0xc9, 0x97, 0x00, 0xff}}},
@ -693,7 +693,7 @@ static Vtx startup_logo[] = {
}; };
static Gfx startup_logo_dl[] = { Gfx startup_logo_dl[] = {
gsSPVertex(&startup_logo[0], 32, 0), gsSPVertex(&startup_logo[0], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
gsSP1Quadrangle(4, 5, 1, 0, 0), gsSP1Quadrangle(4, 5, 1, 0, 0),
@ -746,7 +746,7 @@ static Gfx startup_logo_dl[] = {
}; };
static Gfx startup_logo_dl2[] = { Gfx startup_logo_dl2[] = {
gsSPVertex(&startup_logo[106], 30, 0), gsSPVertex(&startup_logo[106], 30, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -777,7 +777,7 @@ static Gfx startup_logo_dl2[] = {
}; };
static Gfx startup_logo_dl3[] = { Gfx startup_logo_dl3[] = {
gsSPVertex(&startup_logo[158], 30, 0), gsSPVertex(&startup_logo[158], 30, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -839,7 +839,7 @@ static Gfx startup_logo_dl3[] = {
}; };
static Gfx startup_logo_dl4[] = { Gfx startup_logo_dl4[] = {
gsSPVertex(&startup_logo[274], 30, 0), gsSPVertex(&startup_logo[274], 30, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
gsSP1Quadrangle(4, 5, 1, 0, 0), gsSP1Quadrangle(4, 5, 1, 0, 0),
@ -868,7 +868,7 @@ static Gfx startup_logo_dl4[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx startup_logo_dl5[] = { Gfx startup_logo_dl5[] = {
gsSPVertex(&startup_logo[326], 32, 0), gsSPVertex(&startup_logo[326], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
gsSP1Quadrangle(4, 5, 1, 0, 0), gsSP1Quadrangle(4, 5, 1, 0, 0),
@ -921,7 +921,7 @@ static Gfx startup_logo_dl5[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx startup_logo_dl6[] = { Gfx startup_logo_dl6[] = {
gsSPVertex(&startup_logo[436], 32, 0), gsSPVertex(&startup_logo[436], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
gsSP1Quadrangle(4, 5, 1, 0, 0), gsSP1Quadrangle(4, 5, 1, 0, 0),
@ -974,7 +974,7 @@ static Gfx startup_logo_dl6[] = {
}; };
static Gfx startup_logo_dl7[] = { Gfx startup_logo_dl7[] = {
gsSPVertex(&startup_logo[540], 32, 0), gsSPVertex(&startup_logo[540], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
gsSP1Quadrangle(4, 5, 1, 0, 0), gsSP1Quadrangle(4, 5, 1, 0, 0),
@ -1004,7 +1004,7 @@ static Gfx startup_logo_dl7[] = {
}; };
static Gfx startup_logo_dl8[] = { Gfx startup_logo_dl8[] = {
gsSPVertex(&startup_logo[596], 32, 0), gsSPVertex(&startup_logo[596], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
gsSP1Quadrangle(4, 5, 1, 0, 0), gsSP1Quadrangle(4, 5, 1, 0, 0),
@ -1051,7 +1051,7 @@ static Gfx startup_logo_dl8[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Vtx startup_logo2[] = { Vtx startup_logo2[] = {
{{{ 107, 36, -50}, 0, {0, 0}, {0x00, 0x00, 0x88, 0xff}}}, {{{ 107, 36, -50}, 0, {0, 0}, {0x00, 0x00, 0x88, 0xff}}},
{{{ 66, 17, -50}, 0, {0, 0}, {0x00, 0x00, 0x88, 0xff}}}, {{{ 66, 17, -50}, 0, {0, 0}, {0x00, 0x00, 0x88, 0xff}}},
@ -2149,7 +2149,7 @@ static Vtx startup_logo2[] = {
}; };
static Gfx startup_logo_dl9[] = { Gfx startup_logo_dl9[] = {
gsSPVertex(&startup_logo2[0], 32, 0), gsSPVertex(&startup_logo2[0], 32, 0),
gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 1, 2, 0),
@ -2236,7 +2236,7 @@ static Gfx startup_logo_dl9[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx startup_logo_dl10[] = { Gfx startup_logo_dl10[] = {
gsSPVertex(&startup_logo2[161], 32, 0), gsSPVertex(&startup_logo2[161], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -2267,7 +2267,7 @@ static Gfx startup_logo_dl10[] = {
}; };
static Gfx startup_logo_dl11[] = { Gfx startup_logo_dl11[] = {
gsSPVertex(&startup_logo2[240], 32, 0), gsSPVertex(&startup_logo2[240], 32, 0),
gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 1, 2, 0),
@ -2317,7 +2317,7 @@ static Gfx startup_logo_dl11[] = {
}; };
static Gfx startup_logo_dl12[] = { Gfx startup_logo_dl12[] = {
gsSPVertex(&startup_logo2[329], 24, 0), gsSPVertex(&startup_logo2[329], 24, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -2330,7 +2330,7 @@ static Gfx startup_logo_dl12[] = {
}; };
static Gfx startup_logo_dl13[] = { Gfx startup_logo_dl13[] = {
gsSPVertex(&startup_logo2[353], 24, 0), gsSPVertex(&startup_logo2[353], 24, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -2343,7 +2343,7 @@ static Gfx startup_logo_dl13[] = {
}; };
static Gfx startup_logo_dl14[] = { Gfx startup_logo_dl14[] = {
gsSPVertex(&startup_logo2[377], 32, 0), gsSPVertex(&startup_logo2[377], 32, 0),
gsSP1Quadrangle(0, 3, 1, 2, 0), gsSP1Quadrangle(0, 3, 1, 2, 0),
@ -2371,7 +2371,7 @@ static Gfx startup_logo_dl14[] = {
}; };
static Gfx startup_logo_dl15[] = { Gfx startup_logo_dl15[] = {
gsSPVertex(&startup_logo2[442], 32, 0), gsSPVertex(&startup_logo2[442], 32, 0),
gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 1, 2, 0),
@ -2421,7 +2421,7 @@ static Gfx startup_logo_dl15[] = {
}; };
static Gfx startup_logo_dl16[] = { Gfx startup_logo_dl16[] = {
gsSPVertex(&startup_logo2[531], 32, 0), gsSPVertex(&startup_logo2[531], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -2470,7 +2470,7 @@ static Gfx startup_logo_dl16[] = {
}; };
static Gfx startup_logo_dl17[] = { Gfx startup_logo_dl17[] = {
gsSPVertex(&startup_logo2[619], 32, 0), gsSPVertex(&startup_logo2[619], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -2522,7 +2522,7 @@ static Gfx startup_logo_dl17[] = {
}; };
static Gfx startup_logo_dl18[] = { Gfx startup_logo_dl18[] = {
gsSPVertex(&startup_logo2[732], 32, 0), gsSPVertex(&startup_logo2[732], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -2575,7 +2575,7 @@ static Gfx startup_logo_dl18[] = {
}; };
static Gfx startup_logo_dl19[] = { Gfx startup_logo_dl19[] = {
gsSPVertex(&startup_logo2[828], 32, 0), gsSPVertex(&startup_logo2[828], 32, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
gsSP1Triangle(0, 3, 4, 0), gsSP1Triangle(0, 3, 4, 0),
@ -2654,7 +2654,7 @@ static Gfx startup_logo_dl19[] = {
}; };
static Gfx startup_logo_dl20[] = { Gfx startup_logo_dl20[] = {
gsSPVertex(&startup_logo2[941], 29, 0), gsSPVertex(&startup_logo2[941], 29, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0), gsSP1Quadrangle(0, 1, 2, 3, 0),
@ -2744,11 +2744,11 @@ static Gfx startup_logo_dl20[] = {
}; };
static u8 reflection_map_gold[2048] = { u8 reflection_map_gold[2048] = {
#include "textures/startup_logo/reflection_map_gold.rgba16.inc.c" #include "assets/startup_logo/gTextureReflectionMapGold.inc.c"
}; };
static Gfx startup_texture_dl1[] = { Gfx startup_texture_dl1[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPSetGeometryMode(G_TEXTURE_GEN),
gsDPLoadTextureBlock(reflection_map_gold, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPLoadTextureBlock(reflection_map_gold, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
@ -2769,12 +2769,12 @@ static Gfx startup_texture_dl1[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Lights1 lights = gdSPDefLights1 ( Lights1 lights = gdSPDefLights1 (
63, 63, 63, 63, 63, 63,
255, 255, 255, 0, 0, 120 255, 255, 255, 0, 0, 120
); );
static Gfx startup_texture_dl2[] = { Gfx startup_texture_dl2[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPSetGeometryMode(G_TEXTURE_GEN),
gsDPLoadTextureBlock(reflection_map_gold, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPLoadTextureBlock(reflection_map_gold, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
@ -2799,13 +2799,13 @@ static Gfx startup_texture_dl2[] = {
}; };
static Gfx startup_texture_dl3[] = { Gfx startup_texture_dl3[] = {
gsSPDisplayList(startup_texture_dl1), gsSPDisplayList(startup_texture_dl1),
gsSPDisplayList(startup_texture_dl2), gsSPDisplayList(startup_texture_dl2),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx startup_texture_dl4[] = { Gfx startup_texture_dl4[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPSetGeometryMode(G_TEXTURE_GEN),

33
src/data/startup_logo.inc.h Normal file
View File

@ -0,0 +1,33 @@
#ifndef STARTUP_LOGO_H
#define STARTUP_LOGO_H
extern Vtx startup_logo[];
extern Gfx startup_logo_dl[];
extern Gfx startup_logo_dl2[];
extern Gfx startup_logo_dl3[];
extern Gfx startup_logo_dl4[];
extern Gfx startup_logo_dl5[];
extern Gfx startup_logo_dl6[];
extern Gfx startup_logo_dl7[];
extern Gfx startup_logo_dl8[];
extern Vtx startup_logo2[];
extern Gfx startup_logo_dl9[];
extern Gfx startup_logo_dl10[];
extern Gfx startup_logo_dl11[];
extern Gfx startup_logo_dl12[];
extern Gfx startup_logo_dl13[];
extern Gfx startup_logo_dl14[];
extern Gfx startup_logo_dl15[];
extern Gfx startup_logo_dl16[];
extern Gfx startup_logo_dl17[];
extern Gfx startup_logo_dl18[];
extern Gfx startup_logo_dl19[];
extern Gfx startup_logo_dl20[];
extern u8 reflection_map_gold[2048];
extern Gfx startup_texture_dl1[];
extern Lights1 lights;
extern Gfx startup_texture_dl2[];
extern Gfx startup_texture_dl3[];
extern Gfx startup_texture_dl4[];
#endif

1
src/data_segment2.h
View File

@ -48,7 +48,6 @@ extern Gfx D_02007FC8[];
extern Gfx D_02008008[]; extern Gfx D_02008008[];
extern Gfx D_02008030[]; extern Gfx D_02008030[];
extern Gfx D_02008058[]; extern Gfx D_02008058[];
extern Gfx D_060093F8[];
extern Gfx common_rectangle_display[]; extern Gfx common_rectangle_display[];
extern Vtx D_02007BB8[]; extern Vtx D_02007BB8[];

391
src/ending/ceremony_data.inc.c
View File

@ -1,4 +1,4 @@
#include <types.h> #include "src/ending/ceremony_data.inc.h"
Vtx silver_trophy_model[] = { Vtx silver_trophy_model[] = {
@ -259,7 +259,7 @@ Vtx silver_trophy_model[] = {
}; };
static Gfx silver_trophy_dl[] = { Gfx silver_trophy_dl[] = {
gsSPVertex(&silver_trophy_model[52], 31, 0), gsSPVertex(&silver_trophy_model[52], 31, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
@ -290,7 +290,7 @@ static Gfx silver_trophy_dl[] = {
}; };
static Gfx silver_trophy_dl2[] = { Gfx silver_trophy_dl2[] = {
gsSPVertex(&silver_trophy_model[83], 26, 0), gsSPVertex(&silver_trophy_model[83], 26, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0),
@ -319,7 +319,7 @@ static Gfx silver_trophy_dl2[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx silver_trophy_dl3[] = { Gfx silver_trophy_dl3[] = {
gsSPVertex(&silver_trophy_model[109], 32, 0), gsSPVertex(&silver_trophy_model[109], 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
@ -350,7 +350,7 @@ static Gfx silver_trophy_dl3[] = {
}; };
static Gfx silver_trophy_dl4[] = { Gfx silver_trophy_dl4[] = {
gsSPVertex(&silver_trophy_model[165], 32, 0), gsSPVertex(&silver_trophy_model[165], 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -410,7 +410,7 @@ static Gfx silver_trophy_dl4[] = {
}; };
static Gfx silver_trophy_dl5[] = { Gfx silver_trophy_dl5[] = {
gsSPVertex(&silver_trophy_model[0], 22, 0), gsSPVertex(&silver_trophy_model[0], 22, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -438,7 +438,7 @@ static Gfx silver_trophy_dl5[] = {
}; };
static Gfx silver_trophy_dl6[] = { Gfx silver_trophy_dl6[] = {
gsSPVertex(&silver_trophy_model[22], 30, 0), gsSPVertex(&silver_trophy_model[22], 30, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -465,7 +465,7 @@ static Gfx silver_trophy_dl6[] = {
}; };
static Vtx gold_trophy_model[] = { Vtx gold_trophy_model[] = {
{{{ 0, -250, 0}, 0, {0, 0}, {0x2e, 0x00, 0x00, 0xff}}}, {{{ 0, -250, 0}, 0, {0, 0}, {0x2e, 0x00, 0x00, 0xff}}},
{{{ -49, -250, -176}, 0, {0, 0}, {0x2e, 0x00, 0x00, 0xff}}}, {{{ -49, -250, -176}, 0, {0, 0}, {0x2e, 0x00, 0x00, 0xff}}},
@ -1253,19 +1253,19 @@ static Vtx gold_trophy_model[] = {
}; };
static u8 reflection_map_brass[2048] = { u8 reflection_map_brass[2048] = {
#include "textures/trophy/reflection_map_brass.rgba16.inc.c" #include "assets/ending_ceremony/gTextureReflectionMapBrass.inc.c"
}; };
static u8 reflection_map_silver[2048] = { u8 reflection_map_silver[2048] = {
#include "textures/trophy/reflection_map_silver.rgba16.inc.c" #include "assets/ending_ceremony/gTextureReflectionMapSilver.inc.c"
}; };
static u8 reflection_map_gold[2048] = { u8 reflection_map_gold[2048] = {
#include "textures/trophy/reflection_map_gold.rgba16.inc.c" #include "assets/ending_ceremony/gTextureReflectionMapGold.inc.c"
}; };
static Gfx gold_trophy_dl[] = { Gfx gold_trophy_dl[] = {
gsSPVertex(&gold_trophy_model[0], 22, 0), gsSPVertex(&gold_trophy_model[0], 22, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0),
@ -1292,7 +1292,7 @@ static Gfx gold_trophy_dl[] = {
}; };
static Gfx gold_trophy_dl2[] = { Gfx gold_trophy_dl2[] = {
gsSPVertex(&gold_trophy_model[22], 30, 0), gsSPVertex(&gold_trophy_model[22], 30, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -1320,7 +1320,7 @@ static Gfx gold_trophy_dl2[] = {
}; };
static Gfx gold_trophy_dl3[] = { Gfx gold_trophy_dl3[] = {
gsSPVertex(&gold_trophy_model[263], 31, 0), gsSPVertex(&gold_trophy_model[263], 31, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
@ -1398,7 +1398,7 @@ static Gfx gold_trophy_dl3[] = {
}; };
static Gfx gold_trophy_dl4[] = { Gfx gold_trophy_dl4[] = {
gsSPVertex(&gold_trophy_model[381], 30, 0), gsSPVertex(&gold_trophy_model[381], 30, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -1424,7 +1424,7 @@ static Gfx gold_trophy_dl4[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx gold_trophy_dl5[] = { Gfx gold_trophy_dl5[] = {
gsSPVertex(&gold_trophy_model[474], 32, 0), gsSPVertex(&gold_trophy_model[474], 32, 0),
gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0), gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0),
@ -1503,7 +1503,7 @@ static Gfx gold_trophy_dl5[] = {
}; };
static Gfx gold_trophy_dl6[] = { Gfx gold_trophy_dl6[] = {
gsSPVertex(&gold_trophy_model[593], 32, 0), gsSPVertex(&gold_trophy_model[593], 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -1573,7 +1573,7 @@ static Gfx gold_trophy_dl6[] = {
}; };
static Gfx gold_trophy_dl7[] = { Gfx gold_trophy_dl7[] = {
gsSPVertex(&gold_trophy_model[699], 32, 0), gsSPVertex(&gold_trophy_model[699], 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@ -1623,7 +1623,7 @@ static Gfx gold_trophy_dl7[] = {
}; };
static Gfx gold_trophy_dl8[] = { Gfx gold_trophy_dl8[] = {
gsSPTexture(0x7c0, 0x7c0, 0, G_TX_RENDERTILE, G_ON), gsSPTexture(0x7c0, 0x7c0, 0, G_TX_RENDERTILE, G_ON),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
@ -1647,7 +1647,7 @@ static Gfx gold_trophy_dl8[] = {
}; };
static Gfx gold_trophy_dl9[] = { Gfx gold_trophy_dl9[] = {
gsSPTexture(0x7c0, 0x7c0, 0, G_TX_RENDERTILE, G_ON), gsSPTexture(0x7c0, 0x7c0, 0, G_TX_RENDERTILE, G_ON),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
@ -1670,7 +1670,7 @@ static Gfx gold_trophy_dl9[] = {
}; };
static Gfx gold_trophy_dl10[] = { Gfx gold_trophy_dl10[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPLoadTextureBlock((u8 *) reflection_map_gold, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPLoadTextureBlock((u8 *) reflection_map_gold, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
@ -1679,7 +1679,7 @@ static Gfx gold_trophy_dl10[] = {
}; };
static Gfx gold_trophy_dl11[] = { Gfx gold_trophy_dl11[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPLoadTextureBlock((u8 *) reflection_map_gold, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPLoadTextureBlock((u8 *) reflection_map_gold, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
@ -1687,7 +1687,7 @@ static Gfx gold_trophy_dl11[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx gold_trophy_dl12[] = { Gfx gold_trophy_dl12[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPLoadTextureBlock((u8 *) reflection_map_silver, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPLoadTextureBlock((u8 *) reflection_map_silver, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
@ -1696,7 +1696,7 @@ static Gfx gold_trophy_dl12[] = {
}; };
static Gfx gold_trophy_dl13[] = { Gfx gold_trophy_dl13[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPLoadTextureBlock((u8 *) reflection_map_silver, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPLoadTextureBlock((u8 *) reflection_map_silver, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
@ -1705,7 +1705,7 @@ static Gfx gold_trophy_dl13[] = {
}; };
static Gfx gold_trophy_dl14[] = { Gfx gold_trophy_dl14[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPLoadTextureBlock((u8 *) reflection_map_brass, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPLoadTextureBlock((u8 *) reflection_map_brass, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
@ -1714,7 +1714,7 @@ static Gfx gold_trophy_dl14[] = {
}; };
static Gfx gold_trophy_dl15[] = { Gfx gold_trophy_dl15[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPLoadTextureBlock((u8 *) reflection_map_brass, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsDPLoadTextureBlock((u8 *) reflection_map_brass, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
@ -1723,16 +1723,16 @@ static Gfx gold_trophy_dl15[] = {
}; };
static Lights1 light1 = gdSPDefLights1 ( Lights1 light1 = gdSPDefLights1 (
255, 255, 255, 255, 255, 255,
255, 255, 255, 0, 0, 120 255, 255, 255, 0, 0, 120
); );
static u8 texture_podium1[] = { u8 texture_podium1[] = {
#include "textures/trophy/podium1.rgba16.inc.c" #include "assets/ending_ceremony/gTexturePodium1.inc.c"
}; };
static Vtx tall_podium_model[] = { Vtx tall_podium_model[] = {
{{{ -7, 0, -7}, 0, { 0, 0}, {0xc8, 0xe3, 0xff, 0xff}}}, {{{ -7, 0, -7}, 0, { 0, 0}, {0xc8, 0xe3, 0xff, 0xff}}},
{{{ -7, 8, -7}, 0, { 0, 0}, {0xe3, 0xf6, 0xff, 0xff}}}, {{{ -7, 8, -7}, 0, { 0, 0}, {0xe3, 0xf6, 0xff, 0xff}}},
@ -1757,7 +1757,7 @@ static Vtx tall_podium_model[] = {
}; };
static Gfx podium_dl[] = { Gfx podium_dl[] = {
gsSPSetLights1(light1), gsSPSetLights1(light1),
gsDPPipeSync(), gsDPPipeSync(),
@ -1786,14 +1786,14 @@ static Gfx podium_dl[] = {
}; };
static Gfx podium_dl2[] = { Gfx podium_dl2[] = {
gsSPDisplayList(podium_dl), gsSPDisplayList(podium_dl),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx podium_dl3[] = { Gfx podium_dl3[] = {
gsSPDisplayList(podium_dl2), gsSPDisplayList(podium_dl2),
gsSPEndDisplayList(), gsSPEndDisplayList(),
@ -1801,7 +1801,7 @@ static Gfx podium_dl3[] = {
}; };
static Vtx short_podium_model[] = { Vtx short_podium_model[] = {
{{{ -7, 0, 7}, 0, { 0, 0}, {0xc8, 0xe3, 0xff, 0xff}}}, {{{ -7, 0, 7}, 0, { 0, 0}, {0xc8, 0xe3, 0xff, 0xff}}},
{{{ -7, 6, 7}, 0, { 0, 0}, {0xe3, 0xf6, 0xff, 0xff}}}, {{{ -7, 6, 7}, 0, { 0, 0}, {0xe3, 0xf6, 0xff, 0xff}}},
@ -1826,16 +1826,16 @@ static Vtx short_podium_model[] = {
}; };
static Lights1 light2 = gdSPDefLights1 ( Lights1 light2 = gdSPDefLights1 (
255, 255, 255, 255, 255, 255,
255, 255, 255, 0, 0, 120 255, 255, 255, 0, 0, 120
); );
static u8 texture_podium2[] = { u8 texture_podium2[] = {
#include "textures/trophy/podium2.rgba16.inc.c" #include "assets/ending_ceremony/gTexturePodium2.inc.c"
}; };
static Gfx podium2_dl[] = { Gfx podium2_dl[] = {
gsSPSetLights1(light2), gsSPSetLights1(light2),
gsDPPipeSync(), gsDPPipeSync(),
@ -1864,28 +1864,28 @@ static Gfx podium2_dl[] = {
}; };
static Gfx podium2_dl2[] = { Gfx podium2_dl2[] = {
gsSPDisplayList(podium2_dl), gsSPDisplayList(podium2_dl),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx podium2_dl3[] = { Gfx podium2_dl3[] = {
gsSPDisplayList(podium2_dl2), gsSPDisplayList(podium2_dl2),
gsSPEndDisplayList(), gsSPEndDisplayList(),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Lights1 light3 = gdSPDefLights1 ( Lights1 light3 = gdSPDefLights1 (
255, 255, 255, 255, 255, 255,
255, 255, 255, 0, 0, 120 255, 255, 255, 0, 0, 120
); );
static u8 texture_podium3[] = { u8 texture_podium3[] = {
#include "textures/trophy/podium3.rgba16.inc.c" #include "assets/ending_ceremony/gTexturePodium3.inc.c"
}; };
// Todo: rename this to left_ or right_ instead of model2. // Todo: rename this to left_ or right_ instead of model2.
static Vtx short_podium_model2[] = { Vtx short_podium_model2[] = {
{{{ -7, 0, -21}, 0, { 0, 0}, {0xc8, 0xe3, 0xff, 0xff}}}, {{{ -7, 0, -21}, 0, { 0, 0}, {0xc8, 0xe3, 0xff, 0xff}}},
{{{ -7, 4, -21}, 0, { 0, 0}, {0xe3, 0xf6, 0xff, 0xff}}}, {{{ -7, 4, -21}, 0, { 0, 0}, {0xe3, 0xf6, 0xff, 0xff}}},
@ -1910,7 +1910,7 @@ static Vtx short_podium_model2[] = {
}; };
static Gfx podium3_dl[] = { Gfx podium3_dl[] = {
gsSPSetLights1(light3), gsSPSetLights1(light3),
gsDPPipeSync(), gsDPPipeSync(),
@ -1939,14 +1939,14 @@ static Gfx podium3_dl[] = {
}; };
static Gfx podium3_dl2[] = { Gfx podium3_dl2[] = {
gsSPDisplayList(podium3_dl), gsSPDisplayList(podium3_dl),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx podium3_dl3[] = { Gfx podium3_dl3[] = {
gsSPDisplayList(podium3_dl2), gsSPDisplayList(podium3_dl2),
gsSPEndDisplayList(), gsSPEndDisplayList(),
@ -1954,205 +1954,106 @@ static Gfx podium3_dl3[] = {
}; };
static coursePath ending_sequence[] = { TrackWaypoint ending_sequence[] = {
{ -2824, 0, -283, 0 },
{{ 244, 248, 0}, 0}, { -2826, 0, -273, 0 },
{{ 254, 229, 0}, 0}, { -2856, 0, -147, 0 },
{{ 244, 246, 0}, 0}, { -2912, 0, -84, 0 },
{{ 254, 239, 0}, 0}, { -3010, 0, -39, 0 },
{{ 244, 216, 0}, 0}, { -3135, 0, -47, 0 },
{{ 255, 109, 0}, 0}, { -3185, 0, -107, 0 },
{{ 244, 160, 0}, 0}, { -3203, 0, -197, 0 },
{{ 255, 172, 0}, 0}, { -3169, 0, -305, 0 },
{{ 244, 62, 0}, 0}, { -3123, 0, -378, 0 },
{{ 255, 217, 0}, 0}, { -3150, 0, -454, 0 },
{{ 243, 193, 0}, 0}, { -3207, 0, -474, 0 },
{{ 255, 209, 0}, 0}, { -3284, 0, -492, 0 },
{{ 243, 143, 0}, 0}, { -3398, 0, -512, 0 },
{{ 255, 149, 0}, 0}, { -3521, 0, -533, 0 },
{{ 243, 125, 0}, 0}, { -3552, 0, -645, 0 },
{{ 255, 59, 0}, 0}, { -3523, 0, -788, 0 },
{{ 243, 159, 0}, 0}, { -3355, 0, -899, 0 },
{{ 254, 207, 0}, 0}, { -3087, 0, -953, 0 },
{{ 243, 205, 0}, 0}, { -2918, 0, -913, 0 },
{{ 254, 134, 0}, 0}, { -2834, 0, -794, 0 },
{{ 243, 178, 0}, 0}, { -2832, 0, -644, 0 },
{{ 254, 58, 0}, 0}, { -2822, 0, -505, 0 },
{{ 243, 121, 0}, 0}, { -32768, 0, 0, 0 },
{{ 254, 38, 0}, 0},
{{ 243, 44, 0}, 0},
{{ 254, 20, 0}, 0},
{{ 242, 186, 0}, 0},
{{ 254, 0, 0}, 0},
{{ 242, 63, 0}, 0},
{{ 253, 235, 0}, 0},
{{ 242, 32, 0}, 0},
{{ 253, 123, 0}, 0},
{{ 242, 61, 0}, 0},
{{ 252, 236, 0}, 0},
{{ 242, 229, 0}, 0},
{{ 252, 125, 0}, 0},
{{ 243, 241, 0}, 0},
{{ 252, 71, 0}, 0},
{{ 244, 154, 0}, 0},
{{ 252, 111, 0}, 0},
{{ 244, 238, 0}, 0},
{{ 252, 230, 0}, 0},
{{ 244, 240, 0}, 0},
{{ 253, 124, 0}, 0},
{{ 244, 250, 0}, 0},
{{ 254, 7, 0}, 0},
}; };
static s32 path_end[] = {0x80000000, 0}; TrackWaypoint ending_sequence2[] = {
{ -3681, 0, -21, 1 },
static coursePath ending_sequence2[] = { { -3670, 0, -30, 1 },
{ -3612, 0, -50, 1 },
{{ 241, 159, 0}, 0}, { -3540, 0, -41, 1 },
{{ 255, 235, 0}, 1}, { -3469, 0, -15, 1 },
{{ 241, 170, 0}, 0}, { -3387, 0, -32, 1 },
{{ 255, 226, 0}, 1}, { -3274, 0, -104, 1 },
{{ 241, 228, 0}, 0}, { -3242, 0, -193, 1 },
{{ 255, 206, 0}, 1}, { -3219, 0, -282, 1 },
{{ 242, 44, 0}, 0}, { -3177, 0, -333, 1 },
{{ 255, 215, 0}, 1}, { -3151, 0, -398, 1 },
{{ 242, 115, 0}, 0}, { -3159, 0, -444, 1 },
{{ 255, 241, 0}, 1}, { -3209, 0, -462, 1 },
{{ 242, 197, 0}, 0}, { -3286, 0, -476, 1 },
{{ 255, 224, 0}, 1}, { -3405, 0, -499, 1 },
{{ 243, 54, 0}, 0}, { -3531, 0, -491, 1 },
{{ 255, 152, 0}, 1}, { -3677, 0, -483, 1 },
{{ 243, 86, 0}, 0}, { -3805, 0, -391, 1 },
{{ 255, 63, 0}, 1}, { -3938, 0, -279, 1 },
{{ 243, 109, 0}, 0}, { -3965, 0, -107, 1 },
{{ 254, 230, 0}, 1}, { -3940, 0, 38, 1 },
{{ 243, 151, 0}, 0}, { -3797, 0, 72, 1 },
{{ 254, 179, 0}, 1}, { -32768, 0, 0, 0 },
{{ 243, 177, 0}, 0},
{{ 254, 114, 0}, 1},
{{ 243, 169, 0}, 0},
{{ 254, 68, 0}, 1},
{{ 243, 119, 0}, 0},
{{ 254, 50, 0}, 1},
{{ 243, 42, 0}, 0},
{{ 254, 36, 0}, 1},
{{ 242, 179, 0}, 0},
{{ 254, 13, 0}, 1},
{{ 242, 53, 0}, 0},
{{ 254, 21, 0}, 1},
{{ 241, 163, 0}, 0},
{{ 254, 29, 0}, 1},
{{ 241, 35, 0}, 0},
{{ 254, 121, 0}, 1},
{{ 240, 158, 0}, 0},
{{ 254, 233, 0}, 1},
{{ 240, 131, 0}, 0},
{{ 255, 149, 0}, 1},
{{ 240, 156, 0}, 0},
{{ 0, 38, 0}, 1},
{{ 241, 43, 0}, 0},
{{ 0, 72, 0}, 1},
}; };
static s32 path_end2[] = {0x80000000, 0}; TrackWaypoint ending_sequence3[] = {
{ -3677, 0, -1020, 4 },
static coursePath ending_sequence3[] = { { -3660, 0, -1020, 4 },
{ -3523, 0, -996, 4 },
{{ 241, 163, 0}, 0}, { -3465, 0, -996, 4 },
{{ 252, 4, 0}, 4}, { -3358, 0, -1018, 4 },
{{ 241, 180, 0}, 0}, { -3317, 0, -1022, 4 },
{{ 252, 4, 0}, 4}, { -3285, 0, -1015, 4 },
{{ 242, 61, 0}, 0}, { -3226, 0, -976, 4 },
{{ 252, 28, 0}, 4}, { -3198, 0, -946, 4 },
{{ 242, 119, 0}, 0}, { -3190, 0, -916, 4 },
{{ 252, 28, 0}, 4}, { -3172, 0, -803, 4 },
{{ 242, 226, 0}, 0}, { -3157, 0, -717, 4 },
{{ 252, 6, 0}, 4}, { -3109, 0, -584, 4 },
{{ 243, 11, 0}, 0}, { -3116, 0, -521, 4 },
{{ 252, 2, 0}, 4}, { -3146, 0, -487, 4 },
{{ 243, 43, 0}, 0}, { -3203, 0, -490, 4 },
{{ 252, 9, 0}, 4}, { -3283, 0, -499, 4 },
{{ 243, 102, 0}, 0}, { -3400, 0, -519, 4 },
{{ 252, 48, 0}, 4}, { -3521, 0, -563, 4 },
{{ 243, 130, 0}, 0}, { -3710, 0, -621, 4 },
{{ 252, 78, 0}, 4}, { -3803, 0, -804, 4 },
{{ 243, 138, 0}, 0}, { -3803, 0, -957, 4 },
{{ 252, 108, 0}, 4}, { -3753, 0, -1001, 4 },
{{ 243, 156, 0}, 0}, { -32768, 0, 0, 0 },
{{ 252, 221, 0}, 4},
{{ 243, 171, 0}, 0},
{{ 253, 51, 0}, 4},
{{ 243, 219, 0}, 0},
{{ 253, 184, 0}, 4},
{{ 243, 212, 0}, 0},
{{ 253, 247, 0}, 4},
{{ 243, 182, 0}, 0},
{{ 254, 25, 0}, 4},
{{ 243, 125, 0}, 0},
{{ 254, 22, 0}, 4},
{{ 243, 45, 0}, 0},
{{ 254, 13, 0}, 4},
{{ 242, 184, 0}, 0},
{{ 253, 249, 0}, 4},
{{ 242, 63, 0}, 0},
{{ 253, 205, 0}, 4},
{{ 241, 130, 0}, 0},
{{ 253, 147, 0}, 4},
{{ 241, 37, 0}, 0},
{{ 252, 220, 0}, 4},
{{ 241, 37, 0}, 0},
{{ 252, 67, 0}, 4},
{{ 241, 87, 0}, 0},
{{ 252, 23, 0}, 4},
}; };
static s32 path_end3[] = {0x80000000, 0}; TrackWaypoint ending_sequence4[] = {
{ -2767, -26, -63, 7 },
static coursePath ending_sequence4[] = { { -2780, -30, -78, 7 },
{ -2806, 0, -141, 7 },
{{ 245, 49, 255}, 230}, { -2791, 0, -193, 7 },
{{ 255, 193, 0}, 7}, { -2782, 0, -229, 7 },
{{ 245, 36, 255}, 226}, { -2764, 0, -285, 7 },
{{ 255, 178, 0}, 7}, { -2730, 0, -332, 7 },
{{ 245, 10, 0}, 0}, { -2660, 0, -350, 7 },
{{ 255, 115, 0}, 7}, { -2591, 0, -369, 7 },
{{ 245, 25, 0}, 0}, { -2527, 0, -374, 7 },
{{ 255, 63, 0}, 7}, { -2450, 0, -362, 7 },
{{ 245, 34, 0}, 0}, { -2411, 0, -344, 7 },
{{ 255, 27, 0}, 7}, { -2343, 0, -309, 7 },
{{ 245, 52, 0}, 0}, { -2280, 0, -269, 7 },
{{ 254, 227, 0}, 7}, { -2259, 0, -215, 7 },
{{ 245, 86, 0}, 0}, { -2277, 0, -152, 7 },
{{ 254, 180, 0}, 7}, { -2369, 0, -79, 7 },
{{ 245, 156, 0}, 0}, { -2518, 0, -28, 7 },
{{ 254, 162, 0}, 7}, { -2670, 0, -24, 7 },
{{ 245, 225, 0}, 0}, { -2749, 0, -38, 7 },
{{ 254, 143, 0}, 7}, { -32768, 0, 0, 0 },
{{ 246, 33, 0}, 0},
{{ 254, 138, 0}, 7},
{{ 246, 110, 0}, 0},
{{ 254, 150, 0}, 7},
{{ 246, 149, 0}, 0},
{{ 254, 168, 0}, 7},
{{ 246, 217, 0}, 0},
{{ 254, 203, 0}, 7},
{{ 247, 24, 0}, 0},
{{ 254, 243, 0}, 7},
{{ 247, 45, 0}, 0},
{{ 255, 41, 0}, 7},
{{ 247, 27, 0}, 0},
{{ 255, 104, 0}, 7},
{{ 246, 191, 0}, 0},
{{ 255, 177, 0}, 7},
{{ 246, 42, 0}, 0},
{{ 255, 228, 0}, 7},
{{ 245, 146, 0}, 0},
{{ 255, 232, 0}, 7},
{{ 245, 67, 0}, 0},
{{ 255, 218, 0}, 7},
}; };
static s32 path_end4[] = {0x80000000, 0};

56
src/ending/ceremony_data.inc.h Normal file
View File

@ -0,0 +1,56 @@
#ifndef CEREMONY_DATA_H
#define CEREMONY_DATA_H
#include <types.h>
#include "waypoints.h"
extern Vtx silver_trophy_model[];
extern Gfx silver_trophy_dl[];
extern Gfx silver_trophy_dl2[];
extern Gfx silver_trophy_dl3[];
extern Gfx silver_trophy_dl4[];
extern Gfx silver_trophy_dl5[];
extern Gfx silver_trophy_dl6[];
extern Vtx gold_trophy_model[];
extern u8 reflection_map_brass[];
extern u8 reflection_map_silver[];
extern u8 reflection_map_gold[];
extern Gfx gold_trophy_dl[];
extern Gfx gold_trophy_dl2[];
extern Gfx gold_trophy_dl3[];
extern Gfx gold_trophy_dl4[];
extern Gfx gold_trophy_dl5[];
extern Gfx gold_trophy_dl6[];
extern Gfx gold_trophy_dl7[];
extern Gfx gold_trophy_dl8[];
extern Gfx gold_trophy_dl9[];
extern Gfx gold_trophy_dl10[];
extern Gfx gold_trophy_dl11[];
extern Gfx gold_trophy_dl12[];
extern Gfx gold_trophy_dl13[];
extern Gfx gold_trophy_dl14[];
extern Gfx gold_trophy_dl15[];
extern Lights1 light1;
extern u8 texture_podium1[];
extern Vtx tall_podium_model[];
extern Gfx podium_dl[];
extern Gfx podium_dl2[];
extern Gfx podium_dl3[];
extern Vtx short_podium_model[];
extern Lights1 light2;
extern u8 texture_podium2[];
extern Gfx podium2_dl[];
extern Gfx podium2_dl2[];
extern Gfx podium2_dl3[];
extern Lights1 light3;
extern u8 texture_podium3[];
extern Vtx short_podium_model2[];
extern Gfx podium3_dl[];
extern Gfx podium3_dl2[];
extern Gfx podium3_dl3[];
extern TrackWaypoint ending_sequence[];
extern TrackWaypoint ending_sequence2[];
extern TrackWaypoint ending_sequence3[];
extern TrackWaypoint ending_sequence4[];
#endif

106
src/ending/dl_unk_80284EE0.inc.c
View File

@ -1,41 +1,7 @@
#include <types.h> #include <types.h>
#include <PR/gbi.h> #include <PR/gbi.h>
extern Gfx D_070067E8[]; #include "courses/royal_raceway/course_displaylists.inc.h"
extern Gfx D_0700AEF8[];
extern Gfx D_0700A970[];
extern Gfx D_0700AC30[];
extern Gfx D_07000CE0[];
extern Gfx D_07000E88[];
extern Gfx D_0700A618[];
extern Gfx D_070023F8[];
extern Gfx D_07002478[];
extern Gfx D_07001438[];
extern Gfx D_07003728[];
extern Gfx D_070036B8[];
extern Gfx D_07003628[];
extern Gfx D_07003540[];
extern Gfx D_07003DC0[];
extern Gfx D_07003E50[];
extern Gfx D_07003F18[];
extern Gfx D_070050B0[];
extern Gfx D_07005138[];
extern Gfx D_070055D0[];
extern Gfx D_07005B50[];
extern Gfx D_07005C00[];
extern Gfx D_07005D18[];
extern Gfx D_07005DC8[];
extern Gfx D_07005EF8[];
extern Gfx D_07005740[];
extern Gfx D_070057F0[];
extern Gfx D_070058E8[];
extern Gfx D_07001788[];
extern Gfx D_07001AA0[];
extern Gfx D_07001A30[];
extern Gfx D_07003790[];
extern Gfx D_070006D0[];
extern Gfx D_070004D0[];
extern Gfx D_07000840[];
// Init RDP - RSP (Ceremony) // Init RDP - RSP (Ceremony)
Gfx D_80284EE0[] = { Gfx D_80284EE0[] = {
@ -64,42 +30,42 @@ Gfx D_80284F70[] = {
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPDisplayList(D_070067E8), gsSPDisplayList(d_course_royal_raceway_packed_dl_67E8),
gsSPDisplayList(D_0700AEF8), gsSPDisplayList(d_course_royal_raceway_packed_dl_AEF8),
gsSPDisplayList(D_07001438), gsSPDisplayList(d_course_royal_raceway_packed_dl_1438),
gsSPDisplayList(D_0700A970), gsSPDisplayList(d_course_royal_raceway_packed_dl_A970),
gsSPDisplayList(D_07000CE0), gsSPDisplayList(d_course_royal_raceway_packed_dl_CE0),
gsSPDisplayList(D_07000E88), gsSPDisplayList(d_course_royal_raceway_packed_dl_E88),
gsSPDisplayList(D_0700A618), gsSPDisplayList(d_course_royal_raceway_packed_dl_A618),
gsSPDisplayList(D_0700AC30), gsSPDisplayList(d_course_royal_raceway_packed_dl_AC30),
gsSPDisplayList(D_07003728), gsSPDisplayList(d_course_royal_raceway_packed_dl_3728),
gsSPDisplayList(D_070036B8), gsSPDisplayList(d_course_royal_raceway_packed_dl_36B8),
gsSPDisplayList(D_07003628), gsSPDisplayList(d_course_royal_raceway_packed_dl_3628),
gsSPDisplayList(D_07003540), gsSPDisplayList(d_course_royal_raceway_packed_dl_3540),
gsSPDisplayList(D_07003DC0), gsSPDisplayList(d_course_royal_raceway_packed_dl_3DC0),
gsSPDisplayList(D_07003E50), gsSPDisplayList(d_course_royal_raceway_packed_dl_3E50),
gsSPDisplayList(D_07003F18), gsSPDisplayList(d_course_royal_raceway_packed_dl_3F18),
gsSPDisplayList(D_070050B0), gsSPDisplayList(d_course_royal_raceway_packed_dl_50B0),
gsSPDisplayList(D_07005138), gsSPDisplayList(d_course_royal_raceway_packed_dl_5138),
gsSPDisplayList(D_070055D0), gsSPDisplayList(d_course_royal_raceway_packed_dl_55D0),
gsSPDisplayList(D_07005B50), gsSPDisplayList(d_course_royal_raceway_packed_dl_5B50),
gsSPDisplayList(D_07005C00), gsSPDisplayList(d_course_royal_raceway_packed_dl_5C00),
gsSPDisplayList(D_07005D18), gsSPDisplayList(d_course_royal_raceway_packed_dl_5D18),
gsSPDisplayList(D_07005DC8), gsSPDisplayList(d_course_royal_raceway_packed_dl_5DC8),
gsSPDisplayList(D_07005EF8), gsSPDisplayList(d_course_royal_raceway_packed_dl_5EF8),
gsSPDisplayList(D_07005740), gsSPDisplayList(d_course_royal_raceway_packed_dl_5740),
gsSPDisplayList(D_070057F0), gsSPDisplayList(d_course_royal_raceway_packed_dl_57F0),
gsSPDisplayList(D_070058E8), gsSPDisplayList(d_course_royal_raceway_packed_dl_58E8),
gsSPDisplayList(D_07001788), gsSPDisplayList(d_course_royal_raceway_packed_dl_1788),
gsSPDisplayList(D_07001AA0), gsSPDisplayList(d_course_royal_raceway_packed_dl_1AA0),
gsSPDisplayList(D_07001A30), gsSPDisplayList(d_course_royal_raceway_packed_dl_1A30),
gsSPDisplayList(D_070023F8), gsSPDisplayList(d_course_royal_raceway_packed_dl_23F8),
gsSPDisplayList(D_07002478), gsSPDisplayList(d_course_royal_raceway_packed_dl_2478),
gsSPDisplayList(D_07003790), gsSPDisplayList(d_course_royal_raceway_packed_dl_3790),
gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
gsSPDisplayList(D_070006D0), gsSPDisplayList(d_course_royal_raceway_packed_dl_6D0),
gsSPDisplayList(D_070004D0), gsSPDisplayList(d_course_royal_raceway_packed_dl_4D0),
gsSPDisplayList(D_07000840), gsSPDisplayList(d_course_royal_raceway_packed_dl_840),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };

141
src/racing/actors.c
View File

@ -24,6 +24,7 @@
#include "common_textures.h" #include "common_textures.h"
#include "courses/all_course_data.h" #include "courses/all_course_data.h"
#include "main.h" #include "main.h"
#include "data/other_textures.h"
// Appears to be textures // Appears to be textures
// or tluts // or tluts
@ -2282,97 +2283,97 @@ void place_course_actors(void) {
void func_8029E158(void) { void func_8029E158(void) {
set_segment_base_addr(3, (void *) gNextFreeMemoryAddress); set_segment_base_addr(3, (void *) gNextFreeMemoryAddress);
D_802BA050 = dma_textures(D_0F04CBE0, 0x00000257U, 0x00000400U); D_802BA050 = dma_textures(gTextureGreenShell0, 0x00000257U, 0x00000400U);
dma_textures(D_0F04CE30, 0x00000242U, 0x00000400U); dma_textures(gTextureGreenShell1, 0x00000242U, 0x00000400U);
dma_textures(D_0F04D080, 0x00000259U, 0x00000400U); dma_textures(gTextureGreenShell2, 0x00000259U, 0x00000400U);
dma_textures(D_0F04D2D8, 0x00000256U, 0x00000400U); dma_textures(gTextureGreenShell3, 0x00000256U, 0x00000400U);
dma_textures(D_0F04D538, 0x00000246U, 0x00000400U); dma_textures(gTextureGreenShell4, 0x00000246U, 0x00000400U);
dma_textures(D_0F04D790, 0x0000025EU, 0x00000400U); dma_textures(gTextureGreenShell5, 0x0000025EU, 0x00000400U);
dma_textures(D_0F04D9FC, 0x0000025CU, 0x00000400U); dma_textures(gTextureGreenShell6, 0x0000025CU, 0x00000400U);
dma_textures(D_0F04DC5C, 0x00000254U, 0x00000400U); dma_textures(gTextureGreenShell7, 0x00000254U, 0x00000400U);
D_802BA054 = dma_textures(D_0F04DEB0, 0x0000022AU, 0x00000400U); D_802BA054 = dma_textures(gTextureBlueShell0, 0x0000022AU, 0x00000400U);
dma_textures(D_0F04E0DC, 0x00000237U, 0x00000400U); dma_textures(gTextureBlueShell1, 0x00000237U, 0x00000400U);
dma_textures(D_0F04E314, 0x0000023EU, 0x00000400U); dma_textures(gTextureBlueShell2, 0x0000023EU, 0x00000400U);
dma_textures(D_0F04E554, 0x00000243U, 0x00000400U); dma_textures(gTextureBlueShell3, 0x00000243U, 0x00000400U);
dma_textures(D_0F04E798, 0x00000255U, 0x00000400U); dma_textures(gTextureBlueShell4, 0x00000255U, 0x00000400U);
dma_textures(D_0F04E9F0, 0x00000259U, 0x00000400U); dma_textures(gTextureBlueShell5, 0x00000259U, 0x00000400U);
dma_textures(D_0F04EC4C, 0x00000239U, 0x00000400U); dma_textures(gTextureBlueShell6, 0x00000239U, 0x00000400U);
dma_textures(D_0F04EE88, 0x00000236U, 0x00000400U); dma_textures(gTextureBlueShell7, 0x00000236U, 0x00000400U);
dma_textures(D_0F054C3C, 0x0000028EU, 0x00000800U); dma_textures(gTextureFinishLineBanner1, 0x0000028EU, 0x00000800U);
dma_textures(D_0F054ECC, 0x000002FBU, 0x00000800U); dma_textures(gTextureFinishLineBanner2, 0x000002FBU, 0x00000800U);
dma_textures(D_0F0551C8, 0x00000302U, 0x00000800U); dma_textures(gTextureFinishLineBanner3, 0x00000302U, 0x00000800U);
dma_textures(D_0F0554CC, 0x000003B4U, 0x00000800U); dma_textures(gTextureFinishLineBanner4, 0x000003B4U, 0x00000800U);
dma_textures(D_0F055880, 0x0000031EU, 0x00000800U); dma_textures(gTextureFinishLineBanner5, 0x0000031EU, 0x00000800U);
dma_textures(D_0F055BA0, 0x0000036EU, 0x00000800U); dma_textures(gTextureFinishLineBanner6, 0x0000036EU, 0x00000800U);
dma_textures(D_0F055F10, 0x0000029CU, 0x00000800U); dma_textures(gTextureFinishLineBanner7, 0x0000029CU, 0x00000800U);
dma_textures(D_0F0561AC, 0x0000025BU, 0x00000800U); dma_textures(gTextureFinishLineBanner8, 0x0000025BU, 0x00000800U);
dma_textures(gTexture671A88, 0x00000400U, 0x00000800U); dma_textures(gTexture671A88, 0x00000400U, 0x00000800U);
dma_textures(gTexture6774D8, 0x00000400U, 0x00000800U); dma_textures(gTexture6774D8, 0x00000400U, 0x00000800U);
switch (gCurrentCourseId) { switch (gCurrentCourseId) {
case COURSE_MARIO_RACEWAY: case COURSE_MARIO_RACEWAY:
dma_textures(D_0F04F45C, 0x0000035BU, 0x00000800U); dma_textures(gTextureTrees1, 0x0000035BU, 0x00000800U);
D_802BA058 = dma_textures(D_0F056408, 0x000003E8U, 0x00000800U); D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U);
dma_textures(D_0F05662C, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U);
dma_textures(D_0F05688C, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U);
dma_textures(D_0F056AD0, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U);
dma_textures(D_0F056CF0, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U);
dma_textures(D_0F056EC8, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U);
dma_textures(D_0F057084, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U);
dma_textures(D_0F057288, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U);
dma_textures(D_0F057590, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U);
break; break;
case COURSE_BOWSER_CASTLE: case COURSE_BOWSER_CASTLE:
dma_textures(gTextureShrub, 0x000003FFU, 0x00000800U); dma_textures(gTextureShrub, 0x000003FFU, 0x00000800U);
break; break;
case COURSE_YOSHI_VALLEY: case COURSE_YOSHI_VALLEY:
dma_textures(D_0F04F7A4, 0x000003E8U, 0x00000800U); dma_textures(gTextureTrees2, 0x000003E8U, 0x00000800U);
break; break;
case COURSE_FRAPPE_SNOWLAND: case COURSE_FRAPPE_SNOWLAND:
dma_textures(D_0F0513CC, 0x00000454U, 0x00000800U); dma_textures(gTextureFrappeSnowlandTreeLeft, 0x00000454U, 0x00000800U);
dma_textures(D_0F051820, 0x00000432U, 0x00000800U); dma_textures(gTextureFrappeSnowlandTreeRight, 0x00000432U, 0x00000800U);
break; break;
case COURSE_ROYAL_RACEWAY: case COURSE_ROYAL_RACEWAY:
dma_textures(D_0F04FB3C, 0x000003E8U, 0x00000800U); dma_textures(gTextureTrees3, 0x000003E8U, 0x00000800U);
dma_textures(D_0F050D50, 0x000003E8U, 0x00000800U); dma_textures(gTextureTrees7, 0x000003E8U, 0x00000800U);
D_802BA058 = dma_textures(D_0F056408, 0x000003E8U, 0x00000800U); D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U);
dma_textures(D_0F05662C, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U);
dma_textures(D_0F05688C, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U);
dma_textures(D_0F056AD0, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U);
dma_textures(D_0F056CF0, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U);
dma_textures(D_0F056EC8, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U);
dma_textures(D_0F057084, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U);
dma_textures(D_0F057288, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U);
dma_textures(D_0F057590, 0x000003E8U, 0x00000800U); dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U);
break; break;
case COURSE_LUIGI_RACEWAY: case COURSE_LUIGI_RACEWAY:
dma_textures(D_0F050468, 0x000003E8U, 0x00000800U); dma_textures(gTextureTrees5Left, 0x000003E8U, 0x00000800U);
dma_textures(D_0F050678, 0x000003E8U, 0x00000800U); dma_textures(gTextureTrees5Right, 0x000003E8U, 0x00000800U);
break; break;
case COURSE_MOO_MOO_FARM: case COURSE_MOO_MOO_FARM:
dma_textures(D_0F04FE28, 0x000003E8U, 0x00000800U); dma_textures(gTextureTrees4Left, 0x000003E8U, 0x00000800U);
dma_textures(D_0F050118, 0x000003E8U, 0x00000800U); dma_textures(gTextureTrees4Right, 0x000003E8U, 0x00000800U);
dma_textures(D_0F051C54, 0x00000400U, 0x00000800U); dma_textures(gTextureCow01Left, 0x00000400U, 0x00000800U);
dma_textures(D_0F051FD8, 0x00000400U, 0x00000800U); dma_textures(gTextureCow01Right, 0x00000400U, 0x00000800U);
dma_textures(D_0F05232C, 0x00000400U, 0x00000800U); dma_textures(gTextureCow02Left, 0x00000400U, 0x00000800U);
dma_textures(D_0F0526B8, 0x00000400U, 0x00000800U); dma_textures(gTextureCow02Right, 0x00000400U, 0x00000800U);
dma_textures(D_0F052A20, 0x00000400U, 0x00000800U); dma_textures(gTextureCow03Left, 0x00000400U, 0x00000800U);
dma_textures(D_0F052D3C, 0x00000400U, 0x00000800U); dma_textures(gTextureCow03Right, 0x00000400U, 0x00000800U);
dma_textures(D_0F05300C, 0x00000400U, 0x00000800U); dma_textures(gTextureCow04Left, 0x00000400U, 0x00000800U);
dma_textures(D_0F0532F8, 0x00000400U, 0x00000800U); dma_textures(gTextureCow04Right, 0x00000400U, 0x00000800U);
dma_textures(D_0F05363C, 0x00000400U, 0x00000800U); dma_textures(gTextureCow05Left, 0x00000400U, 0x00000800U);
dma_textures(D_0F053950, 0x00000400U, 0x00000800U); dma_textures(gTextureCow05Right, 0x00000400U, 0x00000800U);
break; break;
case COURSE_KALAMARI_DESERT: case COURSE_KALAMARI_DESERT:
dma_textures(D_0F053C34, 0x0000033EU, 0x00000800U); dma_textures(gTextureCactus1Left, 0x0000033EU, 0x00000800U);
dma_textures(D_0F053F74, 0x000002FBU, 0x00000800U); dma_textures(gTextureCactus1Right, 0x000002FBU, 0x00000800U);
dma_textures(D_0F054270, 0x000002A8U, 0x00000800U); dma_textures(gTextureCactus2Left, 0x000002A8U, 0x00000800U);
dma_textures(D_0F054518, 0x00000374U, 0x00000800U); dma_textures(gTextureCactus2Right, 0x00000374U, 0x00000800U);
dma_textures(D_0F05488C, 0x000003AFU, 0x00000800U); dma_textures(gTextureCactus3, 0x000003AFU, 0x00000800U);
break; break;
case COURSE_DK_JUNGLE: case COURSE_DK_JUNGLE:
dma_textures(D_0F057EB4, 0x0000032FU, 0x00000400U); dma_textures(gTextureDksJungleParkwayKiwanoFruit1, 0x0000032FU, 0x00000400U);
dma_textures(D_0F0581E4, 0x00000369U, 0x00000400U); dma_textures(gTextureDksJungleParkwayKiwanoFruit2, 0x00000369U, 0x00000400U);
dma_textures(D_0F058550, 0x00000364U, 0x00000400U); dma_textures(gTextureDksJungleParkwayKiwanoFruit3, 0x00000364U, 0x00000400U);
break; break;
} }
init_red_shell_texture(); init_red_shell_texture();

65
src/racing/actors.h
View File

@ -170,71 +170,6 @@ extern Gfx D_0D0031E8[];
extern Gfx common_model_banana[]; extern Gfx common_model_banana[];
extern Gfx common_model_flat_banana[]; extern Gfx common_model_flat_banana[];
extern u8 D_0F04CBE0[];
extern u8 D_0F04CE30[];
extern u8 D_0F04D080[];
extern u8 D_0F04D2D8[];
extern u8 D_0F04D538[];
extern u8 D_0F04D790[];
extern u8 D_0F04D9FC[];
extern u8 D_0F04DC5C[];
extern u8 D_0F04DEB0[];
extern u8 D_0F04E0DC[];
extern u8 D_0F04E314[];
extern u8 D_0F04E554[];
extern u8 D_0F04E798[];
extern u8 D_0F04E9F0[];
extern u8 D_0F04EC4C[];
extern u8 D_0F04EE88[];
extern u8 D_0F04F45C[];
extern u8 D_0F04F7A4[];
extern u8 D_0F04FB3C[];
extern u8 D_0F04FE28[];
extern u8 D_0F050118[];
extern u8 D_0F050468[];
extern u8 D_0F050678[];
extern u8 D_0F050D50[];
extern u8 D_0F0513CC[];
extern u8 D_0F051820[];
extern u8 D_0F051C54[];
extern u8 D_0F051FD8[];
extern u8 D_0F05232C[];
extern u8 D_0F0526B8[];
extern u8 D_0F052A20[];
extern u8 D_0F052D3C[];
extern u8 D_0F05300C[];
extern u8 D_0F0532F8[];
extern u8 D_0F05363C[];
extern u8 D_0F053950[];
extern u8 D_0F053C34[];
extern u8 D_0F053F74[];
extern u8 D_0F054270[];
extern u8 D_0F054518[];
extern u8 D_0F05488C[];
extern u8 D_0F054C3C[];
extern u8 D_0F054ECC[];
extern u8 D_0F0551C8[];
extern u8 D_0F0554CC[];
extern u8 D_0F055880[];
extern u8 D_0F055BA0[];
extern u8 D_0F055F10[];
extern u8 D_0F0561AC[];
extern u8 D_0F056408[];
extern u8 D_0F05662C[];
extern u8 D_0F05688C[];
extern u8 D_0F056AD0[];
extern u8 D_0F056CF0[];
extern u8 D_0F056EC8[];
extern u8 D_0F057084[];
extern u8 D_0F057288[];
extern u8 D_0F057590[];
extern u8 D_0F057EB4[];
extern u8 D_0F0581E4[];
extern u8 D_0F058550[];
extern u8 gTexture671A88[];
extern u8 gTexture6774D8[];
extern u8 gTextureShrub[];
extern s8 D_800DC628[]; extern s8 D_800DC628[];
extern s8 D_800DC630[]; extern s8 D_800DC630[];
extern s8 D_802B8864[]; extern s8 D_802B8864[];

1
src/racing/memory.c
View File

@ -10,6 +10,7 @@
#include "main.h" #include "main.h"
#include "code_800029B0.h" #include "code_800029B0.h"
#include "math_util.h" #include "math_util.h"
#include "courses/courseTable.h"
s32 sGfxSeekPosition; s32 sGfxSeekPosition;
s32 sPackedSeekPosition; s32 sPackedSeekPosition;

3
src/racing/render_courses.c
View File

@ -16,6 +16,7 @@
#include "skybox_and_splitscreen.h" #include "skybox_and_splitscreen.h"
#include "courses/all_course_data.h" #include "courses/all_course_data.h"
#include "courses/all_course_packed.h" #include "courses/all_course_packed.h"
#include "courses/all_course_offsets.h"
s16 D_802B87B0 = 995; s16 D_802B87B0 = 995;
s16 D_802B87B4 = 1000; s16 D_802B87B4 = 1000;
@ -303,7 +304,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) {
mtxf_identity(matrix); mtxf_identity(matrix);
render_set_position(matrix, 0); render_set_position(matrix, 0);
load_surface_map((uintptr_t) &D_090001D0, arg0); load_surface_map((uintptr_t) sherbet_land_dls_2, arg0);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE);
if ((func_80290C20(arg0->camera) == 1) && (func_802AAB4C(player) < player->pos[1])) { if ((func_80290C20(arg0->camera) == 1) && (func_802AAB4C(player) < player->pos[1])) {

12
src/racing/render_courses.h
View File

@ -41,23 +41,11 @@ extern s32 D_8015F59C;
extern s32 D_802B87C4; extern s32 D_802B87C4;
extern s32 D_802B87C8; extern s32 D_802B87C8;
extern s32 D_802B87CC; extern s32 D_802B87CC;
extern Gfx mario_raceway_dls[];
extern Gfx choco_mountain_dls[];
extern s32 D_802B87BC; extern s32 D_802B87BC;
extern Gfx bowsers_castle_dls[];
extern Gfx banshee_boardwalk_dls[];
extern Gfx royal_raceway_dls[];
extern Gfx luigi_raceway_dls[];
extern Lights1 D_800DC610[]; extern Lights1 D_800DC610[];
extern Gfx moo_moo_farm_dls[];
extern Lights1 D_800DC610[]; // Light data? extern Lights1 D_800DC610[]; // Light data?
extern u8 kalimari_desert_dls[];
extern u8 sherbet_land_dls[];
extern Gfx wario_stadium_dls[];
extern Gfx D_090001D0[];
extern u16 D_8015F58A; extern u16 D_8015F58A;

135
undefined_syms.txt
View File

@ -69,108 +69,9 @@ D_03007800 = 0x03007800;
D_03008000 = 0x03008000; D_03008000 = 0x03008000;
D_03008800 = 0x03008800; D_03008800 = 0x03008800;
D_05FF8DB8 = 0x05FF8DB8; D_05FF8DB8 = 0x05FF8DB8;
D_06000224 = 0x06000224;
D_060093F8 = 0x060093F8;
D_06009410 = 0x06009410;
wario_stadium_dls = 0x09000150;
D_090001D0 = 0x090001D0;
moo_moo_farm_dls = 0x090001D0;
D_0B002A00 = 0x0B002A00; D_0B002A00 = 0x0B002A00;
D_0B0069D8 = 0x0B0069D8;
D_0B006A28 = 0x0B006A28;
D_0B006A78 = 0x0B006A78;
D_0B006AC8 = 0x0B006AC8;
D_0B006B18 = 0x0B006B18;
D_0B006B68 = 0x0B006B68;
D_0B0075F0 = 0x0B0075F0;
D_0B008040 = 0x0B008040;
D_0B008A90 = 0x0B008A90;
D_0B008AA8 = 0x0B008AA8;
D_0B008B68 = 0x0B008B68;
D_0B008C20 = 0x0B008C20;
D_0B008CE0 = 0x0B008CE0;
D_0F04CBE0 = 0x0F04CBE0;
D_0F04CE30 = 0x0F04CE30;
D_0F04D080 = 0x0F04D080;
D_0F04D2D8 = 0x0F04D2D8;
D_0F04D538 = 0x0F04D538;
D_0F04D790 = 0x0F04D790;
D_0F04D9FC = 0x0F04D9FC;
D_0F04DC5C = 0x0F04DC5C;
D_0F04DEB0 = 0x0F04DEB0;
D_0F04E0DC = 0x0F04E0DC;
D_0F04E314 = 0x0F04E314;
D_0F04E554 = 0x0F04E554;
D_0F04E798 = 0x0F04E798;
D_0F04E9F0 = 0x0F04E9F0;
D_0F04EC4C = 0x0F04EC4C;
D_0F04EE88 = 0x0F04EE88;
D_0F04F45C = 0x0F04F45C;
D_0F04F7A4 = 0x0F04F7A4;
D_0F04FB3C = 0x0F04FB3C;
D_0F04FE28 = 0x0F04FE28;
D_0F050118 = 0x0F050118;
D_0F050468 = 0x0F050468;
D_0F050678 = 0x0F050678;
D_0F050D50 = 0x0F050D50;
D_0F0513CC = 0x0F0513CC;
D_0F051820 = 0x0F051820;
D_0F051C54 = 0x0F051C54;
D_0F051FD8 = 0x0F051FD8;
D_0F05232C = 0x0F05232C;
D_0F0526B8 = 0x0F0526B8;
D_0F052A20 = 0x0F052A20;
D_0F052D3C = 0x0F052D3C;
D_0F05300C = 0x0F05300C;
D_0F0532F8 = 0x0F0532F8;
D_0F05363C = 0x0F05363C;
D_0F053950 = 0x0F053950;
D_0F053C34 = 0x0F053C34;
D_0F053F74 = 0x0F053F74;
D_0F054270 = 0x0F054270;
D_0F054518 = 0x0F054518;
D_0F05488C = 0x0F05488C;
D_0F054C3C = 0x0F054C3C;
D_0F054ECC = 0x0F054ECC;
D_0F0551C8 = 0x0F0551C8;
D_0F0554CC = 0x0F0554CC;
D_0F055880 = 0x0F055880;
D_0F055BA0 = 0x0F055BA0;
D_0F055F10 = 0x0F055F10;
D_0F0561AC = 0x0F0561AC;
D_0F056408 = 0x0F056408;
D_0F05662C = 0x0F05662C;
D_0F05688C = 0x0F05688C;
D_0F056AD0 = 0x0F056AD0;
D_0F056CF0 = 0x0F056CF0;
D_0F056EC8 = 0x0F056EC8;
D_0F057084 = 0x0F057084;
D_0F057288 = 0x0F057288;
D_0F057590 = 0x0F057590;
D_0F057EB4 = 0x0F057EB4;
D_0F0581E4 = 0x0F0581E4;
D_0F058550 = 0x0F058550;
D_0F05D1E8 = 0x0F05D1E8;
D_0F05D420 = 0x0F05D420;
D_0F05D674 = 0x0F05D674;
D_0F05DA50 = 0x0F05DA50;
D_0F05DDFC = 0x0F05DDFC;
D_0F05DFC0 = 0x0F05DFC0;
D_0F05E19C = 0x0F05E19C;
D_0F05E3E0 = 0x0F05E3E0;
D_0F05EB50 = 0x0F05EB50;
D_0F07E350 = 0x0F07E350;
D_0F09DB50 = 0x0F09DB50;
D_0F0AD750 = 0x0F0AD750;
D_0F0BD350 = 0x0F0BD350;
D_0F0CCF50 = 0x0F0CCF50;
D_0F0D0E50 = 0x0F0D0E50;
D_A4040004 = 0xA4040004; D_A4040004 = 0xA4040004;
D_A4040008 = 0xA4040008; D_A4040008 = 0xA4040008;
@ -213,39 +114,3 @@ D_E6FFFFFC = 0xE6FFFFFC;
D_FA00000C = 0xFA00000C; D_FA00000C = 0xFA00000C;
D_FA000010 = 0xFA000010; D_FA000010 = 0xFA000010;
D_FA000018 = 0xFA000018; D_FA000018 = 0xFA000018;
D_070067E8 = 0x070067E8;
D_0700AEF8 = 0x0700AEF8;
D_0700A970 = 0x0700A970;
D_0700AC30 = 0x0700AC30;
D_07000CE0 = 0x07000CE0;
D_07000E88 = 0x07000E88;
D_0700A618 = 0x0700A618;
D_070023F8 = 0x070023F8;
D_07002478 = 0x07002478;
D_07001438 = 0x07001438;
D_07003728 = 0x07003728;
D_070036B8 = 0x070036B8;
D_07003628 = 0x07003628;
D_07003540 = 0x07003540;
D_07003DC0 = 0x07003DC0;
D_07003E50 = 0x07003E50;
D_07003F18 = 0x07003F18;
D_070050B0 = 0x070050B0;
D_07005138 = 0x07005138;
D_070055D0 = 0x070055D0;
D_07005B50 = 0x07005B50;
D_07005C00 = 0x07005C00;
D_07005D18 = 0x07005D18;
D_07005DC8 = 0x07005DC8;
D_07005EF8 = 0x07005EF8;
D_07005740 = 0x07005740;
D_070057F0 = 0x070057F0;
D_070058E8 = 0x070058E8;
D_07001788 = 0x07001788;
D_07001AA0 = 0x07001AA0;
D_07001A30 = 0x07001A30;
D_07003790 = 0x07003790;
D_070006D0 = 0x070006D0;
D_070004D0 = 0x070004D0;
D_07000840 = 0x07000840;