diff --git a/Makefile b/Makefile index 0660d9d7a..bd6d842e1 100644 --- a/Makefile +++ b/Makefile @@ -204,8 +204,7 @@ TEXTURE_DIRS := textures/common ALL_DIRS = $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(COURSE_DIRS) include $(ASM_DIRS) $(ALL_KARTS_DIRS) $(TEXTURES_DIR)/raw \ $(TEXTURES_DIR)/standalone $(TEXTURES_DIR)/startup_logo $(TEXTURES_DIR)/crash_screen $(TEXTURES_DIR)/trophy $(TEXTURES_DIR)/courses \ - $(TEXTURES_DIR)/courses/tlut $(TEXTURES_DIR)/courses/tlut2 $(TEXTURE_DIRS) $(TEXTURE_DIRS)/tlut $(TEXTURES_DIR)/courses/tlut3 \ - $(TEXTURE_DIRS)/tlut2 $(BIN_DIR)) + $(TEXTURES_DIR)/courses/tlut $(TEXTURES_DIR)/courses/tlut2 $(TEXTURE_DIRS) $(TEXTURE_DIRS)/tlut $(TEXTURE_DIRS)/tlut2 $(BIN_DIR)) # file dependencies generated by splitter MAKEFILE_SPLIT = Makefile.split @@ -478,18 +477,6 @@ $(TEXTURE_FILES_TLUT2): # common textures $(BUILD_DIR)/src/common_textures.inc.o: src/common_textures.inc.c $(TEXTURE_FILES) $(TEXTURE_FILES_TLUT) $(TEXTURE_FILES_TLUT2) @$(PRINT) "$(GREEN)Compiling Common Textures: $(BLUE)$@ $(NO_COL)\n" - $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/132B50_25ED8_tlut.rgba16.inc.c -g textures/132B50_25ED8_tlut.rgba16.png -s u8 - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_260D8.rgba16.ci8.inc.c -g textures/132B50_260D8.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_26558.rgba16.ci8.inc.c -g textures/132B50_26558.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_269D8.rgba16.ci8.inc.c -g textures/132B50_269D8.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_26E58.rgba16.ci8.inc.c -g textures/132B50_26E58.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_272D8.rgba16.ci8.inc.c -g textures/132B50_272D8.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_27758.rgba16.ci8.inc.c -g textures/132B50_27758.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_27BD8.rgba16.ci8.inc.c -g textures/132B50_27BD8.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_28058.rgba16.ci8.inc.c -g textures/132B50_28058.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_284D8.rgba16.ci8.inc.c -g textures/132B50_284D8.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/textures/132B50_28958.rgba16.ci8.inc.c -g textures/132B50_28958.rgba16.ci8.png -s u8 -w 24 -h 48 -f ci8 -c rgba16 -p textures/132B50_25ED8_tlut.rgba16.png - @$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $< $(V)$(CC) -c $(CFLAGS) -o $@ $< $(PYTHON) tools/set_o32abi_bit.py $@ @@ -532,7 +519,6 @@ $(COURSE_MODEL_TARGETS) : $(BUILD_DIR)/%/model.inc.mio0.o : %/model.inc.c $(COUR COURSE_TEXTURE_FILES := $(foreach dir,textures/courses,$(subst .png, , $(wildcard $(dir)/*))) COURSE_TLUT := $(foreach dir,textures/courses/tlut,$(subst .png, , $(wildcard $(dir)/*))) COURSE_TLUT2 := $(foreach dir,textures/courses/tlut2,$(subst .png, , $(wildcard $(dir)/*))) -COURSE_TLUT3 := $(foreach dir,textures/courses/tlut3,$(subst .png, , $(wildcard $(dir)/*))) COURSE_DATA_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_data.inc.mio0.o) COURSE_DATA_TARGETS_O := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_data.inc.o) @@ -546,10 +532,7 @@ $(COURSE_TLUT): $(COURSE_TLUT2): $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/$@.inc.c -g $@.png -f $(lastword $(subst ., ,$@)) -s u8 -c $(lastword $(subst ., ,$(subst .$(lastword $(subst ., ,$(COURSE_TLUT2))), ,$(COURSE_TLUT2)))) -p $(BUILD_DIR)/$@.tlut.inc.c -m 0xFFFF -$(COURSE_TLUT3): - $(V)$(N64GRAPHICS) -Z $(BUILD_DIR)/$@.inc.c -g $@.png -s u8 -c rgba16 -f ci8 -p textures/courses/$(basename $(notdir $@)).png - -$(COURSE_DATA_TARGETS_O): $(BUILD_DIR)/%/course_data.inc.o : %/course_data.inc.c $(COURSE_TEXTURE_FILES) $(COURSE_TLUT) $(COURSE_TLUT2) $(COURSE_TLUT3) +$(COURSE_DATA_TARGETS_O): $(BUILD_DIR)/%/course_data.inc.o : %/course_data.inc.c $(COURSE_TEXTURE_FILES) $(COURSE_TLUT) $(COURSE_TLUT2) @$(PRINT) "$(GREEN)Compiling Course Data: $(BLUE)$@ $(NO_COL)\n" @$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $< $(V)$(CC) -c $(CFLAGS) -o $@ $< diff --git a/assets.json b/assets.json index dca5fefd4..7d2f0e924 100644 --- a/assets.json +++ b/assets.json @@ -339,28 +339,6 @@ "textures/common/132B50_1A2D8.ia4.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x1A2D8"]}}, -"textures/common/tlut/gTexturePortraitMario.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A4D8"}, "offsets": {"us":["0x132B50", "0x1B6D8"]}}, -"textures/common/tlut/gTexturePortraitLuigi.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A6D8"}, "offsets": {"us":["0x132B50", "0x1BAD8"]}}, -"textures/common/tlut/gTexturePortraitPeach.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1A8D8"}, "offsets": {"us":["0x132B50", "0x1BED8"]}}, -"textures/common/tlut/gTexturePortraitToad.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1AAD8"}, "offsets": {"us":["0x132B50", "0x1C2D8"]}}, -"textures/common/tlut/gTexturePortraitYoshi.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1ACD8"}, "offsets": {"us":["0x132B50", "0x1C6D8"]}}, -"textures/common/tlut/gTexturePortraitDonkeyKong.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1AED8"}, "offsets": {"us":["0x132B50", "0x1CAD8"]}}, -"textures/common/tlut/gTexturePortraitWario.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1B0D8"}, "offsets": {"us":["0x132B50", "0x1CED8"]}}, -"textures/common/tlut/gTexturePortraitBowser.rgba16.ci8.png": {"meta":{"dims":[32,32], "pal":"0x1B2D8"}, "offsets": {"us":["0x132B50", "0x1D2D8"]}}, -"textures/common/tlut/gTexturePortraitBombKartAndQuestionMark.rgba16.ci8.png": {"meta":{"dims":[32,64], "pal":"0x1B4D8"}, "offsets": {"us":["0x132B50", "0x1D6D8"]}}, - -"textures/132B50_25ED8_tlut.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x25ED8"]}}, -"textures/132B50_260D8.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x260D8"]}}, -"textures/132B50_26558.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x26558"]}}, -"textures/132B50_269D8.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x269D8"]}}, -"textures/132B50_26E58.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x26E58"]}}, -"textures/132B50_272D8.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x272D8"]}}, -"textures/132B50_27758.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x27758"]}}, -"textures/132B50_27BD8.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x27BD8"]}}, -"textures/132B50_28058.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x28058"]}}, -"textures/132B50_284D8.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x284D8"]}}, -"textures/132B50_28958.rgba16.ci8.png": {"meta":{"dims":[24,48], "pal":"0x25ED8"}, "offsets": {"us":["0x132B50", "0x28958"]}}, - "textures/common/132B50_28DD8.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x28DD8"]}}, "textures/common/132B50_291D8.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x291D8"]}}, @@ -721,47 +699,7 @@ "textures/standalone/exhaust_4.ia8.png": {"meta":{"dims":[32,128]}, "offsets": {"us":["0x718C44", "0x00000"]}}, "textures/standalone/exhaust_5.ia8.png": {"meta":{"dims":[32,128]}, "offsets": {"us":["0x71903C", "0x00000"]}}, "textures/standalone/logo_mario_kart_64.rgba32.png": {"meta":{"dims":[256,128]}, "offsets": {"us":["0x719480", "0x00000"]}}, -"textures/standalone/course_outline_mario_raceway.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x720C0C", "0x00000"]}}, -"textures/standalone/course_outline_choco_mountain.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x720ED0", "0x00000"]}}, -"textures/standalone/course_outline_bowsers_castle.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x7211D8", "0x00000"]}}, -"textures/standalone/course_outline_banshee_boardwalk.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x72143C", "0x00000"]}}, -"textures/standalone/course_outline_yoshi_valley.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x721634", "0x00000"]}}, -"textures/standalone/course_outline_frappe_snowland.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x721A58", "0x00000"]}}, -"textures/standalone/course_outline_koopa_troopa_beach.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x721CD0", "0x00000"]}}, -"textures/standalone/course_outline_royal_raceway.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x721F38", "0x00000"]}}, -"textures/standalone/course_outline_luigi_raceway.i4.png": {"meta":{"dims":[64,96]}, "offsets": {"us":["0x722210", "0x00000"]}}, -"textures/standalone/course_outline_moo_moo_farm.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x72248C", "0x00000"]}}, -"textures/standalone/course_outline_toads_turnpike.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x7226C4", "0x00000"]}}, -"textures/standalone/course_outline_kalimari_desert.i4.png": {"meta":{"dims":[64,96]}, "offsets": {"us":["0x7229C0", "0x00000"]}}, -"textures/standalone/course_outline_sherbet_land.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x722D2C", "0x00000"]}}, -"textures/standalone/course_outline_rainbow_road.i4.png": {"meta":{"dims":[64,96]}, "offsets": {"us":["0x723034", "0x00000"]}}, -"textures/standalone/course_outline_wario_stadium.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x723370", "0x00000"]}}, -"textures/standalone/course_outline_block_fort.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x723644", "0x00000"]}}, -"textures/standalone/course_outline_skyscraper.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x7238E4", "0x00000"]}}, -"textures/standalone/course_outline_double_deck.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x723B18", "0x00000"]}}, -"textures/standalone/course_outline_dks_jungle_parkway.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x723C9C", "0x00000"]}}, -"textures/standalone/course_outline_big_donut.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x723F84", "0x00000"]}}, -"textures/standalone/course_preview_mario_raceway.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7A1418", "0x00000"]}}, -"textures/standalone/course_preview_choco_mountain.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7A4570", "0x00000"]}}, -"textures/standalone/course_preview_bowsers_castle.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7A6F94", "0x00000"]}}, -"textures/standalone/course_preview_banshee_boardwalk.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7AA074", "0x00000"]}}, -"textures/standalone/course_preview_yoshi_valley.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7AC720", "0x00000"]}}, -"textures/standalone/course_preview_frappe_snowland.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7B0160", "0x00000"]}}, -"textures/standalone/course_preview_koopa_troopa_beach.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7B2568", "0x00000"]}}, -"textures/standalone/course_preview_royal_raceway.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7B488C", "0x00000"]}}, -"textures/standalone/course_preview_luigi_raceway.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7B70AC", "0x00000"]}}, -"textures/standalone/course_preview_moo_moo_farm.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7B9E20", "0x00000"]}}, -"textures/standalone/course_preview_toads_turnpike.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7BC3E8", "0x00000"]}}, -"textures/standalone/course_preview_kalimari_desert.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7BED84", "0x00000"]}}, -"textures/standalone/course_preview_sherbet_land.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7C1590", "0x00000"]}}, -"textures/standalone/course_preview_rainbow_road.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7C45A0", "0x00000"]}}, -"textures/standalone/course_preview_wario_stadium.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7C6DC4", "0x00000"]}}, -"textures/standalone/course_preview_block_fort.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7CA098", "0x00000"]}}, -"textures/standalone/course_preview_skyscraper.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7CC5C0", "0x00000"]}}, -"textures/standalone/course_preview_double_deck.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7CECB0", "0x00000"]}}, -"textures/standalone/course_preview_dks_jungle_parkway.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7D15A8", "0x00000"]}}, -"textures/standalone/course_preview_big_donut.rgba16.png": {"meta":{"dims":[128,78]}, "offsets": {"us":["0x7D548C", "0x00000"]}}, "textures/standalone/trophy_gold.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7D83E8", "0x00000"]}}, "textures/standalone/trophy_silver.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7D8A1C", "0x00000"]}}, "textures/standalone/trophy_bronze.rgba16.png": {"meta":{"dims":[45,45]}, "offsets": {"us":["0x7D9044", "0x00000"]}}, diff --git a/assets/character_portraits.json b/assets/character_portraits.json new file mode 100644 index 000000000..7da181800 --- /dev/null +++ b/assets/character_portraits.json @@ -0,0 +1,22 @@ +{ +"gTLUTPortraitMario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A4D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTLUTPortraitLuigi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A6D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTLUTPortraitPeach": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A8D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTLUTPortraitToad": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1AAD8", "width": 16, "height": 16, "type": "rgba16"}, +"gTLUTPortraitYoshi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1ACD8", "width": 16, "height": 16, "type": "rgba16"}, +"gTLUTPortraitDonkeyKong": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1AED8", "width": 16, "height": 16, "type": "rgba16"}, +"gTLUTPortraitWario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B0D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTLUTPortraitBowser": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B2D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTLUTPortraitBombKartAndQuestionMark": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B4D8", "width": 16, "height": 16, "type": "rgba16"}, + +"gTexturePortraitMario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitMario"}, +"gTexturePortraitLuigi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1BAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitLuigi"}, +"gTexturePortraitPeach": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1BED8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitPeach"}, +"gTexturePortraitToad": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1C2D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitToad"}, +"gTexturePortraitYoshi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1C6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitYoshi"}, +"gTexturePortraitDonkeyKong": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1CAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitDonkeyKong"}, +"gTexturePortraitWario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1CED8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitWario"}, +"gTexturePortraitBowser": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1D2D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitBowser"}, +"gTexturePortraitBombKart": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1D6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitBombKartAndQuestionMark"}, +"gTexturePortraitQuestionMark": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1DAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitBombKartAndQuestionMark"} +} diff --git a/assets/course_outlines.json b/assets/course_outlines.json new file mode 100644 index 000000000..48877d202 --- /dev/null +++ b/assets/course_outlines.json @@ -0,0 +1,22 @@ +{ +"gTextureCourseOutlineMarioRaceway": {"output_dir": "course_outlines", "rom_offset": "0x720C0C", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineChocoMountain": {"output_dir": "course_outlines", "rom_offset": "0x720ED0", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineBowsersCastle": {"output_dir": "course_outlines", "rom_offset": "0x7211D8", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineBansheeBoardwalk": {"output_dir": "course_outlines", "rom_offset": "0x72143C", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineYoshiValley": {"output_dir": "course_outlines", "rom_offset": "0x721634", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineFrappeSnowland": {"output_dir": "course_outlines", "rom_offset": "0x721A58", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineKoopaTroopaBeach": {"output_dir": "course_outlines", "rom_offset": "0x721CD0", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineRoyalRaceway": {"output_dir": "course_outlines", "rom_offset": "0x721F38", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineLuigiRaceway": {"output_dir": "course_outlines", "rom_offset": "0x722210", "width": 64, "height": 96, "type": "i4"}, +"gTextureCourseOutlineMooMooFarm": {"output_dir": "course_outlines", "rom_offset": "0x72248C", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineToadsTurnpike": {"output_dir": "course_outlines", "rom_offset": "0x7226C4", "width": 128, "height": 64, "type": "i4"}, +"gTextureCourseOutlineKalimariDesert": {"output_dir": "course_outlines", "rom_offset": "0x7229C0", "width": 64, "height": 96, "type": "i4"}, +"gTextureCourseOutlineSherbetLand": {"output_dir": "course_outlines", "rom_offset": "0x722D2C", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineRainbowRoad": {"output_dir": "course_outlines", "rom_offset": "0x723034", "width": 64, "height": 96, "type": "i4"}, +"gTextureCourseOutlineWarioStadium": {"output_dir": "course_outlines", "rom_offset": "0x723370", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineBlockFort": {"output_dir": "course_outlines", "rom_offset": "0x723644", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineSkyscraper": {"output_dir": "course_outlines", "rom_offset": "0x7238E4", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineDoubleDeck": {"output_dir": "course_outlines", "rom_offset": "0x723B18", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineDksJungleParkway": {"output_dir": "course_outlines", "rom_offset": "0x723C9C", "width": 64, "height": 64, "type": "i4"}, +"gTextureCourseOutlineBigDonut": {"output_dir": "course_outlines", "rom_offset": "0x723F84", "width": 64, "height": 64, "type": "i4"} +} diff --git a/assets/course_previews.json b/assets/course_previews.json new file mode 100644 index 000000000..66f5a35a5 --- /dev/null +++ b/assets/course_previews.json @@ -0,0 +1,22 @@ +{ +"gTextureCoursePreviewMarioRaceway": {"output_dir": "course_previews", "rom_offset": "0x7A1418", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewChocoMountain": {"output_dir": "course_previews", "rom_offset": "0x7A4570", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewBowsersCastle": {"output_dir": "course_previews", "rom_offset": "0x7A6F94", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewBansheeBoardwalk": {"output_dir": "course_previews", "rom_offset": "0x7AA074", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewYoshiValley": {"output_dir": "course_previews", "rom_offset": "0x7AC720", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewFrappeSnowland": {"output_dir": "course_previews", "rom_offset": "0x7B0160", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewKoopaTroopaBeach": {"output_dir": "course_previews", "rom_offset": "0x7B2568", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewRoyalRaceway": {"output_dir": "course_previews", "rom_offset": "0x7B488C", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewLuigiRaceway": {"output_dir": "course_previews", "rom_offset": "0x7B70AC", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewMooMooFarm": {"output_dir": "course_previews", "rom_offset": "0x7B9E20", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewToadsTurnpike": {"output_dir": "course_previews", "rom_offset": "0x7BC3E8", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewKalimariDesert": {"output_dir": "course_previews", "rom_offset": "0x7BED84", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewSherbetLand": {"output_dir": "course_previews", "rom_offset": "0x7C1590", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewRainbowRoad": {"output_dir": "course_previews", "rom_offset": "0x7C45A0", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewWarioStadium": {"output_dir": "course_previews", "rom_offset": "0x7C6DC4", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewBlockFort": {"output_dir": "course_previews", "rom_offset": "0x7CA098", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewSkyscraper": {"output_dir": "course_previews", "rom_offset": "0x7CC5C0", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewDoubleDeck": {"output_dir": "course_previews", "rom_offset": "0x7CECB0", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewDksJungleParkway": {"output_dir": "course_previews", "rom_offset": "0x7D15A8", "width": 128, "height": 78, "type": "rgba16"}, +"gTextureCoursePreviewBigDonut": {"output_dir": "course_previews", "rom_offset": "0x7D548C", "width": 128, "height": 78, "type": "rgba16"} +} diff --git a/assets/include/character_portraits.mk b/assets/include/character_portraits.mk new file mode 100644 index 000000000..fbdb73a81 --- /dev/null +++ b/assets/include/character_portraits.mk @@ -0,0 +1,59 @@ +PORTRAITS_DIR := assets/character_portraits + +PORTRAIT_PALETTES := \ +$(PORTRAITS_DIR)/gTLUTPortraitMario.png \ +$(PORTRAITS_DIR)/gTLUTPortraitLuigi.png \ +$(PORTRAITS_DIR)/gTLUTPortraitPeach.png \ +$(PORTRAITS_DIR)/gTLUTPortraitToad.png \ +$(PORTRAITS_DIR)/gTLUTPortraitYoshi.png \ +$(PORTRAITS_DIR)/gTLUTPortraitDonkeyKong.png \ +$(PORTRAITS_DIR)/gTLUTPortraitWario.png \ +$(PORTRAITS_DIR)/gTLUTPortraitBowser.png + +PORTRAIT_PNG := \ +$(PORTRAITS_DIR)/gTexturePortraitMario.png \ +$(PORTRAITS_DIR)/gTexturePortraitLuigi.png \ +$(PORTRAITS_DIR)/gTexturePortraitPeach.png \ +$(PORTRAITS_DIR)/gTexturePortraitToad.png \ +$(PORTRAITS_DIR)/gTexturePortraitYoshi.png \ +$(PORTRAITS_DIR)/gTexturePortraitDonkeyKong.png \ +$(PORTRAITS_DIR)/gTexturePortraitWario.png \ +$(PORTRAITS_DIR)/gTexturePortraitBowser.png + +# This is kind of ugly. I think the only fix for it would be to put these two portraits +# and their palette in a separate .mk file. But I think that's even uglier + +SPECIAL_PORTRAIT_PALETTE := $(PORTRAITS_DIR)/gTLUTPortraitBombKartAndQuestionMark.png + +SPECIAL_PORTRAIT_PNG := \ +$(PORTRAITS_DIR)/gTexturePortraitBombKart.png \ +$(PORTRAITS_DIR)/gTexturePortraitQuestionMark.png + +PORTRAIT_EXPORT_SENTINEL := $(PORTRAITS_DIR)/.export + +$(BUILD_DIR)/src/common_textures.inc.o: $(PORTRAIT_PNG:%.png=%.inc.c) $(PORTRAIT_PALETTES:%.png=%.inc.c) +$(BUILD_DIR)/src/common_textures.inc.o: $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c) $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c) + +$(PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/gTexturePortrait%.inc.c : $(PORTRAITS_DIR)/gTexturePortrait%.png + $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/gTLUTPortrait$*.png + +$(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/gTexturePortrait%.inc.c : $(PORTRAITS_DIR)/gTexturePortrait%.png + $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(SPECIAL_PORTRAIT_PALETTE) + +$(PORTRAIT_PALETTES:%.png=%.inc.c): %.inc.c : %.png + $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + +$(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c): %.inc.c : %.png + $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + +$(PORTRAIT_PNG) $(SPECIAL_PORTRAIT_PNG) $(PORTRAIT_PALETTES) $(SPECIAL_PORTRAIT_PALETTE): $(PORTRAIT_EXPORT_SENTINEL) ; + +$(PORTRAIT_EXPORT_SENTINEL): $(ASSET_DIR)/character_portraits.json + $(ASSET_EXTRACT) $(BASEROM) $< + touch $@ + +.PHONY: distclean_character_portraits +distclean_character_portraits: + rm -rf $(PORTRAITS_DIR) + +distclean_assets: distclean_character_portraits diff --git a/assets/include/course_outlines.mk b/assets/include/course_outlines.mk new file mode 100644 index 000000000..84f489a49 --- /dev/null +++ b/assets/include/course_outlines.mk @@ -0,0 +1,45 @@ +COURSE_OUTLINE_DIR := assets/course_outlines + +COURSE_OUTLINE_PNG := \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineMarioRaceway.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineChocoMountain.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineBowsersCastle.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineBansheeBoardwalk.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineYoshiValley.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineFrappeSnowland.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineKoopaTroopaBeach.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineRoyalRaceway.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineLuigiRaceway.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineMooMooFarm.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineToadsTurnpike.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineKalimariDesert.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineSherbetLand.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineRainbowRoad.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineWarioStadium.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineBlockFort.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineSkyscraper.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineDoubleDeck.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineDksJungleParkway.png \ +$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineBigDonut.png + +COURSE_OUTLINE_EXPORT_SENTINEL := $(COURSE_OUTLINE_DIR)/.export + +$(BUILD_DIR)/data/other_textures.o: $(COURSE_OUTLINE_PNG:%.png=%.mio0) + +$(COURSE_OUTLINE_PNG:%.png=%.mio0): %.mio0 : %.bin + $(MIO0TOOL) -c $< $@ + +$(COURSE_OUTLINE_PNG:%.png=%.bin): %.bin : %.png + $(N64GRAPHICS) -i $@ -g $< -s raw -f i4 + +$(COURSE_OUTLINE_PNG): $(COURSE_OUTLINE_EXPORT_SENTINEL) ; + +$(COURSE_OUTLINE_EXPORT_SENTINEL): $(ASSET_DIR)/course_outlines.json + $(ASSET_EXTRACT) $(BASEROM) $< + touch $@ + +.PHONY: distclean_course_outlines +distclean_course_outlines: + rm -rf $(COURSE_OUTLINE_DIR) + +distclean_assets: distclean_course_outlines diff --git a/assets/include/course_previews.mk b/assets/include/course_previews.mk new file mode 100644 index 000000000..267c6cb09 --- /dev/null +++ b/assets/include/course_previews.mk @@ -0,0 +1,45 @@ +COURSE_PREVIEW_DIR := assets/course_previews + +COURSE_PREVIEW_PNG := \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewMarioRaceway.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewChocoMountain.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewBowsersCastle.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewBansheeBoardwalk.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewYoshiValley.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewFrappeSnowland.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewKoopaTroopaBeach.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewRoyalRaceway.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewLuigiRaceway.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewMooMooFarm.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewToadsTurnpike.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewKalimariDesert.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewSherbetLand.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewRainbowRoad.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewWarioStadium.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewBlockFort.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewSkyscraper.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewDoubleDeck.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewDksJungleParkway.png \ +$(COURSE_PREVIEW_DIR)/gTextureCoursePreviewBigDonut.png + +COURSE_PREVIEW_EXPORT_SENTINEL := $(COURSE_PREVIEW_DIR)/.export + +$(BUILD_DIR)/src/textures.inc.o: $(COURSE_PREVIEW_PNG:%.png=%.mio0) + +$(COURSE_PREVIEW_PNG:%.png=%.mio0): %.mio0 : %.bin + $(MIO0TOOL) -c $< $@ + +$(COURSE_PREVIEW_PNG:%.png=%.bin): %.bin : %.png + $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + +$(COURSE_PREVIEW_PNG): $(COURSE_PREVIEW_EXPORT_SENTINEL) ; + +$(COURSE_PREVIEW_EXPORT_SENTINEL): $(ASSET_DIR)/course_previews.json + $(ASSET_EXTRACT) $(BASEROM) $< + touch $@ + +.PHONY: distclean_course_previews +distclean_course_previews: + rm -rf $(COURSE_PREVIEW_DIR) + +distclean_assets: distclean_course_previews diff --git a/assets/include/unused_traffic_light.mk b/assets/include/unused_traffic_light.mk new file mode 100644 index 000000000..2bb6e23d7 --- /dev/null +++ b/assets/include/unused_traffic_light.mk @@ -0,0 +1,37 @@ +UNUSED_TRAFFIC_LIGHT_DIR := assets/unused_traffic_light + +UNUSED_TRAFFIC_LIGHT_PALETTE := $(UNUSED_TRAFFIC_LIGHT_DIR)/gTLUTUnusedTrafficLight.png + +UNUSED_TRAFFIC_LIGHT_PNG := \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight01.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight02.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight03.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight04.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight05.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight06.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight07.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight08.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight09.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight10.png + +UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL := $(UNUSED_TRAFFIC_LIGHT_DIR)/.export + +$(BUILD_DIR)/src/common_textures.inc.o: $(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c) $(UNUSED_TRAFFIC_LIGHT_PALETTE:%.png=%.inc.c) + +$(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c): %.inc.c : %.png + $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(UNUSED_TRAFFIC_LIGHT_PALETTE) + +$(UNUSED_TRAFFIC_LIGHT_PALETTE:%.png=%.inc.c): %.inc.c : %.png + $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + +$(UNUSED_TRAFFIC_LIGHT_PNG) $(UNUSED_TRAFFIC_LIGHT_PALETTE): $(UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL) ; + +$(UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL): $(ASSET_DIR)/unused_traffic_light.json + $(ASSET_EXTRACT) $(BASEROM) $< + touch $@ + +.PHONY: distclean_unused_traffic_light +distclean_unused_traffic_light: + rm -rf $(UNUSED_TRAFFIC_LIGHT_DIR) + +distclean_assets: distclean_unused_traffic_light diff --git a/assets/unused_traffic_light.json b/assets/unused_traffic_light.json new file mode 100644 index 000000000..49a652bc4 --- /dev/null +++ b/assets/unused_traffic_light.json @@ -0,0 +1,13 @@ +{ +"gTLUTUnusedTrafficLight": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x25ED8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureUnusedTrafficLight01": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x260D8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight02": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x26558", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight03": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x269D8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight04": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x26E58", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight05": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x272D8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight06": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x27758", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight07": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x27BD8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight08": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x28058", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight09": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x284D8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, +"gTextureUnusedTrafficLight10": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x28958", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"} +} diff --git a/data/course_player_selection.s b/data/course_player_selection.s index b7c657b30..bf868d526 100644 --- a/data/course_player_selection.s +++ b/data/course_player_selection.s @@ -688,104 +688,84 @@ glabel gTextureBowserFace16 glabel gTextureBowserFace16_end .align 2, 0x00 -glabel gCoursePreviewMarioRaceway -.incbin "textures/standalone/course_preview_mario_raceway.rgba16.mio0" -glabel gCoursePreviewMarioRaceway_end +glabel gTextureCoursePreviewMarioRaceway +.incbin "assets/course_previews/gTextureCoursePreviewMarioRaceway.mio0" .align 2, 0x00 -glabel gCoursePreviewChocoMountain -.incbin "textures/standalone/course_preview_choco_mountain.rgba16.mio0" -glabel gCoursePreviewChocoMountain_end +glabel gTextureCoursePreviewChocoMountain +.incbin "assets/course_previews/gTextureCoursePreviewChocoMountain.mio0" .align 2, 0x00 -glabel gCoursePreviewBowsersCastle -.incbin "textures/standalone/course_preview_bowsers_castle.rgba16.mio0" -glabel gCoursePreviewBowsersCastle_end +glabel gTextureCoursePreviewBowsersCastle +.incbin "assets/course_previews/gTextureCoursePreviewBowsersCastle.mio0" .align 2, 0x00 -glabel gCoursePreviewBansheeBoardwalk -.incbin "textures/standalone/course_preview_banshee_boardwalk.rgba16.mio0" -glabel gCoursePreviewBansheeBoardwalk_end +glabel gTextureCoursePreviewBansheeBoardwalk +.incbin "assets/course_previews/gTextureCoursePreviewBansheeBoardwalk.mio0" .align 2, 0x00 -glabel gCoursePreviewYoshiValley -.incbin "textures/standalone/course_preview_yoshi_valley.rgba16.mio0" -glabel gCoursePreviewYoshiValley_end +glabel gTextureCoursePreviewYoshiValley +.incbin "assets/course_previews/gTextureCoursePreviewYoshiValley.mio0" .align 2, 0x00 -glabel gCoursePreviewFrappeSnowland -.incbin "textures/standalone/course_preview_frappe_snowland.rgba16.mio0" -glabel gCoursePreviewFrappeSnowland_end +glabel gTextureCoursePreviewFrappeSnowland +.incbin "assets/course_previews/gTextureCoursePreviewFrappeSnowland.mio0" .align 2, 0x00 -glabel gCoursePreviewKoopaTroopaBeach -.incbin "textures/standalone/course_preview_koopa_troopa_beach.rgba16.mio0" -glabel gCoursePreviewKoopaTroopaBeach_end +glabel gTextureCoursePreviewKoopaTroopaBeach +.incbin "assets/course_previews/gTextureCoursePreviewKoopaTroopaBeach.mio0" .align 2, 0x00 -glabel gCoursePreviewRoyalRaceway -.incbin "textures/standalone/course_preview_royal_raceway.rgba16.mio0" -glabel gCoursePreviewRoyalRaceway_end +glabel gTextureCoursePreviewRoyalRaceway +.incbin "assets/course_previews/gTextureCoursePreviewRoyalRaceway.mio0" .align 2, 0x00 -glabel gCoursePreviewLuigiRaceway -.incbin "textures/standalone/course_preview_luigi_raceway.rgba16.mio0" -glabel gCoursePreviewLuigiRaceway_end +glabel gTextureCoursePreviewLuigiRaceway +.incbin "assets/course_previews/gTextureCoursePreviewLuigiRaceway.mio0" .align 2, 0x00 -glabel gCoursePreviewMooMooFarm -.incbin "textures/standalone/course_preview_moo_moo_farm.rgba16.mio0" -glabel gCoursePreviewMooMooFarm_end +glabel gTextureCoursePreviewMooMooFarm +.incbin "assets/course_previews/gTextureCoursePreviewMooMooFarm.mio0" .align 2, 0x00 -glabel gCoursePreviewToadsTurnpike -.incbin "textures/standalone/course_preview_toads_turnpike.rgba16.mio0" -glabel gCoursePreviewToadsTurnpike_end +glabel gTextureCoursePreviewToadsTurnpike +.incbin "assets/course_previews/gTextureCoursePreviewToadsTurnpike.mio0" .align 2, 0x00 -glabel gCoursePreviewKalimariDesert -.incbin "textures/standalone/course_preview_kalimari_desert.rgba16.mio0" -glabel gCoursePreviewKalimariDesert_end +glabel gTextureCoursePreviewKalimariDesert +.incbin "assets/course_previews/gTextureCoursePreviewKalimariDesert.mio0" .align 2, 0x00 -glabel gCoursePreviewSherbetLand -.incbin "textures/standalone/course_preview_sherbet_land.rgba16.mio0" -glabel gCoursePreviewSherbetLand_end +glabel gTextureCoursePreviewSherbetLand +.incbin "assets/course_previews/gTextureCoursePreviewSherbetLand.mio0" .align 2, 0x00 -glabel gCoursePreviewRainbowRoad -.incbin "textures/standalone/course_preview_rainbow_road.rgba16.mio0" -glabel gCoursePreviewRainbowRoad_end +glabel gTextureCoursePreviewRainbowRoad +.incbin "assets/course_previews/gTextureCoursePreviewRainbowRoad.mio0" .align 2, 0x00 -glabel gCoursePreviewWarioStadium -.incbin "textures/standalone/course_preview_wario_stadium.rgba16.mio0" -glabel gCoursePreviewWarioStadium_end +glabel gTextureCoursePreviewWarioStadium +.incbin "assets/course_previews/gTextureCoursePreviewWarioStadium.mio0" .align 2, 0x00 -glabel gCoursePreviewBlockFort -.incbin "textures/standalone/course_preview_block_fort.rgba16.mio0" -glabel gCoursePreviewBlockFort_end +glabel gTextureCoursePreviewBlockFort +.incbin "assets/course_previews/gTextureCoursePreviewBlockFort.mio0" .align 2, 0x00 -glabel gCoursePreviewSkyscraper -.incbin "textures/standalone/course_preview_skyscraper.rgba16.mio0" -glabel gCoursePreviewSkyscraper_end +glabel gTextureCoursePreviewSkyscraper +.incbin "assets/course_previews/gTextureCoursePreviewSkyscraper.mio0" .align 2, 0x00 -glabel gCoursePreviewDoubleDeck -.incbin "textures/standalone/course_preview_double_deck.rgba16.mio0" -glabel gCoursePreviewDoubleDeck_end +glabel gTextureCoursePreviewDoubleDeck +.incbin "assets/course_previews/gTextureCoursePreviewDoubleDeck.mio0" .align 2, 0x00 -glabel gCoursePreviewDksJungleParkway -.incbin "textures/standalone/course_preview_dks_jungle_parkway.rgba16.mio0" -glabel gCoursePreviewDksJungleParkway_end +glabel gTextureCoursePreviewDksJungleParkway +.incbin "assets/course_previews/gTextureCoursePreviewDksJungleParkway.mio0" .align 2, 0x00 -glabel gCoursePreviewBigDonut -.incbin "textures/standalone/course_preview_big_donut.rgba16.mio0" -glabel gCoursePreviewBigDonut_end +glabel gTextureCoursePreviewBigDonut +.incbin "assets/course_previews/gTextureCoursePreviewBigDonut.mio0" .align 2, 0x00 glabel gTextureTrophyGold diff --git a/data/other_textures.s b/data/other_textures.s index af6bbe9b3..7841ebd7e 100644 --- a/data/other_textures.s +++ b/data/other_textures.s @@ -1604,80 +1604,80 @@ glabel gTextureLogoMarioKart64 .balign 4, 0x00 glabel gTextureCourseOutlineMarioRaceway -.incbin "textures/standalone/course_outline_mario_raceway.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineMarioRaceway.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineChocoMountain -.incbin "textures/standalone/course_outline_choco_mountain.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineChocoMountain.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineBowsersCastle -.incbin "textures/standalone/course_outline_bowsers_castle.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineBowsersCastle.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineBansheeBoardwalk -.incbin "textures/standalone/course_outline_banshee_boardwalk.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineBansheeBoardwalk.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineYoshiValley -.incbin "textures/standalone/course_outline_yoshi_valley.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineYoshiValley.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineFrappeSnowland -.incbin "textures/standalone/course_outline_frappe_snowland.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineFrappeSnowland.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineKoopaTroopaBeach -.incbin "textures/standalone/course_outline_koopa_troopa_beach.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineKoopaTroopaBeach.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineRoyalRaceway -.incbin "textures/standalone/course_outline_royal_raceway.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineRoyalRaceway.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineLuigiRaceway -.incbin "textures/standalone/course_outline_luigi_raceway.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineLuigiRaceway.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineMooMooFarm -.incbin "textures/standalone/course_outline_moo_moo_farm.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineMooMooFarm.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineToadsTurnpike -.incbin "textures/standalone/course_outline_toads_turnpike.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineToadsTurnpike.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineKalimariDesert -.incbin "textures/standalone/course_outline_kalimari_desert.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineKalimariDesert.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineSherbetLand -.incbin "textures/standalone/course_outline_sherbet_land.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineSherbetLand.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineRainbowRoad -.incbin "textures/standalone/course_outline_rainbow_road.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineRainbowRoad.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineWarioStadium -.incbin "textures/standalone/course_outline_wario_stadium.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineWarioStadium.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineBlockFort -.incbin "textures/standalone/course_outline_block_fort.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineBlockFort.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineSkyscraper -.incbin "textures/standalone/course_outline_skyscraper.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineSkyscraper.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineDoubleDeck -.incbin "textures/standalone/course_outline_double_deck.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineDoubleDeck.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineDksJungleParkway -.incbin "textures/standalone/course_outline_dks_jungle_parkway.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineDksJungleParkway.mio0" .balign 4, 0x00 glabel gTextureCourseOutlineBigDonut -.incbin "textures/standalone/course_outline_big_donut.i4.mio0" +.incbin "assets/course_outlines/gTextureCourseOutlineBigDonut.mio0" diff --git a/src/common_textures.inc.c b/src/common_textures.inc.c index 68c90c6de..ed33e83d8 100644 --- a/src/common_textures.inc.c +++ b/src/common_textures.inc.c @@ -2497,93 +2497,98 @@ s8 D_0D01A2D8[] = { // 1A4D8 mario tlut s8 gTLUTPortraitMario[] = { - #include "textures/common/tlut/gTexturePortraitMario.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitMario.inc.c" }; // 1A6D8 luigi tlut s8 gTLUTPortraitLuigi[] = { - #include "textures/common/tlut/gTexturePortraitLuigi.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitLuigi.inc.c" }; // 1A8D8 peach tlut s8 gTLUTPortraitPeach[] = { - #include "textures/common/tlut/gTexturePortraitPeach.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitPeach.inc.c" }; // 1AAD8 toad tlut s8 gTLUTPortraitToad[] = { - #include "textures/common/tlut/gTexturePortraitToad.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitToad.inc.c" }; // 1ACD8 yoshi tlut s8 gTLUTPortraitYoshi[] = { - #include "textures/common/tlut/gTexturePortraitYoshi.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitYoshi.inc.c" }; // 1AED8 dk tlut s8 gTLUTPortraitDonkeyKong[] = { - #include "textures/common/tlut/gTexturePortraitDonkeyKong.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitDonkeyKong.inc.c" }; // 1B0D8 wario tlut s8 gTLUTPortraitWario[] = { - #include "textures/common/tlut/gTexturePortraitWario.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitWario.inc.c" }; // 1B2D8 bowser tlut s8 gTLUTPortraitBowser[] = { - #include "textures/common/tlut/gTexturePortraitBowser.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitBowser.inc.c" }; // 1B4D8 bob-omb tlut and question mark? s8 gTLUTPortraitBombKartAndQuestionMark[] = { - #include "textures/common/tlut/gTexturePortraitBombKartAndQuestionMark.rgba16.ci8.tlut.inc.c" + #include "assets/character_portraits/gTLUTPortraitBombKartAndQuestionMark.inc.c" }; // Mario s8 gTexturePortraitMario[] = { - #include "textures/common/tlut/gTexturePortraitMario.rgba16.ci8.inc.c" + #include "assets/character_portraits/gTexturePortraitMario.inc.c" }; // Luigi s8 gTexturePortraitLuigi[] = { - #include "textures/common/tlut/gTexturePortraitLuigi.rgba16.ci8.inc.c" + #include "assets/character_portraits/gTexturePortraitLuigi.inc.c" }; // Peach s8 gTexturePortraitPeach[] = { - #include "textures/common/tlut/gTexturePortraitPeach.rgba16.ci8.inc.c" + #include "assets/character_portraits/gTexturePortraitPeach.inc.c" }; // Toad s8 gTexturePortraitToad[] = { - #include "textures/common/tlut/gTexturePortraitToad.rgba16.ci8.inc.c" + #include "assets/character_portraits/gTexturePortraitToad.inc.c" }; // Yoshi s8 gTexturePortraitYoshi[] = { - #include "textures/common/tlut/gTexturePortraitYoshi.rgba16.ci8.inc.c" + #include "assets/character_portraits/gTexturePortraitYoshi.inc.c" }; // Donkey Kong s8 gTexturePortraitDonkeyKong[] = { - #include "textures/common/tlut/gTexturePortraitDonkeyKong.rgba16.ci8.inc.c" + #include "assets/character_portraits/gTexturePortraitDonkeyKong.inc.c" }; // Wario s8 gTexturePortraitWario[] = { - #include "textures/common/tlut/gTexturePortraitWario.rgba16.ci8.inc.c" + #include "assets/character_portraits/gTexturePortraitWario.inc.c" }; // Bowser s8 gTexturePortraitBowser[] = { - #include "textures/common/tlut/gTexturePortraitBowser.rgba16.ci8.inc.c" + #include "assets/character_portraits/gTexturePortraitBowser.inc.c" }; -// Mini Bomb Kart & Question Mark -s8 gTexturePortraitBombKartAndQuestionMark[] = { - #include "textures/common/tlut/gTexturePortraitBombKartAndQuestionMark.rgba16.ci8.inc.c" +// Mini Bomb Kart +s8 gTexturePortraitBombKart[] = { + #include "assets/character_portraits/gTexturePortraitBombKart.inc.c" +}; + +// Question Mark +s8 gTexturePortraitQuestionMark[] = { + #include "assets/character_portraits/gTexturePortraitQuestionMark.inc.c" }; // 1DED8 tlut item frames @@ -2758,49 +2763,49 @@ u8 gTLUTLakituFishing[] = { // unused traffic light tlut UNUSED s8 D_0D025ED8[] = { - #include "textures/132B50_25ED8_tlut.rgba16.inc.c" + #include "assets/unused_traffic_light/gTLUTUnusedTrafficLight.inc.c" }; // unused traffic light textures UNUSED s8 D_0D0260D8[] = { - #include "textures/132B50_260D8.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight01.inc.c" }; UNUSED s8 D_0D026558[] = { - #include "textures/132B50_26558.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight02.inc.c" }; UNUSED s8 D_0D0269D8[] = { - #include "textures/132B50_269D8.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight03.inc.c" }; UNUSED s8 D_0D026E58[] = { - #include "textures/132B50_26E58.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight04.inc.c" }; UNUSED s8 D_0D0272D8[] = { - #include "textures/132B50_272D8.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight05.inc.c" }; UNUSED s8 D_0D027758[] = { - #include "textures/132B50_27758.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight06.inc.c" }; UNUSED s8 D_0D027BD8[] = { - #include "textures/132B50_27BD8.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight07.inc.c" }; UNUSED s8 D_0D028058[] = { - #include "textures/132B50_28058.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight08.inc.c" }; UNUSED s8 D_0D0284D8[] = { - #include "textures/132B50_284D8.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight09.inc.c" }; UNUSED s8 D_0D028958[] = { - #include "textures/132B50_28958.rgba16.ci8.inc.c" + #include "assets/unused_traffic_light/gTextureUnusedTrafficLight10.inc.c" }; // leaf diff --git a/src/textures.h b/src/textures.h index f6ca363b4..7d747c3b0 100644 --- a/src/textures.h +++ b/src/textures.h @@ -738,26 +738,26 @@ extern MkAnimation D_02007598[21]; extern MkAnimation D_02007640[2]; /* Texture data arrays, defined in include/texture_data_2.s */ -extern u64 gCoursePreviewBansheeBoardwalk[]; -extern u64 gCoursePreviewBigDonut[]; -extern u64 gCoursePreviewBlockFort[]; -extern u64 gCoursePreviewBowsersCastle[]; -extern u64 gCoursePreviewChocoMountain[]; -extern u64 gCoursePreviewDksJungleParkway[]; -extern u64 gCoursePreviewDoubleDeck[]; -extern u64 gCoursePreviewFrappeSnowland[]; -extern u64 gCoursePreviewKalimariDesert[]; -extern u64 gCoursePreviewKoopaTroopaBeach[]; -extern u64 gCoursePreviewLuigiRaceway[]; -extern u64 gCoursePreviewMarioRaceway[]; -extern u64 gCoursePreviewMooMooFarm[]; -extern u64 gCoursePreviewRainbowRoad[]; -extern u64 gCoursePreviewRoyalRaceway[]; -extern u64 gCoursePreviewSherbetLand[]; -extern u64 gCoursePreviewSkyscraper[]; -extern u64 gCoursePreviewToadsTurnpike[]; -extern u64 gCoursePreviewWarioStadium[]; -extern u64 gCoursePreviewYoshiValley[]; +extern u64 gTextureCoursePreviewBansheeBoardwalk[]; +extern u64 gTextureCoursePreviewBigDonut[]; +extern u64 gTextureCoursePreviewBlockFort[]; +extern u64 gTextureCoursePreviewBowsersCastle[]; +extern u64 gTextureCoursePreviewChocoMountain[]; +extern u64 gTextureCoursePreviewDksJungleParkway[]; +extern u64 gTextureCoursePreviewDoubleDeck[]; +extern u64 gTextureCoursePreviewFrappeSnowland[]; +extern u64 gTextureCoursePreviewKalimariDesert[]; +extern u64 gTextureCoursePreviewKoopaTroopaBeach[]; +extern u64 gTextureCoursePreviewLuigiRaceway[]; +extern u64 gTextureCoursePreviewMarioRaceway[]; +extern u64 gTextureCoursePreviewMooMooFarm[]; +extern u64 gTextureCoursePreviewRainbowRoad[]; +extern u64 gTextureCoursePreviewRoyalRaceway[]; +extern u64 gTextureCoursePreviewSherbetLand[]; +extern u64 gTextureCoursePreviewSkyscraper[]; +extern u64 gTextureCoursePreviewToadsTurnpike[]; +extern u64 gTextureCoursePreviewWarioStadium[]; +extern u64 gTextureCoursePreviewYoshiValley[]; extern u64 gTexture7E56E4[]; extern u64 gTexture7ED058[]; extern u64 gTexture7ED290[]; diff --git a/src/textures.inc.c b/src/textures.inc.c index f71a79b27..ab56667e5 100644 --- a/src/textures.inc.c +++ b/src/textures.inc.c @@ -873,102 +873,102 @@ MkTexture D_02001B04[2] = { }; MkTexture D_02001B2C[2] = { - {0, 0, gCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157, 0}, + {0, 0, gTextureCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001B54[2] = { - {0, 0, gCoursePreviewChocoMountain, 128, 78, 0, 0, 0x2a24, 0}, + {0, 0, gTextureCoursePreviewChocoMountain, 128, 78, 0, 0, 0x2a24, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001B7C[2] = { - {0, 0, gCoursePreviewBowsersCastle, 128, 78, 0, 0, 0x30de, 0}, + {0, 0, gTextureCoursePreviewBowsersCastle, 128, 78, 0, 0, 0x30de, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001BA4[2] = { - {0, 0, gCoursePreviewBansheeBoardwalk, 128, 78, 0, 0, 0x26ad, 0}, + {0, 0, gTextureCoursePreviewBansheeBoardwalk, 128, 78, 0, 0, 0x26ad, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001BCC[2] = { - {0, 0, gCoursePreviewYoshiValley, 128, 78, 0, 0, 0x3a41, 0}, + {0, 0, gTextureCoursePreviewYoshiValley, 128, 78, 0, 0, 0x3a41, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001BF4[2] = { - {0, 0, gCoursePreviewFrappeSnowland, 128, 78, 0, 0, 0x2409, 0}, + {0, 0, gTextureCoursePreviewFrappeSnowland, 128, 78, 0, 0, 0x2409, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001C1C[2] = { - {0, 0, gCoursePreviewKoopaTroopaBeach, 128, 78, 0, 0, 0x2323, 0}, + {0, 0, gTextureCoursePreviewKoopaTroopaBeach, 128, 78, 0, 0, 0x2323, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001C44[2] = { - {0, 0, gCoursePreviewRoyalRaceway, 128, 78, 0, 0, 0x2821, 0}, + {0, 0, gTextureCoursePreviewRoyalRaceway, 128, 78, 0, 0, 0x2821, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001C6C[2] = { - {0, 0, gCoursePreviewLuigiRaceway, 128, 78, 0, 0, 0x2d74, 0}, + {0, 0, gTextureCoursePreviewLuigiRaceway, 128, 78, 0, 0, 0x2d74, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001C94[2] = { - {0, 0, gCoursePreviewMooMooFarm, 128, 78, 0, 0, 0x25c7, 0}, + {0, 0, gTextureCoursePreviewMooMooFarm, 128, 78, 0, 0, 0x25c7, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001CBC[2] = { - {0, 0, gCoursePreviewToadsTurnpike, 128, 78, 0, 0, 0x299a, 0}, + {0, 0, gTextureCoursePreviewToadsTurnpike, 128, 78, 0, 0, 0x299a, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001CE4[2] = { - {0, 0, gCoursePreviewKalimariDesert, 128, 78, 0, 0, 0x280a, 0}, + {0, 0, gTextureCoursePreviewKalimariDesert, 128, 78, 0, 0, 0x280a, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001D0C[2] = { - {0, 0, gCoursePreviewSherbetLand, 128, 78, 0, 0, 0x300e, 0}, + {0, 0, gTextureCoursePreviewSherbetLand, 128, 78, 0, 0, 0x300e, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001D34[2] = { - {0, 0, gCoursePreviewRainbowRoad, 128, 78, 0, 0, 0x2824, 0}, + {0, 0, gTextureCoursePreviewRainbowRoad, 128, 78, 0, 0, 0x2824, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001D5C[2] = { - {0, 0, gCoursePreviewWarioStadium, 128, 78, 0, 0, 0x32d3, 0}, + {0, 0, gTextureCoursePreviewWarioStadium, 128, 78, 0, 0, 0x32d3, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001D84[2] = { - {0, 0, gCoursePreviewBlockFort, 128, 78, 0, 0, 0x2528, 0}, + {0, 0, gTextureCoursePreviewBlockFort, 128, 78, 0, 0, 0x2528, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001DAC[2] = { - {0, 0, gCoursePreviewSkyscraper, 128, 78, 0, 0, 0x26f0, 0}, + {0, 0, gTextureCoursePreviewSkyscraper, 128, 78, 0, 0, 0x26f0, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001DD4[2] = { - {0, 0, gCoursePreviewDoubleDeck, 128, 78, 0, 0, 0x28f7, 0}, + {0, 0, gTextureCoursePreviewDoubleDeck, 128, 78, 0, 0, 0x28f7, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001DFC[2] = { - {0, 0, gCoursePreviewDksJungleParkway, 128, 78, 0, 0, 0x3ee4, 0}, + {0, 0, gTextureCoursePreviewDksJungleParkway, 128, 78, 0, 0, 0x3ee4, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; MkTexture D_02001E24[2] = { - {0, 0, gCoursePreviewBigDonut, 128, 78, 0, 0, 0x2f5c, 0}, + {0, 0, gTextureCoursePreviewBigDonut, 128, 78, 0, 0, 0x2f5c, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, }; @@ -2514,7 +2514,7 @@ MkTexture D_02004C3C[2] = { }; MkTexture D_02004C64[2] = { - {0, 0, gCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d, 0}, + {0, 0, gTextureCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d, 0}, {0, 0, NULL, 0, 0, 0, 0, 0, 0}, };