Remove undefined_syms for common_textures (#409)

* Remove undefined_syms for common_textures

Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran 2023-09-09 13:33:20 -04:00 committed by GitHub
parent c350eddc6b
commit 233e9217e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 340 additions and 3817 deletions

View File

@ -610,10 +610,9 @@ ifeq ($(COMPILER),ido)
endif
#==============================================================================#
# Compress Segmented Data #
# Compile Trophy Model(s) and Podium Models #
#==============================================================================#
# trophy_model.inc.c
$(BUILD_DIR)/src/trophy_model.inc.mio0.o: $(BUILD_DIR)/src/trophy_model.inc.o
@$(PRINT) "$(GREEN)Compressing Trophy Model: $(BLUE)$@ $(NO_COL)\n"
$(V)$(LD) -t -e 0 -Ttext=0B000000 -Map $(BUILD_DIR)/src/trophy_model.inc.elf.map -o $(BUILD_DIR)/src/trophy_model.inc.elf $(BUILD_DIR)/src/trophy_model.inc.o --no-check-sections
@ -622,7 +621,10 @@ $(BUILD_DIR)/src/trophy_model.inc.mio0.o: $(BUILD_DIR)/src/trophy_model.inc.o
printf ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel trophy_model\n\n.incbin \"build/us/src/trophy_model.inc.mio0\"\n\n.balign 16\nglabel data_821D10_end\n" > build/us/src/trophy_model.inc.mio0.s
$(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/trophy_model.inc.mio0.o $(BUILD_DIR)/src/trophy_model.inc.mio0.s
# startup_logo.inc.c
#==============================================================================#
# Compile Startup Logo #
#==============================================================================#
$(BUILD_DIR)/src/startup_logo.inc.mio0.o: src/startup_logo.inc.c
@$(PRINT) "$(GREEN)Compressing Startup Logo: $(BLUE)$@ $(NO_COL)\n"
$(V)$(LD) -t -e 0 -Ttext=06000000 -Map $(BUILD_DIR)/src/startup_logo.inc.elf.map -o $(BUILD_DIR)/src/startup_logo.inc.elf $(BUILD_DIR)/src/startup_logo.inc.o --no-check-sections
@ -631,14 +633,28 @@ $(BUILD_DIR)/src/startup_logo.inc.mio0.o: src/startup_logo.inc.c
printf ".include \"macros.inc\"\n\n.data\n\n\n\n.balign 4\n\n\nglabel startup_logo\n\n.incbin \"build/us/src/startup_logo.inc.mio0\"\n\n.balign 16\n\nglabel data_825800_end\n" > build/us/src/startup_logo.inc.mio0.s
$(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/startup_logo.inc.mio0.o $(BUILD_DIR)/src/startup_logo.inc.mio0.s
# common_textures.inc.c
$(BUILD_DIR)/src/common_textures.inc.mio0.o: $(BUILD_DIR)/src/common_textures.inc.o
#==============================================================================#
# Compile Common Textures #
#==============================================================================#
LDFLAGS += -R $(BUILD_DIR)/src/common_textures.inc.elf
%/common_textures.inc.elf: %/common_textures.inc.o
$(V)$(LD) -t -e 0 -Ttext=0D000000 -Map $@.map -o $@ $< --no-check-sections
%/common_textures.inc.bin: %/common_textures.inc.elf
$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
%/common_textures.inc.mio0: %/common_textures.inc.bin
@$(PRINT) "$(GREEN)Compressing Common Textures: $(BLUE)$@ $(NO_COL)\n"
$(V)$(LD) -t -e 0 -Ttext=0D000000 --unresolved-symbols=ignore-all -Map $(BUILD_DIR)/src/common_textures.inc.elf.map -o $(BUILD_DIR)/src/common_textures.inc.elf $(BUILD_DIR)/src/common_textures.inc.o --no-check-sections
$(V)$(EXTRACT_DATA_FOR_MIO) $(BUILD_DIR)/src/common_textures.inc.elf $(BUILD_DIR)/src/common_textures.inc.bin
$(V)$(MIO0TOOL) -c $(BUILD_DIR)/src/common_textures.inc.bin $(BUILD_DIR)/src/common_textures.inc.mio0
printf ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"src/common_textures.inc.mio0\"\n\n" > build/us/src/common_textures.inc.mio0.s
$(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/common_textures.inc.mio0.o $(BUILD_DIR)/src/common_textures.inc.mio0.s
$(V)$(MIO0TOOL) -c $< $@
%/common_textures.inc.mio0.s: %/common_textures.inc.mio0
printf ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@
#==============================================================================#
# Finalize and Link #
#==============================================================================#
# Run linker script through the C preprocessor
$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)

File diff suppressed because it is too large Load Diff

View File

@ -1054,7 +1054,7 @@ void func_80070250(s32 objectIndex, s32 arg1, StarSpawn *arg2) {
temp_v0->unk_09E = arg2->pos[1];
temp_v0->sizeScaling = (f32) arg2->pos[2] / 100.0;
temp_v0->activeTexture = &D_8018D220[arg2->id];
func_80073404(objectIndex, 0x40U, 0x20U, D_0D005FB0);
func_80073404(objectIndex, 0x40U, 0x20U, &D_0D005FB0);
temp_v0->unk_0A0 = 0x00FF;
}

View File

@ -3051,7 +3051,7 @@ void func_800792D8(s32 objectIndex, s32 arg1) {
D_8018D168 = 0;
}
func_80073444(objectIndex, (u8 *) gTLUTLakituCountdown, (u8 *) &D_0F05EB50, 0x38U, (u16) 0x00000048);
D_80165C18[objectIndex].unk_074 = (Vtx *) &D_0D005EB0;
D_80165C18[objectIndex].unk_074 = (Vtx *) D_0D005EB0;
D_80165C18[objectIndex].sizeScaling = 0.15f;
func_800721E8(objectIndex, 0x00000010);
func_80072488(objectIndex);
@ -3225,7 +3225,6 @@ void func_8007993C(s32 objectIndex, Player *player) {
func_800722CC(objectIndex, 2);
}
extern Vtx D_0D005F30[];
extern u8 D_0F0CCF50;
void func_800799A8(s32 objectIndex, s32 arg1) {

View File

@ -4,6 +4,12 @@
#include <types.h>
#include <PR/gbi.h>
typedef struct {
s16 waypointId1;
s16 waypointId2;
s32 unk4;
} UnkCommonTextureStruct0;
extern s8 gTLUTFinishLineBanner[];
extern s8 D_0D000200[];
extern Vtx D_0D001200[];
@ -75,11 +81,11 @@ extern Gfx D_0D0052B8[];
extern Gfx D_0D005308[];
extern Gfx D_0D005338[];
extern Gfx D_0D005368[];
extern Gfx D_0D005398[];
extern Gfx D_0D0053B0[];
extern Gfx D_0D0053C8[];
extern Gfx D_0D0053F0[];
extern Gfx D_0D005418[];
extern Gfx D_toads_turnpike_0D005398[];
extern Gfx D_toads_turnpike_0D0053B0[];
extern Gfx D_toads_turnpike_0D0053C8[];
extern Gfx D_toads_turnpike_0D0053F0[];
extern Gfx D_toads_turnpike_0D005418[];
extern Vtx D_0D005430[];
extern Vtx D_0D005470[];
extern Vtx D_0D0054B0[];
@ -92,20 +98,33 @@ extern Vtx D_0D005AA0[];
extern Vtx D_0D005AE0[];
extern Vtx D_0D005B20[];
extern Vtx D_0D005B60[];
extern Vtx D_0D005BA0[];
extern Vtx D_0D005BD0[];
extern Vtx D_0D005C00[];
extern Vtx D_0D005C30[];
extern Vtx D_0D005E80[];
extern Vtx D_0D005EB0[];
extern Vtx D_0D005F00[];
extern Vtx D_0D005F30[];
extern Vtx D_0D005FB0[];
extern Vtx D_0D005FF0[];
extern Vtx D_0D005F80[];
extern Vtx D_0D005FB0;
extern Vtx D_0D005FC0[];
extern Vtx D_0D005FF0;
extern Vtx D_0D006000[];
extern Vtx D_0D006030[];
extern Vtx D_0D006080[];
extern Vtx D_0D0060B0[];
extern Vtx D_0D006100[];
extern Vtx D_0D006130[];
extern Vtx D_0D006180[];
extern Vtx D_0D0061B0[];
extern Vtx D_0D006280[];
extern Vtx D_0D0062B0[];
extern Vtx D_0D006480[];
extern Vtx D_0D0064B0[];
extern Vtx D_0D006700[];
extern Vtx D_0D006730[];
extern Vtx D_0D0068C0[];
extern Vtx D_0D0068F0[];
extern Gfx D_0D006930[];
extern Gfx D_0D006940[];
@ -188,12 +207,12 @@ extern Gfx D_0D008080[];
extern Gfx D_0D008108[];
extern Gfx D_0D008120[];
extern Gfx D_0D008138[];
extern u8 gGrandPrixHumanItemCurve[];
extern u8 gGrandPrixCPUItemCurve[];
extern u8 gVersus2PlayerItemCurve[];
extern u8 gVersus3PlayerItemCurve[];
extern u8 gVersus4PlayerItemCurve[];
extern u8 gBattleItemCurve[];
extern u8 gGrandPrixHumanItemCurve[][100];
extern u8 gGrandPrixCPUItemCurve[][100];
extern u8 gVersus2PlayerItemCurve[][100];
extern u8 gVersus3PlayerItemCurve[][100];
extern u8 gVersus4PlayerItemCurve[][100];
extern u8 gBattleItemCurve[][100];
extern Vtx D_0D008B78[];
extern Vtx D_0D008BB8[];
extern Vtx D_0D008BF8[];
@ -210,7 +229,24 @@ extern Gfx D_0D008E20[];
extern Gfx D_0D008E48[];
extern Gfx D_0D008E70[];
extern Mtx D_0D008E98;
extern Vtx D_0D008EA8[];
extern Vtx D_0D008ED8[];
extern UnkCommonTextureStruct0 D_0D008F18[];
extern UnkCommonTextureStruct0 D_0D008F28[];
extern UnkCommonTextureStruct0 D_0D008F80[];
extern UnkCommonTextureStruct0 D_0D008FB8[];
extern UnkCommonTextureStruct0 D_0D009058[];
extern UnkCommonTextureStruct0 D_0D0090B8[];
extern UnkCommonTextureStruct0 D_0D0090F8[];
extern UnkCommonTextureStruct0 D_0D009158[];
extern UnkCommonTextureStruct0 D_0D009188[];
extern UnkCommonTextureStruct0 D_0D0091E8[];
extern UnkCommonTextureStruct0 D_0D009210[];
extern UnkCommonTextureStruct0 D_0D009238[];
extern UnkCommonTextureStruct0 D_0D009260[];
extern UnkCommonTextureStruct0 D_0D009280[];
extern UnkCommonTextureStruct0 D_0D0092C8[];
extern UnkCommonTextureStruct0 D_0D009310[];
extern UnkCommonTextureStruct0 D_0D0093C0[];
extern f32 D_0D009418[];
extern f32 D_0D009568[];
extern f32 D_0D0096B8[];
@ -239,9 +275,9 @@ extern s8 D_0D015258[];
extern s8 D_0D015A58[];
extern s8 D_0D016258[];
extern s8 D_0D016A58[];
extern s8 D_0D017258[];
extern u8 D_0D017258[];
extern s16 tlutPad[];
extern s8 D_0D017458[];
extern u8 D_0D017458[][2048];
extern u8 gTLUTHudTypeCRankFont[];
extern u8 gTextureHudTypeCRankFont[][256];
extern u8 gTLUTHudTypeCRankTinyFont[];
@ -320,11 +356,11 @@ extern s8 D_0D028958[];
extern s8 D_0D0291D8[];
extern u8 D_0D0293D8[];
extern s8 D_0D029458[];
extern s8 D_0D029858[];
extern u8 D_0D029858[][1024];
extern s8 D_0D029C58[];
extern s8 D_0D02A058[];
extern s8 D_0D02A458[];
extern s8 D_0D02A858[];
extern u8 D_0D02A858[];
extern u8 D_0D02AA58[];
extern u8 D_0D02AC58[][1024];
extern u8 D_0D02BC58[][1024];

View File

@ -3,6 +3,8 @@
#include <PR/gbi.h>
#include <defines.h>
#include "common_textures.h"
/**
* @file Contains common course data
* @segment 0x0D
@ -700,19 +702,19 @@ Gfx D_0D005368[] = {
gsSPEndDisplayList(),
};
Gfx D_0D005398[] = {
Gfx D_toads_turnpike_0D005398[] = {
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsSPEndDisplayList(),
};
Gfx D_0D0053B0[] = {
Gfx D_toads_turnpike_0D0053B0[] = {
gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
gsSPEndDisplayList(),
};
Gfx D_0D0053C8[] = {
Gfx D_toads_turnpike_0D0053C8[] = {
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPSetGeometryMode(G_FOG | G_SHADING_SMOOTH),
gsDPSetCombineMode(G_CC_MODULATEI, G_CC_PASS2),
@ -720,7 +722,7 @@ Gfx D_0D0053C8[] = {
gsSPEndDisplayList(),
};
Gfx D_0D0053F0[] = {
Gfx D_toads_turnpike_0D0053F0[] = {
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPSetGeometryMode(G_FOG | G_SHADING_SMOOTH),
gsDPSetCombineMode(G_CC_MODULATEI, G_CC_PASS2),
@ -728,7 +730,7 @@ Gfx D_0D0053F0[] = {
gsSPEndDisplayList(),
};
Gfx D_0D005418[] = {
Gfx D_toads_turnpike_0D005418[] = {
gsDPSetCycleType(G_CYC_1CYCLE),
gsSPClearGeometryMode(G_FOG),
gsSPEndDisplayList(),
@ -889,22 +891,25 @@ Vtx D_0D005B60[] = {
{{{ -16, 0, 15}, 0, {0, 1984}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D005BD0[] = {
Vtx D_0D005BA0[] = {
{{{ 0, 18, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 16, -9, 0}, 0, {1984, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -16, -9, 0}, 0, {1984, 1984}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D005C00[] = {
Vtx D_0D005BD0[] = {
{{{ 0, 18, 0}, 0, {0, 0}, {0x00, 0x00, 0x78, 0xff}}},
{{{ 16, -9, 0}, 0, {1984, 0}, {0x00, 0x00, 0x78, 0xff}}},
{{{ -16, -9, 0}, 0, {1984, 1984}, {0x00, 0x00, 0x78, 0xff}}},
};
Vtx D_0D005C30[] = {
Vtx D_0D005C00[] = {
{{{ 0, 18, 0}, 0, {0, 0}, {0xd5, 0x2c, 0x66, 0xff}}},
{{{ 16, -9, 0}, 0, {1984, 0}, {0x66, 0xd3, 0x2b, 0xff}}},
{{{ -16, -9, 0}, 0, {1984, 1984}, {0x2a, 0x99, 0xd6, 0xff}}},
};
Vtx D_0D005C30[] = {
{{{ -20, -15, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 19, -15, 0}, 0, {2496, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 19, 16, 0}, 0, {2496, 1984}, {0xff, 0xff, 0xff, 0xff}}},
@ -944,10 +949,13 @@ Vtx D_0D005C30[] = {
{{{ -24, 0, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D005EB0[] = {
Vtx D_0D005E80[] = {
{{{ 23, 0, 0}, 0, {3008, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 23, 23, 0}, 0, {3008, 1472}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -24, 23, 0}, 0, {0, 1472}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D005EB0[] = {
{{{ -28, -35, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 27, -35, 0}, 0, {3520, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 27, 0, 0}, 0, {3520, 2240}, {0xff, 0xff, 0xff, 0xff}}},
@ -955,10 +963,13 @@ Vtx D_0D005EB0[] = {
{{{ -28, 0, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D005F30[] = {
Vtx D_0D005F00[] = {
{{{ 27, 0, 0}, 0, {3520, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 27, 35, 0}, 0, {3520, 2240}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -28, 35, 0}, 0, {0, 2240}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D005F30[] = {
{{{ -10, -35, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 45, -35, 0}, 0, {3520, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 45, 0, 0}, 0, {3520, 2240}, {0xff, 0xff, 0xff, 0xff}}},
@ -966,24 +977,29 @@ Vtx D_0D005F30[] = {
{{{ -10, 0, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D005FB0[] = {
Vtx D_0D005F80[] = {
{{{ 45, 0, 0}, 0, {3520, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 45, 35, 0}, 0, {3520, 2240}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -10, 35, 0}, 0, {0, 2240}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -32, -16, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D005FF0[] = {
Vtx D_0D005FB0 = {{{ -32, -16, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}};
Vtx D_0D005FC0[] = {
{{{ 31, -16, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 15, 0}, 0, {4032, 1984}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -32, 15, 0}, 0, {0, 1984}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -53, -16, 0}, 0, {0, 0}, {0xff, 0x00, 0x00, 0xff}}},
};
Vtx D_0D006030[] = {
Vtx D_0D005FF0 = {{{ -53, -16, 0}, 0, {0, 0}, {0xff, 0x00, 0x00, 0xff}}};
Vtx D_0D006000[] = {
{{{ 10, -16, 0}, 0, {4032, 0}, {0xff, 0x00, 0x00, 0xff}}},
{{{ 10, 15, 0}, 0, {4032, 1984}, {0xff, 0x00, 0x00, 0xff}}},
{{{ -53, 15, 0}, 0, {0, 1984}, {0xff, 0x00, 0x00, 0xff}}},
};
Vtx D_0D006030[] = {
{{{ -32, -32, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, -32, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 31, 0}, 0, {4032, 4032}, {0xff, 0xff, 0xff, 0xff}}},
@ -991,22 +1007,27 @@ Vtx D_0D006030[] = {
{{{ -32, -32, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0xff}}},
};
Vtx D_0D0060B0[] = {
Vtx D_0D006080[] = {
{{{ 31, -32, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0xff}}},
{{{ 31, 31, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0xff}}},
{{{ -32, 31, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0xff}}},
};
Vtx D_0D0060B0[] = {
{{{ -32, -31, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, -31, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 0, 0}, 0, {4032, 1984}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -32, 0, 0}, 0, {0, 1984}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -32, 0, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D006130[] = {
Vtx D_0D006100[] = {
{{{ 31, 0, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 31, 0}, 0, {4032, 1984}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -32, 31, 0}, 0, {0, 1984}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D006130[] = {
{{{ -32, -31, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, -31, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 0, 0}, 0, {0, 1984}, {0xff, 0xff, 0xff, 0xff}}},
@ -1014,10 +1035,13 @@ Vtx D_0D006130[] = {
{{{ -32, 0, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D0061B0[] = {
Vtx D_0D006180[] = {
{{{ 31, 0, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 31, 0}, 0, {0, 1984}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -32, 31, 0}, 0, {4032, 1984}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D0061B0[] = {
{{{ -32, -31, -12}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, -31, -12}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 0, -12}, 0, {4032, 1984}, {0xff, 0xff, 0xff, 0xff}}},
@ -1033,10 +1057,13 @@ Vtx D_0D0061B0[] = {
{{{ -32, 0, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D0062B0[] = {
Vtx D_0D006280[] = {
{{{ 31, 0, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 31, 0}, 0, {0, 1984}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -32, 31, 0}, 0, {4032, 1984}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D0062B0[] = {
{{{ -32, -32, 20}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, -32, 20}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 31, 20}, 0, {4032, 4032}, {0xff, 0xff, 0xff, 0xff}}},
@ -1068,10 +1095,13 @@ Vtx D_0D0062B0[] = {
{{{ -32, 15, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D0064B0[] = {
Vtx D_0D006480[] = {
{{{ 31, 15, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 47, 0}, 0, {4032, 1984}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -32, 47, 0}, 0, {0, 1984}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D0064B0[] = {
{{{ -32, -47, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, -47, 0}, 0, {4032, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 31, 0, 0}, 0, {4032, 3008}, {0xff, 0xff, 0xff, 0xff}}},
@ -1111,10 +1141,13 @@ Vtx D_0D0064B0[] = {
{{{ -36, 0, 0}, 0, {0, 32}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D006730[] = {
Vtx D_0D006700[] = {
{{{ 35, 0, 0}, 0, {4544, 32}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 35, 23, 0}, 0, {4544, 1504}, {0xff, 0xff, 0xff, 0xff}}},
{{{ -36, 23, 0}, 0, {0, 1504}, {0xff, 0xff, 0xff, 0xff}}},
};
Vtx D_0D006730[] = {
{{{ -36, -27, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 35, -27, 0}, 0, {4544, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 35, 0, 0}, 0, {4544, 1728}, {0xff, 0xff, 0xff, 0xff}}},
@ -1142,10 +1175,13 @@ Vtx D_0D006730[] = {
{{{ -56, -16, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0xff}}},
};
Vtx D_0D0068F0[] = {
Vtx D_0D0068C0[] = {
{{{ 55, -16, 0}, 0, {7104, 0}, {0x00, 0x00, 0x00, 0xff}}},
{{{ 55, 15, 0}, 0, {7104, 1984}, {0x00, 0x00, 0x00, 0xff}}},
{{{ -56, 15, 0}, 0, {0, 1984}, {0x00, 0x00, 0x00, 0xff}}},
};
Vtx D_0D0068F0[] = {
{{{ -64, -32, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 63, -32, 0}, 0, {8128, 0}, {0xff, 0xff, 0xff, 0xff}}},
{{{ 63, 31, 0}, 0, {8128, 4032}, {0xff, 0xff, 0xff, 0xff}}},
@ -2214,121 +2250,224 @@ Mtx D_0D008E98 = {
{ 0, 0, 0, 0}},
};
Vtx D_0D008EA8[] = {
// I think these 4 Vtx's are really the rows of a Mtx (D_0D008E98), based on the usage of D_0D008E98 throughout the code base
// {{{ 1, 0, 0}, 0, {0, 1}, {0x00, 0x00, 0x00, 0x00}}},
// {{{ 0, 0, 1}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x01}}},
// {{{ 0, 0, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
// {{{ 0, 0, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
Vtx D_0D008ED8[] = {
// These 4 Vtx's MAY be a Mtx too, its hard to say though as I can't find any references
// to any of them in the code base
{{{ 0, 410, 0}, 0, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 0, 0, 0}, 546, {0, 0}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 0, 0, 0}, 0, {65535, 3}, {0x00, 0x00, 0x00, 0x00}}},
{{{ -1, 3, -1}, 3, {65535, 3}, {0x00, 0x01, 0x00, 0x00}}},
};
{{{ 1, 3, 0}, 2, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 1, 2, 0}, 6, {11, 30}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 55, 74, 0}, 1, {90, 105}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 139, 155, 0}, 1, {177, 205}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D008F18[] = {
{ 1, 3, 2, },
{ -1, -1, 0, },
};
{{{ 225, 242, 0}, 1, {292, 313}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 352, 373, 0}, 1, {452, 465}, {0x00, 0x00, 0x00, 0x01}}},
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
{{{ 10, 25, 0}, 1, {190, 210}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D008F28[] = {
{ 1, 2, 6, },
{ 11, 30, 1, },
{ 55, 74, 1, },
{ 90, 105, 1, },
{ 139, 155, 1, },
{ 177, 205, 1, },
{ 225, 242, 1, },
{ 292, 313, 1, },
{ 352, 373, 1, },
{ 452, 465, 1, },
{ -1, -1, 0, },
};
{{{ 270, 290, 0}, 1, {410, 440}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 540, 550, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 1, 2, 0}, 6, {60, 80}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 125, 140, 0}, 1, {170, 185}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D008F80[] = {
{ 1, 2, 6, },
{ 10, 25, 1, },
{ 190, 210, 1, },
{ 270, 290, 1, },
{ 410, 440, 1, },
{ 540, 550, 1, },
{ -1, -1, 0, },
};
{{{ 230, 240, 0}, 1, {275, 285}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 310, 320, 0}, 1, {321, 349}, {0x00, 0x00, 0x00, 0x03}}},
{{{ 350, 360, 0}, 1, {385, 415}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 450, 468, 0}, 1, {470, 477}, {0x00, 0x00, 0x00, 0x09}}},
UnkCommonTextureStruct0 D_0D008FB8[] = {
{ 1, 2, 6, },
{ 60, 80, 1, },
{ 125, 140, 1, },
{ 170, 185, 1, },
{ 230, 240, 1, },
{ 275, 285, 1, },
{ 310, 320, 1, },
{ 321, 349, 3, },
{ 350, 360, 1, },
{ 385, 415, 1, },
{ 450, 468, 1, },
{ 470, 477, 9, },
{ 480, 485, 11, },
{ 543, 546, 9, },
{ 548, 550, 11, },
{ 565, 568, 2, },
{ 630, 631, 6, },
{ 635, 640, 10, },
{ 645, 655, 1, },
{ -1, -1, 0, },
};
{{{ 480, 485, 0}, 11, {543, 546}, {0x00, 0x00, 0x00, 0x09}}},
{{{ 548, 550, 0}, 11, {565, 568}, {0x00, 0x00, 0x00, 0x02}}},
{{{ 630, 631, 0}, 6, {635, 640}, {0x00, 0x00, 0x00, 0x0a}}},
{{{ 645, 655, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
UnkCommonTextureStruct0 D_0D009058[] = {
{ 1, 2, 6, },
{ 15, 30, 1, },
{ 55, 65, 1, },
{ 125, 150, 1, },
{ 265, 270, 1, },
{ 275, 285, 1, },
{ 305, 320, 2, },
{ 330, 340, 1, },
{ 375, 385, 1, },
{ 547, 570, 1, },
{ 582, 600, 1, },
{ -1, -1, 0, },
};
{{{ 1, 2, 0}, 6, {15, 30}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 55, 65, 0}, 1, {125, 150}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 265, 270, 0}, 1, {275, 285}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 305, 320, 0}, 2, {330, 340}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D0090B8[] = {
{ 1, 2, 6, },
{ 70, 94, 1, },
{ 120, 133, 1, },
{ 150, 170, 1, },
{ 249, 265, 1, },
{ 360, 395, 1, },
{ 635, 655, 1, },
{ -1, -1, 0, },
};
{{{ 375, 385, 0}, 1, {547, 570}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 582, 600, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 1, 2, 0}, 6, {70, 94}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 120, 133, 0}, 1, {150, 170}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D0090F8[] = {
{ 1, 2, 6, },
{ 15, 30, 1, },
{ 41, 63, 1, },
{ 115, 155, 1, },
{ 200, 215, 1, },
{ 240, 241, 9, },
{ 264, 265, 10, },
{ 270, 290, 1, },
{ 345, 375, 1, },
{ 493, 544, 1, },
{ 583, 605, 1, },
{ -1, -1, 0, },
};
{{{ 249, 265, 0}, 1, {360, 395}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 635, 655, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 1, 2, 0}, 6, {15, 30}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 41, 63, 0}, 1, {115, 155}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D009158[] = {
{ 1, 2, 6, },
{ 75, 100, 1, },
{ 135, 150, 1, },
{ 355, 390, 1, },
{ 505, 525, 1, },
{ -1, -1, 0, },
};
{{{ 200, 215, 0}, 1, {240, 241}, {0x00, 0x00, 0x00, 0x09}}},
{{{ 264, 265, 0}, 10, {270, 290}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 345, 375, 0}, 1, {493, 544}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 583, 605, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
UnkCommonTextureStruct0 D_0D009188[] = {
{ 1, 2, 6, },
{ 65, 80, 1, },
{ 165, 166, 9, },
{ 180, 210, 1, },
{ 220, 221, 10, },
{ 250, 275, 1, },
{ 360, 380, 1, },
{ 440, 480, 1, },
{ 600, 601, 9, },
{ 689, 690, 10, },
{ 695, 725, 1, },
{ -1, -1, 0, },
};
{{{ 1, 2, 0}, 6, {75, 100}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 135, 150, 0}, 1, {355, 390}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 505, 525, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 1, 2, 0}, 6, {65, 80}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D0091E8[] = {
{ 1, 2, 6, },
{ 128, 275, 1, },
{ 320, 345, 1, },
{ 465, 565, 1, },
{ -1, -1, 0, },
};
{{{ 165, 166, 0}, 9, {180, 210}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 220, 221, 0}, 10, {250, 275}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 360, 380, 0}, 1, {440, 480}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 600, 601, 0}, 9, {689, 690}, {0x00, 0x00, 0x00, 0x0a}}},
UnkCommonTextureStruct0 D_0D009210[] = {
{ 1, 2, 6, },
{ 75, 100, 1, },
{ 175, 210, 1, },
{ 275, 300, 1, },
{ -1, -1, 0, },
};
{{{ 695, 725, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 1, 2, 0}, 6, {128, 275}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 320, 345, 0}, 1, {465, 565}, {0x00, 0x00, 0x00, 0x01}}},
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
UnkCommonTextureStruct0 D_0D009238[] = {
{ 1, 2, 6, },
{ 106, 188, 1, },
{ 220, 386, 1, },
{ 583, 765, 1, },
{ -1, -1, 0, },
};
{{{ 75, 100, 0}, 1, {175, 210}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 275, 300, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 1, 2, 0}, 6, {106, 188}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 220, 386, 0}, 1, {583, 765}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D009260[] = {
{ 1, 2, 6, },
{ 245, 262, 1, },
{ 585, 606, 1, },
{ -1, -1, 0, },
};
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
{{{ 245, 262, 0}, 1, {585, 606}, {0x00, 0x00, 0x00, 0x01}}},
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
{{{ 7, 38, 0}, 1, {36, 54}, {0x00, 0x00, 0x00, 0x01}}},
UnkCommonTextureStruct0 D_0D009280[] = {
{ 1, 2, 6, },
{ 7, 38, 1, },
{ 36, 54, 1, },
{ 129, 150, 1, },
{ 380, 410, 1, },
{ 425, 445, 1, },
{ 456, 500, 1, },
{ 594, 625, 1, },
{ -1, -1, 0, },
};
{{{ 129, 150, 0}, 1, {380, 410}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 425, 445, 0}, 1, {456, 500}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 594, 625, 0}, 1, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
{{{ 1, 2, 0}, 6, {4, 5}, {0x00, 0x00, 0x00, 0x09}}},
UnkCommonTextureStruct0 D_0D0092C8[] = {
{ 1, 2, 6, },
{ 4, 5, 9, },
{ 129, 130, 10, },
{ 555, 560, 9, },
{ 827, 832, 10, },
{ 810, 845, 1, },
{ 910, 993, 1, },
{ 1390, 1600, 1, },
{ -1, -1, 0, },
};
{{{ 129, 130, 0}, 10, {555, 560}, {0x00, 0x00, 0x00, 0x09}}},
{{{ 827, 832, 0}, 10, {810, 845}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 910, 993, 0}, 1, {1390, 1600}, {0x00, 0x00, 0x00, 0x01}}},
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
{{{ 80, 120, 0}, 1, {200, 250}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 252, 253, 0}, 9, {273, 295}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 300, 315, 0}, 1, {333, 384}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 400, 401, 0}, 10, {405, 435}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 445, 475, 0}, 1, {485, 525}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 585, 615, 0}, 1, {685, 735}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 783, 820, 0}, 1, {956, 984}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 1005, 1050, 0}, 1, {1063, 1088}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 1130, 1131, 0}, 9, {1169, 1170}, {0x00, 0x00, 0x00, 0x0a}}},
{{{ 1195, 1240, 0}, 1, {1262, 1300}, {0x00, 0x00, 0x00, 0x01}}},
{{{ -1, -1, 0}, 0, {1, 2}, {0x00, 0x00, 0x00, 0x06}}},
{{{ 20, 40, 0}, 1, {190, 191}, {0x00, 0x00, 0x00, 0x09}}},
{{{ 259, 260, 0}, 10, {315, 335}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 353, 370, 0}, 1, {398, 430}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 458, 485, 0}, 1, {510, 535}, {0x00, 0x00, 0x00, 0x01}}},
{{{ 580, 660, 0}, 3, {65535, 65535}, {0x00, 0x00, 0x00, 0x00}}},
UnkCommonTextureStruct0 D_0D009310[] = {
{ 1, 2, 6, },
{ 80, 120, 1, },
{ 200, 250, 1, },
{ 252, 253, 9, },
{ 273, 295, 1, },
{ 300, 315, 1, },
{ 333, 384, 1, },
{ 400, 401, 10, },
{ 405, 435, 1, },
{ 445, 475, 1, },
{ 485, 525, 1, },
{ 585, 615, 1, },
{ 685, 735, 1, },
{ 783, 820, 1, },
{ 956, 984, 1, },
{ 1005, 1050, 1, },
{ 1063, 1088, 1, },
{ 1130, 1131, 9, },
{ 1169, 1170, 10, },
{ 1195, 1240, 1, },
{ 1262, 1300, 1, },
{ -1, -1, 0, },
};
UnkCommonTextureStruct0 D_0D0093C0[] = {
{ 1, 2, 6, },
{ 20, 40, 1, },
{ 190, 191, 9, },
{ 259, 260, 10, },
{ 315, 335, 1, },
{ 353, 370, 1, },
{ 398, 430, 1, },
{ 458, 485, 1, },
{ 510, 535, 1, },
{ 580, 660, 3, },
{ -1, -1, 0, },
};
// unknown float data
@ -2726,7 +2865,7 @@ s8 gTexturePortraitWario[] = {
};
// Bowser
s8 gTexturePortraitBowser[] = {
u8 gTexturePortraitBowser[] = {
#include "assets/character_portraits/gTexturePortraitBowser.inc.c"
};

View File

@ -1,5 +1,6 @@
#include <PR/ultratypes.h>
#include <PR/mbi.h>
#include "common_textures.h"
#include "course_offsets.h"
#include "courses/flower_cup/toads_turnpike/course_data.inc.h"
@ -22,11 +23,6 @@ extern u8 gTexture65127C[];
extern u8 gTextureRoad5[];
extern u8 gTextureSignToadRed[];
extern u8 gTexture668228[];
extern Gfx D_toads_turnpike_0D005398[];
extern Gfx D_toads_turnpike_0D0053B0[];
extern Gfx D_toads_turnpike_0D0053C8[];
extern Gfx D_toads_turnpike_0D0053F0[];
extern Gfx D_toads_turnpike_0D005418[];
const course_texture toads_turnpike_textures[] = {
{gTexture645134, 0x052C, 0x0800, 0x0},

View File

@ -858,11 +858,11 @@ UNUSED void func_80046C78(s32 arg0, s32 arg1, u16 arg2, f32 arg3, u8 *texture) {
}
UNUSED void func_80046CDC(s32 arg0, s32 arg1, u16 arg2, f32 arg3, u8 *texture) {
func_800464D0(arg0, arg1, arg2, arg3, texture, D_0D005FB0, 64, 32, 64, 32);
func_800464D0(arg0, arg1, arg2, arg3, texture, &D_0D005FB0, 64, 32, 64, 32);
}
UNUSED void func_80046D40(Vec3f arg0, Vec3su arg1, f32 arg2, u8 *texture) {
func_80046808(arg0, arg1, arg2, texture, D_0D005FB0, 64, 32, 64, 32);
func_80046808(arg0, arg1, arg2, texture, &D_0D005FB0, 64, 32, 64, 32);
}
UNUSED void func_80046D90(s32 arg0, s32 arg1, u16 arg2, f32 arg3, u8 *texture) {

View File

@ -98,247 +98,6 @@ D_0B008B68 = 0x0B008B68;
D_0B008C20 = 0x0B008C20;
D_0B008CE0 = 0x0B008CE0;
D_0D000200 = 0x0D000200;
D_0D001750 = 0x0D001750;
D_0D001780 = 0x0D001780;
D_0D001798 = 0x0D001798;
D_0D0017B0 = 0x0D0017B0;
D_0D0017C8 = 0x0D0017C8;
D_0D0017E0 = 0x0D0017E0;
D_0D0017F8 = 0x0D0017F8;
D_0D001810 = 0x0D001810;
D_0D001828 = 0x0D001828;
D_0D001B90 = 0x0D001B90;
D_0D001BD8 = 0x0D001BD8;
D_0D001C20 = 0x0D001C20;
D_0D001C88 = 0x0D001C88;
D_0D002EE8 = 0x0D002EE8;
D_0D002F80 = 0x0D002F80;
D_0D003008 = 0x0D003008;
D_0D003090 = 0x0D003090;
D_0D0030F8 = 0x0D0030F8;
D_0D003128 = 0x0D003128;
D_0D003158 = 0x0D003158;
D_0D003188 = 0x0D003188;
D_0D0031B8 = 0x0D0031B8;
D_0D0031E8 = 0x0D0031E8;
D_0D004B48 = 0x0D004B48;
D_0D004BD8 = 0x0D004BD8;
D_0D004C68 = 0x0D004C68;
gTLUTGreenShell = 0x0D004E38;
gTLUTBlueShell = 0x0D005038;
D_0D005338 = 0x0D005338;
D_0D005368 = 0x0D005368;
D_0D005470 = 0x0D005470;
D_0D005770 = 0x0D005770;
D_0D005AE0 = 0x0D005AE0;
D_0D005BD0 = 0x0D005BD0;
D_0D005C00 = 0x0D005C00;
D_0D005C30 = 0x0D005C30;
D_0D005EB0 = 0x0D005EB0;
D_0D005F30 = 0x0D005F30;
D_0D005FB0 = 0x0D005FB0;
D_0D005FF0 = 0x0D005FF0;
D_0D006030 = 0x0D006030;
D_0D0060B0 = 0x0D0060B0;
D_0D006130 = 0x0D006130;
D_0D0061B0 = 0x0D0061B0;
D_0D0062B0 = 0x0D0062B0;
D_0D0064B0 = 0x0D0064B0;
D_0D006730 = 0x0D006730;
D_0D0068F0 = 0x0D0068F0;
D_0D006930 = 0x0D006930;
D_0D006940 = 0x0D006940;
D_0D006950 = 0x0D006950;
D_0D006980 = 0x0D006980;
D_0D0069C8 = 0x0D0069C8;
D_0D0069E0 = 0x0D0069E0;
D_0D0069F8 = 0x0D0069F8;
D_0D0076F8 = 0x0D0076F8;
D_0D0077A0 = 0x0D0077A0;
D_0D0077D0 = 0x0D0077D0;
D_0D0077F8 = 0x0D0077F8;
D_0D007828 = 0x0D007828;
D_0D007850 = 0x0D007850;
D_0D007878 = 0x0D007878;
D_0D0078A0 = 0x0D0078A0;
D_0D0078D0 = 0x0D0078D0;
D_0D007928 = 0x0D007928;
D_0D007948 = 0x0D007948;
D_0D007968 = 0x0D007968;
D_0D0079A8 = 0x0D0079A8;
D_0D0079C8 = 0x0D0079C8;
D_0D0079E8 = 0x0D0079E8;
D_0D007A40 = 0x0D007A40;
D_0D007A60 = 0x0D007A60;
D_0D007A80 = 0x0D007A80;
D_0D007AA0 = 0x0D007AA0;
D_0D007AC0 = 0x0D007AC0;
D_0D007AE0 = 0x0D007AE0;
D_0D007B00 = 0x0D007B00;
D_0D007B20 = 0x0D007B20;
D_0D007B98 = 0x0D007B98;
D_0D007C10 = 0x0D007C10;
D_0D007CB8 = 0x0D007CB8;
D_0D007CD8 = 0x0D007CD8;
D_0D007CF8 = 0x0D007CF8;
D_0D007D18 = 0x0D007D18;
D_0D007D38 = 0x0D007D38;
D_0D007D58 = 0x0D007D58;
D_0D007D78 = 0x0D007D78;
D_0D007D98 = 0x0D007D98;
D_0D007DB8 = 0x0D007DB8;
D_0D007DD8 = 0x0D007DD8;
D_0D007DF8 = 0x0D007DF8;
D_0D007E18 = 0x0D007E18;
D_0D007E38 = 0x0D007E38;
D_0D007E58 = 0x0D007E58;
D_0D007E98 = 0x0D007E98;
D_0D007EB8 = 0x0D007EB8;
D_0D007EF8 = 0x0D007EF8;
D_0D007F38 = 0x0D007F38;
D_0D007F78 = 0x0D007F78;
D_0D007FE0 = 0x0D007FE0;
D_0D008000 = 0x0D008000;
D_0D008080 = 0x0D008080;
D_0D008108 = 0x0D008108;
D_0D008120 = 0x0D008120;
D_0D008138 = 0x0D008138;
gGrandPrixHumanItemCurve = 0x0D008150;
gGrandPrixCPUItemCurve = 0x0D008470;
gVersus2PlayerItemCurve = 0x0D008790;
gVersus3PlayerItemCurve = 0x0D008858;
gVersus4PlayerItemCurve = 0x0D008984;
gBattleItemCurve = 0x0D008B14;
D_0D008B78 = 0x0D008B78;
D_0D008C78 = 0x0D008C78;
D_0D008C90 = 0x0D008C90;
D_0D008CD8 = 0x0D008CD8;
D_0D008D10 = 0x0D008D10;
D_0D008D58 = 0x0D008D58;
D_0D008DA0 = 0x0D008DA0;
D_0D008DB8 = 0x0D008DB8;
D_0D008DF8 = 0x0D008DF8;
D_0D008E20 = 0x0D008E20;
D_0D008E48 = 0x0D008E48;
D_0D008E70 = 0x0D008E70;
D_0D008E98 = 0x0D008E98;
D_0D008F18 = 0x0D008F18;
D_0D008F28 = 0x0D008F28;
D_0D008F80 = 0x0D008F80;
D_0D008FB8 = 0x0D008FB8;
D_0D009058 = 0x0D009058;
D_0D0090B8 = 0x0D0090B8;
D_0D0090F8 = 0x0D0090F8;
D_0D009158 = 0x0D009158;
D_0D009188 = 0x0D009188;
D_0D0091E8 = 0x0D0091E8;
D_0D009210 = 0x0D009210;
D_0D009238 = 0x0D009238;
D_0D009260 = 0x0D009260;
D_0D009280 = 0x0D009280;
D_0D0092C8 = 0x0D0092C8;
D_0D009310 = 0x0D009310;
D_0D0093C0 = 0x0D0093C0;
D_0D009418 = 0x0D009418;
D_0D009568 = 0x0D009568;
D_0D0096B8 = 0x0D0096B8;
D_0D009808 = 0x0D009808;
D_0D009958 = 0x0D009958;
D_0D00A558 = 0x0D00A558;
D_0D00A958 = 0x0D00A958;
D_0D00AB58 = 0x0D00AB58;
D_0D00B158 = 0x0D00B158;
D_0D00B558 = 0x0D00B558;
D_0D00B958 = 0x0D00B958;
D_0D00BD58 = 0x0D00BD58;
D_0D00C158 = 0x0D00C158;
D_0D00C558 = 0x0D00C558;
D_0D00D258 = 0x0D00D258;
D_0D015258 = 0x0D015258;
gTLUTHudTypeCRankFont = 0x0D019458;
gTextureHudTypeCRankFont = 0x0D019658;
gTLUTHudTypeCRankTinyFont = 0x0D019E58;
gTextureHudTypeCRankTinyFont = 0x0D01A058;
gTextureCharacterPortraitBorder = 0x0D01A2D8;
gTLUTPortraitMario = 0x0D01A4D8;
gTLUTPortraitLuigi = 0x0D01A6D8;
gTLUTPortraitPeach = 0x0D01A8D8;
gTLUTPortraitToad = 0x0D01AAD8;
gTLUTPortraitYoshi = 0x0D01ACD8;
gTLUTPortraitDonkeyKong = 0x0D01AED8;
gTLUTPortraitWario = 0x0D01B0D8;
gTLUTPortraitBowser = 0x0D01B2D8;
gTLUTPortraitBombKartAndQuestionMark = 0x0D01B4D8;
gTexturePortraitMario = 0x0D01B6D8;
gTexturePortraitLuigi = 0x0D01BAD8;
gTexturePortraitPeach = 0x0D01BED8;
gTexturePortraitToad = 0x0D01C2D8;
gTexturePortraitYoshi = 0x0D01C6D8;
gTexturePortraitDonkeyKong = 0x0D01CAD8;
gTexturePortraitWario = 0x0D01CED8;
gTexturePortraitBowser = 0x0D01D2D8;
gTexturePortraitBombKart = 0x0D01D6D8;
gTexturePortraitQuestionMark = 0x0D01DAD8;
gTLUTItemWindowNone = 0x0D01DED8;
gTLUTItemWindowBanana = 0x0D01E0D8;
gTLUTItemWindowBananaBunch = 0x0D01E2D8;
gTLUTItemWindowMushroom = 0x0D01E4D8;
gTLUTItemWindowDoubleMushroom = 0x0D01E6D8;
gTLUTItemWindowTripleMushroom = 0x0D01E8D8;
gTLUTItemWindowSuperMushroom = 0x0D01EAD8;
gTLUTItemWindowBlueShell = 0x0D01ECD8;
gTLUTItemWindowBoo = 0x0D01EED8;
gTLUTItemWindowGreenShell = 0x0D01F0D8;
gTLUTItemWindowTripleGreenShell = 0x0D01F2D8;
gTLUTItemWindowRedShell = 0x0D01F4D8;
gTLUTItemWindowTripleRedShell = 0x0D01F6D8;
gTLUTItemWindowStar = 0x0D01F8D8;
gTLUTItemWindowThunderBolt = 0x0D01FAD8;
gTLUTItemWindowFakeItemBox = 0x0D01FCD8;
gTextureItemWindowNone = 0x0D01FED8;
gTextureItemWindowBanana = 0x0D0203D8;
gTextureItemWindowBananaBunch = 0x0D0208D8;
gTextureItemWindowMushroom = 0x0D020DD8;
gTextureItemWindowDoubleMushroom = 0x0D0212D8;
gTextureItemWindowTripleMushroom = 0x0D0217D8;
gTextureItemWindowSuperMushroom = 0x0D021CD8;
gTextureItemWindowBlueShell = 0x0D0221D8;
gTextureItemWindowBoo = 0x0D0226D8;
gTextureItemWindowGreenShell = 0x0D022BD8;
gTextureItemWindowTripleGreenShell = 0x0D0230D8;
gTextureItemWindowRedShell = 0x0D0235D8;
gTextureItemWindowTripleRedShell = 0x0D023AD8;
gTextureItemWindowStar = 0x0D023FD8;
gTextureItemWindowThunderBolt = 0x0D0244D8;
gTextureItemWindowFakeItemBox = 0x0D0249D8;
gTLUTLakituCountdown = 0x0D024ED8;
gTLUTLakituCheckeredFlag = 0x0D0254D8;
gTLUTLakituSecondLap = 0x0D0256D8;
gTLUTLakituFinalLap = 0x0D0258D8;
gTLUTLakituReverse = 0x0D025AD8;
gTLUTLakituFishing = 0x0D025CD8;
D_0D028DD8 = 0x0D028DD8;
D_0D0291D8 = 0x0D0291D8;
D_0D0293D8 = 0x0D0293D8;
D_0D029458 = 0x0D029458;
D_0D029858 = 0x0D029858;
D_0D02A858 = 0x0D02A858;
D_0D02AA58 = 0x0D02AA58;
D_0D02AC58 = 0x0D02AC58;
D_0D02BC58 = 0x0D02BC58;
gTextureMiniMapFinishLine = 0x0D02CC58;
gMiniMapKartTextures = 0x0D02CCD8;
gTextureMiniMapProgressDot = 0x0D02D0D8;
D_0F04CBE0 = 0x0F04CBE0;
D_0F04CE30 = 0x0F04CE30;
D_0F04D080 = 0x0F04D080;
@ -538,32 +297,3 @@ D_07003790 = 0x07003790;
D_070006D0 = 0x070006D0;
D_070004D0 = 0x070004D0;
D_07000840 = 0x07000840;
D_toads_turnpike_0D005398 = 0x0D005398;
D_toads_turnpike_0D0053B0 = 0x0D0053B0;
D_toads_turnpike_0D005398 = 0x0D005398;
D_toads_turnpike_0D0053B0 = 0x0D0053B0;
D_toads_turnpike_0D0053C8 = 0x0D0053C8;
D_toads_turnpike_0D0053F0 = 0x0D0053F0;
D_toads_turnpike_0D005418 = 0x0D005418;
D_toads_turnpike_0D005398 = 0x0D005398;
D_toads_turnpike_0D0053B0 = 0x0D0053B0;
D_toads_turnpike_0D005398 = 0x0D005398;
D_toads_turnpike_0D0053B0 = 0x0D0053B0;
D_toads_turnpike_0D0053C8 = 0x0D0053C8;
D_toads_turnpike_0D0053F0 = 0x0D0053F0;
D_toads_turnpike_0D005418 = 0x0D005418;
D_toads_turnpike_0D005398 = 0x0D005398;
D_toads_turnpike_0D0053B0 = 0x0D0053B0;
D_toads_turnpike_0D005398 = 0x0D005398;
D_toads_turnpike_0D0053B0 = 0x0D0053B0;
D_toads_turnpike_0D0053C8 = 0x0D0053C8;
D_toads_turnpike_0D0053F0 = 0x0D0053F0;
D_toads_turnpike_0D005418 = 0x0D005418;
D_toads_turnpike_0D005398 = 0x0D005398;
D_toads_turnpike_0D0053B0 = 0x0D0053B0;
D_toads_turnpike_0D005398 = 0x0D005398;
D_toads_turnpike_0D0053B0 = 0x0D0053B0;
D_toads_turnpike_0D0053C8 = 0x0D0053C8;
D_toads_turnpike_0D0053F0 = 0x0D0053F0;
D_toads_turnpike_0D005418 = 0x0D005418;