diff --git a/Makefile b/Makefile index c7260ab26..2b4742aeb 100644 --- a/Makefile +++ b/Makefile @@ -351,63 +351,61 @@ $(BUILD_DIR)/src/common_textures.inc.o: src/common_textures.inc.c $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1A2D8.ia4.inc.c -g textures/132B50_1A2D8.ia4.png -s u8 -f ia4 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1A4D8_tlut.rgba16.inc.c -g textures/132B50_1A4D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1A6D8_tlut.rgba16.inc.c -g textures/132B50_1A6D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1A8D8_tlut.rgba16.inc.c -g textures/132B50_1A8D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1AAD8_tlut.rgba16.inc.c -g textures/132B50_1AAD8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1ACD8_tlut.rgba16.inc.c -g textures/132B50_1ACD8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1AED8_tlut.rgba16.inc.c -g textures/132B50_1AED8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1B0D8_tlut.rgba16.inc.c -g textures/132B50_1B0D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1B2D8_tlut.rgba16.inc.c -g textures/132B50_1B2D8_tlut.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTPortraitMario.rgba16.inc.c -g textures/gTLUTPortraitMario.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTPortraitLuigi.rgba16.inc.c -g textures/gTLUTPortraitLuigi.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTPortraitPeach.rgba16.inc.c -g textures/gTLUTPortraitPeach.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTPortraitToad.rgba16.inc.c -g textures/gTLUTPortraitToad.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTPortraitYoshi.rgba16.inc.c -g textures/gTLUTPortraitYoshi.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTPortraitDonkeyKong.rgba16.inc.c -g textures/gTLUTPortraitDonkeyKong.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTPortraitWario.rgba16.inc.c -g textures/gTLUTPortraitWario.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTPortraitBowser.rgba16.inc.c -g textures/gTLUTPortraitBowser.rgba16.png -s u8 -w 16 -h 16 $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1B4D8_tlut.rgba16.inc.c -g textures/132B50_1B4D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1B6D8.rgba16.ci8.inc.c -g textures/132B50_1B6D8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1A4D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1BAD8.rgba16.ci8.inc.c -g textures/132B50_1BAD8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1A6D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1BED8.rgba16.ci8.inc.c -g textures/132B50_1BED8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1A8D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1C2D8.rgba16.ci8.inc.c -g textures/132B50_1C2D8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1AAD8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1C6D8.rgba16.ci8.inc.c -g textures/132B50_1C6D8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1ACD8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1CAD8.rgba16.ci8.inc.c -g textures/132B50_1CAD8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1AED8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1CED8.rgba16.ci8.inc.c -g textures/132B50_1CED8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1B0D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1D2D8.rgba16.ci8.inc.c -g textures/132B50_1D2D8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1B2D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1D6D8.rgba16.ci8.inc.c -g textures/132B50_1D6D8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1B4D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1DAD8.rgba16.ci8.inc.c -g textures/132B50_1DAD8.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/132B50_1B4D8_tlut_gen.rgba16.bin - $(BIN2C) textures/132B50_1DAD8.rgba16.ci8.bin $(BUILD_DIR)/textures/132B50_1DAD8.rgba16.ci8 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTexturePortraitMario.rgba16.ci8.inc.c -g textures/gTexturePortraitMario.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/gTLUTPortraitMario.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTexturePortraitLuigi.rgba16.ci8.inc.c -g textures/gTexturePortraitLuigi.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/gTLUTPortraitLuigi.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTexturePortraitPeach.rgba16.ci8.inc.c -g textures/gTexturePortraitPeach.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/gTLUTPortraitPeach.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTexturePortraitToad.rgba16.ci8.inc.c -g textures/gTexturePortraitToad.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/gTLUTPortraitToad.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTexturePortraitYoshi.rgba16.ci8.inc.c -g textures/gTexturePortraitYoshi.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/gTLUTPortraitYoshi.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTexturePortraitDonkeyKong.rgba16.ci8.inc.c -g textures/gTexturePortraitDonkeyKong.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/gTLUTPortraitDonkeyKong.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTexturePortraitWario.rgba16.ci8.inc.c -g textures/gTexturePortraitWario.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/gTLUTPortraitWario.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTexturePortraitBowser.rgba16.ci8.inc.c -g textures/gTexturePortraitBowser.rgba16.ci8.png -s u8 -w 32 -h 32 -f ci8 -c rgba16 -p textures/gTLUTPortraitBowser.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1D6D8.rgba16.ci8.inc.c -g textures/132B50_1D6D8.rgba16.ci8.png -s u8 -w 64 -h 32 -f ci8 -c rgba16 -p textures/132B50_1B4D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1DED8_tlut.rgba16.inc.c -g textures/132B50_1DED8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1E0D8_tlut.rgba16.inc.c -g textures/132B50_1E0D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1E2D8_tlut.rgba16.inc.c -g textures/132B50_1E2D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1E4D8_tlut.rgba16.inc.c -g textures/132B50_1E4D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1E6D8_tlut.rgba16.inc.c -g textures/132B50_1E6D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1E8D8_tlut.rgba16.inc.c -g textures/132B50_1E8D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1EAD8_tlut.rgba16.inc.c -g textures/132B50_1EAD8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1ECD8_tlut.rgba16.inc.c -g textures/132B50_1ECD8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1EED8_tlut.rgba16.inc.c -g textures/132B50_1EED8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1F0D8_tlut.rgba16.inc.c -g textures/132B50_1F0D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1F2D8_tlut.rgba16.inc.c -g textures/132B50_1F2D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1F4D8_tlut.rgba16.inc.c -g textures/132B50_1F4D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1F6D8_tlut.rgba16.inc.c -g textures/132B50_1F6D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1F8D8_tlut.rgba16.inc.c -g textures/132B50_1F8D8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1FAD8_tlut.rgba16.inc.c -g textures/132B50_1FAD8_tlut.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1FCD8_tlut.rgba16.inc.c -g textures/132B50_1FCD8_tlut.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowNone.rgba16.inc.c -g textures/gTLUTItemWindowNone.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowBanana.rgba16.inc.c -g textures/gTLUTItemWindowBanana.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowBananaBunch.rgba16.inc.c -g textures/gTLUTItemWindowBananaBunch.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowMushroom.rgba16.inc.c -g textures/gTLUTItemWindowMushroom.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowDoubleMushroom.rgba16.inc.c -g textures/gTLUTItemWindowDoubleMushroom.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowTripleMushroom.rgba16.inc.c -g textures/gTLUTItemWindowTripleMushroom.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowSuperMushroom.rgba16.inc.c -g textures/gTLUTItemWindowSuperMushroom.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowBlueShell.rgba16.inc.c -g textures/gTLUTItemWindowBlueShell.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowBoo.rgba16.inc.c -g textures/gTLUTItemWindowBoo.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowGreenShell.rgba16.inc.c -g textures/gTLUTItemWindowGreenShell.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowTripleGreenShell.rgba16.inc.c -g textures/gTLUTItemWindowTripleGreenShell.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowRedShell.rgba16.inc.c -g textures/gTLUTItemWindowRedShell.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowTripleRedShell.rgba16.inc.c -g textures/gTLUTItemWindowTripleRedShell.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowStar.rgba16.inc.c -g textures/gTLUTItemWindowStar.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowThunderBolt.rgba16.inc.c -g textures/gTLUTItemWindowThunderBolt.rgba16.png -s u8 -w 16 -h 16 + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTLUTItemWindowFakeItemBox.rgba16.inc.c -g textures/gTLUTItemWindowFakeItemBox.rgba16.png -s u8 -w 16 -h 16 - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_1FED8.rgba16.ci8.inc.c -g textures/132B50_1FED8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1DED8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_203D8.rgba16.ci8.inc.c -g textures/132B50_203D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1E0D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_208D8.rgba16.ci8.inc.c -g textures/132B50_208D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1E2D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_20DD8.rgba16.ci8.inc.c -g textures/132B50_20DD8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1E4D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_212D8.rgba16.ci8.inc.c -g textures/132B50_212D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1E6D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_217D8.rgba16.ci8.inc.c -g textures/132B50_217D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1E8D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_21CD8.rgba16.ci8.inc.c -g textures/132B50_21CD8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1EAD8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_221D8.rgba16.ci8.inc.c -g textures/132B50_221D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1ECD8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_226D8.rgba16.ci8.inc.c -g textures/132B50_226D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1EED8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_22BD8.rgba16.ci8.inc.c -g textures/132B50_22BD8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1F0D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_230D8.rgba16.ci8.inc.c -g textures/132B50_230D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1F2D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_235D8.rgba16.ci8.inc.c -g textures/132B50_235D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1F4D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_23AD8.rgba16.ci8.inc.c -g textures/132B50_23AD8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1F6D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_23FD8.rgba16.ci8.inc.c -g textures/132B50_23FD8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1F8D8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_244D8.rgba16.ci8.inc.c -g textures/132B50_244D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1FAD8_tlut_gen.rgba16.bin - $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_249D8.rgba16.ci8.inc.c -g textures/132B50_249D8.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/132B50_1FCD8_tlut_gen.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowNone.rgba16.ci8.inc.c -g textures/gTextureItemWindowNone.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowNone.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowBanana.rgba16.ci8.inc.c -g textures/gTextureItemWindowBanana.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowBanana.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowBananaBunch.rgba16.ci8.inc.c -g textures/gTextureItemWindowBananaBunch.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowBananaBunch.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowMushroom.rgba16.ci8.inc.c -g textures/gTextureItemWindowMushroom.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowMushroom.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowDoubleMushroom.rgba16.ci8.inc.c -g textures/gTextureItemWindowDoubleMushroom.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowDoubleMushroom.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowTripleMushroom.rgba16.ci8.inc.c -g textures/gTextureItemWindowTripleMushroom.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowTripleMushroom.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowSuperMushroom.rgba16.ci8.inc.c -g textures/gTextureItemWindowSuperMushroom.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowSuperMushroom.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowBlueShell.rgba16.ci8.inc.c -g textures/gTextureItemWindowBlueShell.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowBlueShell.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowBoo.rgba16.ci8.inc.c -g textures/gTextureItemWindowBoo.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowBoo.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowGreenShell.rgba16.ci8.inc.c -g textures/gTextureItemWindowGreenShell.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowGreenShell.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowTripleGreenShell.rgba16.ci8.inc.c -g textures/gTextureItemWindowTripleGreenShell.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowTripleGreenShell.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowRedShell.rgba16.ci8.inc.c -g textures/gTextureItemWindowRedShell.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowRedShell.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowTripleRedShell.rgba16.ci8.inc.c -g textures/gTextureItemWindowTripleRedShell.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowTripleRedShell.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowStar.rgba16.ci8.inc.c -g textures/gTextureItemWindowStar.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowStar.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowThunderBolt.rgba16.ci8.inc.c -g textures/gTextureItemWindowThunderBolt.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowThunderBolt.rgba16.bin + $(N64GRAPHICS) -i $(BUILD_DIR)/textures/gTextureItemWindowFakeItemBox.rgba16.ci8.inc.c -g textures/gTextureItemWindowFakeItemBox.rgba16.ci8.png -s u8 -w 40 -h 32 -f ci8 -c rgba16 -p textures/gTLUTItemWindowFakeItemBox.rgba16.bin $(BIN2C) textures/132B50_24ED8_tlut.rgba16.bin $(BUILD_DIR)/textures/132B50_24ED8_tlut.rgba16 $(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_25ED8_tlut.rgba16.inc.c -g textures/132B50_25ED8_tlut.rgba16.png -s u8 -w 16 -h 16 diff --git a/asm/bss_8001C4D0.s b/asm/bss_8001C4D0.s index 05ad031a8..fcead5f75 100644 --- a/asm/bss_8001C4D0.s +++ b/asm/bss_8001C4D0.s @@ -763,17 +763,8 @@ glabel D_80183E80 glabel D_80183E84 .skip 4 -glabel D_80183E88 -.skip 4 - -glabel D_80183E8C -.skip 4 - -glabel D_80183E90 -.skip 4 - -glabel D_80183E94 -.skip 4 +glabel gItemWindowObjectByPlayerId +.skip 16 glabel D_80183E98 .skip 8 diff --git a/asm/non_matchings/code_800431B0/func_8004E6C4.s b/asm/non_matchings/code_800431B0/func_8004E6C4.s index c1ac1ceac..9a28d41a4 100644 --- a/asm/non_matchings/code_800431B0/func_8004E6C4.s +++ b/asm/non_matchings/code_800431B0/func_8004E6C4.s @@ -1,8 +1,8 @@ glabel func_8004E6C4 /* 04F2C4 8004E6C4 00047880 */ sll $t7, $a0, 2 -/* 04F2C8 8004E6C8 3C028018 */ lui $v0, %hi(D_80183E88) # 0x8018 +/* 04F2C8 8004E6C8 3C028018 */ lui $v0, %hi(gItemWindowObjectByPlayerId) # 0x8018 /* 04F2CC 8004E6CC 004F1021 */ addu $v0, $v0, $t7 -/* 04F2D0 8004E6D0 8C423E88 */ lw $v0, %lo(D_80183E88)($v0) # 0x3e88($v0) +/* 04F2D0 8004E6D0 8C423E88 */ lw $v0, %lo(gItemWindowObjectByPlayerId)($v0) # 0x3e88($v0) /* 04F2D4 8004E6D4 3C198016 */ lui $t9, %hi(D_80165C18) # $t9, 0x8016 /* 04F2D8 8004E6D8 27395C18 */ addiu $t9, %lo(D_80165C18) # addiu $t9, $t9, 0x5c18 /* 04F2DC 8004E6DC 0002C0C0 */ sll $t8, $v0, 3 diff --git a/asm/non_matchings/code_800431B0/func_8004F020.s b/asm/non_matchings/code_800431B0/func_8004F020.s index b5bae8519..70c335e1b 100644 --- a/asm/non_matchings/code_800431B0/func_8004F020.s +++ b/asm/non_matchings/code_800431B0/func_8004F020.s @@ -77,8 +77,8 @@ glabel func_8004F020 .L8004F138: /* 04FD38 8004F138 4600148D */ trunc.w.s $f18, $f2 .L8004F13C: -/* 04FD3C 8004F13C 3C060D03 */ lui $a2, %hi(D_0D02CC58) # $a2, 0xd03 -/* 04FD40 8004F140 24C6CC58 */ addiu $a2, %lo(D_0D02CC58) # addiu $a2, $a2, -0x33a8 +/* 04FD3C 8004F13C 3C060D03 */ lui $a2, %hi(gTextureMiniMapFinishLine) # $a2, 0xd03 +/* 04FD40 8004F140 24C6CC58 */ addiu $a2, %lo(gTextureMiniMapFinishLine) # addiu $a2, $a2, -0x33a8 /* 04FD44 8004F144 4600010D */ trunc.w.s $f4, $f0 /* 04FD48 8004F148 44049000 */ mfc1 $a0, $f18 /* 04FD4C 8004F14C 44052000 */ mfc1 $a1, $f4 diff --git a/asm/non_matchings/code_800431B0/func_8004F168.s b/asm/non_matchings/code_800431B0/func_8004F168.s index 7a6b7329e..40b0486d5 100644 --- a/asm/non_matchings/code_800431B0/func_8004F168.s +++ b/asm/non_matchings/code_800431B0/func_8004F168.s @@ -88,14 +88,14 @@ glabel func_8004F168 /* 04FEB8 8004F2B8 1041001B */ beq $v0, $at, .L8004F328 /* 04FEBC 8004F2BC 24010001 */ li $at, 1 /* 04FEC0 8004F2C0 10410019 */ beq $v0, $at, .L8004F328 -/* 04FEC4 8004F2C4 3C0A0D03 */ lui $t2, %hi(D_0D02CCD8) # $t2, 0xd03 +/* 04FEC4 8004F2C4 3C0A0D03 */ lui $t2, %hi(gMiniMapKartTextures) # $t2, 0xd03 /* 04FEC8 8004F2C8 8466002E */ lh $a2, 0x2e($v1) /* 04FECC 8004F2CC 34018000 */ li $at, 32768 /* 04FED0 8004F2D0 000869C0 */ sll $t5, $t0, 7 /* 04FED4 8004F2D4 00C13021 */ addu $a2, $a2, $at /* 04FED8 8004F2D8 30CCFFFF */ andi $t4, $a2, 0xffff /* 04FEDC 8004F2DC 01803025 */ move $a2, $t4 -/* 04FEE0 8004F2E0 254ACCD8 */ addiu $t2, %lo(D_0D02CCD8) # addiu $t2, $t2, -0x3328 +/* 04FEE0 8004F2E0 254ACCD8 */ addiu $t2, %lo(gMiniMapKartTextures) # addiu $t2, $t2, -0x3328 /* 04FEE4 8004F2E4 3C190D00 */ lui $t9, %hi(D_0D005470) # $t9, 0xd00 /* 04FEE8 8004F2E8 27395470 */ addiu $t9, %lo(D_0D005470) # addiu $t9, $t9, 0x5470 /* 04FEEC 8004F2EC 01AA7021 */ addu $t6, $t5, $t2 @@ -116,11 +116,11 @@ glabel func_8004F168 .L8004F328: /* 04FF28 8004F328 8466002E */ lh $a2, 0x2e($v1) /* 04FF2C 8004F32C 34018000 */ li $at, 32768 -/* 04FF30 8004F330 3C0E0D03 */ lui $t6, %hi(D_0D02CCD8) # $t6, 0xd03 +/* 04FF30 8004F330 3C0E0D03 */ lui $t6, %hi(gMiniMapKartTextures) # $t6, 0xd03 /* 04FF34 8004F334 00C13021 */ addu $a2, $a2, $at /* 04FF38 8004F338 30C8FFFF */ andi $t0, $a2, 0xffff /* 04FF3C 8004F33C 01003025 */ move $a2, $t0 -/* 04FF40 8004F340 25CECCD8 */ addiu $t6, %lo(D_0D02CCD8) # addiu $t6, $t6, -0x3328 +/* 04FF40 8004F340 25CECCD8 */ addiu $t6, %lo(gMiniMapKartTextures) # addiu $t6, $t6, -0x3328 /* 04FF44 8004F344 000D51C0 */ sll $t2, $t5, 7 /* 04FF48 8004F348 3C0F0D00 */ lui $t7, %hi(D_0D005470) # $t7, 0xd00 /* 04FF4C 8004F34C 25EF5470 */ addiu $t7, %lo(D_0D005470) # addiu $t7, $t7, 0x5470 @@ -146,9 +146,9 @@ glabel func_8004F168 /* 04FF98 8004F398 24070008 */ li $a3, 8 /* 04FF9C 8004F39C 24060008 */ li $a2, 8 /* 04FFA0 8004F3A0 15A00009 */ bnez $t5, .L8004F3C8 -/* 04FFA4 8004F3A4 3C0E0D03 */ lui $t6, %hi(D_0D02D0D8) # $t6, 0xd03 -/* 04FFA8 8004F3A8 3C0A0D03 */ lui $t2, %hi(D_0D02D0D8) # $t2, 0xd03 -/* 04FFAC 8004F3AC 254AD0D8 */ addiu $t2, %lo(D_0D02D0D8) # addiu $t2, $t2, -0x2f28 +/* 04FFA4 8004F3A4 3C0E0D03 */ lui $t6, %hi(gTextureMiniMapProgressDot) # $t6, 0xd03 +/* 04FFA8 8004F3A8 3C0A0D03 */ lui $t2, %hi(gTextureMiniMapProgressDot) # $t2, 0xd03 +/* 04FFAC 8004F3AC 254AD0D8 */ addiu $t2, %lo(gTextureMiniMapProgressDot) # addiu $t2, $t2, -0x2f28 /* 04FFB0 8004F3B0 AFAA0010 */ sw $t2, 0x10($sp) /* 04FFB4 8004F3B4 24060008 */ li $a2, 8 /* 04FFB8 8004F3B8 0C013114 */ jal func_8004C450 @@ -156,7 +156,7 @@ glabel func_8004F168 /* 04FFC0 8004F3C0 10000005 */ b .L8004F3D8 /* 04FFC4 8004F3C4 8FBF002C */ lw $ra, 0x2c($sp) .L8004F3C8: -/* 04FFC8 8004F3C8 25CED0D8 */ addiu $t6, %lo(D_0D02D0D8) # addiu $t6, $t6, -0x2f28 +/* 04FFC8 8004F3C8 25CED0D8 */ addiu $t6, %lo(gTextureMiniMapProgressDot) # addiu $t6, $t6, -0x2f28 /* 04FFCC 8004F3CC 0C0130D9 */ jal func_8004C364 /* 04FFD0 8004F3D0 AFAE0010 */ sw $t6, 0x10($sp) .L8004F3D4: diff --git a/asm/non_matchings/code_800431B0/func_8004FDB4.s b/asm/non_matchings/code_800431B0/func_8004FDB4.s index e668782b3..ffcc0f3ca 100644 --- a/asm/non_matchings/code_800431B0/func_8004FDB4.s +++ b/asm/non_matchings/code_800431B0/func_8004FDB4.s @@ -42,8 +42,8 @@ glabel func_8004FDB4 /* 050A54 8004FE54 0C012CD7 */ jal func_8004B35C /* 050A58 8004FE58 240600FF */ li $a2, 255 /* 050A5C 8004FE5C 8E300000 */ lw $s0, ($s1) -/* 050A60 8004FE60 3C0C0D02 */ lui $t4, %hi(D_0D01B4D8) # $t4, 0xd02 -/* 050A64 8004FE64 258CB4D8 */ addiu $t4, %lo(D_0D01B4D8) # addiu $t4, $t4, -0x4b28 +/* 050A60 8004FE60 3C0C0D02 */ lui $t4, %hi(gTLUTPortraitMiniBombKart) # $t4, 0xd02 +/* 050A64 8004FE64 258CB4D8 */ addiu $t4, %lo(gTLUTPortraitMiniBombKart) # addiu $t4, $t4, -0x4b28 /* 050A68 8004FE68 26180008 */ addiu $t8, $s0, 8 /* 050A6C 8004FE6C AE380000 */ sw $t8, ($s1) /* 050A70 8004FE70 3C19FD10 */ lui $t9, 0xfd10 @@ -79,10 +79,10 @@ glabel func_8004FDB4 /* 050AE8 8004FEE8 AE0F0000 */ sw $t7, ($s0) /* 050AEC 8004FEEC 8E300000 */ lw $s0, ($s1) /* 050AF0 8004FEF0 3C0CE700 */ lui $t4, 0xe700 -/* 050AF4 8004FEF4 3C040D02 */ lui $a0, %hi(D_0D01DAD8) # $a0, 0xd02 +/* 050AF4 8004FEF4 3C040D02 */ lui $a0, %hi(gTexturePortraitQuestionMark) # $a0, 0xd02 /* 050AF8 8004FEF8 26190008 */ addiu $t9, $s0, 8 /* 050AFC 8004FEFC AE390000 */ sw $t9, ($s1) -/* 050B00 8004FF00 2484DAD8 */ addiu $a0, %lo(D_0D01DAD8) # addiu $a0, $a0, -0x2528 +/* 050B00 8004FF00 2484DAD8 */ addiu $a0, %lo(gTexturePortraitQuestionMark) # addiu $a0, $a0, -0x2528 /* 050B04 8004FF04 24050020 */ li $a1, 32 /* 050B08 8004FF08 24060020 */ li $a2, 32 /* 050B0C 8004FF0C AE000004 */ sw $zero, 4($s0) @@ -127,7 +127,7 @@ glabel func_8004FDB4 /* 050BA0 8004FFA0 240600FF */ li $a2, 255 /* 050BA4 8004FFA4 8E300000 */ lw $s0, ($s1) /* 050BA8 8004FFA8 3C0DFD10 */ lui $t5, 0xfd10 -/* 050BAC 8004FFAC 3C0F800E */ lui $t7, %hi(D_800E457C) +/* 050BAC 8004FFAC 3C0F800E */ lui $t7, %hi(gPortraitTLUTs) /* 050BB0 8004FFB0 260C0008 */ addiu $t4, $s0, 8 /* 050BB4 8004FFB4 AE2C0000 */ sw $t4, ($s1) /* 050BB8 8004FFB8 AE0D0000 */ sw $t5, ($s0) @@ -136,13 +136,13 @@ glabel func_8004FDB4 /* 050BC4 8004FFC4 3C0DF500 */ lui $t5, (0xF5000100 >> 16) # lui $t5, 0xf500 /* 050BC8 8004FFC8 00037080 */ sll $t6, $v1, 2 /* 050BCC 8004FFCC 01EE7821 */ addu $t7, $t7, $t6 -/* 050BD0 8004FFD0 8DEF457C */ lw $t7, %lo(D_800E457C)($t7) +/* 050BD0 8004FFD0 8DEF457C */ lw $t7, %lo(gPortraitTLUTs)($t7) /* 050BD4 8004FFD4 01C01825 */ move $v1, $t6 /* 050BD8 8004FFD8 3C0E0700 */ lui $t6, 0x700 /* 050BDC 8004FFDC AE0F0004 */ sw $t7, 4($s0) /* 050BE0 8004FFE0 8E300000 */ lw $s0, ($s1) /* 050BE4 8004FFE4 35AD0100 */ ori $t5, (0xF5000100 & 0xFFFF) # ori $t5, $t5, 0x100 -/* 050BE8 8004FFE8 3C04800E */ lui $a0, %hi(D_800E459C) +/* 050BE8 8004FFE8 3C04800E */ lui $a0, %hi(gPortraitTextures) /* 050BEC 8004FFEC 26180008 */ addiu $t8, $s0, 8 /* 050BF0 8004FFF0 AE380000 */ sw $t8, ($s1) /* 050BF4 8004FFF4 AE000004 */ sw $zero, 4($s0) @@ -176,7 +176,7 @@ glabel func_8004FDB4 /* 050C64 80050064 AE000004 */ sw $zero, 4($s0) /* 050C68 80050068 AE0F0000 */ sw $t7, ($s0) /* 050C6C 8005006C 0C0114A9 */ jal func_800452A4 -/* 050C70 80050070 8C84459C */ lw $a0, %lo(D_800E459C)($a0) +/* 050C70 80050070 8C84459C */ lw $a0, %lo(gPortraitTextures)($a0) /* 050C74 80050074 8FB800C4 */ lw $t8, 0xc4($sp) /* 050C78 80050078 5300000A */ beql $t8, $zero, .L800500A4 /* 050C7C 8005007C 8E300000 */ lw $s0, ($s1) diff --git a/asm/non_matchings/code_800431B0/func_80050C68.s b/asm/non_matchings/code_800431B0/func_80050C68.s index 443a91c75..7ce06b7cd 100644 --- a/asm/non_matchings/code_800431B0/func_80050C68.s +++ b/asm/non_matchings/code_800431B0/func_80050C68.s @@ -28,10 +28,10 @@ glabel func_80050C68 /* 0518CC 80050CCC 10400048 */ beqz $v0, .L80050DF0 /* 0518D0 80050CD0 3224FFFF */ andi $a0, $s1, 0xffff /* 0518D4 80050CD4 3C130D00 */ lui $s3, %hi(D_0D007DB8) # $s3, 0xd00 -/* 0518D8 80050CD8 3C140D02 */ lui $s4, %hi(D_0D01B4D8) # $s4, 0xd02 +/* 0518D8 80050CD8 3C140D02 */ lui $s4, %hi(gTLUTPortraitMiniBombKart) # $s4, 0xd02 /* 0518DC 80050CDC 3C150D00 */ lui $s5, %hi(D_0D0069E0) # $s5, 0xd00 /* 0518E0 80050CE0 26B569E0 */ addiu $s5, %lo(D_0D0069E0) # addiu $s5, $s5, 0x69e0 -/* 0518E4 80050CE4 2694B4D8 */ addiu $s4, %lo(D_0D01B4D8) # addiu $s4, $s4, -0x4b28 +/* 0518E4 80050CE4 2694B4D8 */ addiu $s4, %lo(gTLUTPortraitMiniBombKart) # addiu $s4, $s4, -0x4b28 /* 0518E8 80050CE8 26737DB8 */ addiu $s3, %lo(D_0D007DB8) # addiu $s3, $s3, 0x7db8 /* 0518EC 80050CEC 03C02825 */ move $a1, $fp /* 0518F0 80050CF0 0C0141F6 */ jal func_800507D8 @@ -44,8 +44,8 @@ glabel func_80050C68 /* 05190C 80050D0C AC530004 */ sw $s3, 4($v0) /* 051910 80050D10 AC560000 */ sw $s6, ($v0) /* 051914 80050D14 8E020000 */ lw $v0, ($s0) -/* 051918 80050D18 3C040D02 */ lui $a0, %hi(D_0D01D6D8) # $a0, 0xd02 -/* 05191C 80050D1C 2484D6D8 */ addiu $a0, %lo(D_0D01D6D8) # addiu $a0, $a0, -0x2928 +/* 051918 80050D18 3C040D02 */ lui $a0, %hi(gTexturePortraitMiniBombKart) # $a0, 0xd02 +/* 05191C 80050D1C 2484D6D8 */ addiu $a0, %lo(gTexturePortraitMiniBombKart) # addiu $a0, $a0, -0x2928 /* 051920 80050D20 244F0008 */ addiu $t7, $v0, 8 /* 051924 80050D24 AE0F0000 */ sw $t7, ($s0) /* 051928 80050D28 AC540004 */ sw $s4, 4($v0) diff --git a/asm/non_matchings/code_800431B0/func_80050E34.s b/asm/non_matchings/code_800431B0/func_80050E34.s index 853d2cd00..374837d2f 100644 --- a/asm/non_matchings/code_800431B0/func_80050E34.s +++ b/asm/non_matchings/code_800431B0/func_80050E34.s @@ -72,8 +72,8 @@ glabel func_80050E34 /* 051B38 80050F38 AC580000 */ sw $t8, ($v0) /* 051B3C 80050F3C AC590004 */ sw $t9, 4($v0) /* 051B40 80050F40 8E020000 */ lw $v0, ($s0) -/* 051B44 80050F44 3C180D02 */ lui $t8, %hi(D_0D01B4D8) # $t8, 0xd02 -/* 051B48 80050F48 2718B4D8 */ addiu $t8, %lo(D_0D01B4D8) # addiu $t8, $t8, -0x4b28 +/* 051B44 80050F44 3C180D02 */ lui $t8, %hi(gTLUTPortraitMiniBombKart) # $t8, 0xd02 +/* 051B48 80050F48 2718B4D8 */ addiu $t8, %lo(gTLUTPortraitMiniBombKart) # addiu $t8, $t8, -0x4b28 /* 051B4C 80050F4C 244E0008 */ addiu $t6, $v0, 8 /* 051B50 80050F50 AE0E0000 */ sw $t6, ($s0) /* 051B54 80050F54 3C0FFD10 */ lui $t7, 0xfd10 @@ -109,13 +109,13 @@ glabel func_80050E34 /* 051BCC 80050FCC AC590000 */ sw $t9, ($v0) /* 051BD0 80050FD0 8E020000 */ lw $v0, ($s0) /* 051BD4 80050FD4 3C18E700 */ lui $t8, 0xe700 -/* 051BD8 80050FD8 3C040D02 */ lui $a0, %hi(D_0D01DAD8) # $a0, 0xd02 +/* 051BD8 80050FD8 3C040D02 */ lui $a0, %hi(gTexturePortraitQuestionMark) # $a0, 0xd02 /* 051BDC 80050FDC 244F0008 */ addiu $t7, $v0, 8 /* 051BE0 80050FE0 AE0F0000 */ sw $t7, ($s0) /* 051BE4 80050FE4 AC400004 */ sw $zero, 4($v0) /* 051BE8 80050FE8 AC580000 */ sw $t8, ($v0) /* 051BEC 80050FEC AFAD00D4 */ sw $t5, 0xd4($sp) -/* 051BF0 80050FF0 2484DAD8 */ addiu $a0, %lo(D_0D01DAD8) # addiu $a0, $a0, -0x2528 +/* 051BF0 80050FF0 2484DAD8 */ addiu $a0, %lo(gTexturePortraitQuestionMark) # addiu $a0, $a0, -0x2528 /* 051BF4 80050FF4 24050020 */ li $a1, 32 /* 051BF8 80050FF8 0C0114A9 */ jal func_800452A4 /* 051BFC 80050FFC 24060020 */ li $a2, 32 @@ -160,12 +160,12 @@ glabel func_80050E34 /* 051C94 80051094 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 /* 051C98 80051098 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 /* 051C9C 8005109C 8E020000 */ lw $v0, ($s0) -/* 051CA0 800510A0 3C19800E */ lui $t9, %hi(D_800E457C) +/* 051CA0 800510A0 3C19800E */ lui $t9, %hi(gPortraitTLUTs) /* 051CA4 800510A4 032AC821 */ addu $t9, $t9, $t2 /* 051CA8 800510A8 244F0008 */ addiu $t7, $v0, 8 /* 051CAC 800510AC AE0F0000 */ sw $t7, ($s0) /* 051CB0 800510B0 AC580000 */ sw $t8, ($v0) -/* 051CB4 800510B4 8F39457C */ lw $t9, %lo(D_800E457C)($t9) +/* 051CB4 800510B4 8F39457C */ lw $t9, %lo(gPortraitTLUTs)($t9) /* 051CB8 800510B8 3C0FE800 */ lui $t7, 0xe800 /* 051CBC 800510BC 3C048016 */ lui $a0, %hi(D_801656C0) # $a0, 0x8016 /* 051CC0 800510C0 AC590004 */ sw $t9, 4($v0) @@ -248,9 +248,9 @@ glabel func_80050E34 /* 051DF0 800511F0 AFAA003C */ sw $t2, 0x3c($sp) /* 051DF4 800511F4 8FAA003C */ lw $t2, 0x3c($sp) .L800511F8: -/* 051DF8 800511F8 3C04800E */ lui $a0, %hi(D_800E459C) +/* 051DF8 800511F8 3C04800E */ lui $a0, %hi(gPortraitTextures) /* 051DFC 800511FC 008A2021 */ addu $a0, $a0, $t2 -/* 051E00 80051200 8C84459C */ lw $a0, %lo(D_800E459C)($a0) +/* 051E00 80051200 8C84459C */ lw $a0, %lo(gPortraitTextures)($a0) /* 051E04 80051204 24050020 */ li $a1, 32 /* 051E08 80051208 0C0114A9 */ jal func_800452A4 /* 051E0C 8005120C 24060020 */ li $a2, 32 diff --git a/asm/non_matchings/code_80057C60/func_80059560.s b/asm/non_matchings/code_80057C60/func_80059560.s index d9d03c779..68b4ca4a3 100644 --- a/asm/non_matchings/code_80057C60/func_80059560.s +++ b/asm/non_matchings/code_80057C60/func_80059560.s @@ -56,12 +56,12 @@ glabel func_80059560 /* 05A234 80059634 00003025 */ move $a2, $zero /* 05A238 80059638 3C073F80 */ lui $a3, 0x3f80 /* 05A23C 8005963C 11200014 */ beqz $t1, .L80059690 -/* 05A240 80059640 3C0A0D02 */ lui $t2, %hi(D_0D01B4D8) # $t2, 0xd02 -/* 05A244 80059644 3C0B0D02 */ lui $t3, %hi(D_0D01D6D8) # $t3, 0xd02 +/* 05A240 80059640 3C0A0D02 */ lui $t2, %hi(gTLUTPortraitMiniBombKart) # $t2, 0xd02 +/* 05A244 80059644 3C0B0D02 */ lui $t3, %hi(gTexturePortraitMiniBombKart) # $t3, 0xd02 /* 05A248 80059648 3C0C0D00 */ lui $t4, %hi(D_0D005AE0) # $t4, 0xd00 /* 05A24C 8005964C 258C5AE0 */ addiu $t4, %lo(D_0D005AE0) # addiu $t4, $t4, 0x5ae0 -/* 05A250 80059650 256BD6D8 */ addiu $t3, %lo(D_0D01D6D8) # addiu $t3, $t3, -0x2928 -/* 05A254 80059654 254AB4D8 */ addiu $t2, %lo(D_0D01B4D8) # addiu $t2, $t2, -0x4b28 +/* 05A250 80059650 256BD6D8 */ addiu $t3, %lo(gTexturePortraitMiniBombKart) # addiu $t3, $t3, -0x2928 +/* 05A254 80059654 254AB4D8 */ addiu $t2, %lo(gTLUTPortraitMiniBombKart) # addiu $t2, $t2, -0x4b28 /* 05A258 80059658 240D0020 */ li $t5, 32 /* 05A25C 8005965C 240E0020 */ li $t6, 32 /* 05A260 80059660 240F0020 */ li $t7, 32 diff --git a/asm/non_matchings/code_8006E9C0/func_8006EE7C.s b/asm/non_matchings/code_8006E9C0/func_8006EE7C.s deleted file mode 100644 index 4703d422d..000000000 --- a/asm/non_matchings/code_8006E9C0/func_8006EE7C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8006EE7C -/* 06FA7C 8006EE7C 000470C0 */ sll $t6, $a0, 3 -/* 06FA80 8006EE80 01C47023 */ subu $t6, $t6, $a0 -/* 06FA84 8006EE84 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 06FA88 8006EE88 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 06FA8C 8006EE8C 000E7140 */ sll $t6, $t6, 5 -/* 06FA90 8006EE90 01CF1021 */ addu $v0, $t6, $t7 -/* 06FA94 8006EE94 A44000A4 */ sh $zero, 0xa4($v0) -/* 06FA98 8006EE98 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 06FA9C 8006EE9C 845800A4 */ lh $t8, 0xa4($v0) -/* 06FAA0 8006EEA0 44812000 */ mtc1 $at, $f4 -/* 06FAA4 8006EEA4 3C030D02 */ lui $v1, %hi(D_0D01DED8) # $v1, 0xd02 -/* 06FAA8 8006EEA8 3C050D02 */ lui $a1, %hi(D_0D01FED8) # $a1, 0xd02 -/* 06FAAC 8006EEAC 24A5FED8 */ addiu $a1, %lo(D_0D01FED8) # addiu $a1, $a1, -0x128 -/* 06FAB0 8006EEB0 2463DED8 */ addiu $v1, %lo(D_0D01DED8) # addiu $v1, $v1, -0x2128 -/* 06FAB4 8006EEB4 2419FFFF */ li $t9, -1 -/* 06FAB8 8006EEB8 240800A0 */ li $t0, 160 -/* 06FABC 8006EEBC 2409FFE0 */ li $t1, -32 -/* 06FAC0 8006EEC0 AC430068 */ sw $v1, 0x68($v0) -/* 06FAC4 8006EEC4 AC430060 */ sw $v1, 0x60($v0) -/* 06FAC8 8006EEC8 AC45006C */ sw $a1, 0x6c($v0) -/* 06FACC 8006EECC AC450064 */ sw $a1, 0x64($v0) -/* 06FAD0 8006EED0 AC59004C */ sw $t9, 0x4c($v0) -/* 06FAD4 8006EED4 A448009C */ sh $t0, 0x9c($v0) -/* 06FAD8 8006EED8 A449009E */ sh $t1, 0x9e($v0) -/* 06FADC 8006EEDC A05800D2 */ sb $t8, 0xd2($v0) -/* 06FAE0 8006EEE0 03E00008 */ jr $ra -/* 06FAE4 8006EEE4 E4440000 */ swc1 $f4, ($v0) diff --git a/asm/non_matchings/code_8006E9C0/func_8006EEE8.s b/asm/non_matchings/code_8006E9C0/func_8006EEE8.s index 253a50d56..7f023aaef 100644 --- a/asm/non_matchings/code_8006E9C0/func_8006EEE8.s +++ b/asm/non_matchings/code_8006E9C0/func_8006EEE8.s @@ -6,10 +6,10 @@ glabel func_8006EEE8 /* 06FAF8 8006EEF8 00047080 */ sll $t6, $a0, 2 /* 06FAFC 8006EEFC 84A55520 */ lh $a1, %lo(D_800E5520)($a1) # 0x5520 /* 06FB00 8006EF00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 06FB04 8006EF04 3C04800E */ lui $a0, %hi(D_800E54D0) # 0x800e +/* 06FB04 8006EF04 3C04800E */ lui $a0, %hi(gCourseOutlineTextures) # 0x800e /* 06FB08 8006EF08 AFBF0014 */ sw $ra, 0x14($sp) /* 06FB0C 8006EF0C 008E2021 */ addu $a0, $a0, $t6 -/* 06FB10 8006EF10 8C8454D0 */ lw $a0, %lo(D_800E54D0)($a0) # 0x54d0 +/* 06FB10 8006EF10 8C8454D0 */ lw $a0, %lo(gCourseOutlineTextures)($a0) # 0x54d0 /* 06FB14 8006EF14 AFA8001C */ sw $t0, 0x1c($sp) /* 06FB18 8006EF18 0C0AA13D */ jal func_802A84F4 /* 06FB1C 8006EF1C 00A03025 */ move $a2, $a1 diff --git a/asm/non_matchings/code_8006E9C0/func_8006EF60.s b/asm/non_matchings/code_8006E9C0/func_8006EF60.s index 73f397158..23ba061bf 100644 --- a/asm/non_matchings/code_8006E9C0/func_8006EF60.s +++ b/asm/non_matchings/code_8006E9C0/func_8006EF60.s @@ -10,11 +10,11 @@ glabel func_8006EF60 /* 06FB80 8006EF80 AFB2001C */ sw $s2, 0x1c($sp) /* 06FB84 8006EF84 3C01FFFF */ lui $at, 0xffff /* 06FB88 8006EF88 3C10800E */ lui $s0, %hi(D_800E5520) # $s0, 0x800e -/* 06FB8C 8006EF8C 3C13800E */ lui $s3, %hi(D_800E54D0) # $s3, 0x800e +/* 06FB8C 8006EF8C 3C13800E */ lui $s3, %hi(gCourseOutlineTextures) # $s3, 0x800e /* 06FB90 8006EF90 3C148019 */ lui $s4, %hi(D_8018D248) # $s4, 0x8019 /* 06FB94 8006EF94 AFBF002C */ sw $ra, 0x2c($sp) /* 06FB98 8006EF98 2694D248 */ addiu $s4, %lo(D_8018D248) # addiu $s4, $s4, -0x2db8 -/* 06FB9C 8006EF9C 267354D0 */ addiu $s3, %lo(D_800E54D0) # addiu $s3, $s3, 0x54d0 +/* 06FB9C 8006EF9C 267354D0 */ addiu $s3, %lo(gCourseOutlineTextures) # addiu $s3, $s3, 0x54d0 /* 06FBA0 8006EFA0 26105520 */ addiu $s0, %lo(D_800E5520) # addiu $s0, $s0, 0x5520 /* 06FBA4 8006EFA4 00009025 */ move $s2, $zero /* 06FBA8 8006EFA8 24150014 */ li $s5, 20 diff --git a/asm/non_matchings/code_8006E9C0/func_800703E0.s b/asm/non_matchings/code_8006E9C0/func_800703E0.s deleted file mode 100644 index 75a55f1b0..000000000 --- a/asm/non_matchings/code_8006E9C0/func_800703E0.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_800703E0 -/* 070FE0 800703E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 070FE4 800703E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 070FE8 800703E8 AFA60020 */ sw $a2, 0x20($sp) -/* 070FEC 800703EC 0C01C8E9 */ jal func_800723A4 -/* 070FF0 800703F0 AFA40018 */ sw $a0, 0x18($sp) -/* 070FF4 800703F4 8FA40018 */ lw $a0, 0x18($sp) -/* 070FF8 800703F8 8FA30020 */ lw $v1, 0x20($sp) -/* 070FFC 800703FC 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 071000 80070400 000470C0 */ sll $t6, $a0, 3 -/* 071004 80070404 01C47023 */ subu $t6, $t6, $a0 -/* 071008 80070408 94780006 */ lhu $t8, 6($v1) -/* 07100C 8007040C 000E7140 */ sll $t6, $t6, 5 -/* 071010 80070410 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 071014 80070414 01CF1021 */ addu $v0, $t6, $t7 -/* 071018 80070418 24190001 */ li $t9, 1 -/* 07101C 8007041C A45900A4 */ sh $t9, 0xa4($v0) -/* 071020 80070420 A05800D5 */ sb $t8, 0xd5($v0) -/* 071024 80070424 94680000 */ lhu $t0, ($v1) -/* 071028 80070428 44808000 */ mtc1 $zero, $f16 -/* 07102C 8007042C 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 071030 80070430 A44800C0 */ sh $t0, 0xc0($v0) -/* 071034 80070434 94690002 */ lhu $t1, 2($v1) -/* 071038 80070438 A449009E */ sh $t1, 0x9e($v0) -/* 07103C 8007043C 946A0004 */ lhu $t2, 4($v1) -/* 071040 80070440 448A2000 */ mtc1 $t2, $f4 -/* 071044 80070444 05410004 */ bgez $t2, .L80070458 -/* 071048 80070448 468021A0 */ cvt.s.w $f6, $f4 -/* 07104C 8007044C 44814000 */ mtc1 $at, $f8 -/* 071050 80070450 00000000 */ nop -/* 071054 80070454 46083180 */ add.s $f6, $f6, $f8 -.L80070458: -/* 071058 80070458 3C014059 */ li $at, 0x40590000 # 3.390625 -/* 07105C 8007045C 44818800 */ mtc1 $at, $f17 -/* 071060 80070460 460032A1 */ cvt.d.s $f10, $f6 -/* 071064 80070464 3C0B0D03 */ lui $t3, %hi(D_0D0293D8) # $t3, 0xd03 -/* 071068 80070468 46305483 */ div.d $f18, $f10, $f16 -/* 07106C 8007046C 256B93D8 */ addiu $t3, %lo(D_0D0293D8) # addiu $t3, $t3, -0x6c28 -/* 071070 80070470 3C070D00 */ lui $a3, %hi(D_0D005770) # $a3, 0xd00 -/* 071074 80070474 AC4B0064 */ sw $t3, 0x64($v0) -/* 071078 80070478 24E75770 */ addiu $a3, %lo(D_0D005770) # addiu $a3, $a3, 0x5770 -/* 07107C 8007047C 24050010 */ li $a1, 16 -/* 071080 80070480 24060010 */ li $a2, 16 -/* 071084 80070484 46209120 */ cvt.s.d $f4, $f18 -/* 071088 80070488 0C01CD01 */ jal func_80073404 -/* 07108C 8007048C E4440000 */ swc1 $f4, ($v0) -/* 071090 80070490 8FBF0014 */ lw $ra, 0x14($sp) -/* 071094 80070494 27BD0018 */ addiu $sp, $sp, 0x18 -/* 071098 80070498 03E00008 */ jr $ra -/* 07109C 8007049C 00000000 */ nop diff --git a/asm/non_matchings/code_8006E9C0/func_80071428.s b/asm/non_matchings/code_8006E9C0/func_80071428.s index 968c26700..8fd7d9e1e 100644 --- a/asm/non_matchings/code_8006E9C0/func_80071428.s +++ b/asm/non_matchings/code_8006E9C0/func_80071428.s @@ -18,12 +18,12 @@ glabel func_80071428 /* 072068 80071468 3C048018 */ lui $a0, %hi(D_80183DBC) # $a0, 0x8018 /* 07206C 8007146C 0C01C7C0 */ jal find_unused_obj_index /* 072070 80071470 24843DBC */ addiu $a0, %lo(D_80183DBC) # addiu $a0, $a0, 0x3dbc -/* 072074 80071474 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 072074 80071474 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 072078 80071478 0C01C7C0 */ jal find_unused_obj_index -/* 07207C 8007147C 24843E88 */ addiu $a0, %lo(D_80183E88) # addiu $a0, $a0, 0x3e88 -/* 072080 80071480 3C048018 */ lui $a0, %hi(D_80183E8C) # $a0, 0x8018 +/* 07207C 8007147C 24843E88 */ addiu $a0, %lo(gItemWindowObjectByPlayerId) # addiu $a0, $a0, 0x3e88 +/* 072080 80071480 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 /* 072084 80071484 0C01C7C0 */ jal find_unused_obj_index -/* 072088 80071488 24843E8C */ addiu $a0, %lo(D_80183E8C) # addiu $a0, $a0, 0x3e8c +/* 072088 80071488 24843E8C */ addiu $a0, %lo(gItemWindowObjectByPlayerId + 4) # addiu $a0, $a0, 0x3e8c /* 07208C 8007148C 0C01C064 */ jal func_80070190 /* 072090 80071490 00000000 */ nop /* 072094 80071494 0C01C157 */ jal func_8007055C @@ -58,7 +58,7 @@ glabel func_80071428 /* 072108 80071508 240B0019 */ li $t3, 25 /* 07210C 8007150C 240C00A0 */ li $t4, 160 /* 072110 80071510 468054A0 */ cvt.s.w $f18, $f10 -/* 072114 80071514 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 072114 80071514 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 072118 80071518 E432CFF4 */ swc1 $f18, %lo(D_8018CFF4)($at) /* 07211C 8007151C 3C018016 */ lui $at, %hi(D_8016579E) # $at, 0x8016 /* 072120 80071520 A42D579E */ sh $t5, %lo(D_8016579E)($at) @@ -82,7 +82,7 @@ glabel func_80071428 /* 072168 80071568 A5000048 */ sh $zero, 0x48($t0) /* 07216C 8007156C A518006A */ sh $t8, 0x6a($t0) /* 072170 80071570 0C01BB9F */ jal func_8006EE7C -/* 072174 80071574 8C843E88 */ lw $a0, %lo(D_80183E88)($a0) +/* 072174 80071574 8C843E88 */ lw $a0, %lo(gItemWindowObjectByPlayerId)($a0) /* 072178 80071578 3C01420C */ li $at, 0x420C0000 # 35.000000 /* 07217C 8007157C 44810000 */ mtc1 $at, $f0 /* 072180 80071580 3C01C1C0 */ li $at, 0xC1C00000 # -24.000000 diff --git a/asm/non_matchings/code_8006E9C0/func_80071818.s b/asm/non_matchings/code_8006E9C0/func_80071818.s index ae18f7500..9cf638190 100644 --- a/asm/non_matchings/code_8006E9C0/func_80071818.s +++ b/asm/non_matchings/code_8006E9C0/func_80071818.s @@ -10,12 +10,12 @@ glabel func_80071818 /* 072438 80071838 3C048018 */ lui $a0, %hi(D_80183DBC) # $a0, 0x8018 /* 07243C 8007183C 0C01C7C0 */ jal find_unused_obj_index /* 072440 80071840 24843DBC */ addiu $a0, %lo(D_80183DBC) # addiu $a0, $a0, 0x3dbc -/* 072444 80071844 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 072444 80071844 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 072448 80071848 0C01C7C0 */ jal find_unused_obj_index -/* 07244C 8007184C 24843E88 */ addiu $a0, %lo(D_80183E88) # addiu $a0, $a0, 0x3e88 -/* 072450 80071850 3C048018 */ lui $a0, %hi(D_80183E8C) # $a0, 0x8018 +/* 07244C 8007184C 24843E88 */ addiu $a0, %lo(gItemWindowObjectByPlayerId) # addiu $a0, $a0, 0x3e88 +/* 072450 80071850 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 /* 072454 80071854 0C01C7C0 */ jal find_unused_obj_index -/* 072458 80071858 24843E8C */ addiu $a0, %lo(D_80183E8C) # addiu $a0, $a0, 0x3e8c +/* 072458 80071858 24843E8C */ addiu $a0, %lo(gItemWindowObjectByPlayerId + 4) # addiu $a0, $a0, 0x3e8c /* 07245C 8007185C 0C01C064 */ jal func_80070190 /* 072460 80071860 00000000 */ nop /* 072464 80071864 0C01C157 */ jal func_8007055C @@ -49,9 +49,9 @@ glabel func_80071818 /* 0724D4 800718D4 A4490058 */ sh $t1, 0x58($v0) /* 0724D8 800718D8 A44A005A */ sh $t2, 0x5a($v0) /* 0724DC 800718DC A44B0060 */ sh $t3, 0x60($v0) -/* 0724E0 800718E0 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 0724E0 800718E0 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 0724E4 800718E4 0C01BB9F */ jal func_8006EE7C -/* 0724E8 800718E8 8C843E88 */ lw $a0, %lo(D_80183E88)($a0) +/* 0724E8 800718E8 8C843E88 */ lw $a0, %lo(gItemWindowObjectByPlayerId)($a0) /* 0724EC 800718EC 3C028019 */ lui $v0, %hi(D_8018CA70) # $v0, 0x8019 /* 0724F0 800718F0 2442CA70 */ addiu $v0, %lo(D_8018CA70) # addiu $v0, $v0, -0x3590 /* 0724F4 800718F4 240C0043 */ li $t4, 67 @@ -78,9 +78,9 @@ glabel func_80071818 /* 072548 80071948 A44900DC */ sh $t1, 0xdc($v0) /* 07254C 8007194C A44A00DE */ sh $t2, 0xde($v0) /* 072550 80071950 A44B00E4 */ sh $t3, 0xe4($v0) -/* 072554 80071954 3C048018 */ lui $a0, %hi(D_80183E8C) # $a0, 0x8018 +/* 072554 80071954 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 /* 072558 80071958 0C01BB9F */ jal func_8006EE7C -/* 07255C 8007195C 8C843E8C */ lw $a0, %lo(D_80183E8C)($a0) +/* 07255C 8007195C 8C843E8C */ lw $a0, %lo(gItemWindowObjectByPlayerId + 4)($a0) /* 072560 80071960 3C013F00 */ li $at, 0x3F000000 # 0.500000 /* 072564 80071964 44812000 */ mtc1 $at, $f4 /* 072568 80071968 3C028019 */ lui $v0, %hi(D_8018CA70) # $v0, 0x8019 diff --git a/asm/non_matchings/code_8006E9C0/func_80071A20.s b/asm/non_matchings/code_8006E9C0/func_80071A20.s index a7db89d40..1ace61ebb 100644 --- a/asm/non_matchings/code_8006E9C0/func_80071A20.s +++ b/asm/non_matchings/code_8006E9C0/func_80071A20.s @@ -10,12 +10,12 @@ glabel func_80071A20 /* 072640 80071A40 3C048018 */ lui $a0, %hi(D_80183DBC) # $a0, 0x8018 /* 072644 80071A44 0C01C7C0 */ jal find_unused_obj_index /* 072648 80071A48 24843DBC */ addiu $a0, %lo(D_80183DBC) # addiu $a0, $a0, 0x3dbc -/* 07264C 80071A4C 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 07264C 80071A4C 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 072650 80071A50 0C01C7C0 */ jal find_unused_obj_index -/* 072654 80071A54 24843E88 */ addiu $a0, %lo(D_80183E88) # addiu $a0, $a0, 0x3e88 -/* 072658 80071A58 3C048018 */ lui $a0, %hi(D_80183E8C) # $a0, 0x8018 +/* 072654 80071A54 24843E88 */ addiu $a0, %lo(gItemWindowObjectByPlayerId) # addiu $a0, $a0, 0x3e88 +/* 072658 80071A58 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 /* 07265C 80071A5C 0C01C7C0 */ jal find_unused_obj_index -/* 072660 80071A60 24843E8C */ addiu $a0, %lo(D_80183E8C) # addiu $a0, $a0, 0x3e8c +/* 072660 80071A60 24843E8C */ addiu $a0, %lo(gItemWindowObjectByPlayerId + 4) # addiu $a0, $a0, 0x3e8c /* 072664 80071A64 0C01C064 */ jal func_80070190 /* 072668 80071A68 00000000 */ nop /* 07266C 80071A6C 0C01C157 */ jal func_8007055C @@ -86,15 +86,15 @@ glabel func_80071A20 /* 07276C 80071B6C 8C680004 */ lw $t0, 4($v1) /* 072770 80071B70 E4440088 */ swc1 $f4, 0x88($v0) /* 072774 80071B74 C4460088 */ lwc1 $f6, 0x88($v0) -/* 072778 80071B78 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 072778 80071B78 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 07277C 80071B7C A459006A */ sh $t9, 0x6a($v0) /* 072780 80071B80 A44800EE */ sh $t0, 0xee($v0) /* 072784 80071B84 E4460004 */ swc1 $f6, 4($v0) /* 072788 80071B88 0C01BB9F */ jal func_8006EE7C -/* 07278C 80071B8C 8C843E88 */ lw $a0, %lo(D_80183E88)($a0) -/* 072790 80071B90 3C048018 */ lui $a0, %hi(D_80183E8C) # $a0, 0x8018 +/* 07278C 80071B8C 8C843E88 */ lw $a0, %lo(gItemWindowObjectByPlayerId)($a0) +/* 072790 80071B90 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 /* 072794 80071B94 0C01BB9F */ jal func_8006EE7C -/* 072798 80071B98 8C843E8C */ lw $a0, %lo(D_80183E8C)($a0) +/* 072798 80071B98 8C843E8C */ lw $a0, %lo(gItemWindowObjectByPlayerId + 4)($a0) /* 07279C 80071B9C 2409001E */ li $t1, 30 /* 0727A0 80071BA0 3C018019 */ lui $at, %hi(D_8018D3C4) # $at, 0x8019 /* 0727A4 80071BA4 AC29D3C4 */ sw $t1, %lo(D_8018D3C4)($at) diff --git a/asm/non_matchings/code_8006E9C0/func_80071C28.s b/asm/non_matchings/code_8006E9C0/func_80071C28.s index 5b8e3fe61..3bbb36627 100644 --- a/asm/non_matchings/code_8006E9C0/func_80071C28.s +++ b/asm/non_matchings/code_8006E9C0/func_80071C28.s @@ -17,18 +17,18 @@ glabel func_80071C28 /* 072864 80071C64 3C048018 */ lui $a0, %hi(D_80183DC4) # $a0, 0x8018 /* 072868 80071C68 0C01C7C0 */ jal find_unused_obj_index /* 07286C 80071C6C 24843DC4 */ addiu $a0, %lo(D_80183DC4) # addiu $a0, $a0, 0x3dc4 -/* 072870 80071C70 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 072870 80071C70 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 072874 80071C74 0C01C7C0 */ jal find_unused_obj_index -/* 072878 80071C78 24843E88 */ addiu $a0, %lo(D_80183E88) # addiu $a0, $a0, 0x3e88 -/* 07287C 80071C7C 3C048018 */ lui $a0, %hi(D_80183E8C) # $a0, 0x8018 +/* 072878 80071C78 24843E88 */ addiu $a0, %lo(gItemWindowObjectByPlayerId) # addiu $a0, $a0, 0x3e88 +/* 07287C 80071C7C 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 /* 072880 80071C80 0C01C7C0 */ jal find_unused_obj_index -/* 072884 80071C84 24843E8C */ addiu $a0, %lo(D_80183E8C) # addiu $a0, $a0, 0x3e8c -/* 072888 80071C88 3C048018 */ lui $a0, %hi(D_80183E90) # $a0, 0x8018 +/* 072884 80071C84 24843E8C */ addiu $a0, %lo(gItemWindowObjectByPlayerId + 4) # addiu $a0, $a0, 0x3e8c +/* 072888 80071C88 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 8) # $a0, 0x8018 /* 07288C 80071C8C 0C01C7C0 */ jal find_unused_obj_index -/* 072890 80071C90 24843E90 */ addiu $a0, %lo(D_80183E90) # addiu $a0, $a0, 0x3e90 -/* 072894 80071C94 3C048018 */ lui $a0, %hi(D_80183E94) # $a0, 0x8018 +/* 072890 80071C90 24843E90 */ addiu $a0, %lo(gItemWindowObjectByPlayerId + 8) # addiu $a0, $a0, 0x3e90 +/* 072894 80071C94 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 12) # $a0, 0x8018 /* 072898 80071C98 0C01C7C0 */ jal find_unused_obj_index -/* 07289C 80071C9C 24843E94 */ addiu $a0, %lo(D_80183E94) # addiu $a0, $a0, 0x3e94 +/* 07289C 80071C9C 24843E94 */ addiu $a0, %lo(gItemWindowObjectByPlayerId + 12) # addiu $a0, $a0, 0x3e94 /* 0728A0 80071CA0 0C01C064 */ jal func_80070190 /* 0728A4 80071CA4 00000000 */ nop /* 0728A8 80071CA8 0C01C1E0 */ jal func_80070780 @@ -118,7 +118,7 @@ glabel func_80071C28 /* 0729F8 80071DF8 24010003 */ li $at, 3 /* 0729FC 80071DFC 240200B8 */ li $v0, 184 /* 072A00 80071E00 17010005 */ bne $t8, $at, .L80071E18 -/* 072A04 80071E04 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 072A04 80071E04 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 072A08 80071E08 A6030044 */ sh $v1, 0x44($s0) /* 072A0C 80071E0C A60300C8 */ sh $v1, 0xc8($s0) /* 072A10 80071E10 A602014C */ sh $v0, 0x14c($s0) @@ -142,16 +142,16 @@ glabel func_80071C28 /* 072A54 80071E54 A60F0172 */ sh $t7, 0x172($s0) /* 072A58 80071E58 A61801F6 */ sh $t8, 0x1f6($s0) /* 072A5C 80071E5C 0C01BB9F */ jal func_8006EE7C -/* 072A60 80071E60 8C843E88 */ lw $a0, %lo(D_80183E88)($a0) -/* 072A64 80071E64 3C048018 */ lui $a0, %hi(D_80183E8C) # $a0, 0x8018 +/* 072A60 80071E60 8C843E88 */ lw $a0, %lo(gItemWindowObjectByPlayerId)($a0) +/* 072A64 80071E64 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 /* 072A68 80071E68 0C01BB9F */ jal func_8006EE7C -/* 072A6C 80071E6C 8C843E8C */ lw $a0, %lo(D_80183E8C)($a0) -/* 072A70 80071E70 3C048018 */ lui $a0, %hi(D_80183E90) # $a0, 0x8018 +/* 072A6C 80071E6C 8C843E8C */ lw $a0, %lo(gItemWindowObjectByPlayerId + 4)($a0) +/* 072A70 80071E70 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 8) # $a0, 0x8018 /* 072A74 80071E74 0C01BB9F */ jal func_8006EE7C -/* 072A78 80071E78 8C843E90 */ lw $a0, %lo(D_80183E90)($a0) -/* 072A7C 80071E7C 3C048018 */ lui $a0, %hi(D_80183E94) # $a0, 0x8018 +/* 072A78 80071E78 8C843E90 */ lw $a0, %lo(gItemWindowObjectByPlayerId + 8)($a0) +/* 072A7C 80071E7C 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 12) # $a0, 0x8018 /* 072A80 80071E80 0C01BB9F */ jal func_8006EE7C -/* 072A84 80071E84 8C843E94 */ lw $a0, %lo(D_80183E94)($a0) +/* 072A84 80071E84 8C843E94 */ lw $a0, %lo(gItemWindowObjectByPlayerId + 12)($a0) /* 072A88 80071E88 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 072A8C 80071E8C 44813000 */ mtc1 $at, $f6 /* 072A90 80071E90 3C198019 */ lui $t9, %hi(D_8018EDF3) # $t9, 0x8019 diff --git a/asm/non_matchings/code_80071F00/func_8007ABFC.s b/asm/non_matchings/code_80071F00/func_8007ABFC.s index afa601551..f55e72000 100644 --- a/asm/non_matchings/code_80071F00/func_8007ABFC.s +++ b/asm/non_matchings/code_80071F00/func_8007ABFC.s @@ -12,9 +12,9 @@ glabel func_8007ABFC /* 07B824 8007AC24 17000019 */ bnez $t8, .L8007AC8C /* 07B828 8007AC28 00803025 */ move $a2, $a0 /* 07B82C 8007AC2C 0004C880 */ sll $t9, $a0, 2 -/* 07B830 8007AC30 3C048018 */ lui $a0, %hi(D_80183E88) # 0x8018 +/* 07B830 8007AC30 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # 0x8018 /* 07B834 8007AC34 00992021 */ addu $a0, $a0, $t9 -/* 07B838 8007AC38 8C843E88 */ lw $a0, %lo(D_80183E88)($a0) # 0x3e88($a0) +/* 07B838 8007AC38 8C843E88 */ lw $a0, %lo(gItemWindowObjectByPlayerId)($a0) # 0x3e88($a0) /* 07B83C 8007AC3C 24050004 */ li $a1, 4 /* 07B840 8007AC40 AFA30018 */ sw $v1, 0x18($sp) /* 07B844 8007AC44 AFA60020 */ sw $a2, 0x20($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007AC9C.s b/asm/non_matchings/code_80071F00/func_8007AC9C.s index 356052f05..3cbdbbea2 100644 --- a/asm/non_matchings/code_80071F00/func_8007AC9C.s +++ b/asm/non_matchings/code_80071F00/func_8007AC9C.s @@ -1,10 +1,10 @@ glabel func_8007AC9C /* 07B89C 8007AC9C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 07B8A0 8007ACA0 AFB00014 */ sw $s0, 0x14($sp) -/* 07B8A4 8007ACA4 3C108018 */ lui $s0, %hi(D_80183E88) # 0x8018 +/* 07B8A4 8007ACA4 3C108018 */ lui $s0, %hi(gItemWindowObjectByPlayerId) # 0x8018 /* 07B8A8 8007ACA8 0004C080 */ sll $t8, $a0, 2 /* 07B8AC 8007ACAC 02188021 */ addu $s0, $s0, $t8 -/* 07B8B0 8007ACB0 8E103E88 */ lw $s0, %lo(D_80183E88)($s0) # 0x3e88($s0) +/* 07B8B0 8007ACB0 8E103E88 */ lw $s0, %lo(gItemWindowObjectByPlayerId)($s0) # 0x3e88($s0) /* 07B8B4 8007ACB4 000470C0 */ sll $t6, $a0, 3 /* 07B8B8 8007ACB8 01C47023 */ subu $t6, $t6, $a0 /* 07B8BC 8007ACBC 0010C8C0 */ sll $t9, $s0, 3 diff --git a/asm/non_matchings/code_80071F00/func_8007B040.s b/asm/non_matchings/code_80071F00/func_8007B040.s index e1cab46b3..3632900b8 100644 --- a/asm/non_matchings/code_80071F00/func_8007B040.s +++ b/asm/non_matchings/code_80071F00/func_8007B040.s @@ -47,10 +47,10 @@ glabel func_8007B040 /* 07BCE8 8007B0E8 8D08C538 */ lw $t0, %lo(gPlayerCountSelection1)($t0) /* 07BCEC 8007B0EC 00001825 */ move $v1, $zero /* 07BCF0 8007B0F0 19000019 */ blez $t0, .L8007B158 -/* 07BCF4 8007B0F4 3C048018 */ lui $a0, %hi(D_80183E88) # $a0, 0x8018 +/* 07BCF4 8007B0F4 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 /* 07BCF8 8007B0F8 3C0C8016 */ lui $t4, %hi(D_80165C18) # $t4, 0x8016 /* 07BCFC 8007B0FC 258C5C18 */ addiu $t4, %lo(D_80165C18) # addiu $t4, $t4, 0x5c18 -/* 07BD00 8007B100 24843E88 */ addiu $a0, %lo(D_80183E88) # addiu $a0, $a0, 0x3e88 +/* 07BD00 8007B100 24843E88 */ addiu $a0, %lo(gItemWindowObjectByPlayerId) # addiu $a0, $a0, 0x3e88 /* 07BD04 8007B104 240D00E0 */ li $t5, 224 /* 07BD08 8007B108 27AA0040 */ addiu $t2, $sp, 0x40 /* 07BD0C 8007B10C 27A90050 */ addiu $t1, $sp, 0x50 @@ -103,12 +103,12 @@ glabel func_8007B040 /* 07BDB8 8007B1B8 A4E800A2 */ sh $t0, 0xa2($a3) /* 07BDBC 8007B1BC A0E800D2 */ sb $t0, 0xd2($a3) /* 07BDC0 8007B1C0 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9) -/* 07BDC4 8007B1C4 3C068018 */ lui $a2, %hi(D_80183E88) # 0x8018 +/* 07BDC4 8007B1C4 3C068018 */ lui $a2, %hi(gItemWindowObjectByPlayerId) # 0x8018 /* 07BDC8 8007B1C8 0018C080 */ sll $t8, $t8, 2 /* 07BDCC 8007B1CC 00037880 */ sll $t7, $v1, 2 /* 07BDD0 8007B1D0 00CF3021 */ addu $a2, $a2, $t7 /* 07BDD4 8007B1D4 0303C023 */ subu $t8, $t8, $v1 -/* 07BDD8 8007B1D8 8CC43E88 */ lw $a0, %lo(D_80183E88)($a2) # 0x3e88($a2) +/* 07BDD8 8007B1D8 8CC43E88 */ lw $a0, %lo(gItemWindowObjectByPlayerId)($a2) # 0x3e88($a2) /* 07BDDC 8007B1DC 0018C0C0 */ sll $t8, $t8, 3 /* 07BDE0 8007B1E0 03197021 */ addu $t6, $t8, $t9 /* 07BDE4 8007B1E4 AFAE0038 */ sw $t6, 0x38($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007B254.s b/asm/non_matchings/code_80071F00/func_8007B254.s index b0d899cd7..ef31a964a 100644 --- a/asm/non_matchings/code_80071F00/func_8007B254.s +++ b/asm/non_matchings/code_80071F00/func_8007B254.s @@ -11,11 +11,11 @@ glabel func_8007B254 /* 07BE78 8007B278 01C47023 */ subu $t6, $t6, $a0 /* 07BE7C 8007B27C 000E7140 */ sll $t6, $t6, 5 /* 07BE80 8007B280 01CF1021 */ addu $v0, $t6, $t7 -/* 07BE84 8007B284 3C190D02 */ lui $t9, %hi(D_0D01DED8) # $t9, 0xd02 -/* 07BE88 8007B288 3C080D02 */ lui $t0, %hi(D_0D01FED8) # $t0, 0xd02 +/* 07BE84 8007B284 3C190D02 */ lui $t9, %hi(gTLUTItemWindowNone) # $t9, 0xd02 +/* 07BE88 8007B288 3C080D02 */ lui $t0, %hi(gTextureItemWindowNone) # $t0, 0xd02 /* 07BE8C 8007B28C 24180002 */ li $t8, 2 -/* 07BE90 8007B290 2739DED8 */ addiu $t9, %lo(D_0D01DED8) # addiu $t9, $t9, -0x2128 -/* 07BE94 8007B294 2508FED8 */ addiu $t0, %lo(D_0D01FED8) # addiu $t0, $t0, -0x128 +/* 07BE90 8007B290 2739DED8 */ addiu $t9, %lo(gTLUTItemWindowNone) # addiu $t9, $t9, -0x2128 +/* 07BE94 8007B294 2508FED8 */ addiu $t0, %lo(gTextureItemWindowNone) # addiu $t0, $t0, -0x128 /* 07BE98 8007B298 24090028 */ li $t1, 40 /* 07BE9C 8007B29C 240A0020 */ li $t2, 32 /* 07BEA0 8007B2A0 240B0032 */ li $t3, 50 diff --git a/asm/non_matchings/code_80071F00/func_8007B34C.s b/asm/non_matchings/code_80071F00/func_8007B34C.s index 59014d046..4409e1d54 100644 --- a/asm/non_matchings/code_80071F00/func_8007B34C.s +++ b/asm/non_matchings/code_80071F00/func_8007B34C.s @@ -20,12 +20,12 @@ glabel func_8007B34C /* 07BF94 8007B394 AFA00040 */ sw $zero, 0x40($sp) /* 07BF98 8007B398 012A1021 */ addu $v0, $t1, $t2 /* 07BF9C 8007B39C 944B0006 */ lhu $t3, 6($v0) -/* 07BFA0 8007B3A0 3C108018 */ lui $s0, %hi(D_80183E88) # 0x8018 +/* 07BFA0 8007B3A0 3C108018 */ lui $s0, %hi(gItemWindowObjectByPlayerId) # 0x8018 /* 07BFA4 8007B3A4 00047880 */ sll $t7, $a0, 2 /* 07BFA8 8007B3A8 020F8021 */ addu $s0, $s0, $t7 /* 07BFAC 8007B3AC 316C2000 */ andi $t4, $t3, 0x2000 /* 07BFB0 8007B3B0 11800003 */ beqz $t4, .L8007B3C0 -/* 07BFB4 8007B3B4 8E103E88 */ lw $s0, %lo(D_80183E88)($s0) # 0x3e88($s0) +/* 07BFB4 8007B3B4 8E103E88 */ lw $s0, %lo(gItemWindowObjectByPlayerId)($s0) # 0x3e88($s0) /* 07BFB8 8007B3B8 240D0001 */ li $t5, 1 /* 07BFBC 8007B3BC AFAD0040 */ sw $t5, 0x40($sp) .L8007B3C0: @@ -561,16 +561,16 @@ glabel L8007B998 .L8007BB50: /* 07C750 8007BB50 8FA8002C */ lw $t0, 0x2c($sp) .L8007BB54: -/* 07C754 8007BB54 3C09800E */ lui $t1, %hi(D_800E44F0) -/* 07C758 8007BB58 3C0A800E */ lui $t2, %hi(D_800E4530) +/* 07C754 8007BB54 3C09800E */ lui $t1, %hi(gItemWindowTLUTs) +/* 07C758 8007BB58 3C0A800E */ lui $t2, %hi(gItemWindowTextures) /* 07C75C 8007BB5C 810200D2 */ lb $v0, 0xd2($t0) /* 07C760 8007BB60 850D00A4 */ lh $t5, 0xa4($t0) /* 07C764 8007BB64 00027080 */ sll $t6, $v0, 2 /* 07C768 8007BB68 012E4821 */ addu $t1, $t1, $t6 -/* 07C76C 8007BB6C 8D2944F0 */ lw $t1, %lo(D_800E44F0)($t1) +/* 07C76C 8007BB6C 8D2944F0 */ lw $t1, %lo(gItemWindowTLUTs)($t1) /* 07C770 8007BB70 014E5021 */ addu $t2, $t2, $t6 /* 07C774 8007BB74 AD090060 */ sw $t1, 0x60($t0) -/* 07C778 8007BB78 8D4A4530 */ lw $t2, %lo(D_800E4530)($t2) +/* 07C778 8007BB78 8D4A4530 */ lw $t2, %lo(gItemWindowTextures)($t2) /* 07C77C 8007BB7C AD0A0064 */ sw $t2, 0x64($t0) /* 07C780 8007BB80 8FAB0038 */ lw $t3, 0x38($sp) /* 07C784 8007BB84 A56D0010 */ sh $t5, 0x10($t3) diff --git a/assets.json b/assets.json index 19b43a94f..a6cf65c29 100644 --- a/assets.json +++ b/assets.json @@ -12189,61 +12189,59 @@ "textures/132B50_1A298.rgba16.ci8.png": {"meta":{"dims":[8,8], "pal":"0x19E58"}, "offsets": {"us":["0x132B50", "0x1A298"]}}, "textures/132B50_1A2D8.ia4.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x1A2D8"]}}, -"textures/132B50_1A4D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1A4D8"]}}, -"textures/132B50_1A6D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1A6D8"]}}, -"textures/132B50_1A8D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1A8D8"]}}, -"textures/132B50_1AAD8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1AAD8"]}}, -"textures/132B50_1ACD8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1ACD8"]}}, -"textures/132B50_1AED8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1AED8"]}}, -"textures/132B50_1B0D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1B0D8"]}}, -"textures/132B50_1B2D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1B2D8"]}}, +"textures/gTLUTPortraitMario.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1A4D8"]}}, +"textures/gTLUTPortraitLuigi.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1A6D8"]}}, +"textures/gTLUTPortraitPeach.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1A8D8"]}}, +"textures/gTLUTPortraitToad.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1AAD8"]}}, +"textures/gTLUTPortraitYoshi.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1ACD8"]}}, +"textures/gTLUTPortraitDonkeyKong.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1AED8"]}}, +"textures/gTLUTPortraitWario.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1B0D8"]}}, +"textures/gTLUTPortraitBowser.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1B2D8"]}}, "textures/132B50_1B4D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1B4D8"]}}, -"textures/132B50_1B6D8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A4D8"}, "offsets": {"us":["0x132B50", "0x1B6D8"]}}, -"textures/132B50_1BAD8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A6D8"}, "offsets": {"us":["0x132B50", "0x1BAD8"]}}, -"textures/132B50_1BED8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A8D8"}, "offsets": {"us":["0x132B50", "0x1BED8"]}}, -"textures/132B50_1C2D8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1AAD8"}, "offsets": {"us":["0x132B50", "0x1C2D8"]}}, -"textures/132B50_1C6D8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1ACD8"}, "offsets": {"us":["0x132B50", "0x1C6D8"]}}, -"textures/132B50_1CAD8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1AED8"}, "offsets": {"us":["0x132B50", "0x1CAD8"]}}, -"textures/132B50_1CED8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1B0D8"}, "offsets": {"us":["0x132B50", "0x1CED8"]}}, -"textures/132B50_1D2D8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1B2D8"}, "offsets": {"us":["0x132B50", "0x1D2D8"]}}, -"textures/132B50_1D6D8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1B4D8"}, "offsets": {"us":["0x132B50", "0x1D6D8"]}}, -"textures/132B50_1DAD8.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1B4D8"}, "offsets": {"us":["0x132B50", "0x1DAD8"]}}, -"textures/132B50_1DAD8.rgba16.ci8.bin": {"meta":{"size":"0x400"}, "offsets": {"us":["0x132B50", "0x1DAD8"]}}, +"textures/gTexturePortraitMario.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A4D8"}, "offsets": {"us":["0x132B50", "0x1B6D8"]}}, +"textures/gTexturePortraitLuigi.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A6D8"}, "offsets": {"us":["0x132B50", "0x1BAD8"]}}, +"textures/gTexturePortraitPeach.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A8D8"}, "offsets": {"us":["0x132B50", "0x1BED8"]}}, +"textures/gTexturePortraitToad.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1AAD8"}, "offsets": {"us":["0x132B50", "0x1C2D8"]}}, +"textures/gTexturePortraitYoshi.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1ACD8"}, "offsets": {"us":["0x132B50", "0x1C6D8"]}}, +"textures/gTexturePortraitDonkeyKong.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1AED8"}, "offsets": {"us":["0x132B50", "0x1CAD8"]}}, +"textures/gTexturePortraitWario.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1B0D8"}, "offsets": {"us":["0x132B50", "0x1CED8"]}}, +"textures/gTexturePortraitBowser.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1B2D8"}, "offsets": {"us":["0x132B50", "0x1D2D8"]}}, +"textures/132B50_1D6D8.rgba16.ci8.png": {"meta":{"dims":[64,32], "pal":"0x1B4D8"}, "offsets": {"us":["0x132B50", "0x1D6D8"]}}, -"textures/132B50_1DED8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1DED8"]}}, -"textures/132B50_1E0D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E0D8"]}}, -"textures/132B50_1E2D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E2D8"]}}, -"textures/132B50_1E4D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E4D8"]}}, -"textures/132B50_1E6D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E6D8"]}}, -"textures/132B50_1E8D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E8D8"]}}, -"textures/132B50_1EAD8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1EAD8"]}}, -"textures/132B50_1ECD8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1ECD8"]}}, -"textures/132B50_1EED8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1EED8"]}}, -"textures/132B50_1F0D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F0D8"]}}, -"textures/132B50_1F2D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F2D8"]}}, -"textures/132B50_1F4D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F4D8"]}}, -"textures/132B50_1F6D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F6D8"]}}, -"textures/132B50_1F8D8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F8D8"]}}, -"textures/132B50_1FAD8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1FAD8"]}}, -"textures/132B50_1FCD8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1FCD8"]}}, +"textures/gTLUTItemWindowNone.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1DED8"]}}, +"textures/gTLUTItemWindowBanana.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E0D8"]}}, +"textures/gTLUTItemWindowBananaBunch.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E2D8"]}}, +"textures/gTLUTItemWindowMushroom.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E4D8"]}}, +"textures/gTLUTItemWindowDoubleMushroom.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E6D8"]}}, +"textures/gTLUTItemWindowTripleMushroom.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1E8D8"]}}, +"textures/gTLUTItemWindowSuperMushroom.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1EAD8"]}}, +"textures/gTLUTItemWindowBlueShell.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1ECD8"]}}, +"textures/gTLUTItemWindowBoo.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1EED8"]}}, +"textures/gTLUTItemWindowGreenShell.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F0D8"]}}, +"textures/gTLUTItemWindowTripleGreenShell.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F2D8"]}}, +"textures/gTLUTItemWindowRedShell.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F4D8"]}}, +"textures/gTLUTItemWindowTripleRedShell.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F6D8"]}}, +"textures/gTLUTItemWindowStar.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1F8D8"]}}, +"textures/gTLUTItemWindowThunderBolt.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1FAD8"]}}, +"textures/gTLUTItemWindowFakeItemBox.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x1FCD8"]}}, -"textures/132B50_1FED8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1DED8"}, "offsets": {"us":["0x132B50", "0x1FED8"]}}, -"textures/132B50_203D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E0D8"}, "offsets": {"us":["0x132B50", "0x203D8"]}}, -"textures/132B50_208D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E2D8"}, "offsets": {"us":["0x132B50", "0x208D8"]}}, -"textures/132B50_20DD8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E4D8"}, "offsets": {"us":["0x132B50", "0x20DD8"]}}, -"textures/132B50_212D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E6D8"}, "offsets": {"us":["0x132B50", "0x212D8"]}}, -"textures/132B50_217D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E8D8"}, "offsets": {"us":["0x132B50", "0x217D8"]}}, -"textures/132B50_21CD8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1EAD8"}, "offsets": {"us":["0x132B50", "0x21CD8"]}}, -"textures/132B50_221D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1ECD8"}, "offsets": {"us":["0x132B50", "0x221D8"]}}, -"textures/132B50_226D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1EED8"}, "offsets": {"us":["0x132B50", "0x226D8"]}}, -"textures/132B50_22BD8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F0D8"}, "offsets": {"us":["0x132B50", "0x22BD8"]}}, -"textures/132B50_230D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F2D8"}, "offsets": {"us":["0x132B50", "0x230D8"]}}, -"textures/132B50_235D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F4D8"}, "offsets": {"us":["0x132B50", "0x235D8"]}}, -"textures/132B50_23AD8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F6D8"}, "offsets": {"us":["0x132B50", "0x23AD8"]}}, -"textures/132B50_23FD8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F8D8"}, "offsets": {"us":["0x132B50", "0x23FD8"]}}, -"textures/132B50_244D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1FAD8"}, "offsets": {"us":["0x132B50", "0x244D8"]}}, -"textures/132B50_249D8.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1FCD8"}, "offsets": {"us":["0x132B50", "0x249D8"]}}, +"textures/gTextureItemWindowNone.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1DED8"}, "offsets": {"us":["0x132B50", "0x1FED8"]}}, +"textures/gTextureItemWindowBanana.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E0D8"}, "offsets": {"us":["0x132B50", "0x203D8"]}}, +"textures/gTextureItemWindowBananaBunch.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E2D8"}, "offsets": {"us":["0x132B50", "0x208D8"]}}, +"textures/gTextureItemWindowMushroom.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E4D8"}, "offsets": {"us":["0x132B50", "0x20DD8"]}}, +"textures/gTextureItemWindowDoubleMushroom.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E6D8"}, "offsets": {"us":["0x132B50", "0x212D8"]}}, +"textures/gTextureItemWindowTripleMushroom.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1E8D8"}, "offsets": {"us":["0x132B50", "0x217D8"]}}, +"textures/gTextureItemWindowSuperMushroom.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1EAD8"}, "offsets": {"us":["0x132B50", "0x21CD8"]}}, +"textures/gTextureItemWindowBlueShell.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1ECD8"}, "offsets": {"us":["0x132B50", "0x221D8"]}}, +"textures/gTextureItemWindowBoo.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1EED8"}, "offsets": {"us":["0x132B50", "0x226D8"]}}, +"textures/gTextureItemWindowGreenShell.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F0D8"}, "offsets": {"us":["0x132B50", "0x22BD8"]}}, +"textures/gTextureItemWindowTripleGreenShell.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F2D8"}, "offsets": {"us":["0x132B50", "0x230D8"]}}, +"textures/gTextureItemWindowRedShell.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F4D8"}, "offsets": {"us":["0x132B50", "0x235D8"]}}, +"textures/gTextureItemWindowTripleRedShell.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F6D8"}, "offsets": {"us":["0x132B50", "0x23AD8"]}}, +"textures/gTextureItemWindowStar.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1F8D8"}, "offsets": {"us":["0x132B50", "0x23FD8"]}}, +"textures/gTextureItemWindowThunderBolt.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1FAD8"}, "offsets": {"us":["0x132B50", "0x244D8"]}}, +"textures/gTextureItemWindowFakeItemBox.rgba16.ci8.png": {"meta":{"dims":[40,32], "pal":"0x1FCD8"}, "offsets": {"us":["0x132B50", "0x249D8"]}}, "textures/132B50_24ED8_tlut.rgba16.bin": {"meta":{"size":"0x1000"}, "offsets": {"us":["0x132B50", "0x24ED8"]}}, "textures/132B50_25ED8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x25ED8"]}}, diff --git a/ctx_includes.c b/ctx_includes.c index 0293d52ba..4aa72792c 100644 --- a/ctx_includes.c +++ b/ctx_includes.c @@ -102,6 +102,7 @@ #include "src/code_8003DC40.h" #include "src/code_800431B0.h" #include "src/code_80057C60.h" +#include "src/code_8006E9C0.h" #include "src/code_80071F00.h" #include "src/code_80086E70.h" #include "src/code_8008C1D0.h" diff --git a/data/data_0DD0A0_2_0.s b/data/data_0DD0A0_2_0.s index 54b812ade..725b95eee 100644 --- a/data/data_0DD0A0_2_0.s +++ b/data/data_0DD0A0_2_0.s @@ -30,28 +30,28 @@ vertex 23, -19, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF vertex 23, 20, 0, 0, 2496, 0xFF, 0xFF, 0xFF, 0xFF vertex -24, 20, 0, 3008, 2496, 0xFF, 0xFF, 0xFF, 0xFF -glabel D_800E44F0 -.word D_0D01DED8, D_0D01E0D8, D_0D01E2D8, D_0D01F0D8 -.word D_0D01F2D8, D_0D01F4D8, D_0D01F6D8, D_0D01ECD8 -.word D_0D01FAD8, D_0D01FCD8, D_0D01F8D8, D_0D01EED8 -.word D_0D01E4D8, D_0D01E6D8, D_0D01E8D8, D_0D01EAD8 +glabel gItemWindowTLUTs +.word gTLUTItemWindowNone, gTLUTItemWindowBanana, gTLUTItemWindowBananaBunch, gTLUTItemWindowGreenShell +.word gTLUTItemWindowTripleGreenShell, gTLUTItemWindowRedShell, gTLUTItemWindowTripleRedShell, gTLUTItemWindowBlueShell +.word gTLUTItemWindowThunderBolt, gTLUTItemWindowFakeItemBox, gTLUTItemWindowStar, gTLUTItemWindowBoo +.word gTLUTItemWindowMushroom, gTLUTItemWindowDoubleMushroom, gTLUTItemWindowTripleMushroom, gTLUTItemWindowSuperMushroom -glabel D_800E4530 -.word D_0D01FED8, D_0D0203D8, D_0D0208D8, D_0D022BD8 -.word D_0D0230D8, D_0D0235D8, D_0D023AD8, D_0D0221D8 -.word D_0D0244D8, D_0D0249D8, D_0D023FD8, D_0D0226D8 -.word D_0D020DD8, D_0D0212D8, D_0D0217D8, D_0D021CD8 +glabel gItemWindowTextures +.word gTextureItemWindowNone, gTextureItemWindowBanana, gTextureItemWindowBananaBunch, gTextureItemWindowGreenShell +.word gTextureItemWindowTripleGreenShell, gTextureItemWindowRedShell, gTextureItemWindowTripleRedShell, gTextureItemWindowBlueShell +.word gTextureItemWindowThunderBolt, gTextureItemWindowFakeItemBox, gTextureItemWindowStar, gTextureItemWindowBoo +.word gTextureItemWindowMushroom, gTextureItemWindowDoubleMushroom, gTextureItemWindowTripleMushroom, gTextureItemWindowSuperMushroom glabel D_800E4570 .word D_0D00B158, D_0D00B558, D_0D00B958 -glabel D_800E457C -.word D_0D01A4D8, D_0D01A6D8, D_0D01ACD8, D_0D01AAD8 -.word D_0D01AED8, D_0D01B0D8, D_0D01A8D8, D_0D01B2D8 +glabel gPortraitTLUTs +.word gTLUTPortraitMario, gTLUTPortraitLuigi, gTLUTPortraitYoshi, gTLUTPortraitToad +.word gTLUTPortraitDonkeyKong, gTLUTPortraitWario, gTLUTPortraitPeach, gTLUTPortraitBowser -glabel D_800E459C -.word D_0D01B6D8, D_0D01BAD8, D_0D01C6D8, D_0D01C2D8 -.word D_0D01CAD8, D_0D01CED8, D_0D01BED8, D_0D01D2D8 +glabel gPortraitTextures +.word gTexturePortraitMario, gTexturePortraitLuigi, gTexturePortraitYoshi, gTexturePortraitToad +.word gTexturePortraitDonkeyKong, gTexturePortraitWario, gTexturePortraitPeach, gTexturePortraitBowser .word 0x00000000 @@ -424,7 +424,7 @@ glabel D_800E52D0 # TODO: RGBA16 palette for CRASH/POOMP .word 0xfcb5fd01, 0xfd41fd81, 0xfdc1fe01, 0xfe41fe81 .word 0xfec1ffff, 0x00000000, 0x00000000, 0x00000000 -glabel D_800E54D0 # passed as a0 to func_8006ED94 +glabel gCourseOutlineTextures # passed as a0 to func_8006ED94 .word gTextureCourseOutlineMarioRaceway, gTextureCourseOutlineChocoMountain, gTextureCourseOutlineBowsersCastle, gTextureCourseOutlineBansheeBoardwalk .word gTextureCourseOutlineYoshiValley, gTextureCourseOutlineFrappeSnowland, gTextureCourseOutlineKoopaTroopaBeach, gTextureCourseOutlineRoyalRaceway .word gTextureCourseOutlineLuigiRaceway, gTextureCourseOutlineMooMooFarm, gTextureCourseOutlineToadsTurnpike, gTextureCourseOutlineKalimariDesert diff --git a/include/objects.h b/include/objects.h index 4f2f22a49..b34189f06 100644 --- a/include/objects.h +++ b/include/objects.h @@ -83,6 +83,9 @@ extern struct_80165C18_entry D_80165C18[]; // This is another list of indices in D_80165C18. extern s32 D_80183DD8[]; +// Appears to be a list of object list indices for the Item Window part of the HUD +extern s32 gItemWindowObjectByPlayerId[]; + /** * D_80183EA0, D_80183F28, D_8018BFA8, and D_8018C030 are all lists of indices in D_80165C18. * func_80070190 initializes them in such a way that the indicies in each list are not adjacent. @@ -92,6 +95,9 @@ extern s32 D_80183DD8[]; **/ extern s32 D_80183EA0[]; +/** + * Snowmen in Frappe Snowlad +**/ extern s32 D_80183F28[]; extern s32 D_8018BFA8[]; extern s32 D_8018C030[]; @@ -149,4 +155,8 @@ extern s32 D_8018C970[]; // Next free spot in D_8018C970? Wraps back around to 0 if it gets bigger than D_8018C970_SIZE extern s32 D_80183E7C; +// List of object list indices used by the clouds and stars in some stages +// Also used for snowflakes like D_8018C1B0? Not sure what's up with that +extern s32 D_8018CC80[]; + #endif diff --git a/src/code_800431B0.c b/src/code_800431B0.c index 4eb5775da..c10bffbdd 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -2937,7 +2937,7 @@ void func_8004E638(s32 playerId) { struct_80165C18_entry *temp_v1; struct_8018CA70_entry *temp_v0; - objectIndex = D_80183E88[playerId]; + objectIndex = gItemWindowObjectByPlayerId[playerId]; temp_v1 = &D_80165C18[objectIndex]; if (temp_v1->unk_0A6 >= 2) { temp_v0 = &D_8018CA70[playerId]; @@ -2950,7 +2950,7 @@ void func_8004E6C4(s32 playerId) { struct_80165C18_entry *temp_v1; struct_8018CA70_entry *temp_v0; - objectIndex = D_80183E88[playerId]; + objectIndex = gItemWindowObjectByPlayerId[playerId]; temp_v1 = &D_80165C18[objectIndex]; if (temp_v1->unk_0A6 >= 2) { temp_v0 = &D_8018CA70[playerId]; @@ -3165,14 +3165,14 @@ block_7: var_f16 = (f64) var_f0 + 4.0; goto block_7; } - func_8004CAD0((s32) (f32) (((*(&D_8018D2C0 + temp_v0) + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0), (s32) var_f0, (s32) D_0D02CC58); + func_8004CAD0((s32) (f32) (((*(&D_8018D2C0 + temp_v0) + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0), (s32) var_f0, (s32) gTextureMiniMapFinishLine); } #else GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F020.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b +//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022 extern f32 D_8018D2A0; extern s16 D_8018D2B0; extern s16 D_8018D2B8; @@ -3185,34 +3185,28 @@ extern s16 D_8018D2F8; void func_8004F168(s32 arg0, s32 arg1, s32 arg2) { Player *temp_v1; - f32 temp_f0; s16 temp_a0; s16 temp_a1; s32 temp_t0; - s32 temp_v0; temp_v1 = &gPlayerOne[arg1]; temp_t0 = arg0 * 2; if (temp_v1->unk_000 & 0x8000) { - temp_f0 = D_8018D2A0; - temp_a0 = ((*(&D_8018D2C0 + temp_t0) + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0 + (s16) (s32) (temp_v1->pos[0] * temp_f0); - temp_a1 = ((*(&D_8018D2D8 + temp_t0) + D_8018D2F8) - ((s16) D_8018D2B8 / 2)) + D_8018D2E8 + (s32) (temp_v1->pos[2] * temp_f0); + temp_a0 = ((*(&D_8018D2C0 + temp_t0) + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0 + (s16) (s32) (temp_v1->pos[0] * D_8018D2A0); + temp_a1 = ((*(&D_8018D2D8 + temp_t0) + D_8018D2F8) - ((s16) D_8018D2B8 / 2)) + D_8018D2E8 + (s32) (temp_v1->pos[2] * D_8018D2A0); if (arg2 != 8) { - if (gPlayerPositions[arg1] == 0) { - temp_v0 = gModeSelection; - if ((temp_v0 != 3) && (temp_v0 != 1)) { - func_80046424((s32) temp_a0, (s32) temp_a1, (temp_v1->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (s32) ((arg2 << 7) + D_0D02CCD8), (s32) D_0D005470, 8, 8, 8, 8); - return; - } + if ((gPlayerPositions[arg1] == 0) && (gModeSelection != 3) && (gModeSelection != 1)) { + func_80046424((s32) temp_a0, (s32) temp_a1, (temp_v1->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (s32) gMiniMapKartTextures[arg2], (s32) D_0D005470, 8, 8, 8, 8); + return; } - func_800463B0((s32) temp_a0, (s32) temp_a1, (temp_v1->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (s32) ((arg2 << 7) + D_0D02CCD8), (s32) D_0D005470, 8, 8, 8, 8); + func_800463B0((s32) temp_a0, (s32) temp_a1, (temp_v1->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (s32) gMiniMapKartTextures[arg2], (s32) D_0D005470, 8, 8, 8, 8); return; } if (gPlayerPositions[arg1] == 0) { - func_8004C450((s32) temp_a0, (s32) temp_a1, 8U, 8U, (s32) D_0D02D0D8); + func_8004C450((s32) temp_a0, (s32) temp_a1, 8U, 8U, (s32) gTextureMiniMapProgressDot); return; } - func_8004C364((s32) temp_a0, (s32) temp_a1, 8U, 8U, (s32) D_0D02D0D8); + func_8004C364((s32) temp_a0, (s32) temp_a1, 8U, 8U, (s32) gTextureMiniMapProgressDot); } } #else @@ -3509,25 +3503,25 @@ extern s32 D_8018D3E0; extern s32 D_8018D3E4; extern s32 D_8018D3E8; extern s32 D_8018D3EC; -static u32 D_800E457C[8] = { - (u32) D_0D01A4D8, - (u32) D_0D01A6D8, - (u32) D_0D01ACD8, - (u32) D_0D01AAD8, - (u32) D_0D01AED8, - (u32) D_0D01B0D8, - (u32) D_0D01A8D8, - (u32) D_0D01B2D8, +static u32 gPortraitTLUTs[8] = { + (u32) gTLUTPortraitMario, + (u32) gTLUTPortraitLuigi, + (u32) gTLUTPortraitYoshi, + (u32) gTLUTPortraitToad, + (u32) gTLUTPortraitDonkeyKong, + (u32) gTLUTPortraitWario, + (u32) gTLUTPortraitPeach, + (u32) gTLUTPortraitBowser, }; -static s8 *D_800E459C[9] = { - D_0D01B6D8, - D_0D01BAD8, - D_0D01C6D8, - D_0D01C2D8, - D_0D01CAD8, - D_0D01CED8, - D_0D01BED8, - D_0D01D2D8, +static s8 *gPortraitTextures[9] = { + gTexturePortraitMario, + gTexturePortraitLuigi, + gTexturePortraitYoshi, + gTexturePortraitToad, + gTexturePortraitDonkeyKong, + gTexturePortraitWario, + gTexturePortraitPeach, + gTexturePortraitBowser, NULL, }; s16 gCurrentCourseId; /* unable to generate initializer */ @@ -3578,7 +3572,7 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s32 arg5, s temp_s0_2 = gDisplayListHead; gDisplayListHead = temp_s0_2 + 8; temp_s0_2->words.w0 = 0xFD100000; - temp_s0_2->words.w1 = (u32) D_0D01B4D8; + temp_s0_2->words.w1 = (u32) gTLUTPortraitMiniBombKart; temp_s0_3 = gDisplayListHead; gDisplayListHead = temp_s0_3 + 8; temp_s0_3->words.w1 = 0; @@ -3599,7 +3593,7 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s32 arg5, s gDisplayListHead = temp_s0_7 + 8; temp_s0_7->words.w1 = 0; temp_s0_7->words.w0 = 0xE7000000; - func_800452A4(D_0D01DAD8, 0x00000020, 0x00000020); + func_800452A4(gTexturePortraitQuestionMark, 0x00000020, 0x00000020); temp_s0_8 = gDisplayListHead; gDisplayListHead = temp_s0_8 + 8; temp_s0_8->words.w1 = (u32) D_0D0069E0; @@ -3618,7 +3612,7 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s32 arg5, s temp_s0_10 = gDisplayListHead; gDisplayListHead = temp_s0_10 + 8; temp_s0_10->words.w0 = 0xFD100000; - temp_s0_10->words.w1 = D_800E457C[arg4]; + temp_s0_10->words.w1 = gPortraitTLUTs[arg4]; temp_s0_11 = gDisplayListHead; gDisplayListHead = temp_s0_11 + 8; temp_s0_11->words.w1 = 0; @@ -3639,7 +3633,7 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s32 arg5, s gDisplayListHead = temp_s0_15 + 8; temp_s0_15->words.w1 = 0; temp_s0_15->words.w0 = 0xE7000000; - func_800452A4(D_800E459C[arg4], 0x00000020, 0x00000020); + func_800452A4(gPortraitTextures[arg4], 0x00000020, 0x00000020); if (arg7 != 0) { temp_s0_16 = gDisplayListHead; gDisplayListHead = temp_s0_16 + 8; @@ -4017,7 +4011,7 @@ void func_80050C68(void) { temp_v0_2->words.w0 = 0x06000000; temp_v0_3 = gDisplayListHead; gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w1 = (u32) D_0D01B4D8; + temp_v0_3->words.w1 = (u32) gTLUTPortraitMiniBombKart; temp_v0_3->words.w0 = 0xFD100000; temp_v0_4 = gDisplayListHead; gDisplayListHead = temp_v0_4 + 8; @@ -4039,7 +4033,7 @@ void func_80050C68(void) { gDisplayListHead = temp_v0_8 + 8; temp_v0_8->words.w1 = 0; temp_v0_8->words.w0 = 0xE7000000; - func_800452A4(D_0D01D6D8, 0x00000020, 0x00000020); + func_800452A4(gTexturePortraitMiniBombKart, 0x00000020, 0x00000020); func_80042330(sp88 + 0x20, sp84 + 0x12, 0U, 0.6f); temp_v0_9 = gDisplayListHead; gDisplayListHead = temp_v0_9 + 8; @@ -4067,17 +4061,17 @@ extern ? D_8018CE24; extern s32 D_8018D3E4; extern s32 D_8018D3E8; extern s32 D_8018D3EC; -static u32 D_800E457C[8] = { - (u32) D_0D01A4D8, - (u32) D_0D01A6D8, - (u32) D_0D01ACD8, - (u32) D_0D01AAD8, - (u32) D_0D01AED8, - (u32) D_0D01B0D8, - (u32) D_0D01A8D8, - (u32) D_0D01B2D8, +static u32 gPortraitTLUTs[8] = { + (u32) gTLUTPortraitMario, + (u32) gTLUTPortraitLuigi, + (u32) gTLUTPortraitYoshi, + (u32) gTLUTPortraitToad, + (u32) gTLUTPortraitDonkeyKong, + (u32) gTLUTPortraitWario, + (u32) gTLUTPortraitPeach, + (u32) gTLUTPortraitBowser, }; -static ? D_800E459C; /* unable to generate initializer */ +static ? gPortraitTextures; /* unable to generate initializer */ s16 gCurrentCourseId; /* unable to generate initializer */ void func_80050E34(s32 playerId, s32 arg1) { @@ -4150,7 +4144,7 @@ void func_80050E34(s32 playerId, s32 arg1) { temp_v0_4 = gDisplayListHead; gDisplayListHead = temp_v0_4 + 8; temp_v0_4->words.w0 = 0xFD100000; - temp_v0_4->words.w1 = (u32) D_0D01B4D8; + temp_v0_4->words.w1 = (u32) gTLUTPortraitMiniBombKart; temp_v0_5 = gDisplayListHead; gDisplayListHead = temp_v0_5 + 8; temp_v0_5->words.w1 = 0; @@ -4172,7 +4166,7 @@ void func_80050E34(s32 playerId, s32 arg1) { temp_v0_9->words.w1 = 0; temp_v0_9->words.w0 = 0xE7000000; spD4 = spD4; - func_800452A4(D_0D01DAD8, 0x00000020, 0x00000020); + func_800452A4(gTexturePortraitQuestionMark, 0x00000020, 0x00000020); temp_s1_2 = &D_80165C18[spD4]; temp_s1_2->unk_004[0] = temp_s1_2->unk_028[0] + (f32) (spD0 + 0x20); temp_s1_2->unk_004[2] = temp_s1_2->unk_028[2]; @@ -4187,7 +4181,7 @@ void func_80050E34(s32 playerId, s32 arg1) { temp_v0_11 = gDisplayListHead; gDisplayListHead = temp_v0_11 + 8; temp_v0_11->words.w0 = 0xFD100000; - temp_v0_11->words.w1 = D_800E457C[temp_s1]; + temp_v0_11->words.w1 = gPortraitTLUTs[temp_s1]; temp_v0_12 = gDisplayListHead; gDisplayListHead = temp_v0_12 + 8; temp_v0_12->words.w1 = 0; @@ -4219,7 +4213,7 @@ void func_80050E34(s32 playerId, s32 arg1) { sp3C = temp_t2; func_8004B2BC((s32) D_80165C18[spD4].unk_0A0); } - func_800452A4(*(&D_800E459C + sp3C), 0x00000020, 0x00000020); + func_800452A4(*(&gPortraitTextures + sp3C), 0x00000020, 0x00000020); temp_a0 = &D_80165C18[spD4] + 4; temp_a1 = &D_80165C18[spD4] + 0xBE; sp38 = temp_a1; diff --git a/src/code_800431B0.h b/src/code_800431B0.h index 4a9c9bf94..335570651 100644 --- a/src/code_800431B0.h +++ b/src/code_800431B0.h @@ -403,7 +403,6 @@ extern Vec3f D_80183E40; extern Vec3f D_80183E50; extern Vec3f D_80183E70; extern Vec3s D_80183E80; -extern s32 D_80183E88[]; extern Vec3s D_80183E98; extern s32 D_80183EAC; extern UnkActorInner D_8018C830; diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 6af4ec101..b5b60b620 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -758,7 +758,7 @@ void func_80059560(s32 playerId) { if (D_801657E4 == 2) { temp_v0_2 = &D_8018CA70[playerId]; if ((temp_v0_2->unk_74 != 0) && (D_80165608 != 0)) { - func_80047910((s32) temp_v0_2->unk_6C, (s32) temp_v0_2->unk_6E, 0U, 1.0f, (s32) D_0D01B4D8, (s32) D_0D01D6D8, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020); + func_80047910((s32) temp_v0_2->unk_6C, (s32) temp_v0_2->unk_6E, 0U, 1.0f, (s32) gTLUTPortraitMiniBombKart, (s32) gTexturePortraitMiniBombKart, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020); } } } diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index 17a14c763..d2d3e2b66 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -5,6 +5,7 @@ #include "code_8006E9C0.h" #include "code_80071F00.h" #include "objects.h" +#include "common_textures.h" #include void func_8006E9C0(void) { @@ -70,20 +71,8 @@ void func_8006EA5C(void) { } #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_80183E38; -extern s32 D_80183E4C; -extern s32 D_80183E5C; -extern s32 D_80183E6C; -extern s32 D_80183E7C; -extern s32 D_8018C1B0; -extern UnkActorInner D_8018C3B0; -extern s32 D_8018C3F0; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-29-2022 extern ? D_8018C5F0; -extern s32 D_8018C630; -extern ? D_8018C830; -extern s32 D_8018C870; -extern s32 D_8018C970; extern s16 D_8018CF18; extern s16 D_8018CF20; extern s16 D_8018CF48; @@ -98,7 +87,6 @@ extern s16 D_8018CFC8; extern s16 D_8018CFD0; extern s16 D_8018CFD8; extern s16 D_8018CFE0; -extern s16 D_8018CFE8; extern s16 D_8018CFF0; extern s16 D_8018CFF8; extern s16 D_8018D000; @@ -114,33 +102,33 @@ extern s16 D_8018D0E8; extern s16 D_8018D110; void func_8006EB10(void) { - ? *var_v1; - ? *var_v1_2; - ? *var_v1_3; - ? *var_v1_4; - ? *var_v1_5; + s32 *var_v1; + s32 *var_v1_2; + s32 *var_v1_3; + s32 *var_v1_4; + s32 *var_v1_5; - var_v1 = &D_8018C1B0; + var_v1 = D_8018C1B0; do { var_v1 += 4; var_v1->unk-4 = -1; } while ((u32) var_v1 < (u32) &D_8018C3B0); - var_v1_2 = &D_8018C3F0; + var_v1_2 = D_8018C3F0; do { var_v1_2 += 4; var_v1_2->unk-4 = -1; } while ((u32) var_v1_2 < (u32) &D_8018C5F0); - var_v1_3 = &D_8018C630; + var_v1_3 = D_8018C630; do { var_v1_3 += 4; var_v1_3->unk-4 = -1; } while ((u32) var_v1_3 < (u32) &D_8018C830); - var_v1_4 = &D_8018C870; + var_v1_4 = D_8018C870; do { var_v1_4 += 4; var_v1_4->unk-4 = -1; - } while ((u32) var_v1_4 < (u32) &D_8018C970); - var_v1_5 = &D_8018C970; + } while ((u32) var_v1_4 < (u32) D_8018C970); + var_v1_5 = D_8018C970; do { var_v1_5 += 0x10; var_v1_5->unk-10 = -1; @@ -208,36 +196,29 @@ void func_8006EE44(void) { D_8018D1E0 = func_8006ED94(&gTextureLogoMarioKart64, D_8018D9B0, 0x79E1, 0x20000); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_0D01DED8; -extern s32 D_0D01FED8; - +// Some kind of initalization for the Item Window part of the HUD void func_8006EE7C(s32 objectIndex) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0A4 = 0; - temp_v0->unk_068 = &D_0D01DED8; - temp_v0->unk_060 = &D_0D01DED8; - temp_v0->unk_06C = (s32) &D_0D01FED8; - temp_v0->unk_064 = &D_0D01FED8; + temp_v0->unk_0D2 = temp_v0->unk_0A4; + temp_v0->unk_068 = (s32 *) gTLUTItemWindowNone; + temp_v0->unk_060 = (s32 *) gTLUTItemWindowNone; + temp_v0->unk_06C = gTextureItemWindowNone; + temp_v0->unk_064 = gTextureItemWindowNone; temp_v0->unk_04C = -1; - temp_v0->unk_084[0xC] = 0x00A0; - temp_v0->unk_084[0xD] = -0x0020; - temp_v0->unk_0D2 = (s8) temp_v0->unk_0A4; + temp_v0->unk_09C = 0x00A0; // Screen X position + temp_v0->unk_09E = -0x0020; // Screen Y position temp_v0->unk_000 = 1.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006EE7C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 D_8018D240; extern s16 D_8018D2B0; extern s16 D_8018D2B8; -static s32 D_800E54D0[0x14] = { +static s32 gCourseOutlineTextures[0x14] = { (s32) &gTextureCourseOutlineMarioRaceway, (s32) &gTextureCourseOutlineChocoMountain, (s32) &gTextureCourseOutlineBowsersCastle, @@ -291,7 +272,7 @@ void func_8006EEE8(s32 courseId) { temp_t0 = courseId * 2; temp_a1 = D_800E5520[courseId]; sp1C = temp_t0; - D_8018D240 = func_802A84F4(D_800E54D0[courseId], (u32) temp_a1, (u32) temp_a1); + D_8018D240 = func_802A84F4(gCourseOutlineTextures[courseId], (u32) temp_a1, (u32) temp_a1); temp_v1 = &D_800E5548[temp_t0]; D_8018D2B0 = temp_v1->unk0; D_8018D2B8 = temp_v1->unk2; @@ -304,7 +285,7 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006EEE8.s") //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 D_8018D248; extern s32 D_8018D9B4; -static s32 *D_800E54D0[0x14] = { +static s32 *gCourseOutlineTextures[0x14] = { gTextureCourseOutlineMarioRaceway, gTextureCourseOutlineChocoMountain, gTextureCourseOutlineBowsersCastle, @@ -358,7 +339,7 @@ void func_8006EF60(void) { s32 var_s2; var_s4 = &D_8018D248; - var_s3 = D_800E54D0; + var_s3 = gCourseOutlineTextures; var_s0 = &D_800E5520; var_s2 = 0; var_s1 = D_8018D9B4 + 0xFFFF0000; @@ -1134,47 +1115,44 @@ void func_80070328(void *arg0) { GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070328.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern Vtx D_0D005770; -extern s32 D_0D0293D8; - -void func_800703E0(s32 objectIndex, s32 arg1, void *arg2) { - f32 var_f6; +/** + * This function is part of the spawning for the "stars" in some stages + * + * arg2 is a pointer to some type of spawn data for the stars, although it not super clear + * what types each element is. It seems like its a bunch of u16's, so maybe a Vec4su? + * + * The stars in Wario's Stadium, Toad's Turnpike, and Rainbow Road are not part of the skybox. + * They are instead objects that seemingly hover in the air around the player + * They have no true x/y/z position, instead they seem to be kept in a position relative to the + * player they hang around. There is however an x/y position for where they should be on screen + * when they are visbile (unk_09E[0] and [1]). + * unk_000 is some sort of size scaling on the start texture. + * unk_0A2 is an alpha value, used to make the star twinkle. +**/ +void func_800703E0(s32 objectIndex, s32 arg1, u16 *arg2) { struct_80165C18_entry *temp_v0; - u16 temp_t2; func_800723A4(objectIndex, arg1); temp_v0 = &D_80165C18[objectIndex]; + temp_v0->unk_0D5 = arg2[3]; // No idea, all 0's for stars temp_v0->unk_0A4 = 1; - temp_v0->unk_0D5 = (u8) arg2->unk6; - temp_v0->unk_0C0 = arg2->unk0; - temp_v0->unk_09E = (s16) arg2->unk2; - temp_t2 = arg2->unk4; - var_f6 = (f32) temp_t2; - if ((s32) temp_t2 < 0) { - var_f6 += 4294967296.0f; - } - temp_v0->unk_064 = &D_0D0293D8; - temp_v0->unk_000 = (f32) ((f64) var_f6 / 100.0); - func_80073404(objectIndex, 0x10U, 0x10U, (s32) &D_0D005770); + temp_v0->unk_0BE[1] = arg2[0]; // No idea + temp_v0->unk_09E = arg2[1]; // screen Y position + temp_v0->unk_000 = (f32)arg2[2] / 100.0; // some type of scaling on the texture + temp_v0->unk_064 = D_0D0293D8; + func_80073404(objectIndex, 0x10U, 0x10U, D_0D005770); } -#else -GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_800703E0.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800703E0(s32, ?, void *); /* extern */ +//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022 extern ? D_8018CC80; -extern s32 D_8018D1F0; extern s32 D_8018D1F8; extern s8 D_8018D230; -void func_800704A0(void *arg0) { +void func_800704A0(u16 *arg0) { s32 var_s1; s32 var_s2; - void *var_s0; + u16 *var_s0; var_s2 = 0; var_s0 = arg0; @@ -1812,10 +1790,9 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070780.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8006EE7C(s32); /* extern */ -void func_8007055C(); /* extern */ -void func_80070780(); /* extern */ +//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-30-2022 +? func_8007055C(); /* extern */ +? func_80070780(); /* extern */ extern s32 D_80165638; extern s32 D_80165648; extern s16 D_801656B0; @@ -1825,23 +1802,19 @@ extern s16 D_801657A2; extern s8 D_80165888; extern s8 D_80165890; extern s32 D_80183DA0; -extern s32 D_80183DB8; extern s32 D_80183DBC; -extern s32 D_80183E88; -extern s32 D_80183E8C; extern f32 D_8018CFCC; extern f32 D_8018CFD4; extern f32 D_8018CFEC; extern f32 D_8018CFF4; extern f32 D_8018D00C; -extern f32 D_8018D028; -extern f32 D_8018D050; +extern ? D_8018D028; +extern ? D_8018D050; extern ? D_8018D078; -extern s16 D_8018D098; +extern ? D_8018D098; extern ? D_8018D0A0; -extern f32 D_8018D0C8; +extern ? D_8018D0C8; extern ? D_8018D0F0; -extern s32 D_8018D140; extern s32 D_8018D150; extern s32 D_8018D158; extern s32 D_8018D380; @@ -1871,16 +1844,15 @@ void func_80071428(void) { f32 temp_f0_2; f32 temp_f0_3; f32 var_f0; - s32 temp_v1; D_8018D140 = 0; D_8018D150 = 0; D_8018CFCC = 1.0f; find_unused_obj_index(&D_80183DA0); - find_unused_obj_index(&D_80183DB8); + find_unused_obj_index(D_80183DB8); find_unused_obj_index(&D_80183DBC); - find_unused_obj_index(&D_80183E88); - find_unused_obj_index(&D_80183E8C); + find_unused_obj_index(gItemWindowObjectByPlayerId); + find_unused_obj_index(gItemWindowObjectByPlayerId + 4); func_80070190(); func_8007055C(); func_8007055C(); @@ -1907,7 +1879,7 @@ void func_80071428(void) { D_8018CA70->slideItemBoxX = 0; D_8018CA70->slideItemBoxY = 0; D_8018CA70->stagingPosition = (s16) *gPlayerPositions; - func_8006EE7C(D_80183E88); + func_8006EE7C(*gItemWindowObjectByPlayerId); var_f0 = 35.0f; var_v0 = &D_8018D078; var_a3 = &D_8018D0A0; @@ -1972,14 +1944,13 @@ void func_80071428(void) { D_8018D384 = (s32) 0x0078; D_8018D3C4 = 0x00000032; D_8018D3BC = (s32) 0x0028; - temp_v1 = gModeSelection; D_8018D3C0 = 0x00000050; D_801657A2 = 0x0333; - switch (temp_v1) { /* irregular */ - case GRAND_PRIX: + switch (gModeSelection) { /* irregular */ + case 0: D_8018D158 = 8; return; - case TIME_TRIALS: + case 1: D_80165638 = (func_800B4F2C(0, 40.0f, &D_8018D3DC, 1, 0x0078, 0x0028) & 0xFFFFF) - 1; D_80165648 = func_800B4E24(0) & 0xFFFFF; D_80165888 = 1; @@ -1993,29 +1964,23 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071428.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8006EE7C(s32); /* extern */ -void func_8007055C(); /* extern */ -void func_80070780(); /* extern */ +//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022 +? func_8007055C(); /* extern */ +? func_80070780(); /* extern */ extern s16 D_801657A2; extern s32 D_80183DA0; -extern s32 D_80183DB8; extern s32 D_80183DBC; -extern s32 D_80183E88; -extern s32 D_80183E8C; extern s32 D_8018D158; extern s32 D_8018D3BC; extern s32 D_8018D3C0; extern s32 D_8018D3C4; void func_80071818(void) { - s32 temp_v1; - find_unused_obj_index(&D_80183DA0); - find_unused_obj_index(&D_80183DB8); + find_unused_obj_index(D_80183DB8); find_unused_obj_index(&D_80183DBC); - find_unused_obj_index(&D_80183E88); - find_unused_obj_index(&D_80183E8C); + find_unused_obj_index(gItemWindowObjectByPlayerId); + find_unused_obj_index(gItemWindowObjectByPlayerId + 4); func_80070190(); func_8007055C(); func_8007055C(); @@ -2034,7 +1999,7 @@ void func_80071818(void) { D_8018CA70->timerY = 0x0010; D_8018CA70->lapX = 0x0067; D_8018CA70->lapY = 0x0028; - func_8006EE7C(D_80183E88); + func_8006EE7C(*gItemWindowObjectByPlayerId); D_8018CA70->unkC6 = 0x0043; D_8018CA70->unkC8 = 0x0032; D_8018CA70->unkCA = 0; @@ -2049,25 +2014,24 @@ void func_80071818(void) { D_8018CA70->unkDC = 0x0010; D_8018CA70->unkDE = 0x00F7; D_8018CA70->unkE4 = 0x0028; - func_8006EE7C(D_80183E8C); + func_8006EE7C(*(gItemWindowObjectByPlayerId + 4)); D_8018CA70->unk88 = 0.5f; D_8018CA70->stagingPosition = (s16) gPlayerPositions->unk0; D_8018CA70->unkEE = (s16) gPlayerPositions->unk4; D_8018CA70->rankScaling = D_8018CA70->unk88; D_8018D3C4 = 0x0000001E; D_8018D3BC = 0x00000018; - temp_v1 = gModeSelection; D_8018D3C0 = 0x00000028; D_801657A2 = 0x0666; - switch (temp_v1) { /* irregular */ - case GRAND_PRIX: + switch (gModeSelection) { /* irregular */ + case 0: D_8018D158 = 8; return; - case VERSUS: + case 2: block_7: D_8018D158 = 2; return; - case BATTLE: + case 3: goto block_7; } } @@ -2076,29 +2040,23 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071818.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8006EE7C(s32, s16, s16, s16); /* extern */ -void func_8007055C(); /* extern */ -void func_80070780(); /* extern */ +//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022 +? func_8007055C(); /* extern */ +? func_80070780(); /* extern */ extern s16 D_801657A2; extern s32 D_80183DA0; -extern s32 D_80183DB8; extern s32 D_80183DBC; -extern s32 D_80183E88; -extern s32 D_80183E8C; extern s32 D_8018D158; extern s32 D_8018D3BC; extern s32 D_8018D3C0; extern s32 D_8018D3C4; void func_80071A20(void) { - s32 temp_v0; - find_unused_obj_index(&D_80183DA0); - find_unused_obj_index(&D_80183DB8); + find_unused_obj_index(D_80183DB8); find_unused_obj_index(&D_80183DBC); - find_unused_obj_index(&D_80183E88); - find_unused_obj_index(&D_80183E8C); + find_unused_obj_index(gItemWindowObjectByPlayerId); + find_unused_obj_index(gItemWindowObjectByPlayerId + 4); func_80070190(); func_8007055C(); func_8007055C(); @@ -2131,7 +2089,7 @@ void func_80071A20(void) { D_8018CA70->unkDC = 0x007F; D_8018CA70->unkDE = 0x0101; D_8018CA70->unkE4 = 0x00DA; - if (gModeSelection == BATTLE) { + if (gModeSelection == 3) { D_8018CA70->itemBoxY = 0x005E; D_8018CA70->unkC8 = 0x00D0; } @@ -2139,22 +2097,21 @@ void func_80071A20(void) { D_8018CA70->stagingPosition = (s16) gPlayerPositions->unk0; D_8018CA70->unkEE = (s16) gPlayerPositions->unk4; D_8018CA70->rankScaling = D_8018CA70->unk88; - func_8006EE7C(D_80183E88, 0x0034, 0x00EA, 0x0101); - func_8006EE7C(D_80183E8C); + func_8006EE7C(*gItemWindowObjectByPlayerId); + func_8006EE7C(*(gItemWindowObjectByPlayerId + 4)); D_8018D3C4 = 0x0000001E; D_8018D3BC = 0x00000018; - temp_v0 = gModeSelection; D_8018D3C0 = 0x00000028; D_801657A2 = 0x0666; - switch (temp_v0) { /* irregular */ - case GRAND_PRIX: + switch (gModeSelection) { /* irregular */ + case 0: D_8018D158 = 8; return; - case VERSUS: + case 2: block_9: D_8018D158 = 2; return; - case BATTLE: + case 3: goto block_9; } } @@ -2163,37 +2120,28 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071A20.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8006EE7C(s32, s16, s16, s16); /* extern */ -void func_80070780(); /* extern */ +//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022 +? func_80070780(); /* extern */ extern s16 D_801657A2; extern s32 D_80183DA0; -extern s32 D_80183DB8; extern s32 D_80183DBC; extern s32 D_80183DC0; extern s32 D_80183DC4; -extern s32 D_80183E88; -extern s32 D_80183E8C; -extern s32 D_80183E90; -extern s32 D_80183E94; -extern s32 D_8018D158;find_unused_obj_index +extern s32 D_8018D158; extern s32 D_8018D3BC; extern s32 D_8018D3C0; extern s32 D_8018D3C4; void func_80071C28(void) { - f32 temp_f0; - f32 temp_f0_2; - find_unused_obj_index(&D_80183DA0); - find_unused_obj_index(&D_80183DB8); + find_unused_obj_index(D_80183DB8); find_unused_obj_index(&D_80183DBC); find_unused_obj_index(&D_80183DC0); find_unused_obj_index(&D_80183DC4); - find_unused_obj_index(&D_80183E88); - find_unused_obj_index(&D_80183E8C); - find_unused_obj_index(&D_80183E90); - find_unused_obj_index(&D_80183E94); + find_unused_obj_index(gItemWindowObjectByPlayerId); + find_unused_obj_index(gItemWindowObjectByPlayerId + 4); + find_unused_obj_index(gItemWindowObjectByPlayerId + 8); + find_unused_obj_index(gItemWindowObjectByPlayerId + 0xC); func_80070190(); func_80070780(); D_8018CA70->unkE6 = 0x011A; @@ -2252,30 +2200,28 @@ void func_80071C28(void) { D_8018CA70->unk1EC = 0x00D4; D_8018CA70->unk1F8 = 0x00C8; D_8018CA70->unk1FA = 0x00C0; - if (gModeSelection == BATTLE) { + if (gModeSelection == 3) { D_8018CA70->itemBoxY = 0x00C8; D_8018CA70->unkC8 = 0x00C8; D_8018CA70->unk14C = 0x00B8; D_8018CA70->unk1D0 = 0x00B8; } D_8018CA70->unk190 = 0.5f; - temp_f0 = D_8018CA70->unk190; - D_8018CA70->unk10C = temp_f0; - D_8018CA70->unk88 = temp_f0; - D_8018CA70->rankScaling = temp_f0; + D_8018CA70->unk10C = (f32) D_8018CA70->unk190; + D_8018CA70->unk88 = (f32) D_8018CA70->unk190; + D_8018CA70->rankScaling = D_8018CA70->unk190; D_8018CA70->stagingPosition = (s16) gPlayerPositions->unk0; D_8018CA70->unkEE = (s16) gPlayerPositions->unk4; D_8018CA70->unk172 = (s16) gPlayerPositions->unk8; D_8018CA70->unk1F6 = (s16) gPlayerPositions->unkC; - func_8006EE7C(D_80183E88, 0x0036, 0x0050, 0x003C); - func_8006EE7C(D_80183E8C); - func_8006EE7C(D_80183E90); - func_8006EE7C(D_80183E94); + func_8006EE7C(*gItemWindowObjectByPlayerId); + func_8006EE7C(*(gItemWindowObjectByPlayerId + 4)); + func_8006EE7C(*(gItemWindowObjectByPlayerId + 8)); + func_8006EE7C(*(gItemWindowObjectByPlayerId + 0xC)); D_8018CA70->unk18C = 1.5f; - temp_f0_2 = D_8018CA70->unk18C; - D_8018CA70->unk108 = temp_f0_2; - D_8018CA70->unk84 = temp_f0_2; - D_8018CA70->unknownScaling = temp_f0_2; + D_8018CA70->unk108 = (f32) D_8018CA70->unk18C; + D_8018CA70->unk84 = (f32) D_8018CA70->unk18C; + D_8018CA70->unknownScaling = D_8018CA70->unk18C; D_8018D158 = (s32) D_8018EDF3; D_8018D3C4 = 0x00000014; D_8018D3BC = 0x00000010; diff --git a/src/code_8006E9C0.h b/src/code_8006E9C0.h index 2856bf7c6..8694fda68 100644 --- a/src/code_8006E9C0.h +++ b/src/code_8006E9C0.h @@ -6,9 +6,11 @@ void func_8006E9C0(); void func_8006EA5C(); void func_8006ED60(); -s32 func_8006ED94(u8 *devAddr, u8* baseAddress, u32 size, u32 offset); +s32 func_8006ED94(u8 *devAddr, u8* baseAddress, u32 size, u32 offset); void func_8006EE44(); +void func_8006EE7C(s32); void func_80070190(); +void func_800703E0(s32, s32, u16*); void func_80070714(); extern s32 gScreenModeSelection; diff --git a/src/code_80071F00.c b/src/code_80071F00.c index 020a5c226..660d024bd 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -661,7 +661,7 @@ s32 func_8007326C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { return sp24; } -void func_80073404(s32 arg0, u8 arg1, u8 arg2, s32 arg3) { +void func_80073404(s32 arg0, u8 arg1, u8 arg2, Vtx *arg3) { D_80165C18[arg0].unk_074 = arg3; D_80165C18[arg0].unk_0D9 = arg1; D_80165C18[arg0].unk_0DA = arg2; @@ -4166,7 +4166,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007AA44.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_80183E88; +extern s32 gItemWindowObjectByPlayerId; /** * Give item @@ -4179,7 +4179,7 @@ void func_8007ABFC(u8 arg0, s32 arg1) { temp_v1 = &D_8018CA70[arg0]; if (temp_v1->raceCompleteBool == 0) { - temp_a0 = *(&D_80183E88 + (arg0 * 4)); + temp_a0 = *(&gItemWindowObjectByPlayerId + (arg0 * 4)); sp18 = temp_v1; sp1C = temp_a0; if (func_80072354(temp_a0, 4) != 0) { @@ -4198,7 +4198,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007ABFC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_80183E88; +extern s32 gItemWindowObjectByPlayerId; void func_8007AC9C(s32 playerId) { Player *sp20; @@ -4206,7 +4206,7 @@ void func_8007AC9C(s32 playerId) { s32 temp_s0; struct_80165C18_entry *temp_s1; - temp_s0 = *(&D_80183E88 + (playerId * 4)); + temp_s0 = *(&gItemWindowObjectByPlayerId + (playerId * 4)); temp_s1 = &D_80165C18[temp_s0]; temp_v0 = &gPlayerOne[playerId]; if (temp_s1->unk_0A4 == 0x000F) { @@ -4325,7 +4325,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007AFB0.s") //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern ? D_80164392; extern ? D_801643BA; -extern s32 D_80183E88; +extern s32 gItemWindowObjectByPlayerId; s32 func_8007B040(s32 objectIndex, s32 arg1) { s32 sp64; @@ -4366,7 +4366,7 @@ s32 func_8007B040(s32 objectIndex, s32 arg1) { temp_t0 = gPlayerCountSelection1; var_v1_2 = 0; if (temp_t0 > 0) { - var_a0 = &D_80183E88; + var_a0 = &gItemWindowObjectByPlayerId; do { if (var_v1_2 != arg1) { temp_a1 = D_80165C18[*var_a0].unk_0A4; @@ -4388,7 +4388,7 @@ s32 func_8007B040(s32 objectIndex, s32 arg1) { temp_a3_2->unk_0D1 = (s8) temp_v1; temp_a3_2->unk_0A2 = temp_t0_2; temp_a3_2->unk_0D2 = (s8) temp_t0_2; - temp_a0 = (&D_80183E88)[temp_v1]; + temp_a0 = (&gItemWindowObjectByPlayerId)[temp_v1]; sp38 = &gPlayerOne[temp_v1]; sp64 = temp_a0; func_800722A4(temp_a0, 1); @@ -4411,8 +4411,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B040.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc void func_800C8F80(u8, ?); /* extern */ -extern s32 D_0D01DED8; -extern s8 D_0D01FED8; +extern s32 gTLUTItemWindowNone; +extern s8 gTextureItemWindowNone; extern s8 D_80165888; extern s16 D_8018CAB8; @@ -4425,8 +4425,8 @@ void func_8007B254(s32 objectIndex, u8 arg1) { temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0A6 = 2; temp_v0->unk_0A4 = 0; - temp_v0->unk_068 = &D_0D01DED8; - temp_v0->unk_06C = (s32) &D_0D01FED8; + temp_v0->unk_068 = &gTLUTItemWindowNone; + temp_v0->unk_06C = (s32) &gTextureItemWindowNone; temp_v0->unk_0D9 = 0x28; temp_v0->unk_0DA = 0x20; temp_v0->unk_04C = 0x00000032; @@ -4453,86 +4453,51 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B254.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007AC9C(s32); /* extern */ +//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-30-2022 +? func_8007AC9C(s32); /* extern */ s8 func_8007AFB0(s32, s32); /* extern */ s32 func_8007B040(s32, s32); /* extern */ -void func_8007B254(s32, s32); /* extern */ -void func_800C8F80(u8, ?); /* extern */ -void func_800C9018(u8, ?); /* extern */ -extern s32 D_0D01DED8; -extern s32 D_0D01E0D8; -extern s32 D_0D01E2D8; -extern s32 D_0D01E4D8; -extern s32 D_0D01E6D8; -extern s32 D_0D01E8D8; -extern s32 D_0D01EAD8; -extern s32 D_0D01ECD8; -extern s32 D_0D01EED8; -extern s32 D_0D01F0D8; -extern s32 D_0D01F2D8; -extern s32 D_0D01F4D8; -extern s32 D_0D01F6D8; -extern s32 D_0D01F8D8; -extern s32 D_0D01FAD8; -extern s32 D_0D01FCD8; -extern s32 D_0D01FED8; -extern s32 D_0D0203D8; -extern s32 D_0D0208D8; -extern s32 D_0D020DD8; -extern s32 D_0D0212D8; -extern s32 D_0D0217D8; -extern s32 D_0D021CD8; -extern s32 D_0D0221D8; -extern s32 D_0D0226D8; -extern s32 D_0D022BD8; -extern s32 D_0D0230D8; -extern s32 D_0D0235D8; -extern s32 D_0D023AD8; -extern s32 D_0D023FD8; -extern s32 D_0D0244D8; -extern s32 D_0D0249D8; +? func_8007B254(s32, s32); /* extern */ +? func_800C8F80(u8, ?); /* extern */ +? func_800C9018(u8, ?); /* extern */ extern s8 D_80165888; -extern s32 D_80183E88; -extern s32 gControllerOne; -static s32 *D_800E44F0[0x10] = { - &D_0D01DED8, - &D_0D01E0D8, - &D_0D01E2D8, - &D_0D01F0D8, - &D_0D01F2D8, - &D_0D01F4D8, - &D_0D01F6D8, - &D_0D01ECD8, - &D_0D01FAD8, - &D_0D01FCD8, - &D_0D01F8D8, - &D_0D01EED8, - &D_0D01E4D8, - &D_0D01E6D8, - &D_0D01E8D8, - &D_0D01EAD8, +static s32 *gItemWindowTLUTs[0x10] = { + (s32 *) gTLUTItemWindowNone, + (s32 *) gTLUTItemWindowBanana, + (s32 *) gTLUTItemWindowBananaBunch, + (s32 *) gTLUTItemWindowGreenShell, + (s32 *) gTLUTItemWindowTripleGreenShell, + (s32 *) gTLUTItemWindowRedShell, + (s32 *) gTLUTItemWindowTripleRedShell, + (s32 *) gTLUTItemWindowBlueShell, + (s32 *) gTLUTItemWindowThunderBolt, + (s32 *) gTLUTItemWindowFakeItemBox, + (s32 *) gTLUTItemWindowStar, + (s32 *) gTLUTItemWindowBoo, + (s32 *) gTLUTItemWindowMushroom, + (s32 *) gTLUTItemWindowDoubleMushroom, + (s32 *) gTLUTItemWindowTripleMushroom, + (s32 *) gTLUTItemWindowSuperMushroom, }; -static s32 *D_800E4530[0x10] = { - &D_0D01FED8, - &D_0D0203D8, - &D_0D0208D8, - &D_0D022BD8, - &D_0D0230D8, - &D_0D0235D8, - &D_0D023AD8, - &D_0D0221D8, - &D_0D0244D8, - &D_0D0249D8, - &D_0D023FD8, - &D_0D0226D8, - &D_0D020DD8, - &D_0D0212D8, - &D_0D0217D8, - &D_0D021CD8, +static s8 *gItemWindowTextures[0x10] = { + gTextureItemWindowNone, + gTextureItemWindowBanana, + gTextureItemWindowBananaBunch, + gTextureItemWindowGreenShell, + gTextureItemWindowTripleGreenShell, + gTextureItemWindowRedShell, + gTextureItemWindowTripleRedShell, + gTextureItemWindowBlueShell, + gTextureItemWindowThunderBolt, + gTextureItemWindowFakeItemBox, + gTextureItemWindowStar, + gTextureItemWindowBoo, + gTextureItemWindowMushroom, + gTextureItemWindowDoubleMushroom, + gTextureItemWindowTripleMushroom, + gTextureItemWindowSuperMushroom, }; -// have effect on object of player void func_8007B34C(s32 playerId) { s32 sp40; Player *sp38; @@ -4541,12 +4506,10 @@ void func_8007B34C(s32 playerId) { s16 temp_a1; s16 temp_a1_2; s16 temp_a1_3; - s16 temp_v0_6; + s16 temp_v0_4; s32 temp_s0; - s32 temp_v0; s32 temp_v0_2; - s32 temp_v0_4; - s8 temp_v0_7; + s8 temp_v0_5; struct_80165C18_entry *temp_t0; struct_8018CA70_entry *temp_v1; struct_8018CA70_entry *temp_v1_2; @@ -4555,13 +4518,13 @@ void func_8007B34C(s32 playerId) { struct_8018CA70_entry *temp_v1_5; struct_8018CA70_entry *temp_v1_6; u16 temp_t6; - u16 temp_v0_3; - u8 temp_v0_5; + u16 temp_v0; + u8 temp_v0_3; sp38 = &gPlayerOne[playerId]; sp40 = 0; - temp_s0 = *(&D_80183E88 + (playerId * 4)); - if (((playerId * 0x10) + gControllerOne)->unk6 & 0x2000) { + temp_s0 = gItemWindowObjectByPlayerId[playerId]; + if (gControllerOne[playerId].buttonPressed & 0x2000) { sp40 = 1; } if (D_80165888 != 0) { @@ -4575,15 +4538,14 @@ void func_8007B34C(s32 playerId) { func_8007B254(temp_s0, playerId); break; case 2: - temp_v0 = gActiveScreenMode; - if (temp_v0 == SCREEN_MODE_1P) { + if (gActiveScreenMode == 0) { temp_v1 = &D_8018CA70[playerId]; sp28 = temp_v1; s16_step_up_towards(&temp_v1->slideItemBoxY, 0x0040, 4); if (temp_v1->slideItemBoxY == 0x0040) { func_80072488(temp_s0); } - } else if (temp_v0 == SCREEN_MODE_3P_4P_SPLITSCREEN) { + } else if (gActiveScreenMode == 3) { if ((playerId == 0) || (playerId == 2)) { temp_v1_2 = &D_8018CA70[playerId]; sp28 = temp_v1_2; @@ -4639,12 +4601,11 @@ void func_8007B34C(s32 playerId) { func_8007278C(temp_s0, 0x00000014); break; case 11: - temp_v0_2 = gActiveScreenMode; - if (temp_v0_2 == SCREEN_MODE_1P) { + if (gActiveScreenMode == 0) { if (s16_step_down_towards((playerId * 0x84) + 0x48 + D_8018CA70, 0, 4) != 0) { func_80072488(temp_s0); } - } else if (temp_v0_2 == SCREEN_MODE_3P_4P_SPLITSCREEN) { + } else if (gActiveScreenMode == 3) { if ((playerId == 0) || (playerId == 2)) { temp_v1_5 = &D_8018CA70[playerId]; sp28 = temp_v1_5; @@ -4706,20 +4667,20 @@ void func_8007B34C(s32 playerId) { break; } if (func_80072320(temp_s0, 2) != 0) { - temp_v0_3 = (u16) sp2C->unk_098; - if (temp_v0_3 == 0) { + temp_v0 = (u16) sp2C->unk_098; + if (temp_v0 == 0) { func_8007AC9C(playerId); } else { - sp2C->unk_098 = temp_v0_3 - 1; + sp2C->unk_098 = temp_v0 - 1; } } - temp_v0_4 = sp2C->unk_04C; - if (temp_v0_4 >= 0) { - if (temp_v0_4 > 0) { - sp2C->unk_04C = temp_v0_4 - 1; + temp_v0_2 = sp2C->unk_04C; + if (temp_v0_2 >= 0) { + if (temp_v0_2 > 0) { + sp2C->unk_04C = temp_v0_2 - 1; } else { - temp_v0_5 = sp2C->unk_0D6; - switch (temp_v0_5) { /* switch 1; irregular */ + temp_v0_3 = sp2C->unk_0D6; + switch (temp_v0_3) { /* switch 1; irregular */ case 1: /* switch 1 */ if (sp40 != 0) { func_80073600(temp_s0); @@ -4733,16 +4694,16 @@ void func_8007B34C(s32 playerId) { case 3: /* switch 1 */ if (sp2C->unk_0A4 == 0) { if (func_80072354(temp_s0, 1) != 0) { - temp_v0_6 = sp2C->unk_0A2; - if (temp_v0_6 == 0x000B) { + temp_v0_4 = sp2C->unk_0A2; + if (temp_v0_4 == 0x000B) { if (func_8007B040(temp_s0, playerId) != 0) { func_800726CC(temp_s0, 0x00000014); sp2C->unk_0D6 = 0; } else { func_800726CC(temp_s0, 9); } - } else if ((temp_v0_6 == 0x000D) || (temp_v0_6 == 0x000E)) { - sp2C->unk_0A2 = temp_v0_6 - 1; + } else if ((temp_v0_4 == 0x000D) || (temp_v0_4 == 0x000E)) { + sp2C->unk_0A2 = temp_v0_4 - 1; func_800729D0(temp_s0, (s32) sp2C->unk_0A2); sp2C->unk_0D6 = 3; func_800726CC(temp_s0, 0x00000028); @@ -4759,9 +4720,9 @@ void func_8007B34C(s32 playerId) { } } } - temp_v0_7 = sp2C->unk_0D2; - sp2C->unk_060 = D_800E44F0[temp_v0_7]; - sp2C->unk_064 = D_800E4530[temp_v0_7]; + temp_v0_5 = sp2C->unk_0D2; + sp2C->unk_060 = gItemWindowTLUTs[temp_v0_5]; + sp2C->unk_064 = gItemWindowTextures[temp_v0_5]; sp38->unk_010 = sp2C->unk_0A4; } #else diff --git a/src/code_80071F00.h b/src/code_80071F00.h index 7a3961c56..cf7109f84 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -52,7 +52,7 @@ s32 func_80072E54(s32, s32, s32, s32, s32, s32); s32 func_80072F88(s32, s32, s32, s32, s32, s32); s32 func_800730BC(s32, s32, s32, s32, s32, s32); s32 func_8007326C(s32, s32, s32, s32, s32, s32); -void func_80073404(s32, u8, u8, s32); +void func_80073404(s32, u8, u8, Vtx*); void func_80073444(s32, s32*, s32*, u8, u16); void func_8007348C(s32, s32*, u8, u8, s32); void func_800734D4(); diff --git a/src/common_textures.h b/src/common_textures.h index 61d118a11..9bdd2a8e5 100644 --- a/src/common_textures.h +++ b/src/common_textures.h @@ -241,57 +241,57 @@ extern s8 D_0D017258[]; extern s16 tlutPad[]; extern s8 D_0D017458[]; extern s8 D_0D01A2D8[]; -extern s8 D_0D01A4D8[]; -extern s8 D_0D01A6D8[]; -extern s8 D_0D01A8D8[]; -extern s8 D_0D01AAD8[]; -extern s8 D_0D01ACD8[]; -extern s8 D_0D01AED8[]; -extern s8 D_0D01B0D8[]; -extern s8 D_0D01B2D8[]; -extern s8 D_0D01B4D8[]; -extern s8 D_0D01B6D8[]; -extern s8 D_0D01BAD8[]; -extern s8 D_0D01BED8[]; -extern s8 D_0D01C2D8[]; -extern s8 D_0D01C6D8[]; -extern s8 D_0D01CAD8[]; -extern s8 D_0D01CED8[]; -extern s8 D_0D01D2D8[]; -extern s8 D_0D01D6D8[]; -extern s8 D_0D01DAD8[]; -extern s8 D_0D01DED8[]; -extern s8 D_0D01E0D8[]; -extern s8 D_0D01E2D8[]; -extern s8 D_0D01E4D8[]; -extern s8 D_0D01E6D8[]; -extern s8 D_0D01E8D8[]; -extern s8 D_0D01EAD8[]; -extern s8 D_0D01ECD8[]; -extern s8 D_0D01EED8[]; -extern s8 D_0D01F0D8[]; -extern s8 D_0D01F2D8[]; -extern s8 D_0D01F4D8[]; -extern s8 D_0D01F6D8[]; -extern s8 D_0D01F8D8[]; -extern s8 D_0D01FAD8[]; -extern s8 D_0D01FCD8[]; -extern s8 D_0D01FED8[]; -extern s8 D_0D0203D8[]; -extern s8 D_0D0208D8[]; -extern s8 D_0D020DD8[]; -extern s8 D_0D0212D8[]; -extern s8 D_0D0217D8[]; -extern s8 D_0D021CD8[]; -extern s8 D_0D0221D8[]; -extern s8 D_0D0226D8[]; -extern s8 D_0D022BD8[]; -extern s8 D_0D0230D8[]; -extern s8 D_0D0235D8[]; -extern s8 D_0D023AD8[]; -extern s8 D_0D023FD8[]; -extern s8 D_0D0244D8[]; -extern s8 D_0D0249D8[]; +extern s8 gTLUTPortraitMario[]; +extern s8 gTLUTPortraitLuigi[]; +extern s8 gTLUTPortraitPeach[]; +extern s8 gTLUTPortraitToad[]; +extern s8 gTLUTPortraitYoshi[]; +extern s8 gTLUTPortraitDonkeyKong[]; +extern s8 gTLUTPortraitWario[]; +extern s8 gTLUTPortraitBowser[]; +extern s8 gTLUTPortraitMiniBombKart[]; +extern s8 gTexturePortraitMario[]; +extern s8 gTexturePortraitLuigi[]; +extern s8 gTexturePortraitPeach[]; +extern s8 gTexturePortraitToad[]; +extern s8 gTexturePortraitYoshi[]; +extern s8 gTexturePortraitDonkeyKong[]; +extern s8 gTexturePortraitWario[]; +extern s8 gTexturePortraitBowser[]; +extern s8 gTexturePortraitMiniBombKart[]; +extern s8 gTexturePortraitQuestionMark[]; +extern s8 gTLUTItemWindowNone[]; +extern s8 gTLUTItemWindowBanana[]; +extern s8 gTLUTItemWindowBananaBunch[]; +extern s8 gTLUTItemWindowMushroom[]; +extern s8 gTLUTItemWindowDoubleMushroom[]; +extern s8 gTLUTItemWindowTripleMushroom[]; +extern s8 gTLUTItemWindowSuperMushroom[]; +extern s8 gTLUTItemWindowBlueShell[]; +extern s8 gTLUTItemWindowBoo[]; +extern s8 gTLUTItemWindowGreenShell[]; +extern s8 gTLUTItemWindowTripleGreenShell[]; +extern s8 gTLUTItemWindowRedShell[]; +extern s8 gTLUTItemWindowTripleRedShell[]; +extern s8 gTLUTItemWindowStar[]; +extern s8 gTLUTItemWindowThunderBolt[]; +extern s8 gTLUTItemWindowFakeItemBox[]; +extern s8 gTextureItemWindowNone[]; +extern s8 gTextureItemWindowBanana[]; +extern s8 gTextureItemWindowBananaBunch[]; +extern s8 gTextureItemWindowMushroom[]; +extern s8 gTextureItemWindowDoubleMushroom[]; +extern s8 gTextureItemWindowTripleMushroom[]; +extern s8 gTextureItemWindowSuperMushroom[]; +extern s8 gTextureItemWindowBlueShell[]; +extern s8 gTextureItemWindowBoo[]; +extern s8 gTextureItemWindowGreenShell[]; +extern s8 gTextureItemWindowTripleGreenShell[]; +extern s8 gTextureItemWindowRedShell[]; +extern s8 gTextureItemWindowTripleRedShell[]; +extern s8 gTextureItemWindowStar[]; +extern s8 gTextureItemWindowThunderBolt[]; +extern s8 gTextureItemWindowFakeItemBox[]; extern s8 D_0D024ED8[]; extern s8 D_0D025ED8[]; extern s8 D_0D0260D8[]; @@ -322,15 +322,8 @@ extern s8 D_0D02BC58[]; extern s8 D_0D02C058[]; extern s8 D_0D02C458[]; extern s8 D_0D02C858[]; -extern s8 D_0D02CC58[]; -extern s8 D_0D02CCD8[]; -extern s8 D_0D02CD58[]; -extern s8 D_0D02CDD8[]; -extern s8 D_0D02CE58[]; -extern s8 D_0D02CED8[]; -extern s8 D_0D02CF58[]; -extern s8 D_0D02CFD8[]; -extern s8 D_0D02D058[]; -extern s8 D_0D02D0D8[]; +extern s8 gTextureMiniMapFinishLine[]; +extern s8 gMiniMapKartTextures[][128]; +extern s8 gTextureMiniMapProgressDot[]; #endif diff --git a/src/common_textures.inc.c b/src/common_textures.inc.c index 97c9245b9..bc4f0bb97 100644 --- a/src/common_textures.inc.c +++ b/src/common_textures.inc.c @@ -2480,229 +2480,231 @@ s8 D_0D01A2D8[] = { // 1A4D8 mario tlut -s8 D_0D01A4D8[] = { - #include "textures/132B50_1A4D8_tlut.rgba16.inc.c" +s8 gTLUTPortraitMario[] = { + #include "textures/gTLUTPortraitMario.rgba16.inc.c" }; // 1A6D8 luigi tlut -s8 D_0D01A6D8[] = { - #include "textures/132B50_1A6D8_tlut.rgba16.inc.c" +s8 gTLUTPortraitLuigi[] = { + #include "textures/gTLUTPortraitLuigi.rgba16.inc.c" }; // 1A8D8 peach tlut -s8 D_0D01A8D8[] = { - #include "textures/132B50_1A8D8_tlut.rgba16.inc.c" +s8 gTLUTPortraitPeach[] = { + #include "textures/gTLUTPortraitPeach.rgba16.inc.c" }; // 1AAD8 toad tlut -s8 D_0D01AAD8[] = { - #include "textures/132B50_1AAD8_tlut.rgba16.inc.c" +s8 gTLUTPortraitToad[] = { + #include "textures/gTLUTPortraitToad.rgba16.inc.c" }; // 1ACD8 yoshi tlut -s8 D_0D01ACD8[] = { - #include "textures/132B50_1ACD8_tlut.rgba16.inc.c" +s8 gTLUTPortraitYoshi[] = { + #include "textures/gTLUTPortraitYoshi.rgba16.inc.c" }; // 1AED8 dk tlut -s8 D_0D01AED8[] = { - #include "textures/132B50_1AED8_tlut.rgba16.inc.c" +s8 gTLUTPortraitDonkeyKong[] = { + #include "textures/gTLUTPortraitDonkeyKong.rgba16.inc.c" }; // 1B0D8 wario tlut -s8 D_0D01B0D8[] = { - #include "textures/132B50_1B0D8_tlut.rgba16.inc.c" +s8 gTLUTPortraitWario[] = { + #include "textures/gTLUTPortraitWario.rgba16.inc.c" }; // 1B2D8 bowser tlut -s8 D_0D01B2D8[] = { - #include "textures/132B50_1B2D8_tlut.rgba16.inc.c" +s8 gTLUTPortraitBowser[] = { + #include "textures/gTLUTPortraitBowser.rgba16.inc.c" }; // 1B4D8 bob-omb tlut and question mark? -s8 D_0D01B4D8[] = { +s8 gTLUTPortraitMiniBombKart[] = { #include "textures/132B50_1B4D8_tlut.rgba16.inc.c" }; // Mario -s8 D_0D01B6D8[] = { - #include "textures/132B50_1B6D8.rgba16.ci8.inc.c" +s8 gTexturePortraitMario[] = { + #include "textures/gTexturePortraitMario.rgba16.ci8.inc.c" }; // Luigi -s8 D_0D01BAD8[] = { - #include "textures/132B50_1BAD8.rgba16.ci8.inc.c" +s8 gTexturePortraitLuigi[] = { + #include "textures/gTexturePortraitLuigi.rgba16.ci8.inc.c" }; // Peach -s8 D_0D01BED8[] = { - #include "textures/132B50_1BED8.rgba16.ci8.inc.c" +s8 gTexturePortraitPeach[] = { + #include "textures/gTexturePortraitPeach.rgba16.ci8.inc.c" }; // Toad -s8 D_0D01C2D8[] = { - #include "textures/132B50_1C2D8.rgba16.ci8.inc.c" +s8 gTexturePortraitToad[] = { + #include "textures/gTexturePortraitToad.rgba16.ci8.inc.c" }; // Yoshi -s8 D_0D01C6D8[] = { - #include "textures/132B50_1C6D8.rgba16.ci8.inc.c" +s8 gTexturePortraitYoshi[] = { + #include "textures/gTexturePortraitYoshi.rgba16.ci8.inc.c" }; // Donkey Kong -s8 D_0D01CAD8[] = { - #include "textures/132B50_1CAD8.rgba16.ci8.inc.c" +s8 gTexturePortraitDonkeyKong[] = { + #include "textures/gTexturePortraitDonkeyKong.rgba16.ci8.inc.c" }; // Wario -s8 D_0D01CED8[] = { - #include "textures/132B50_1CED8.rgba16.ci8.inc.c" +s8 gTexturePortraitWario[] = { + #include "textures/gTexturePortraitWario.rgba16.ci8.inc.c" }; // Bowser -s8 D_0D01D2D8[] = { - #include "textures/132B50_1D2D8.rgba16.ci8.inc.c" +s8 gTexturePortraitBowser[] = { + #include "textures/gTexturePortraitBowser.rgba16.ci8.inc.c" }; -// Bob-omb -s8 D_0D01D6D8[] = { +// The Mini Bomb Kart and Question Mark portrait textures are +// part of a single PNG file and use the same TLUT, which makes +// including the image(s) as a C array kind of awkward +s8 gTexturePortraitMiniBombKart[][1024] = { #include "textures/132B50_1D6D8.rgba16.ci8.inc.c" }; // Question Mark -s8 D_0D01DAD8[] = { - #include "textures/132B50_1DAD8.rgba16.ci8.inc.c" -}; +// s8 gTexturePortraitQuestionMark[] = { +// #include "textures/132B50_1DAD8.rgba16.ci8.inc.c" +// }; // 1DED8 tlut item frames -s8 D_0D01DED8[] = { - #include "textures/132B50_1DED8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowNone[] = { + #include "textures/gTLUTItemWindowNone.rgba16.inc.c" }; -s8 D_0D01E0D8[] = { - #include "textures/132B50_1E0D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowBanana[] = { + #include "textures/gTLUTItemWindowBanana.rgba16.inc.c" }; -s8 D_0D01E2D8[] = { - #include "textures/132B50_1E2D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowBananaBunch[] = { + #include "textures/gTLUTItemWindowBananaBunch.rgba16.inc.c" }; -s8 D_0D01E4D8[] = { - #include "textures/132B50_1E4D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowMushroom[] = { + #include "textures/gTLUTItemWindowMushroom.rgba16.inc.c" }; -s8 D_0D01E6D8[] = { - #include "textures/132B50_1E6D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowDoubleMushroom[] = { + #include "textures/gTLUTItemWindowDoubleMushroom.rgba16.inc.c" }; -s8 D_0D01E8D8[] = { - #include "textures/132B50_1E8D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowTripleMushroom[] = { + #include "textures/gTLUTItemWindowTripleMushroom.rgba16.inc.c" }; -s8 D_0D01EAD8[] = { - #include "textures/132B50_1EAD8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowSuperMushroom[] = { + #include "textures/gTLUTItemWindowSuperMushroom.rgba16.inc.c" }; -s8 D_0D01ECD8[] = { - #include "textures/132B50_1ECD8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowBlueShell[] = { + #include "textures/gTLUTItemWindowBlueShell.rgba16.inc.c" }; -s8 D_0D01EED8[] = { - #include "textures/132B50_1EED8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowBoo[] = { + #include "textures/gTLUTItemWindowBoo.rgba16.inc.c" }; -s8 D_0D01F0D8[] = { - #include "textures/132B50_1F0D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowGreenShell[] = { + #include "textures/gTLUTItemWindowGreenShell.rgba16.inc.c" }; -s8 D_0D01F2D8[] = { - #include "textures/132B50_1F2D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowTripleGreenShell[] = { + #include "textures/gTLUTItemWindowTripleGreenShell.rgba16.inc.c" }; -s8 D_0D01F4D8[] = { - #include "textures/132B50_1F4D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowRedShell[] = { + #include "textures/gTLUTItemWindowRedShell.rgba16.inc.c" }; -s8 D_0D01F6D8[] = { - #include "textures/132B50_1F6D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowTripleRedShell[] = { + #include "textures/gTLUTItemWindowTripleRedShell.rgba16.inc.c" }; -s8 D_0D01F8D8[] = { - #include "textures/132B50_1F8D8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowStar[] = { + #include "textures/gTLUTItemWindowStar.rgba16.inc.c" }; -s8 D_0D01FAD8[] = { - #include "textures/132B50_1FAD8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowThunderBolt[] = { + #include "textures/gTLUTItemWindowThunderBolt.rgba16.inc.c" }; -s8 D_0D01FCD8[] = { - #include "textures/132B50_1FCD8_tlut.rgba16.inc.c" +s8 gTLUTItemWindowFakeItemBox[] = { + #include "textures/gTLUTItemWindowFakeItemBox.rgba16.inc.c" }; // UI Item Frames -s8 D_0D01FED8[] = { - #include "textures/132B50_1FED8.rgba16.ci8.inc.c" +s8 gTextureItemWindowNone[] = { + #include "textures/gTextureItemWindowNone.rgba16.ci8.inc.c" }; -s8 D_0D0203D8[] = { - #include "textures/132B50_203D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowBanana[] = { + #include "textures/gTextureItemWindowBanana.rgba16.ci8.inc.c" }; -s8 D_0D0208D8[] = { - #include "textures/132B50_208D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowBananaBunch[] = { + #include "textures/gTextureItemWindowBananaBunch.rgba16.ci8.inc.c" }; -s8 D_0D020DD8[] = { - #include "textures/132B50_20DD8.rgba16.ci8.inc.c" +s8 gTextureItemWindowMushroom[] = { + #include "textures/gTextureItemWindowMushroom.rgba16.ci8.inc.c" }; -s8 D_0D0212D8[] = { - #include "textures/132B50_212D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowDoubleMushroom[] = { + #include "textures/gTextureItemWindowDoubleMushroom.rgba16.ci8.inc.c" }; -s8 D_0D0217D8[] = { - #include "textures/132B50_217D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowTripleMushroom[] = { + #include "textures/gTextureItemWindowTripleMushroom.rgba16.ci8.inc.c" }; -s8 D_0D021CD8[] = { - #include "textures/132B50_21CD8.rgba16.ci8.inc.c" +s8 gTextureItemWindowSuperMushroom[] = { + #include "textures/gTextureItemWindowSuperMushroom.rgba16.ci8.inc.c" }; -s8 D_0D0221D8[] = { - #include "textures/132B50_221D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowBlueShell[] = { + #include "textures/gTextureItemWindowBlueShell.rgba16.ci8.inc.c" }; -s8 D_0D0226D8[] = { - #include "textures/132B50_226D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowBoo[] = { + #include "textures/gTextureItemWindowBoo.rgba16.ci8.inc.c" }; -s8 D_0D022BD8[] = { - #include "textures/132B50_22BD8.rgba16.ci8.inc.c" +s8 gTextureItemWindowGreenShell[] = { + #include "textures/gTextureItemWindowGreenShell.rgba16.ci8.inc.c" }; -s8 D_0D0230D8[] = { - #include "textures/132B50_230D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowTripleGreenShell[] = { + #include "textures/gTextureItemWindowTripleGreenShell.rgba16.ci8.inc.c" }; -s8 D_0D0235D8[] = { - #include "textures/132B50_235D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowRedShell[] = { + #include "textures/gTextureItemWindowRedShell.rgba16.ci8.inc.c" }; -s8 D_0D023AD8[] = { - #include "textures/132B50_23AD8.rgba16.ci8.inc.c" +s8 gTextureItemWindowTripleRedShell[] = { + #include "textures/gTextureItemWindowTripleRedShell.rgba16.ci8.inc.c" }; -s8 D_0D023FD8[] = { - #include "textures/132B50_23FD8.rgba16.ci8.inc.c" +s8 gTextureItemWindowStar[] = { + #include "textures/gTextureItemWindowStar.rgba16.ci8.inc.c" }; -s8 D_0D0244D8[] = { - #include "textures/132B50_244D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowThunderBolt[] = { + #include "textures/gTextureItemWindowThunderBolt.rgba16.ci8.inc.c" }; -s8 D_0D0249D8[] = { - #include "textures/132B50_249D8.rgba16.ci8.inc.c" +s8 gTextureItemWindowFakeItemBox[] = { + #include "textures/gTextureItemWindowFakeItemBox.rgba16.ci8.inc.c" }; // Unk data. Perhaps not an img nor tlut. @@ -2846,45 +2848,37 @@ s8 D_0D02C858[] = { }; // minimap cars -s8 D_0D02CC58[] = { +s8 gTextureMiniMapFinishLine[] = { #include "textures/132B50_2CC58.rgba16.inc.c" }; -s8 D_0D02CCD8[] = { - #include "textures/132B50_2CCD8.rgba16.inc.c" +s8 gMiniMapKartTextures[][128] = { + { // Mario + #include "textures/132B50_2CCD8.rgba16.inc.c" + }, + { // Luigi + #include "textures/132B50_2CD58.rgba16.inc.c" + }, + { // Yoshi + #include "textures/132B50_2CDD8.rgba16.inc.c" + }, + { // Toad + #include "textures/132B50_2CE58.rgba16.inc.c" + }, + { // Donkey Kong + #include "textures/132B50_2CED8.rgba16.inc.c" + }, + { // Wario + #include "textures/132B50_2CF58.rgba16.inc.c" + }, + { // Peach + #include "textures/132B50_2CFD8.rgba16.inc.c" + }, + { // Bowser + #include "textures/132B50_2D058.rgba16.inc.c" + }, }; -s8 D_0D02CD58[] = { - #include "textures/132B50_2CD58.rgba16.inc.c" +s8 gTextureMiniMapProgressDot[] = { + #include "textures/132B50_2D0D8.rgba16.inc.c" }; - -s8 D_0D02CDD8[] = { - #include "textures/132B50_2CDD8.rgba16.inc.c" -}; - -s8 D_0D02CE58[] = { - #include "textures/132B50_2CE58.rgba16.inc.c" -}; - -s8 D_0D02CED8[] = { - #include "textures/132B50_2CED8.rgba16.inc.c" -}; - -s8 D_0D02CF58[] = { - #include "textures/132B50_2CF58.rgba16.inc.c" -}; - -s8 D_0D02CFD8[] = { - #include "textures/132B50_2CFD8.rgba16.inc.c" -}; - -// last minimap car -s8 D_0D02D058[] = { - #include "textures/132B50_2D058.rgba16.inc.c" -}; - -// progress dot -s8 D_0D02D0D8[] = { - #include "textures/132B50_2D0D8.rgba16.inc.c" -}; - diff --git a/undefined_syms.txt b/undefined_syms.txt index 01a190627..10c520dd6 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -481,57 +481,57 @@ D_0D019658 = 0x0D019658; D_0D019E58 = 0x0D019E58; D_0D01A058 = 0x0D01A058; D_0D01A2D8 = 0x0D01A2D8; -D_0D01A4D8 = 0x0D01A4D8; -D_0D01A6D8 = 0x0D01A6D8; -D_0D01A8D8 = 0x0D01A8D8; -D_0D01AAD8 = 0x0D01AAD8; -D_0D01ACD8 = 0x0D01ACD8; -D_0D01AED8 = 0x0D01AED8; -D_0D01B0D8 = 0x0D01B0D8; -D_0D01B2D8 = 0x0D01B2D8; -D_0D01B4D8 = 0x0D01B4D8; -D_0D01B6D8 = 0x0D01B6D8; -D_0D01BAD8 = 0x0D01BAD8; -D_0D01BED8 = 0x0D01BED8; -D_0D01C2D8 = 0x0D01C2D8; -D_0D01C6D8 = 0x0D01C6D8; -D_0D01CAD8 = 0x0D01CAD8; -D_0D01CED8 = 0x0D01CED8; -D_0D01D2D8 = 0x0D01D2D8; -D_0D01D6D8 = 0x0D01D6D8; -D_0D01DAD8 = 0x0D01DAD8; -D_0D01DED8 = 0x0D01DED8; -D_0D01E0D8 = 0x0D01E0D8; -D_0D01E2D8 = 0x0D01E2D8; -D_0D01E4D8 = 0x0D01E4D8; -D_0D01E6D8 = 0x0D01E6D8; -D_0D01E8D8 = 0x0D01E8D8; -D_0D01EAD8 = 0x0D01EAD8; -D_0D01ECD8 = 0x0D01ECD8; -D_0D01EED8 = 0x0D01EED8; -D_0D01F0D8 = 0x0D01F0D8; -D_0D01F2D8 = 0x0D01F2D8; -D_0D01F4D8 = 0x0D01F4D8; -D_0D01F6D8 = 0x0D01F6D8; -D_0D01F8D8 = 0x0D01F8D8; -D_0D01FAD8 = 0x0D01FAD8; -D_0D01FCD8 = 0x0D01FCD8; -D_0D01FED8 = 0x0D01FED8; -D_0D0203D8 = 0x0D0203D8; -D_0D0208D8 = 0x0D0208D8; -D_0D020DD8 = 0x0D020DD8; -D_0D0212D8 = 0x0D0212D8; -D_0D0217D8 = 0x0D0217D8; -D_0D021CD8 = 0x0D021CD8; -D_0D0221D8 = 0x0D0221D8; -D_0D0226D8 = 0x0D0226D8; -D_0D022BD8 = 0x0D022BD8; -D_0D0230D8 = 0x0D0230D8; -D_0D0235D8 = 0x0D0235D8; -D_0D023AD8 = 0x0D023AD8; -D_0D023FD8 = 0x0D023FD8; -D_0D0244D8 = 0x0D0244D8; -D_0D0249D8 = 0x0D0249D8; +gTLUTPortraitMario = 0x0D01A4D8; +gTLUTPortraitLuigi = 0x0D01A6D8; +gTLUTPortraitPeach = 0x0D01A8D8; +gTLUTPortraitToad = 0x0D01AAD8; +gTLUTPortraitYoshi = 0x0D01ACD8; +gTLUTPortraitDonkeyKong = 0x0D01AED8; +gTLUTPortraitWario = 0x0D01B0D8; +gTLUTPortraitBowser = 0x0D01B2D8; +gTLUTPortraitMiniBombKart = 0x0D01B4D8; +gTexturePortraitMario = 0x0D01B6D8; +gTexturePortraitLuigi = 0x0D01BAD8; +gTexturePortraitPeach = 0x0D01BED8; +gTexturePortraitToad = 0x0D01C2D8; +gTexturePortraitYoshi = 0x0D01C6D8; +gTexturePortraitDonkeyKong = 0x0D01CAD8; +gTexturePortraitWario = 0x0D01CED8; +gTexturePortraitBowser = 0x0D01D2D8; +gTexturePortraitMiniBombKart = 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; D_0D024ED8 = 0x0D024ED8; D_0D0254D8 = 0x0D0254D8; D_0D0256D8 = 0x0D0256D8; @@ -546,9 +546,9 @@ D_0D02A858 = 0x0D02A858; D_0D02AA58 = 0x0D02AA58; D_0D02AC58 = 0x0D02AC58; D_0D02BC58 = 0x0D02BC58; -D_0D02CC58 = 0x0D02CC58; -D_0D02CCD8 = 0x0D02CCD8; -D_0D02D0D8 = 0x0D02D0D8; +gTextureMiniMapFinishLine = 0x0D02CC58; +gMiniMapKartTextures = 0x0D02CCD8; +gTextureMiniMapProgressDot = 0x0D02D0D8; D_0F04CBE0 = 0x0F04CBE0; D_0F04CE30 = 0x0F04CE30; D_0F04D080 = 0x0F04D080;