From 81a9c346d45407f85c35a07cec6d5d23c1ef5dae Mon Sep 17 00:00:00 2001 From: MegaMech Date: Wed, 20 Sep 2023 17:17:24 -0600 Subject: [PATCH] Delete courses/cup folders and rename course related files (#432) * Move course folders * Rename model to vertices * Rename packed to displaylists * Rename displaylists to course_displaylists.inc.c * rename vertices to course_vertices * makefile cleanup * Rename trophy_model to ceremony_data * move ceremony_data.inc.c to ending folder --- Makefile | 51 +++--- Makefile.split | 12 +- README.md | 20 +-- addr_to_sym.py | 2 +- assets/include/courses/banshee_boardwalk.mk | 6 +- assets/include/courses/bowsers_castle.mk | 4 +- assets/include/courses/choco_mountain.mk | 2 +- assets/include/courses/dks_jungle_parkway.mk | 4 +- assets/include/courses/frappe_snowland.mk | 6 +- assets/include/courses/kalimari_desert.mk | 2 +- assets/include/courses/koopa_troopa_beach.mk | 4 +- assets/include/courses/luigi_raceway.mk | 2 +- assets/include/courses/mario_raceway.mk | 2 +- assets/include/courses/moo_moo_farm.mk | 6 +- assets/include/courses/rainbow_road.mk | 18 +-- assets/include/courses/royal_raceway.mk | 2 +- assets/include/courses/sherbet_land.mk | 2 +- assets/include/courses/toads_turnpike.mk | 2 +- assets/include/courses/wario_stadium.mk | 2 +- assets/include/courses/yoshi_valley.mk | 4 +- courses/all_course_data.h | 42 ++--- courses/all_course_model.h | 6 +- courses/all_course_packed.h | 42 ++--- .../banshee_boardwalk/course_data.inc.c | 2 +- .../banshee_boardwalk/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../{battle => }/big_donut/course_data.inc.c | 2 +- .../{battle => }/big_donut/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../{battle => }/block_fort/course_data.inc.c | 2 +- .../{battle => }/block_fort/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../bowsers_castle/course_data.inc.c | 2 +- .../bowsers_castle/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../choco_mountain/course_data.inc.c | 2 +- .../choco_mountain/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 courses/courseTable.h | 5 + .../dks_jungle_parkway/course_data.inc.c | 2 +- .../dks_jungle_parkway/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../double_deck/course_data.inc.c | 2 +- .../double_deck/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../frappe_snowland/course_data.inc.c | 2 +- .../frappe_snowland/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../kalimari_desert/course_data.inc.c | 2 +- .../kalimari_desert/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../koopa_troopa_beach/course_data.inc.c | 2 +- .../koopa_troopa_beach/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../luigi_raceway/course_data.inc.c | 2 +- .../luigi_raceway/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../luigi_raceway/staff_ghost.incl.c | 0 .../mario_raceway/course_data.inc.c | 2 +- .../mario_raceway/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../mario_raceway/staff_ghost.incl.c | 0 .../moo_moo_farm/course_data.inc.c | 2 +- .../moo_moo_farm/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../rainbow_road/course_data.inc.c | 2 +- .../rainbow_road/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../royal_raceway/course_data.inc.c | 2 +- .../royal_raceway/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../royal_raceway/staff_ghost.incl.c | 0 .../sherbet_land/course_data.inc.c | 2 +- .../sherbet_land/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../{battle => }/skyscraper/course_data.inc.c | 2 +- .../{battle => }/skyscraper/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 courses/staff_ghosts.inc.c | 6 +- .../toads_turnpike/course_data.inc.c | 2 +- .../toads_turnpike/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../wario_stadium/course_data.inc.c | 2 +- .../wario_stadium/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 .../yoshi_valley/course_data.inc.c | 2 +- .../yoshi_valley/course_data.inc.h | 0 .../course_displaylists.inc.c} | 2 +- .../course_displaylists.inc.h} | 0 .../course_vertices.inc.c} | 0 mk64.ld | 148 ++++++++---------- src/course_banshee_boardwalk_offsets.c | 2 +- src/course_bowsers_castle_offsets.c | 2 +- src/course_choco_mountain_offsets.c | 2 +- src/course_kalimari_desert_offsets.c | 2 +- src/course_luigi_raceway_offsets.c | 2 +- src/course_mario_raceway_offsets.c | 2 +- src/course_moo_moo_farm_offsets.c | 2 +- src/course_royal_raceway_offsets.c | 2 +- src/course_sherbet_land_offsets.c | 2 +- src/course_toads_turnpike_offsets.c | 2 +- src/course_wario_stadium_offsets.c | 2 +- .../ceremony_data.inc.c} | 0 141 files changed, 246 insertions(+), 258 deletions(-) rename courses/{special_cup => }/banshee_boardwalk/course_data.inc.c (99%) rename courses/{special_cup => }/banshee_boardwalk/course_data.inc.h (100%) rename courses/{special_cup/banshee_boardwalk/packed.inc.c => banshee_boardwalk/course_displaylists.inc.c} (99%) rename courses/{special_cup/banshee_boardwalk/packed.inc.h => banshee_boardwalk/course_displaylists.inc.h} (100%) rename courses/{special_cup/banshee_boardwalk/model.inc.c => banshee_boardwalk/course_vertices.inc.c} (100%) rename courses/{battle => }/big_donut/course_data.inc.c (96%) rename courses/{battle => }/big_donut/course_data.inc.h (100%) rename courses/{battle/big_donut/packed.inc.c => big_donut/course_displaylists.inc.c} (99%) rename courses/{battle/big_donut/packed.inc.h => big_donut/course_displaylists.inc.h} (100%) rename courses/{battle/big_donut/model.inc.c => big_donut/course_vertices.inc.c} (100%) rename courses/{battle => }/block_fort/course_data.inc.c (96%) rename courses/{battle => }/block_fort/course_data.inc.h (100%) rename courses/{battle/block_fort/packed.inc.c => block_fort/course_displaylists.inc.c} (99%) rename courses/{battle/block_fort/packed.inc.h => block_fort/course_displaylists.inc.h} (100%) rename courses/{battle/block_fort/model.inc.c => block_fort/course_vertices.inc.c} (100%) rename courses/{star_cup => }/bowsers_castle/course_data.inc.c (99%) rename courses/{star_cup => }/bowsers_castle/course_data.inc.h (100%) rename courses/{star_cup/bowsers_castle/packed.inc.c => bowsers_castle/course_displaylists.inc.c} (99%) rename courses/{star_cup/bowsers_castle/packed.inc.h => bowsers_castle/course_displaylists.inc.h} (100%) rename courses/{star_cup/bowsers_castle/model.inc.c => bowsers_castle/course_vertices.inc.c} (100%) rename courses/{flower_cup => }/choco_mountain/course_data.inc.c (99%) rename courses/{flower_cup => }/choco_mountain/course_data.inc.h (100%) rename courses/{flower_cup/choco_mountain/packed.inc.c => choco_mountain/course_displaylists.inc.c} (99%) rename courses/{flower_cup/choco_mountain/packed.inc.h => choco_mountain/course_displaylists.inc.h} (100%) rename courses/{flower_cup/choco_mountain/model.inc.c => choco_mountain/course_vertices.inc.c} (100%) rename courses/{special_cup => }/dks_jungle_parkway/course_data.inc.c (99%) rename courses/{special_cup => }/dks_jungle_parkway/course_data.inc.h (100%) rename courses/{special_cup/dks_jungle_parkway/packed.inc.c => dks_jungle_parkway/course_displaylists.inc.c} (99%) rename courses/{special_cup/dks_jungle_parkway/packed.inc.h => dks_jungle_parkway/course_displaylists.inc.h} (100%) rename courses/{special_cup/dks_jungle_parkway/model.inc.c => dks_jungle_parkway/course_vertices.inc.c} (100%) rename courses/{battle => }/double_deck/course_data.inc.c (96%) rename courses/{battle => }/double_deck/course_data.inc.h (100%) rename courses/{battle/double_deck/packed.inc.c => double_deck/course_displaylists.inc.c} (99%) rename courses/{battle/double_deck/packed.inc.h => double_deck/course_displaylists.inc.h} (100%) rename courses/{battle/double_deck/model.inc.c => double_deck/course_vertices.inc.c} (100%) rename courses/{flower_cup => }/frappe_snowland/course_data.inc.c (99%) rename courses/{flower_cup => }/frappe_snowland/course_data.inc.h (100%) rename courses/{flower_cup/frappe_snowland/packed.inc.c => frappe_snowland/course_displaylists.inc.c} (99%) rename courses/{flower_cup/frappe_snowland/packed.inc.h => frappe_snowland/course_displaylists.inc.h} (100%) rename courses/{flower_cup/frappe_snowland/model.inc.c => frappe_snowland/course_vertices.inc.c} (100%) rename courses/{mushroom_cup => }/kalimari_desert/course_data.inc.c (99%) rename courses/{mushroom_cup => }/kalimari_desert/course_data.inc.h (100%) rename courses/{mushroom_cup/kalimari_desert/packed.inc.c => kalimari_desert/course_displaylists.inc.c} (99%) rename courses/{mushroom_cup/kalimari_desert/packed.inc.h => kalimari_desert/course_displaylists.inc.h} (100%) rename courses/{mushroom_cup/kalimari_desert/model.inc.c => kalimari_desert/course_vertices.inc.c} (100%) rename courses/{mushroom_cup => }/koopa_troopa_beach/course_data.inc.c (99%) rename courses/{mushroom_cup => }/koopa_troopa_beach/course_data.inc.h (100%) rename courses/{mushroom_cup/koopa_troopa_beach/packed.inc.c => koopa_troopa_beach/course_displaylists.inc.c} (99%) rename courses/{mushroom_cup/koopa_troopa_beach/packed.inc.h => koopa_troopa_beach/course_displaylists.inc.h} (100%) rename courses/{mushroom_cup/koopa_troopa_beach/model.inc.c => koopa_troopa_beach/course_vertices.inc.c} (100%) rename courses/{mushroom_cup => }/luigi_raceway/course_data.inc.c (99%) rename courses/{mushroom_cup => }/luigi_raceway/course_data.inc.h (100%) rename courses/{mushroom_cup/luigi_raceway/packed.inc.c => luigi_raceway/course_displaylists.inc.c} (99%) rename courses/{mushroom_cup/luigi_raceway/packed.inc.h => luigi_raceway/course_displaylists.inc.h} (100%) rename courses/{mushroom_cup/luigi_raceway/model.inc.c => luigi_raceway/course_vertices.inc.c} (100%) rename courses/{mushroom_cup => }/luigi_raceway/staff_ghost.incl.c (100%) rename courses/{flower_cup => }/mario_raceway/course_data.inc.c (99%) rename courses/{flower_cup => }/mario_raceway/course_data.inc.h (100%) rename courses/{flower_cup/mario_raceway/packed.inc.c => mario_raceway/course_displaylists.inc.c} (99%) rename courses/{flower_cup/mario_raceway/packed.inc.h => mario_raceway/course_displaylists.inc.h} (100%) rename courses/{flower_cup/mario_raceway/model.inc.c => mario_raceway/course_vertices.inc.c} (100%) rename courses/{flower_cup => }/mario_raceway/staff_ghost.incl.c (100%) rename courses/{mushroom_cup => }/moo_moo_farm/course_data.inc.c (99%) rename courses/{mushroom_cup => }/moo_moo_farm/course_data.inc.h (100%) rename courses/{mushroom_cup/moo_moo_farm/packed.inc.c => moo_moo_farm/course_displaylists.inc.c} (99%) rename courses/{mushroom_cup/moo_moo_farm/packed.inc.h => moo_moo_farm/course_displaylists.inc.h} (100%) rename courses/{mushroom_cup/moo_moo_farm/model.inc.c => moo_moo_farm/course_vertices.inc.c} (100%) rename courses/{special_cup => }/rainbow_road/course_data.inc.c (99%) rename courses/{special_cup => }/rainbow_road/course_data.inc.h (100%) rename courses/{special_cup/rainbow_road/packed.inc.c => rainbow_road/course_displaylists.inc.c} (99%) rename courses/{special_cup/rainbow_road/packed.inc.h => rainbow_road/course_displaylists.inc.h} (100%) rename courses/{special_cup/rainbow_road/model.inc.c => rainbow_road/course_vertices.inc.c} (100%) rename courses/{star_cup => }/royal_raceway/course_data.inc.c (99%) rename courses/{star_cup => }/royal_raceway/course_data.inc.h (100%) rename courses/{star_cup/royal_raceway/packed.inc.c => royal_raceway/course_displaylists.inc.c} (99%) rename courses/{star_cup/royal_raceway/packed.inc.h => royal_raceway/course_displaylists.inc.h} (100%) rename courses/{star_cup/royal_raceway/model.inc.c => royal_raceway/course_vertices.inc.c} (100%) rename courses/{star_cup => }/royal_raceway/staff_ghost.incl.c (100%) rename courses/{star_cup => }/sherbet_land/course_data.inc.c (99%) rename courses/{star_cup => }/sherbet_land/course_data.inc.h (100%) rename courses/{star_cup/sherbet_land/packed.inc.c => sherbet_land/course_displaylists.inc.c} (99%) rename courses/{star_cup/sherbet_land/packed.inc.h => sherbet_land/course_displaylists.inc.h} (100%) rename courses/{star_cup/sherbet_land/model.inc.c => sherbet_land/course_vertices.inc.c} (100%) rename courses/{battle => }/skyscraper/course_data.inc.c (97%) rename courses/{battle => }/skyscraper/course_data.inc.h (100%) rename courses/{battle/skyscraper/packed.inc.c => skyscraper/course_displaylists.inc.c} (99%) rename courses/{battle/skyscraper/packed.inc.h => skyscraper/course_displaylists.inc.h} (100%) rename courses/{battle/skyscraper/model.inc.c => skyscraper/course_vertices.inc.c} (100%) rename courses/{flower_cup => }/toads_turnpike/course_data.inc.c (99%) rename courses/{flower_cup => }/toads_turnpike/course_data.inc.h (100%) rename courses/{flower_cup/toads_turnpike/packed.inc.c => toads_turnpike/course_displaylists.inc.c} (99%) rename courses/{flower_cup/toads_turnpike/packed.inc.h => toads_turnpike/course_displaylists.inc.h} (100%) rename courses/{flower_cup/toads_turnpike/model.inc.c => toads_turnpike/course_vertices.inc.c} (100%) rename courses/{star_cup => }/wario_stadium/course_data.inc.c (99%) rename courses/{star_cup => }/wario_stadium/course_data.inc.h (100%) rename courses/{star_cup/wario_stadium/packed.inc.c => wario_stadium/course_displaylists.inc.c} (99%) rename courses/{star_cup/wario_stadium/packed.inc.h => wario_stadium/course_displaylists.inc.h} (100%) rename courses/{star_cup/wario_stadium/model.inc.c => wario_stadium/course_vertices.inc.c} (100%) rename courses/{special_cup => }/yoshi_valley/course_data.inc.c (99%) rename courses/{special_cup => }/yoshi_valley/course_data.inc.h (100%) rename courses/{special_cup/yoshi_valley/packed.inc.c => yoshi_valley/course_displaylists.inc.c} (99%) rename courses/{special_cup/yoshi_valley/packed.inc.h => yoshi_valley/course_displaylists.inc.h} (100%) rename courses/{special_cup/yoshi_valley/model.inc.c => yoshi_valley/course_vertices.inc.c} (100%) rename src/{trophy_model.inc.c => ending/ceremony_data.inc.c} (100%) diff --git a/Makefile b/Makefile index 1798b0784..8a2caac4e 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ ASM_DIRS := asm asm/audio asm/os asm/unused asm/os/non_matchings $(DATA_DI # Directories containing course source and data files -COURSE_DIRS := $(shell find courses -mindepth 2 -type d) +COURSE_DIRS := $(shell find courses -mindepth 1 -type d) TEXTURES_DIR = textures TEXTURE_DIRS := textures/common @@ -222,14 +222,12 @@ ALL_DIRS = $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(COURSE_DIRS) inc MAKEFILE_SPLIT = Makefile.split include $(MAKEFILE_SPLIT) -COURSE_ASM_FILES := $(wildcard courses/*/*/packed.s) - # These are files that need to be encoded into EUC-JP in order for the ROM to match # We filter them out from the regular C_FILES since we don't need nor want the # UTF-8 versions getting compiled EUC_JP_FILES := src/ending/credits.c src/code_80005FD0.c src/code_80091750.c C_FILES := $(filter-out $(EUC_JP_FILES),$(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c))) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) $(COURSE_ASM_FILES) +S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) COURSE_FILES := $(foreach dir,$(COURSE_DIRS),$(wildcard $(dir)/*.inc.c)) # Object files @@ -451,7 +449,7 @@ $(BUILD_DIR)/src/crash_screen.o: src/crash_screen.c $(V)$(CC) -c $(CFLAGS) -o $@ $< $(PYTHON) tools/set_o32abi_bit.py $@ -$(BUILD_DIR)/src/trophy_model.inc.o: src/trophy_model.inc.c +$(BUILD_DIR)/src/ending/ceremony_data.inc.o: src/ending/ceremony_data.inc.c @$(PRINT) "$(GREEN)Compiling Trophy Model: $(BLUE)$@ $(NO_COL)\n" $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/trophy/reflection_map_brass.rgba16.inc.c -g textures/trophy/reflection_map_brass.rgba16.png -f rgba16 -s u8 $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/trophy/reflection_map_silver.rgba16.inc.c -g textures/trophy/reflection_map_silver.rgba16.png -f rgba16 -s u8 @@ -501,16 +499,15 @@ $(BUILD_DIR)/src/common_textures.inc.o: src/common_textures.inc.c $(TEXTURE_FILE # Course Packed Displaylists Generation # #==============================================================================# -COURSE_PACKED_DL := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/packed_dl.inc.bin) - -%/packed.inc.elf: %/packed.inc.o +%/course_displaylists.inc.elf: %/course_displaylists.inc.o $(V)$(LD) -t -e 0 -Ttext=07000000 -Map $@.map -o $@ $< --no-check-sections -%/packed.inc.bin: %/packed.inc.elf +%/course_displaylists.inc.bin: %/course_displaylists.inc.elf $(V)$(EXTRACT_DATA_FOR_MIO) $< $@ -%/packed_dl.inc.bin: %/packed.inc.bin - @$(PRINT) "$(GREEN)Compressing Packed Displaylists: $(BLUE)$@ $(NO_COL)\n" +# Displaylists are packed using a custom format +%/course_displaylists_packed.inc.bin: %/course_displaylists.inc.bin + @$(PRINT) "$(GREEN)Compressing Course Displaylists: $(BLUE)$@ $(NO_COL)\n" $(V)$(DLPACKER) $< $@ @@ -519,21 +516,21 @@ COURSE_PACKED_DL := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/packed_dl.i # Course Geography Generation # #==============================================================================# -COURSE_MODEL_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/model.inc.mio0.o) +COURSE_GEOGRAPHY_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_geography.inc.mio0.o) -%/model.inc.elf: %/model.inc.o +%/course_vertices.inc.elf: %/course_vertices.inc.o $(V)$(LD) -t -e 0 -Ttext=0F000000 -Map $@.map -o $@ $< --no-check-sections -%/model.inc.bin: %/model.inc.elf +%/course_vertices.inc.bin: %/course_vertices.inc.elf $(V)$(EXTRACT_DATA_FOR_MIO) $< $@ -%/model.inc.mio0: %/model.inc.bin +%/course_vertices.inc.mio0: %/course_vertices.inc.bin @$(PRINT) "$(GREEN)Compressing Course Geography: $(BLUE)$@ $(NO_COL)\n" $(V)$(MIO0TOOL) -c $< $@ -# Geography and packed displaylists are compressed together rather than separately. -%/model.inc.mio0.s: %/model.inc.mio0 %/packed_dl.inc.bin - printf ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$(@D)/model.inc.mio0\"\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_packed\n\n.incbin \"$(@D)/packed_dl.inc.bin\"\n\n.balign 0x10\n" > $@ +# Course vertices and displaylists are included together due to no alignment between the two files. +%/course_geography.inc.mio0.s: %/course_vertices.inc.mio0 %/course_displaylists_packed.inc.bin + printf ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$(@D)/course_vertices.inc.mio0\"\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_packed\n\n.incbin \"$(@D)/course_displaylists_packed.inc.bin\"\n\n.balign 0x10\n" > $@ @@ -546,8 +543,8 @@ LDFLAGS += $(foreach elf,$(COURSE_DATA_ELFS),-R $(elf)) COURSE_DATA_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_data.inc.mio0.o) -%/course_data.inc.elf: %/course_data.inc.o %/packed.inc.elf - $(V)$(LD) -t -e 0 -Ttext=06000000 -Map $@.map -R $*/packed.inc.elf -o $@ $< --no-check-sections +%/course_data.inc.elf: %/course_data.inc.o %/course_displaylists.inc.elf + $(V)$(LD) -t -e 0 -Ttext=06000000 -Map $@.map -R $*/course_displaylists.inc.elf -o $@ $< --no-check-sections %/course_data.inc.bin: %/course_data.inc.elf $(V)$(EXTRACT_DATA_FOR_MIO) $< $@ @@ -622,13 +619,13 @@ endif # Compile Trophy and Podium Models # #==============================================================================# -$(BUILD_DIR)/src/trophy_model.inc.mio0.o: $(BUILD_DIR)/src/trophy_model.inc.o +$(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.o: $(BUILD_DIR)/src/ending/ceremony_data.inc.o @$(PRINT) "$(GREEN)Compressing Trophy Model: $(BLUE)$@ $(NO_COL)\n" - $(V)$(LD) -t -e 0 -Ttext=0B000000 -Map $(BUILD_DIR)/src/trophy_model.inc.elf.map -o $(BUILD_DIR)/src/trophy_model.inc.elf $(BUILD_DIR)/src/trophy_model.inc.o --no-check-sections - $(V)$(EXTRACT_DATA_FOR_MIO) $(BUILD_DIR)/src/trophy_model.inc.elf $(BUILD_DIR)/src/trophy_model.inc.bin - $(V)$(MIO0TOOL) -c $(BUILD_DIR)/src/trophy_model.inc.bin $(BUILD_DIR)/src/trophy_model.inc.mio0 - printf ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel trophy_model\n\n.incbin \"build/us/src/trophy_model.inc.mio0\"\n\n.balign 16\nglabel data_821D10_end\n" > build/us/src/trophy_model.inc.mio0.s - $(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/trophy_model.inc.mio0.o $(BUILD_DIR)/src/trophy_model.inc.mio0.s + $(V)$(LD) -t -e 0 -Ttext=0B000000 -Map $(BUILD_DIR)/src/ending/ceremony_data.inc.elf.map -o $(BUILD_DIR)/src/ending/ceremony_data.inc.elf $(BUILD_DIR)/src/ending/ceremony_data.inc.o --no-check-sections + $(V)$(EXTRACT_DATA_FOR_MIO) $(BUILD_DIR)/src/ending/ceremony_data.inc.elf $(BUILD_DIR)/src/ending/ceremony_data.inc.bin + $(V)$(MIO0TOOL) -c $(BUILD_DIR)/src/ending/ceremony_data.inc.bin $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0 + printf ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel ceremony_data\n\n.incbin \"build/us/src/ending/ceremony_data.inc.mio0\"\n\n.balign 16\nglabel data_821D10_end\n" > build/us/src/ending/ceremony_data.inc.mio0.s + $(AS) $(ASFLAGS) -o $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.o $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.s @@ -677,7 +674,7 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) $(V)$(CPP) $(CPPFLAGS) -DBUILD_DIR=$(BUILD_DIR) -MMD -MP -MT $@ -MF $@.d -o $@ $< # Link MK64 ELF file -$(ELF): $(COURSE_DATA_TARGETS) $(O_FILES) $(COURSE_MIO0_OBJ_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/src/startup_logo.inc.mio0.o $(BUILD_DIR)/src/trophy_model.inc.mio0.o $(BUILD_DIR)/src/common_textures.inc.mio0.o $(COURSE_MODEL_TARGETS) undefined_syms.txt +$(ELF): $(O_FILES) $(COURSE_DATA_TARGETS) $(COURSE_MIO0_OBJ_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/src/startup_logo.inc.mio0.o $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.o $(BUILD_DIR)/src/common_textures.inc.mio0.o $(COURSE_GEOGRAPHY_TARGETS) undefined_syms.txt @$(PRINT) "$(GREEN)Linking ELF file: $(BLUE)$@ $(NO_COL)\n" $(V)$(LD) $(LDFLAGS) -o $@ diff --git a/Makefile.split b/Makefile.split index f9c68d2de..63caf6f30 100644 --- a/Makefile.split +++ b/Makefile.split @@ -22,9 +22,9 @@ COURSE_NAMES := \ dks_jungle_parkway \ big_donut -COURSE_DL_NAMES := $(addprefix course_,$(addsuffix _dl,$(COURSE_NAMES))) -COURSE_DL_MIO0_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .mio0,$(COURSE_DL_NAMES))) -COURSE_DL_MIO0_OBJ_FILES := $(COURSE_DL_MIO0_FILES:.mio0=.mio0.o) +# COURSE_DL_NAMES := $(addprefix course_,$(addsuffix _dl,$(COURSE_NAMES))) +# COURSE_DL_MIO0_FILES := $(addprefix $(BUILD_DIR)/bin/,$(addsuffix .mio0,$(COURSE_DL_NAMES))) +# COURSE_DL_MIO0_OBJ_FILES := $(COURSE_DL_MIO0_FILES:.mio0=.mio0.o) # COURSE_VERTEX_NAMES := $(addprefix course_,$(addsuffix _vertex,$(COURSE_NAMES))) @@ -124,6 +124,6 @@ $(BUILD_DIR)/src/trophy_model.inc.elf: SEGMENT_ADDRESS := 0x0B000000 # COURSES -$(BUILD_DIR)/courses/star_cup/sherbet_land/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000 -$(BUILD_DIR)/courses/star_cup/wario_stadium/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000 -$(BUILD_DIR)/courses/mushroom_cup/luigi_raceway/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000 +$(BUILD_DIR)/courses/sherbet_land/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000 +$(BUILD_DIR)/courses/wario_stadium/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000 +$(BUILD_DIR)/courses/luigi_raceway/gfx.inc.elf: SEGMENT_ADDRESS := 0x06000000 diff --git a/README.md b/README.md index cd2c06219..295c411e0 100644 --- a/README.md +++ b/README.md @@ -81,19 +81,21 @@ Some menu textures are compressed using a format called tkmk00. A byte-matching ├── asm: Handwritten assembly code, rom header and boot │ ├── non_matchings: asm for non-matching sections │ └── os: OS related assembly code - ├── bin: Data needing import; kart textures, and textures. - ├── courses: course, model, & DL data, course table, staff ghosts. + ├── assets: Textures + ├── bin: Files needing import. Most of them are already done. + ├── courses: Course geography, course data, course table, and staff ghosts. ├── build: Output directory ├── data: Data, text, audio banks, and instrument sets. ├── docs: Build guides - ├── include: header files - ├── courses: level scripts, geo layout, offsets and display lists - ├── lib: SDK library code - ├── music: sequences + ├── include: Header files + ├── music: Sequences ├── src: C source code for the game - | ├── debug: custom debug code - │ ├── audio: sample tables and audio source - │ └── os: libultra + | ├── actors: Individual actors split out from other files + │ ├── audio: Sample tables and audio source + | ├── debug: Custom debug code + | ├── ending: Podium ceremony and credits code. + │ ├── os: Libultra + | └── racing: Race and game engine code. ├── textures: texture data, bitmaps | ├── common: textures common to many courses | ├── courses: course specific textures diff --git a/addr_to_sym.py b/addr_to_sym.py index eb3dd0d3c..13737b628 100644 --- a/addr_to_sym.py +++ b/addr_to_sym.py @@ -9,7 +9,7 @@ def process_match(match): return f"d_course_big_donut_packed_dl_{hex(offset)[2:].upper()}" # Open the input file -with open("courses/battle/big_donut/packed.inc.c", "r") as f: +with open("courses/big_donut/packed.inc.c", "r") as f: # Read the file contents file_content = f.read() diff --git a/assets/include/courses/banshee_boardwalk.mk b/assets/include/courses/banshee_boardwalk.mk index f3179d344..063b34341 100644 --- a/assets/include/courses/banshee_boardwalk.mk +++ b/assets/include/courses/banshee_boardwalk.mk @@ -63,9 +63,9 @@ $(BANSHEE_BOARDWALK_DIR)/boo_frames.bin: $(BANSHEE_BOARDWALK_BOO_FRAMES:%.png=%. $(BANSHEE_BOARDWALK_BOO_FRAMES:%.png=%.bin): %.bin : %.png $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BANSHEE_BOARDWALK_BOO_PALETTE) -$(BUILD_DIR)/courses/special_cup/banshee_boardwalk/course_data.inc.o: $(BANSHEE_BOARDWALK_BOO_PALETTE:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/banshee_boardwalk/course_data.inc.o: $(BANSHEE_BOARDWALK_BAT_PALETTE:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_FRAMES:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/banshee_boardwalk/course_data.inc.o: $(BANSHEE_BOARDWALK_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/banshee_boardwalk/course_data.inc.o: $(BANSHEE_BOARDWALK_BOO_PALETTE:%.png=%.inc.c) +$(BUILD_DIR)/courses/banshee_boardwalk/course_data.inc.o: $(BANSHEE_BOARDWALK_BAT_PALETTE:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_FRAMES:%.png=%.inc.c) +$(BUILD_DIR)/courses/banshee_boardwalk/course_data.inc.o: $(BANSHEE_BOARDWALK_PNG:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BANSHEE_BOARDWALK_BAT_PALETTE) diff --git a/assets/include/courses/bowsers_castle.mk b/assets/include/courses/bowsers_castle.mk index d507e54e9..ca71568e2 100644 --- a/assets/include/courses/bowsers_castle.mk +++ b/assets/include/courses/bowsers_castle.mk @@ -14,8 +14,8 @@ THOWMP_SIDE_PNG := $(BOWSERS_CASTLE_DIR)/gTextureThwompSide.png BOWSERS_CASTLE_EXPORT_SENTINEL := $(BOWSERS_CASTLE_DIR)/.export -$(BUILD_DIR)/courses/star_cup/bowsers_castle/course_data.inc.o: $(THWOMP_FACE_FRAMES:%.png=%.inc.c) $(THWOMP_PALETTE:%.png=%.inc.c) -$(BUILD_DIR)/courses/star_cup/bowsers_castle/course_data.inc.o: $(THOWMP_SIDE_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/bowsers_castle/course_data.inc.o: $(THWOMP_FACE_FRAMES:%.png=%.inc.c) $(THWOMP_PALETTE:%.png=%.inc.c) +$(BUILD_DIR)/courses/bowsers_castle/course_data.inc.o: $(THOWMP_SIDE_PNG:%.png=%.inc.c) $(THOWMP_SIDE_PNG:%.png=%.inc.c) $(THWOMP_PALETTE:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/choco_mountain.mk b/assets/include/courses/choco_mountain.mk index 8c71d0302..4c87cdaf4 100644 --- a/assets/include/courses/choco_mountain.mk +++ b/assets/include/courses/choco_mountain.mk @@ -6,7 +6,7 @@ $(CHOCO_MOUNTAIN_DIR)/gTextureChocoMountainRock.png CHOCO_MOUNTAIN_EXPORT_SENTINEL := $(CHOCO_MOUNTAIN_DIR)/.export -$(BUILD_DIR)/courses/flower_cup/choco_mountain/course_data.inc.o: $(CHOCO_MOUNTAIN_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/choco_mountain/course_data.inc.o: $(CHOCO_MOUNTAIN_PNG:%.png=%.inc.c) $(CHOCO_MOUNTAIN_PNG:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/dks_jungle_parkway.mk b/assets/include/courses/dks_jungle_parkway.mk index 409c66626..eab271a13 100644 --- a/assets/include/courses/dks_jungle_parkway.mk +++ b/assets/include/courses/dks_jungle_parkway.mk @@ -32,8 +32,8 @@ $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES:%.png=%.mio0): %.mio0 : %.bin $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES:%.png=%.bin): %.bin : %.png $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE) -$(BUILD_DIR)/courses/special_cup/dks_jungle_parkway/course_data.inc.o: $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/dks_jungle_parkway/course_data.inc.o: $(DKS_JUNGLE_PARKWAY_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/dks_jungle_parkway/course_data.inc.o: $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE:%.png=%.inc.c) +$(BUILD_DIR)/courses/dks_jungle_parkway/course_data.inc.o: $(DKS_JUNGLE_PARKWAY_PNG:%.png=%.inc.c) $(DKS_JUNGLE_PARKWAY_PNG:%.png=%.inc.c) $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/frappe_snowland.mk b/assets/include/courses/frappe_snowland.mk index 0a4e0b58b..93d8b371b 100644 --- a/assets/include/courses/frappe_snowland.mk +++ b/assets/include/courses/frappe_snowland.mk @@ -17,9 +17,9 @@ $(FRAPPE_SNOWLAND_DIR)/gTextureFrappeSnowlandTreeRight.png \ FRAPPE_SNOWLAND_EXPORT_SENTINEL := $(FRAPPE_SNOWLAND_DIR)/.export -$(BUILD_DIR)/courses/flower_cup/frappe_snowland/course_data.inc.o: $(FRAPPE_SNOWLAND_SNOWMAN_PNG:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOW_PNG:%.png=%.inc.c) -$(BUILD_DIR)/courses/flower_cup/frappe_snowland/course_data.inc.o: $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOW_PALETTE:%.png=%.inc.c) -$(BUILD_DIR)/courses/flower_cup/frappe_snowland/course_data.inc.o: $(FRAPPE_SNOWLAND_TREE_PALETTE:%.png=%.inc.c) +$(BUILD_DIR)/courses/frappe_snowland/course_data.inc.o: $(FRAPPE_SNOWLAND_SNOWMAN_PNG:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOW_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/frappe_snowland/course_data.inc.o: $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOW_PALETTE:%.png=%.inc.c) +$(BUILD_DIR)/courses/frappe_snowland/course_data.inc.o: $(FRAPPE_SNOWLAND_TREE_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOWMAN_PNG:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE) diff --git a/assets/include/courses/kalimari_desert.mk b/assets/include/courses/kalimari_desert.mk index 1623135d0..46d776dc6 100644 --- a/assets/include/courses/kalimari_desert.mk +++ b/assets/include/courses/kalimari_desert.mk @@ -40,7 +40,7 @@ $(KALIMARI_DESERT_DIR)/gTextureLocomotiveBogie.png KALIMARI_DESERT_EXPORT_SENTINEL := $(KALIMARI_DESERT_DIR)/.export -$(BUILD_DIR)/courses/mushroom_cup/kalimari_desert/course_data.inc.o: $(KALIMARI_DESERT_PNG:%.png=%.inc.c) $(CACTUS_PALETTE_IMPORT:%.png=%.inc.c) +$(BUILD_DIR)/courses/kalimari_desert/course_data.inc.o: $(KALIMARI_DESERT_PNG:%.png=%.inc.c) $(CACTUS_PALETTE_IMPORT:%.png=%.inc.c) $(KALIMARI_DESERT_PNG:%.png=%.inc.c) $(CACTUS_PALETTE_IMPORT:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/koopa_troopa_beach.mk b/assets/include/courses/koopa_troopa_beach.mk index 22ec4815e..7d6a66e00 100644 --- a/assets/include/courses/koopa_troopa_beach.mk +++ b/assets/include/courses/koopa_troopa_beach.mk @@ -20,8 +20,8 @@ $(KOOPA_TROOPA_BEACH_DIR)/gTextureKoopaTroopaPalmTrunk.png KOOPA_TROOPA_BEACH_EXPORT_SENTINEL := $(KOOPA_TROOPA_BEACH_DIR)/.export -$(BUILD_DIR)/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.o: $(KOOPA_TROOPA_BEACH_CRAB_PALETTE:%.png=%.inc.c) $(KOOPA_TROOPA_BEACH_CRAB_FRAMES:%.png=%.inc.c) -$(BUILD_DIR)/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.o: $(KOOPA_TROOPA_BEACH_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/koopa_troopa_beach/course_data.inc.o: $(KOOPA_TROOPA_BEACH_CRAB_PALETTE:%.png=%.inc.c) $(KOOPA_TROOPA_BEACH_CRAB_FRAMES:%.png=%.inc.c) +$(BUILD_DIR)/courses/koopa_troopa_beach/course_data.inc.o: $(KOOPA_TROOPA_BEACH_PNG:%.png=%.inc.c) $(KOOPA_TROOPA_BEACH_CRAB_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(KOOPA_TROOPA_BEACH_CRAB_PALETTE) diff --git a/assets/include/courses/luigi_raceway.mk b/assets/include/courses/luigi_raceway.mk index c70a07982..6504d9709 100644 --- a/assets/include/courses/luigi_raceway.mk +++ b/assets/include/courses/luigi_raceway.mk @@ -8,7 +8,7 @@ $(LUIGI_RACEWAY_DIR)/gTextureLuigiRacewayBalloonRope.png LUIGI_RACEWAY_EXPORT_SENTINEL := $(LUIGI_RACEWAY_DIR)/.export -$(BUILD_DIR)/courses/mushroom_cup/luigi_raceway/course_data.inc.o: $(LUIGI_RACEWAY_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/luigi_raceway/course_data.inc.o: $(LUIGI_RACEWAY_PNG:%.png=%.inc.c) $(LUIGI_RACEWAY_PNG:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/mario_raceway.mk b/assets/include/courses/mario_raceway.mk index b25142c58..42c41be17 100644 --- a/assets/include/courses/mario_raceway.mk +++ b/assets/include/courses/mario_raceway.mk @@ -27,7 +27,7 @@ $(PIRANHA_PLANT_FRAMES:%.png=%.mio0): %.mio0 : %.bin $(PIRANHA_PLANT_FRAMES:%.png=%.bin): %.bin : %.png $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE) -$(BUILD_DIR)/courses/flower_cup/mario_raceway/course_data.inc.o: $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(MARIO_RACEWAY_SIGN:%.png=%.inc.c) +$(BUILD_DIR)/courses/mario_raceway/course_data.inc.o: $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(MARIO_RACEWAY_SIGN:%.png=%.inc.c) $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(MARIO_RACEWAY_SIGN:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/moo_moo_farm.mk b/assets/include/courses/moo_moo_farm.mk index 6bc29b76e..f1aeacc7b 100644 --- a/assets/include/courses/moo_moo_farm.mk +++ b/assets/include/courses/moo_moo_farm.mk @@ -39,9 +39,9 @@ MOO_MOO_FARM_DIRT_PNG := $(MOO_MOO_FARM_DIR)/gTextureMooMooFarmDirt.png MOO_MOO_FARM_EXPORT_SENTINEL := $(MOO_MOO_FARM_DIR)/.export -$(BUILD_DIR)/courses/mushroom_cup/moo_moo_farm/course_data.inc.o: $(MOLE_PALETTE:%.png=%.inc.c) $(MOLE_FRAMES:%.png=%.inc.c) -$(BUILD_DIR)/courses/mushroom_cup/moo_moo_farm/course_data.inc.o: $(COW_PALETTE_IMPORT:%.png=%.inc.c) -$(BUILD_DIR)/courses/mushroom_cup/moo_moo_farm/course_data.inc.o: $(MOO_MOO_FARM_DIRT_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/moo_moo_farm/course_data.inc.o: $(MOLE_PALETTE:%.png=%.inc.c) $(MOLE_FRAMES:%.png=%.inc.c) +$(BUILD_DIR)/courses/moo_moo_farm/course_data.inc.o: $(COW_PALETTE_IMPORT:%.png=%.inc.c) +$(BUILD_DIR)/courses/moo_moo_farm/course_data.inc.o: $(MOO_MOO_FARM_DIRT_PNG:%.png=%.inc.c) $(MOLE_FRAMES:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(MOLE_PALETTE) diff --git a/assets/include/courses/rainbow_road.mk b/assets/include/courses/rainbow_road.mk index e6639d371..312fe65df 100644 --- a/assets/include/courses/rainbow_road.mk +++ b/assets/include/courses/rainbow_road.mk @@ -54,15 +54,15 @@ $(RAINBOW_ROAD_DIR)/gTextureRainbowRoadChainChompEye.png RAINBOW_ROAD_EXPORT_SENTINEL := $(RAINBOW_ROAD_DIR)/.export -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_MUSHROOM_PNG:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_MARIO_PNG:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_BOO_PNG:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_CHARACTER_PNG:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_MUSHROOM_PALETTES:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_MARIO_PALETTES:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_BOO_PALETTES:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_CHARACTER_PALETTES:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_MUSHROOM_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_MARIO_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_BOO_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_CHARACTER_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_MUSHROOM_PALETTES:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_MARIO_PALETTES:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_BOO_PALETTES:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_CHARACTER_PALETTES:%.png=%.inc.c) +$(BUILD_DIR)/courses/rainbow_road/course_data.inc.o: $(RAINBOW_ROAD_PNG:%.png=%.inc.c) $(RAINBOW_ROAD_MUSHROOM_PNG:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonMushroom4.png diff --git a/assets/include/courses/royal_raceway.mk b/assets/include/courses/royal_raceway.mk index 4126f09c1..9d7da1932 100644 --- a/assets/include/courses/royal_raceway.mk +++ b/assets/include/courses/royal_raceway.mk @@ -4,7 +4,7 @@ ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE := $(ROYAL_RACEWAY_DIR)/gTLUTRoyalRacewayPir ROYAL_RACEWAY_EXPORT_SENTINEL := $(ROYAL_RACEWAY_DIR)/.export -$(BUILD_DIR)/courses/star_cup/royal_raceway/course_data.inc.o: $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) +$(BUILD_DIR)/courses/royal_raceway/course_data.inc.o: $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/sherbet_land.mk b/assets/include/courses/sherbet_land.mk index 41db79f18..8fb047494 100644 --- a/assets/include/courses/sherbet_land.mk +++ b/assets/include/courses/sherbet_land.mk @@ -8,7 +8,7 @@ $(SHERBET_LAND_DIR)/gTexturePenguinEye.png SHERBET_LAND_EXPORT_SENTINEL := $(SHERBET_LAND_DIR)/.export -$(BUILD_DIR)/courses/star_cup/sherbet_land/course_data.inc.o: $(SHERBET_LAND_ICE:%.png=%.inc.c) $(PENGUIN_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/sherbet_land/course_data.inc.o: $(SHERBET_LAND_ICE:%.png=%.inc.c) $(PENGUIN_PNG:%.png=%.inc.c) $(SHERBET_LAND_ICE:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f ia16 diff --git a/assets/include/courses/toads_turnpike.mk b/assets/include/courses/toads_turnpike.mk index 6449159b1..129a5f13f 100644 --- a/assets/include/courses/toads_turnpike.mk +++ b/assets/include/courses/toads_turnpike.mk @@ -38,7 +38,7 @@ $(TOADS_TURNPIKE_DIR)/gTextureToadsTurnpikeCarSideLod1.png TOADS_TURNPIKE_EXPORT_SENTINEL := $(TOADS_TURNPIKE_DIR)/.export -$(BUILD_DIR)/courses/flower_cup/toads_turnpike/course_data.inc.o: $(TOADS_TURNPIKE_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/toads_turnpike/course_data.inc.o: $(TOADS_TURNPIKE_PNG:%.png=%.inc.c) $(TOADS_TURNPIKE_PNG:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/wario_stadium.mk b/assets/include/courses/wario_stadium.mk index c470343a0..7bd46d938 100644 --- a/assets/include/courses/wario_stadium.mk +++ b/assets/include/courses/wario_stadium.mk @@ -8,7 +8,7 @@ $(WARIO_STADIUM_DIR)/gTextureWarioStadiumSignBottomRight.png WARIO_STADIUM_EXPORT_SENTINEL := $(WARIO_STADIUM_DIR)/.export -$(BUILD_DIR)/courses/star_cup/wario_stadium/course_data.inc.o: $(WARIO_STADIUM_SIGN:%.png=%.inc.c) +$(BUILD_DIR)/courses/wario_stadium/course_data.inc.o: $(WARIO_STADIUM_SIGN:%.png=%.inc.c) $(WARIO_STADIUM_SIGN:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/courses/yoshi_valley.mk b/assets/include/courses/yoshi_valley.mk index efb7135dc..e55b86ff9 100644 --- a/assets/include/courses/yoshi_valley.mk +++ b/assets/include/courses/yoshi_valley.mk @@ -10,8 +10,8 @@ YOSHI_VALLEY_HEDGEHOG_PNG := $(YOSHI_VALLEY_DIR)/gTextureYoshiValleyHedgehog.pn YOSHI_VALLEY_EXPORT_SENTINEL := $(YOSHI_VALLEY_DIR)/.export -$(BUILD_DIR)/courses/special_cup/yoshi_valley/course_data.inc.o: $(YOSHI_VALLEY_HEDGEHOG_PALETTE:%.png=%.inc.c) $(YOSHI_VALLEY_HEDGEHOG_PNG:%.png=%.inc.c) -$(BUILD_DIR)/courses/special_cup/yoshi_valley/course_data.inc.o: $(YOSHI_VALLEY_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/yoshi_valley/course_data.inc.o: $(YOSHI_VALLEY_HEDGEHOG_PALETTE:%.png=%.inc.c) $(YOSHI_VALLEY_HEDGEHOG_PNG:%.png=%.inc.c) +$(BUILD_DIR)/courses/yoshi_valley/course_data.inc.o: $(YOSHI_VALLEY_PNG:%.png=%.inc.c) $(YOSHI_VALLEY_HEDGEHOG_PNG:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(YOSHI_VALLEY_HEDGEHOG_PALETTE) diff --git a/courses/all_course_data.h b/courses/all_course_data.h index f57c594f3..3a2c16f56 100644 --- a/courses/all_course_data.h +++ b/courses/all_course_data.h @@ -1,25 +1,25 @@ #ifndef ALL_COURSE_DATA_H #define ALL_COURSE_DATA_H -#include "courses/battle/big_donut/course_data.inc.h" -#include "courses/battle/block_fort/course_data.inc.h" -#include "courses/battle/double_deck/course_data.inc.h" -#include "courses/battle/skyscraper/course_data.inc.h" -#include "courses/flower_cup/choco_mountain/course_data.inc.h" -#include "courses/flower_cup/frappe_snowland/course_data.inc.h" -#include "courses/flower_cup/mario_raceway/course_data.inc.h" -#include "courses/flower_cup/toads_turnpike/course_data.inc.h" -#include "courses/mushroom_cup/kalimari_desert/course_data.inc.h" -#include "courses/mushroom_cup/koopa_troopa_beach/course_data.inc.h" -#include "courses/mushroom_cup/luigi_raceway/course_data.inc.h" -#include "courses/mushroom_cup/moo_moo_farm/course_data.inc.h" -#include "courses/special_cup/banshee_boardwalk/course_data.inc.h" -#include "courses/special_cup/dks_jungle_parkway/course_data.inc.h" -#include "courses/special_cup/rainbow_road/course_data.inc.h" -#include "courses/special_cup/yoshi_valley/course_data.inc.h" -#include "courses/star_cup/bowsers_castle/course_data.inc.h" -#include "courses/star_cup/royal_raceway/course_data.inc.h" -#include "courses/star_cup/sherbet_land/course_data.inc.h" -#include "courses/star_cup/wario_stadium/course_data.inc.h" +#include "courses/big_donut/course_data.inc.h" +#include "courses/block_fort/course_data.inc.h" +#include "courses/double_deck/course_data.inc.h" +#include "courses/skyscraper/course_data.inc.h" +#include "courses/choco_mountain/course_data.inc.h" +#include "courses/frappe_snowland/course_data.inc.h" +#include "courses/mario_raceway/course_data.inc.h" +#include "courses/toads_turnpike/course_data.inc.h" +#include "courses/kalimari_desert/course_data.inc.h" +#include "courses/koopa_troopa_beach/course_data.inc.h" +#include "courses/luigi_raceway/course_data.inc.h" +#include "courses/moo_moo_farm/course_data.inc.h" +#include "courses/banshee_boardwalk/course_data.inc.h" +#include "courses/dks_jungle_parkway/course_data.inc.h" +#include "courses/rainbow_road/course_data.inc.h" +#include "courses/yoshi_valley/course_data.inc.h" +#include "courses/bowsers_castle/course_data.inc.h" +#include "courses/royal_raceway/course_data.inc.h" +#include "courses/sherbet_land/course_data.inc.h" +#include "courses/wario_stadium/course_data.inc.h" -#endif +#endif // ALL_COURSE_DATA_H diff --git a/courses/all_course_model.h b/courses/all_course_model.h index de8b3267c..5db74d8d9 100644 --- a/courses/all_course_model.h +++ b/courses/all_course_model.h @@ -1,5 +1,5 @@ -#ifndef ALL_COURSE_DATA_H -#define ALL_COURSE_DATA_H +#ifndef ALL_COURSE_MODEL_H +#define ALL_COURSE_MODEL_H #include "macros.h" #include "common_structs.h" @@ -52,4 +52,4 @@ extern mk64_Vtx d_course_wario_stadium_vertex[0x17B3]; #define d_course_sherbet_land_vertex_count ARRAY_COUNT(d_course_sherbet_land_vertex) #define d_course_wario_stadium_vertex_count ARRAY_COUNT(d_course_wario_stadium_vertex) -#endif +#endif // ALL_COURSE_MODEL_H diff --git a/courses/all_course_packed.h b/courses/all_course_packed.h index e119d9213..687a737ad 100644 --- a/courses/all_course_packed.h +++ b/courses/all_course_packed.h @@ -8,25 +8,25 @@ * incorrect **/ -#include "courses/battle/big_donut/packed.inc.h" -#include "courses/battle/block_fort/packed.inc.h" -#include "courses/battle/double_deck/packed.inc.h" -#include "courses/battle/skyscraper/packed.inc.h" -#include "courses/flower_cup/choco_mountain/packed.inc.h" -#include "courses/flower_cup/frappe_snowland/packed.inc.h" -#include "courses/flower_cup/mario_raceway/packed.inc.h" -#include "courses/flower_cup/toads_turnpike/packed.inc.h" -#include "courses/mushroom_cup/kalimari_desert/packed.inc.h" -#include "courses/mushroom_cup/koopa_troopa_beach/packed.inc.h" -#include "courses/mushroom_cup/luigi_raceway/packed.inc.h" -#include "courses/mushroom_cup/moo_moo_farm/packed.inc.h" -#include "courses/special_cup/banshee_boardwalk/packed.inc.h" -#include "courses/special_cup/dks_jungle_parkway/packed.inc.h" -#include "courses/special_cup/rainbow_road/packed.inc.h" -#include "courses/special_cup/yoshi_valley/packed.inc.h" -#include "courses/star_cup/bowsers_castle/packed.inc.h" -#include "courses/star_cup/royal_raceway/packed.inc.h" -#include "courses/star_cup/sherbet_land/packed.inc.h" -#include "courses/star_cup/wario_stadium/packed.inc.h" +#include "courses/big_donut/course_displaylists.inc.h" +#include "courses/block_fort/course_displaylists.inc.h" +#include "courses/double_deck/course_displaylists.inc.h" +#include "courses/skyscraper/course_displaylists.inc.h" +#include "courses/choco_mountain/course_displaylists.inc.h" +#include "courses/frappe_snowland/course_displaylists.inc.h" +#include "courses/mario_raceway/course_displaylists.inc.h" +#include "courses/toads_turnpike/course_displaylists.inc.h" +#include "courses/kalimari_desert/course_displaylists.inc.h" +#include "courses/koopa_troopa_beach/course_displaylists.inc.h" +#include "courses/luigi_raceway/course_displaylists.inc.h" +#include "courses/moo_moo_farm/course_displaylists.inc.h" +#include "courses/banshee_boardwalk/course_displaylists.inc.h" +#include "courses/dks_jungle_parkway/course_displaylists.inc.h" +#include "courses/rainbow_road/course_displaylists.inc.h" +#include "courses/yoshi_valley/course_displaylists.inc.h" +#include "courses/bowsers_castle/course_displaylists.inc.h" +#include "courses/royal_raceway/course_displaylists.inc.h" +#include "courses/sherbet_land/course_displaylists.inc.h" +#include "courses/wario_stadium/course_displaylists.inc.h" -#endif +#endif // ALL_COURSE_PACKED_H diff --git a/courses/special_cup/banshee_boardwalk/course_data.inc.c b/courses/banshee_boardwalk/course_data.inc.c similarity index 99% rename from courses/special_cup/banshee_boardwalk/course_data.inc.c rename to courses/banshee_boardwalk/course_data.inc.c index a47ed204d..d66875701 100644 --- a/courses/special_cup/banshee_boardwalk/course_data.inc.c +++ b/courses/banshee_boardwalk/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_banshee_boardwalk_dl_0[] = { diff --git a/courses/special_cup/banshee_boardwalk/course_data.inc.h b/courses/banshee_boardwalk/course_data.inc.h similarity index 100% rename from courses/special_cup/banshee_boardwalk/course_data.inc.h rename to courses/banshee_boardwalk/course_data.inc.h diff --git a/courses/special_cup/banshee_boardwalk/packed.inc.c b/courses/banshee_boardwalk/course_displaylists.inc.c similarity index 99% rename from courses/special_cup/banshee_boardwalk/packed.inc.c rename to courses/banshee_boardwalk/course_displaylists.inc.c index 769ac1341..3fd5566c8 100644 --- a/courses/special_cup/banshee_boardwalk/packed.inc.c +++ b/courses/banshee_boardwalk/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_banshee_boardwalk_packed_dl_0[] = { diff --git a/courses/special_cup/banshee_boardwalk/packed.inc.h b/courses/banshee_boardwalk/course_displaylists.inc.h similarity index 100% rename from courses/special_cup/banshee_boardwalk/packed.inc.h rename to courses/banshee_boardwalk/course_displaylists.inc.h diff --git a/courses/special_cup/banshee_boardwalk/model.inc.c b/courses/banshee_boardwalk/course_vertices.inc.c similarity index 100% rename from courses/special_cup/banshee_boardwalk/model.inc.c rename to courses/banshee_boardwalk/course_vertices.inc.c diff --git a/courses/battle/big_donut/course_data.inc.c b/courses/big_donut/course_data.inc.c similarity index 96% rename from courses/battle/big_donut/course_data.inc.c rename to courses/big_donut/course_data.inc.c index 2f62f8a3b..af4b4f5f1 100644 --- a/courses/battle/big_donut/course_data.inc.c +++ b/courses/big_donut/course_data.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_big_donut_dl[] = { gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), diff --git a/courses/battle/big_donut/course_data.inc.h b/courses/big_donut/course_data.inc.h similarity index 100% rename from courses/battle/big_donut/course_data.inc.h rename to courses/big_donut/course_data.inc.h diff --git a/courses/battle/big_donut/packed.inc.c b/courses/big_donut/course_displaylists.inc.c similarity index 99% rename from courses/battle/big_donut/packed.inc.c rename to courses/big_donut/course_displaylists.inc.c index 6d9cfd572..3b31c3418 100644 --- a/courses/battle/big_donut/packed.inc.c +++ b/courses/big_donut/course_displaylists.inc.c @@ -5,7 +5,7 @@ #include #include -#include +#include Gfx d_course_big_donut_packed_dl_0[] = { diff --git a/courses/battle/big_donut/packed.inc.h b/courses/big_donut/course_displaylists.inc.h similarity index 100% rename from courses/battle/big_donut/packed.inc.h rename to courses/big_donut/course_displaylists.inc.h diff --git a/courses/battle/big_donut/model.inc.c b/courses/big_donut/course_vertices.inc.c similarity index 100% rename from courses/battle/big_donut/model.inc.c rename to courses/big_donut/course_vertices.inc.c diff --git a/courses/battle/block_fort/course_data.inc.c b/courses/block_fort/course_data.inc.c similarity index 96% rename from courses/battle/block_fort/course_data.inc.c rename to courses/block_fort/course_data.inc.c index 2626cc418..630519013 100644 --- a/courses/battle/block_fort/course_data.inc.c +++ b/courses/block_fort/course_data.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_block_fort_dl[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), diff --git a/courses/battle/block_fort/course_data.inc.h b/courses/block_fort/course_data.inc.h similarity index 100% rename from courses/battle/block_fort/course_data.inc.h rename to courses/block_fort/course_data.inc.h diff --git a/courses/battle/block_fort/packed.inc.c b/courses/block_fort/course_displaylists.inc.c similarity index 99% rename from courses/battle/block_fort/packed.inc.c rename to courses/block_fort/course_displaylists.inc.c index 95e89ef07..a77246e31 100644 --- a/courses/battle/block_fort/packed.inc.c +++ b/courses/block_fort/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_block_fort_packed_dl_0[] = { diff --git a/courses/battle/block_fort/packed.inc.h b/courses/block_fort/course_displaylists.inc.h similarity index 100% rename from courses/battle/block_fort/packed.inc.h rename to courses/block_fort/course_displaylists.inc.h diff --git a/courses/battle/block_fort/model.inc.c b/courses/block_fort/course_vertices.inc.c similarity index 100% rename from courses/battle/block_fort/model.inc.c rename to courses/block_fort/course_vertices.inc.c diff --git a/courses/star_cup/bowsers_castle/course_data.inc.c b/courses/bowsers_castle/course_data.inc.c similarity index 99% rename from courses/star_cup/bowsers_castle/course_data.inc.c rename to courses/bowsers_castle/course_data.inc.c index fdc24e93e..2099010c1 100644 --- a/courses/star_cup/bowsers_castle/course_data.inc.c +++ b/courses/bowsers_castle/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_bowsers_castle_dl_0[] = { diff --git a/courses/star_cup/bowsers_castle/course_data.inc.h b/courses/bowsers_castle/course_data.inc.h similarity index 100% rename from courses/star_cup/bowsers_castle/course_data.inc.h rename to courses/bowsers_castle/course_data.inc.h diff --git a/courses/star_cup/bowsers_castle/packed.inc.c b/courses/bowsers_castle/course_displaylists.inc.c similarity index 99% rename from courses/star_cup/bowsers_castle/packed.inc.c rename to courses/bowsers_castle/course_displaylists.inc.c index 74fe56e47..20b5bec40 100644 --- a/courses/star_cup/bowsers_castle/packed.inc.c +++ b/courses/bowsers_castle/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_bowsers_castle_packed_dl_0[] = { diff --git a/courses/star_cup/bowsers_castle/packed.inc.h b/courses/bowsers_castle/course_displaylists.inc.h similarity index 100% rename from courses/star_cup/bowsers_castle/packed.inc.h rename to courses/bowsers_castle/course_displaylists.inc.h diff --git a/courses/star_cup/bowsers_castle/model.inc.c b/courses/bowsers_castle/course_vertices.inc.c similarity index 100% rename from courses/star_cup/bowsers_castle/model.inc.c rename to courses/bowsers_castle/course_vertices.inc.c diff --git a/courses/flower_cup/choco_mountain/course_data.inc.c b/courses/choco_mountain/course_data.inc.c similarity index 99% rename from courses/flower_cup/choco_mountain/course_data.inc.c rename to courses/choco_mountain/course_data.inc.c index b166f3245..ab513654a 100644 --- a/courses/flower_cup/choco_mountain/course_data.inc.c +++ b/courses/choco_mountain/course_data.inc.c @@ -5,7 +5,7 @@ #include #include -#include +#include Gfx d_course_choco_mountain_dl_0[] = { diff --git a/courses/flower_cup/choco_mountain/course_data.inc.h b/courses/choco_mountain/course_data.inc.h similarity index 100% rename from courses/flower_cup/choco_mountain/course_data.inc.h rename to courses/choco_mountain/course_data.inc.h diff --git a/courses/flower_cup/choco_mountain/packed.inc.c b/courses/choco_mountain/course_displaylists.inc.c similarity index 99% rename from courses/flower_cup/choco_mountain/packed.inc.c rename to courses/choco_mountain/course_displaylists.inc.c index 04964cfd5..0ba1751f6 100644 --- a/courses/flower_cup/choco_mountain/packed.inc.c +++ b/courses/choco_mountain/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_choco_mountain_packed_dl_0[] = { diff --git a/courses/flower_cup/choco_mountain/packed.inc.h b/courses/choco_mountain/course_displaylists.inc.h similarity index 100% rename from courses/flower_cup/choco_mountain/packed.inc.h rename to courses/choco_mountain/course_displaylists.inc.h diff --git a/courses/flower_cup/choco_mountain/model.inc.c b/courses/choco_mountain/course_vertices.inc.c similarity index 100% rename from courses/flower_cup/choco_mountain/model.inc.c rename to courses/choco_mountain/course_vertices.inc.c diff --git a/courses/courseTable.h b/courses/courseTable.h index 9d9922fac..98e2248ef 100644 --- a/courses/courseTable.h +++ b/courses/courseTable.h @@ -1,3 +1,6 @@ +#ifndef COURSE_TABLE_H +#define COURSE_TABLE_H + #include #include #include "types.h" @@ -182,3 +185,5 @@ extern u8 _course_big_donut_offsetsSegmentRomStart[]; extern u8 _course_big_donut_offsetsSegmentRomEnd[]; extern u8 d_course_big_donut_packed[]; extern u32 big_donut_textures[]; + +#endif // COURSE_TABLE_H diff --git a/courses/special_cup/dks_jungle_parkway/course_data.inc.c b/courses/dks_jungle_parkway/course_data.inc.c similarity index 99% rename from courses/special_cup/dks_jungle_parkway/course_data.inc.c rename to courses/dks_jungle_parkway/course_data.inc.c index 0bb07396b..9cac31391 100644 --- a/courses/special_cup/dks_jungle_parkway/course_data.inc.c +++ b/courses/dks_jungle_parkway/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_dks_jungle_parkway_dl_0[] = { diff --git a/courses/special_cup/dks_jungle_parkway/course_data.inc.h b/courses/dks_jungle_parkway/course_data.inc.h similarity index 100% rename from courses/special_cup/dks_jungle_parkway/course_data.inc.h rename to courses/dks_jungle_parkway/course_data.inc.h diff --git a/courses/special_cup/dks_jungle_parkway/packed.inc.c b/courses/dks_jungle_parkway/course_displaylists.inc.c similarity index 99% rename from courses/special_cup/dks_jungle_parkway/packed.inc.c rename to courses/dks_jungle_parkway/course_displaylists.inc.c index ae4305d4d..685006397 100644 --- a/courses/special_cup/dks_jungle_parkway/packed.inc.c +++ b/courses/dks_jungle_parkway/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_dks_jungle_parkway_packed_dl_0[] = { diff --git a/courses/special_cup/dks_jungle_parkway/packed.inc.h b/courses/dks_jungle_parkway/course_displaylists.inc.h similarity index 100% rename from courses/special_cup/dks_jungle_parkway/packed.inc.h rename to courses/dks_jungle_parkway/course_displaylists.inc.h diff --git a/courses/special_cup/dks_jungle_parkway/model.inc.c b/courses/dks_jungle_parkway/course_vertices.inc.c similarity index 100% rename from courses/special_cup/dks_jungle_parkway/model.inc.c rename to courses/dks_jungle_parkway/course_vertices.inc.c diff --git a/courses/battle/double_deck/course_data.inc.c b/courses/double_deck/course_data.inc.c similarity index 96% rename from courses/battle/double_deck/course_data.inc.c rename to courses/double_deck/course_data.inc.c index 5554f877b..38da49b43 100644 --- a/courses/battle/double_deck/course_data.inc.c +++ b/courses/double_deck/course_data.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_double_deck_dl[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), diff --git a/courses/battle/double_deck/course_data.inc.h b/courses/double_deck/course_data.inc.h similarity index 100% rename from courses/battle/double_deck/course_data.inc.h rename to courses/double_deck/course_data.inc.h diff --git a/courses/battle/double_deck/packed.inc.c b/courses/double_deck/course_displaylists.inc.c similarity index 99% rename from courses/battle/double_deck/packed.inc.c rename to courses/double_deck/course_displaylists.inc.c index e576b146d..ca291a9e9 100644 --- a/courses/battle/double_deck/packed.inc.c +++ b/courses/double_deck/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_double_deck_packed_dl_0[] = { diff --git a/courses/battle/double_deck/packed.inc.h b/courses/double_deck/course_displaylists.inc.h similarity index 100% rename from courses/battle/double_deck/packed.inc.h rename to courses/double_deck/course_displaylists.inc.h diff --git a/courses/battle/double_deck/model.inc.c b/courses/double_deck/course_vertices.inc.c similarity index 100% rename from courses/battle/double_deck/model.inc.c rename to courses/double_deck/course_vertices.inc.c diff --git a/courses/flower_cup/frappe_snowland/course_data.inc.c b/courses/frappe_snowland/course_data.inc.c similarity index 99% rename from courses/flower_cup/frappe_snowland/course_data.inc.c rename to courses/frappe_snowland/course_data.inc.c index 91c918173..77f4582d0 100644 --- a/courses/flower_cup/frappe_snowland/course_data.inc.c +++ b/courses/frappe_snowland/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_frappe_snowland_dl_0[] = { diff --git a/courses/flower_cup/frappe_snowland/course_data.inc.h b/courses/frappe_snowland/course_data.inc.h similarity index 100% rename from courses/flower_cup/frappe_snowland/course_data.inc.h rename to courses/frappe_snowland/course_data.inc.h diff --git a/courses/flower_cup/frappe_snowland/packed.inc.c b/courses/frappe_snowland/course_displaylists.inc.c similarity index 99% rename from courses/flower_cup/frappe_snowland/packed.inc.c rename to courses/frappe_snowland/course_displaylists.inc.c index 86aae43d4..117e18256 100644 --- a/courses/flower_cup/frappe_snowland/packed.inc.c +++ b/courses/frappe_snowland/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_frappe_snowland_packed_dl_0[] = { diff --git a/courses/flower_cup/frappe_snowland/packed.inc.h b/courses/frappe_snowland/course_displaylists.inc.h similarity index 100% rename from courses/flower_cup/frappe_snowland/packed.inc.h rename to courses/frappe_snowland/course_displaylists.inc.h diff --git a/courses/flower_cup/frappe_snowland/model.inc.c b/courses/frappe_snowland/course_vertices.inc.c similarity index 100% rename from courses/flower_cup/frappe_snowland/model.inc.c rename to courses/frappe_snowland/course_vertices.inc.c diff --git a/courses/mushroom_cup/kalimari_desert/course_data.inc.c b/courses/kalimari_desert/course_data.inc.c similarity index 99% rename from courses/mushroom_cup/kalimari_desert/course_data.inc.c rename to courses/kalimari_desert/course_data.inc.c index 8425241af..cff340d0a 100644 --- a/courses/mushroom_cup/kalimari_desert/course_data.inc.c +++ b/courses/kalimari_desert/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_kalimari_desert_dl_0[] = { diff --git a/courses/mushroom_cup/kalimari_desert/course_data.inc.h b/courses/kalimari_desert/course_data.inc.h similarity index 100% rename from courses/mushroom_cup/kalimari_desert/course_data.inc.h rename to courses/kalimari_desert/course_data.inc.h diff --git a/courses/mushroom_cup/kalimari_desert/packed.inc.c b/courses/kalimari_desert/course_displaylists.inc.c similarity index 99% rename from courses/mushroom_cup/kalimari_desert/packed.inc.c rename to courses/kalimari_desert/course_displaylists.inc.c index 8a5a8cb20..e59ff49d8 100644 --- a/courses/mushroom_cup/kalimari_desert/packed.inc.c +++ b/courses/kalimari_desert/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_kalimari_desert_packed_dl_0[] = { diff --git a/courses/mushroom_cup/kalimari_desert/packed.inc.h b/courses/kalimari_desert/course_displaylists.inc.h similarity index 100% rename from courses/mushroom_cup/kalimari_desert/packed.inc.h rename to courses/kalimari_desert/course_displaylists.inc.h diff --git a/courses/mushroom_cup/kalimari_desert/model.inc.c b/courses/kalimari_desert/course_vertices.inc.c similarity index 100% rename from courses/mushroom_cup/kalimari_desert/model.inc.c rename to courses/kalimari_desert/course_vertices.inc.c diff --git a/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c b/courses/koopa_troopa_beach/course_data.inc.c similarity index 99% rename from courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c rename to courses/koopa_troopa_beach/course_data.inc.c index 7849b5b6b..19a0e65d3 100644 --- a/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c +++ b/courses/koopa_troopa_beach/course_data.inc.c @@ -7,7 +7,7 @@ #include #include -#include +#include Gfx d_course_koopa_troopa_beach_dl_0[] = { diff --git a/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.h b/courses/koopa_troopa_beach/course_data.inc.h similarity index 100% rename from courses/mushroom_cup/koopa_troopa_beach/course_data.inc.h rename to courses/koopa_troopa_beach/course_data.inc.h diff --git a/courses/mushroom_cup/koopa_troopa_beach/packed.inc.c b/courses/koopa_troopa_beach/course_displaylists.inc.c similarity index 99% rename from courses/mushroom_cup/koopa_troopa_beach/packed.inc.c rename to courses/koopa_troopa_beach/course_displaylists.inc.c index 1a0421346..cd213cf9c 100644 --- a/courses/mushroom_cup/koopa_troopa_beach/packed.inc.c +++ b/courses/koopa_troopa_beach/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_koopa_troopa_beach_packed_dl_0[] = { diff --git a/courses/mushroom_cup/koopa_troopa_beach/packed.inc.h b/courses/koopa_troopa_beach/course_displaylists.inc.h similarity index 100% rename from courses/mushroom_cup/koopa_troopa_beach/packed.inc.h rename to courses/koopa_troopa_beach/course_displaylists.inc.h diff --git a/courses/mushroom_cup/koopa_troopa_beach/model.inc.c b/courses/koopa_troopa_beach/course_vertices.inc.c similarity index 100% rename from courses/mushroom_cup/koopa_troopa_beach/model.inc.c rename to courses/koopa_troopa_beach/course_vertices.inc.c diff --git a/courses/mushroom_cup/luigi_raceway/course_data.inc.c b/courses/luigi_raceway/course_data.inc.c similarity index 99% rename from courses/mushroom_cup/luigi_raceway/course_data.inc.c rename to courses/luigi_raceway/course_data.inc.c index 0ede20987..a7b33000f 100644 --- a/courses/mushroom_cup/luigi_raceway/course_data.inc.c +++ b/courses/luigi_raceway/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_luigi_raceway_dl_0[] = { diff --git a/courses/mushroom_cup/luigi_raceway/course_data.inc.h b/courses/luigi_raceway/course_data.inc.h similarity index 100% rename from courses/mushroom_cup/luigi_raceway/course_data.inc.h rename to courses/luigi_raceway/course_data.inc.h diff --git a/courses/mushroom_cup/luigi_raceway/packed.inc.c b/courses/luigi_raceway/course_displaylists.inc.c similarity index 99% rename from courses/mushroom_cup/luigi_raceway/packed.inc.c rename to courses/luigi_raceway/course_displaylists.inc.c index f12cd9755..bc262fd21 100644 --- a/courses/mushroom_cup/luigi_raceway/packed.inc.c +++ b/courses/luigi_raceway/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_luigi_raceway_packed_dl_0[] = { diff --git a/courses/mushroom_cup/luigi_raceway/packed.inc.h b/courses/luigi_raceway/course_displaylists.inc.h similarity index 100% rename from courses/mushroom_cup/luigi_raceway/packed.inc.h rename to courses/luigi_raceway/course_displaylists.inc.h diff --git a/courses/mushroom_cup/luigi_raceway/model.inc.c b/courses/luigi_raceway/course_vertices.inc.c similarity index 100% rename from courses/mushroom_cup/luigi_raceway/model.inc.c rename to courses/luigi_raceway/course_vertices.inc.c diff --git a/courses/mushroom_cup/luigi_raceway/staff_ghost.incl.c b/courses/luigi_raceway/staff_ghost.incl.c similarity index 100% rename from courses/mushroom_cup/luigi_raceway/staff_ghost.incl.c rename to courses/luigi_raceway/staff_ghost.incl.c diff --git a/courses/flower_cup/mario_raceway/course_data.inc.c b/courses/mario_raceway/course_data.inc.c similarity index 99% rename from courses/flower_cup/mario_raceway/course_data.inc.c rename to courses/mario_raceway/course_data.inc.c index 54189602c..be5ba1267 100644 --- a/courses/flower_cup/mario_raceway/course_data.inc.c +++ b/courses/mario_raceway/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_mario_raceway_dl_0[] = { diff --git a/courses/flower_cup/mario_raceway/course_data.inc.h b/courses/mario_raceway/course_data.inc.h similarity index 100% rename from courses/flower_cup/mario_raceway/course_data.inc.h rename to courses/mario_raceway/course_data.inc.h diff --git a/courses/flower_cup/mario_raceway/packed.inc.c b/courses/mario_raceway/course_displaylists.inc.c similarity index 99% rename from courses/flower_cup/mario_raceway/packed.inc.c rename to courses/mario_raceway/course_displaylists.inc.c index 83276055c..de42970c7 100644 --- a/courses/flower_cup/mario_raceway/packed.inc.c +++ b/courses/mario_raceway/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_mario_raceway_packed_dl_0[] = { diff --git a/courses/flower_cup/mario_raceway/packed.inc.h b/courses/mario_raceway/course_displaylists.inc.h similarity index 100% rename from courses/flower_cup/mario_raceway/packed.inc.h rename to courses/mario_raceway/course_displaylists.inc.h diff --git a/courses/flower_cup/mario_raceway/model.inc.c b/courses/mario_raceway/course_vertices.inc.c similarity index 100% rename from courses/flower_cup/mario_raceway/model.inc.c rename to courses/mario_raceway/course_vertices.inc.c diff --git a/courses/flower_cup/mario_raceway/staff_ghost.incl.c b/courses/mario_raceway/staff_ghost.incl.c similarity index 100% rename from courses/flower_cup/mario_raceway/staff_ghost.incl.c rename to courses/mario_raceway/staff_ghost.incl.c diff --git a/courses/mushroom_cup/moo_moo_farm/course_data.inc.c b/courses/moo_moo_farm/course_data.inc.c similarity index 99% rename from courses/mushroom_cup/moo_moo_farm/course_data.inc.c rename to courses/moo_moo_farm/course_data.inc.c index 395180723..b0281eb6d 100644 --- a/courses/mushroom_cup/moo_moo_farm/course_data.inc.c +++ b/courses/moo_moo_farm/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_moo_moo_farm_dl_0[] = { diff --git a/courses/mushroom_cup/moo_moo_farm/course_data.inc.h b/courses/moo_moo_farm/course_data.inc.h similarity index 100% rename from courses/mushroom_cup/moo_moo_farm/course_data.inc.h rename to courses/moo_moo_farm/course_data.inc.h diff --git a/courses/mushroom_cup/moo_moo_farm/packed.inc.c b/courses/moo_moo_farm/course_displaylists.inc.c similarity index 99% rename from courses/mushroom_cup/moo_moo_farm/packed.inc.c rename to courses/moo_moo_farm/course_displaylists.inc.c index d5ab86151..f490ca8c1 100644 --- a/courses/mushroom_cup/moo_moo_farm/packed.inc.c +++ b/courses/moo_moo_farm/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_moo_moo_farm_packed_dl_0[] = { diff --git a/courses/mushroom_cup/moo_moo_farm/packed.inc.h b/courses/moo_moo_farm/course_displaylists.inc.h similarity index 100% rename from courses/mushroom_cup/moo_moo_farm/packed.inc.h rename to courses/moo_moo_farm/course_displaylists.inc.h diff --git a/courses/mushroom_cup/moo_moo_farm/model.inc.c b/courses/moo_moo_farm/course_vertices.inc.c similarity index 100% rename from courses/mushroom_cup/moo_moo_farm/model.inc.c rename to courses/moo_moo_farm/course_vertices.inc.c diff --git a/courses/special_cup/rainbow_road/course_data.inc.c b/courses/rainbow_road/course_data.inc.c similarity index 99% rename from courses/special_cup/rainbow_road/course_data.inc.c rename to courses/rainbow_road/course_data.inc.c index dc30bfe94..cdd674ed2 100644 --- a/courses/special_cup/rainbow_road/course_data.inc.c +++ b/courses/rainbow_road/course_data.inc.c @@ -7,7 +7,7 @@ #include #include -#include +#include Gfx d_course_rainbow_road_dl_0[] = { diff --git a/courses/special_cup/rainbow_road/course_data.inc.h b/courses/rainbow_road/course_data.inc.h similarity index 100% rename from courses/special_cup/rainbow_road/course_data.inc.h rename to courses/rainbow_road/course_data.inc.h diff --git a/courses/special_cup/rainbow_road/packed.inc.c b/courses/rainbow_road/course_displaylists.inc.c similarity index 99% rename from courses/special_cup/rainbow_road/packed.inc.c rename to courses/rainbow_road/course_displaylists.inc.c index e66177cc4..50a60952c 100644 --- a/courses/special_cup/rainbow_road/packed.inc.c +++ b/courses/rainbow_road/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_rainbow_road_packed_dl_0[] = { diff --git a/courses/special_cup/rainbow_road/packed.inc.h b/courses/rainbow_road/course_displaylists.inc.h similarity index 100% rename from courses/special_cup/rainbow_road/packed.inc.h rename to courses/rainbow_road/course_displaylists.inc.h diff --git a/courses/special_cup/rainbow_road/model.inc.c b/courses/rainbow_road/course_vertices.inc.c similarity index 100% rename from courses/special_cup/rainbow_road/model.inc.c rename to courses/rainbow_road/course_vertices.inc.c diff --git a/courses/star_cup/royal_raceway/course_data.inc.c b/courses/royal_raceway/course_data.inc.c similarity index 99% rename from courses/star_cup/royal_raceway/course_data.inc.c rename to courses/royal_raceway/course_data.inc.c index ad7e6759f..3c198abe7 100644 --- a/courses/star_cup/royal_raceway/course_data.inc.c +++ b/courses/royal_raceway/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_royal_raceway_dl_0[] = { diff --git a/courses/star_cup/royal_raceway/course_data.inc.h b/courses/royal_raceway/course_data.inc.h similarity index 100% rename from courses/star_cup/royal_raceway/course_data.inc.h rename to courses/royal_raceway/course_data.inc.h diff --git a/courses/star_cup/royal_raceway/packed.inc.c b/courses/royal_raceway/course_displaylists.inc.c similarity index 99% rename from courses/star_cup/royal_raceway/packed.inc.c rename to courses/royal_raceway/course_displaylists.inc.c index 04b03a948..30c396236 100644 --- a/courses/star_cup/royal_raceway/packed.inc.c +++ b/courses/royal_raceway/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_royal_raceway_packed_dl_0[] = { diff --git a/courses/star_cup/royal_raceway/packed.inc.h b/courses/royal_raceway/course_displaylists.inc.h similarity index 100% rename from courses/star_cup/royal_raceway/packed.inc.h rename to courses/royal_raceway/course_displaylists.inc.h diff --git a/courses/star_cup/royal_raceway/model.inc.c b/courses/royal_raceway/course_vertices.inc.c similarity index 100% rename from courses/star_cup/royal_raceway/model.inc.c rename to courses/royal_raceway/course_vertices.inc.c diff --git a/courses/star_cup/royal_raceway/staff_ghost.incl.c b/courses/royal_raceway/staff_ghost.incl.c similarity index 100% rename from courses/star_cup/royal_raceway/staff_ghost.incl.c rename to courses/royal_raceway/staff_ghost.incl.c diff --git a/courses/star_cup/sherbet_land/course_data.inc.c b/courses/sherbet_land/course_data.inc.c similarity index 99% rename from courses/star_cup/sherbet_land/course_data.inc.c rename to courses/sherbet_land/course_data.inc.c index 45838986c..70f35dd66 100644 --- a/courses/star_cup/sherbet_land/course_data.inc.c +++ b/courses/sherbet_land/course_data.inc.c @@ -7,7 +7,7 @@ #include #include -#include +#include Gfx d_course_sherbet_land_dl_0[] = { diff --git a/courses/star_cup/sherbet_land/course_data.inc.h b/courses/sherbet_land/course_data.inc.h similarity index 100% rename from courses/star_cup/sherbet_land/course_data.inc.h rename to courses/sherbet_land/course_data.inc.h diff --git a/courses/star_cup/sherbet_land/packed.inc.c b/courses/sherbet_land/course_displaylists.inc.c similarity index 99% rename from courses/star_cup/sherbet_land/packed.inc.c rename to courses/sherbet_land/course_displaylists.inc.c index 57ff43037..76f3bdcc4 100644 --- a/courses/star_cup/sherbet_land/packed.inc.c +++ b/courses/sherbet_land/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_sherbet_land_packed_dl_0[] = { diff --git a/courses/star_cup/sherbet_land/packed.inc.h b/courses/sherbet_land/course_displaylists.inc.h similarity index 100% rename from courses/star_cup/sherbet_land/packed.inc.h rename to courses/sherbet_land/course_displaylists.inc.h diff --git a/courses/star_cup/sherbet_land/model.inc.c b/courses/sherbet_land/course_vertices.inc.c similarity index 100% rename from courses/star_cup/sherbet_land/model.inc.c rename to courses/sherbet_land/course_vertices.inc.c diff --git a/courses/battle/skyscraper/course_data.inc.c b/courses/skyscraper/course_data.inc.c similarity index 97% rename from courses/battle/skyscraper/course_data.inc.c rename to courses/skyscraper/course_data.inc.c index df256de38..b3c8592fb 100644 --- a/courses/battle/skyscraper/course_data.inc.c +++ b/courses/skyscraper/course_data.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_skyscraper_dl[] = { gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), diff --git a/courses/battle/skyscraper/course_data.inc.h b/courses/skyscraper/course_data.inc.h similarity index 100% rename from courses/battle/skyscraper/course_data.inc.h rename to courses/skyscraper/course_data.inc.h diff --git a/courses/battle/skyscraper/packed.inc.c b/courses/skyscraper/course_displaylists.inc.c similarity index 99% rename from courses/battle/skyscraper/packed.inc.c rename to courses/skyscraper/course_displaylists.inc.c index 190322987..70c200cda 100644 --- a/courses/battle/skyscraper/packed.inc.c +++ b/courses/skyscraper/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_skyscraper_packed_dl_0[] = { diff --git a/courses/battle/skyscraper/packed.inc.h b/courses/skyscraper/course_displaylists.inc.h similarity index 100% rename from courses/battle/skyscraper/packed.inc.h rename to courses/skyscraper/course_displaylists.inc.h diff --git a/courses/battle/skyscraper/model.inc.c b/courses/skyscraper/course_vertices.inc.c similarity index 100% rename from courses/battle/skyscraper/model.inc.c rename to courses/skyscraper/course_vertices.inc.c diff --git a/courses/staff_ghosts.inc.c b/courses/staff_ghosts.inc.c index d2a07b8f2..a7f7e4907 100644 --- a/courses/staff_ghosts.inc.c +++ b/courses/staff_ghosts.inc.c @@ -9,15 +9,15 @@ */ StaffGhost d_mario_raceway_staff_ghost[] = { - #include "courses/flower_cup/mario_raceway/staff_ghost.incl.c" + #include "courses/mario_raceway/staff_ghost.incl.c" }; StaffGhost d_luigi_raceway_staff_ghost[1046] = { - #include "courses/mushroom_cup/luigi_raceway/staff_ghost.incl.c" + #include "courses/luigi_raceway/staff_ghost.incl.c" }; StaffGhost d_royal_raceway_staff_ghost[] = { - #include "courses/star_cup/royal_raceway/staff_ghost.incl.c" + #include "courses/royal_raceway/staff_ghost.incl.c" }; // Unknown data. Perhaps colour or lights diff --git a/courses/flower_cup/toads_turnpike/course_data.inc.c b/courses/toads_turnpike/course_data.inc.c similarity index 99% rename from courses/flower_cup/toads_turnpike/course_data.inc.c rename to courses/toads_turnpike/course_data.inc.c index bf8995e71..c6df5d268 100644 --- a/courses/flower_cup/toads_turnpike/course_data.inc.c +++ b/courses/toads_turnpike/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_toads_turnpike_dl_0[] = { diff --git a/courses/flower_cup/toads_turnpike/course_data.inc.h b/courses/toads_turnpike/course_data.inc.h similarity index 100% rename from courses/flower_cup/toads_turnpike/course_data.inc.h rename to courses/toads_turnpike/course_data.inc.h diff --git a/courses/flower_cup/toads_turnpike/packed.inc.c b/courses/toads_turnpike/course_displaylists.inc.c similarity index 99% rename from courses/flower_cup/toads_turnpike/packed.inc.c rename to courses/toads_turnpike/course_displaylists.inc.c index 5fa8d4c3e..09c7c7ef4 100644 --- a/courses/flower_cup/toads_turnpike/packed.inc.c +++ b/courses/toads_turnpike/course_displaylists.inc.c @@ -3,7 +3,7 @@ #include #include -#include +#include Gfx d_course_toads_turnpike_packed_dl_0[] = { diff --git a/courses/flower_cup/toads_turnpike/packed.inc.h b/courses/toads_turnpike/course_displaylists.inc.h similarity index 100% rename from courses/flower_cup/toads_turnpike/packed.inc.h rename to courses/toads_turnpike/course_displaylists.inc.h diff --git a/courses/flower_cup/toads_turnpike/model.inc.c b/courses/toads_turnpike/course_vertices.inc.c similarity index 100% rename from courses/flower_cup/toads_turnpike/model.inc.c rename to courses/toads_turnpike/course_vertices.inc.c diff --git a/courses/star_cup/wario_stadium/course_data.inc.c b/courses/wario_stadium/course_data.inc.c similarity index 99% rename from courses/star_cup/wario_stadium/course_data.inc.c rename to courses/wario_stadium/course_data.inc.c index 8b548b1b4..d56163097 100644 --- a/courses/star_cup/wario_stadium/course_data.inc.c +++ b/courses/wario_stadium/course_data.inc.c @@ -6,7 +6,7 @@ #include #include -#include +#include Gfx d_course_wario_stadium_dl_0[] = { diff --git a/courses/star_cup/wario_stadium/course_data.inc.h b/courses/wario_stadium/course_data.inc.h similarity index 100% rename from courses/star_cup/wario_stadium/course_data.inc.h rename to courses/wario_stadium/course_data.inc.h diff --git a/courses/star_cup/wario_stadium/packed.inc.c b/courses/wario_stadium/course_displaylists.inc.c similarity index 99% rename from courses/star_cup/wario_stadium/packed.inc.c rename to courses/wario_stadium/course_displaylists.inc.c index aca1126de..e4fa29da7 100644 --- a/courses/star_cup/wario_stadium/packed.inc.c +++ b/courses/wario_stadium/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_wario_stadium_packed_dl_0[] = { diff --git a/courses/star_cup/wario_stadium/packed.inc.h b/courses/wario_stadium/course_displaylists.inc.h similarity index 100% rename from courses/star_cup/wario_stadium/packed.inc.h rename to courses/wario_stadium/course_displaylists.inc.h diff --git a/courses/star_cup/wario_stadium/model.inc.c b/courses/wario_stadium/course_vertices.inc.c similarity index 100% rename from courses/star_cup/wario_stadium/model.inc.c rename to courses/wario_stadium/course_vertices.inc.c diff --git a/courses/special_cup/yoshi_valley/course_data.inc.c b/courses/yoshi_valley/course_data.inc.c similarity index 99% rename from courses/special_cup/yoshi_valley/course_data.inc.c rename to courses/yoshi_valley/course_data.inc.c index db6bd290a..fc8b89371 100644 --- a/courses/special_cup/yoshi_valley/course_data.inc.c +++ b/courses/yoshi_valley/course_data.inc.c @@ -7,7 +7,7 @@ #include #include -#include +#include Gfx d_course_yoshi_valley_dl_0[] = { diff --git a/courses/special_cup/yoshi_valley/course_data.inc.h b/courses/yoshi_valley/course_data.inc.h similarity index 100% rename from courses/special_cup/yoshi_valley/course_data.inc.h rename to courses/yoshi_valley/course_data.inc.h diff --git a/courses/special_cup/yoshi_valley/packed.inc.c b/courses/yoshi_valley/course_displaylists.inc.c similarity index 99% rename from courses/special_cup/yoshi_valley/packed.inc.c rename to courses/yoshi_valley/course_displaylists.inc.c index 538896843..55af242aa 100644 --- a/courses/special_cup/yoshi_valley/packed.inc.c +++ b/courses/yoshi_valley/course_displaylists.inc.c @@ -4,7 +4,7 @@ #include #include -#include +#include Gfx d_course_yoshi_valley_packed_dl_0[] = { diff --git a/courses/special_cup/yoshi_valley/packed.inc.h b/courses/yoshi_valley/course_displaylists.inc.h similarity index 100% rename from courses/special_cup/yoshi_valley/packed.inc.h rename to courses/yoshi_valley/course_displaylists.inc.h diff --git a/courses/special_cup/yoshi_valley/model.inc.c b/courses/yoshi_valley/course_vertices.inc.c similarity index 100% rename from courses/special_cup/yoshi_valley/model.inc.c rename to courses/yoshi_valley/course_vertices.inc.c diff --git a/mk64.ld b/mk64.ld index 438ef21a4..f95f7037e 100644 --- a/mk64.ld +++ b/mk64.ld @@ -15,53 +15,13 @@ OUTPUT_ARCH (mips) _##name##SegmentRomEnd = __romPos + SIZEOF(.name); \ __romPos += SIZEOF(.name); -#define MIO0_SEG(name) \ - BEGIN_SEG(name##_mio0, 0x0) \ - { \ - BUILD_DIR/bin/name.mio0.o(.data); \ - . = ALIGN(0x10); \ - } \ - END_SEG(name##_mio0) - -#define COURSE_DATA_SEG(dir, name) \ - BEGIN_SEG(name##_mio0, 0x06000000) \ - { \ - BUILD_DIR/courses/dir/course_data.inc.mio0.o(.data); \ - . = ALIGN(0x10); \ - } \ - END_SEG(name##_mio0) - -#define COURSE_OFFSETS_SEG(name, addr) \ - BEGIN_SEG(name, addr) \ - { \ - BUILD_DIR/src/name.o(.data); \ - . = ALIGN(0x10); \ - } \ - END_SEG(name) - -#define COURSE_VERT_SEG(dir, name) \ - BEGIN_SEG(name, 0x0F000000) \ - { \ - BUILD_DIR/courses/dir/model.inc.mio0.o(.data); \ - . = ALIGN(0x10); \ - } \ - END_SEG(name) - -#define COURSE_PACKED_SEG(dir, name) \ - BEGIN_SEG(name, 0x07000000) \ - { \ - BUILD_DIR/courses/dir/packed.inc.mio0.o(.data); \ - . = ALIGN(0x10); \ - } \ - END_SEG(name) - #define BEGIN_NOLOAD(name) \ _##name##SegNoloadStart = ADDR(.name.noload); \ .name.noload (NOLOAD) : #define END_NOLOAD(name) \ _##name##SegNoloadEnd = ADDR(.name.noload) + SIZEOF(.name.noload); - + SECTIONS { __romPos = 0; @@ -534,7 +494,7 @@ SECTIONS 0x828400 -> 0x8028DE30 (0xD0) */ BEGIN_SEG(data_821D10, 0x0B000000) { - BUILD_DIR/src/trophy_model.inc.mio0.o(.data); + BUILD_DIR/src/ending/ceremony_data.inc.mio0.o(.data); . = ALIGN(0x10); } END_SEG(data_821D10) @@ -548,26 +508,42 @@ SECTIONS /* Segment Six Course Data (Displaylists, models, textures, course paths, etc.) */ - COURSE_DATA_SEG(flower_cup/mario_raceway,course_mario_raceway_dl) - COURSE_DATA_SEG(flower_cup/choco_mountain,course_choco_mountain_dl) - COURSE_DATA_SEG(star_cup/bowsers_castle,course_bowsers_castle_dl) - COURSE_DATA_SEG(special_cup/banshee_boardwalk,course_banshee_boardwalk_dl) - COURSE_DATA_SEG(special_cup/yoshi_valley,course_yoshi_valley_dl) - COURSE_DATA_SEG(flower_cup/frappe_snowland,course_frappe_snowland_dl) - COURSE_DATA_SEG(mushroom_cup/koopa_troopa_beach,course_koopa_troopa_beach_dl) - COURSE_DATA_SEG(star_cup/royal_raceway,course_royal_raceway_dl) - COURSE_DATA_SEG(mushroom_cup/luigi_raceway,course_luigi_raceway_dl) - COURSE_DATA_SEG(mushroom_cup/moo_moo_farm,course_moo_moo_farm_dl) - COURSE_DATA_SEG(flower_cup/toads_turnpike,course_toads_turnpike_dl) - COURSE_DATA_SEG(mushroom_cup/kalimari_desert,course_kalimari_desert_dl) - COURSE_DATA_SEG(star_cup/sherbet_land,course_sherbet_land_dl) - COURSE_DATA_SEG(special_cup/rainbow_road,course_rainbow_road_dl) - COURSE_DATA_SEG(star_cup/wario_stadium,course_wario_stadium_dl) - COURSE_DATA_SEG(battle/block_fort,course_block_fort_dl) - COURSE_DATA_SEG(battle/skyscraper,course_skyscraper_dl) - COURSE_DATA_SEG(battle/double_deck,course_double_deck_dl) - COURSE_DATA_SEG(special_cup/dks_jungle_parkway,course_dks_jungle_parkway_dl) - COURSE_DATA_SEG(battle/big_donut,course_big_donut_dl) + #define COURSE_DATA_SEG(dir, name) \ + BEGIN_SEG(name##_mio0, 0x06000000) \ + { \ + BUILD_DIR/courses/dir/course_data.inc.mio0.o(.data); \ + . = ALIGN(0x10); \ + } \ + END_SEG(name##_mio0) + + COURSE_DATA_SEG(mario_raceway,course_mario_raceway_dl) + COURSE_DATA_SEG(choco_mountain,course_choco_mountain_dl) + COURSE_DATA_SEG(bowsers_castle,course_bowsers_castle_dl) + COURSE_DATA_SEG(banshee_boardwalk,course_banshee_boardwalk_dl) + COURSE_DATA_SEG(yoshi_valley,course_yoshi_valley_dl) + COURSE_DATA_SEG(frappe_snowland,course_frappe_snowland_dl) + COURSE_DATA_SEG(koopa_troopa_beach,course_koopa_troopa_beach_dl) + COURSE_DATA_SEG(royal_raceway,course_royal_raceway_dl) + COURSE_DATA_SEG(luigi_raceway,course_luigi_raceway_dl) + COURSE_DATA_SEG(moo_moo_farm,course_moo_moo_farm_dl) + COURSE_DATA_SEG(toads_turnpike,course_toads_turnpike_dl) + COURSE_DATA_SEG(kalimari_desert,course_kalimari_desert_dl) + COURSE_DATA_SEG(sherbet_land,course_sherbet_land_dl) + COURSE_DATA_SEG(rainbow_road,course_rainbow_road_dl) + COURSE_DATA_SEG(wario_stadium,course_wario_stadium_dl) + COURSE_DATA_SEG(block_fort,course_block_fort_dl) + COURSE_DATA_SEG(skyscraper,course_skyscraper_dl) + COURSE_DATA_SEG(double_deck,course_double_deck_dl) + COURSE_DATA_SEG(dks_jungle_parkway,course_dks_jungle_parkway_dl) + COURSE_DATA_SEG(big_donut,course_big_donut_dl) + + #define COURSE_OFFSETS_SEG(name, addr) \ + BEGIN_SEG(name, addr) \ + { \ + BUILD_DIR/src/name.o(.data); \ + . = ALIGN(0x10); \ + } \ + END_SEG(name) COURSE_OFFSETS_SEG(course_mario_raceway_offsets, 0x09000000) COURSE_OFFSETS_SEG(course_choco_mountain_offsets, 0x09000000) @@ -592,26 +568,34 @@ SECTIONS /* Segment 0xF Course Geography (0x4 uncompressed) and Segment 0x7 Packed Displaylists */ - COURSE_VERT_SEG(flower_cup/mario_raceway,mario_raceway_vertex) - COURSE_VERT_SEG(flower_cup/choco_mountain,choco_mountain_vertex) - COURSE_VERT_SEG(star_cup/bowsers_castle,bowsers_castle_vertex) - COURSE_VERT_SEG(special_cup/banshee_boardwalk,banshee_boardwalk_vertex) - COURSE_VERT_SEG(special_cup/yoshi_valley,yoshi_valley_vertex) - COURSE_VERT_SEG(flower_cup/frappe_snowland,frappe_snowland_vertex) - COURSE_VERT_SEG(mushroom_cup/koopa_troopa_beach,koopa_troopa_beach_vertex) - COURSE_VERT_SEG(star_cup/royal_raceway,royal_raceway_vertex) - COURSE_VERT_SEG(mushroom_cup/luigi_raceway,luigi_raceway_vertex) - COURSE_VERT_SEG(mushroom_cup/moo_moo_farm,moo_moo_farm_vertex) - COURSE_VERT_SEG(flower_cup/toads_turnpike,toads_turnpike_vertex) - COURSE_VERT_SEG(mushroom_cup/kalimari_desert,kalimari_desert_vertex) - COURSE_VERT_SEG(star_cup/sherbet_land,sherbet_land_vertex) - COURSE_VERT_SEG(special_cup/rainbow_road,rainbow_road_vertex) - COURSE_VERT_SEG(star_cup/wario_stadium,wario_stadium_vertex) - COURSE_VERT_SEG(battle/block_fort,block_fort_vertex) - COURSE_VERT_SEG(battle/skyscraper,skyscraper_vertex) - COURSE_VERT_SEG(battle/double_deck,double_deck_vertex) - COURSE_VERT_SEG(special_cup/dks_jungle_parkway,dks_jungle_parkway_vertex) - COURSE_VERT_SEG(battle/big_donut,big_donut_vertex) + #define COURSE_VERT_SEG(dir, name) \ + BEGIN_SEG(name, 0x0F000000) \ + { \ + BUILD_DIR/courses/dir/course_geography.inc.mio0.o(.data); \ + . = ALIGN(0x10); \ + } \ + END_SEG(name) + + COURSE_VERT_SEG(mario_raceway,mario_raceway_vertex) + COURSE_VERT_SEG(choco_mountain,choco_mountain_vertex) + COURSE_VERT_SEG(bowsers_castle,bowsers_castle_vertex) + COURSE_VERT_SEG(banshee_boardwalk,banshee_boardwalk_vertex) + COURSE_VERT_SEG(yoshi_valley,yoshi_valley_vertex) + COURSE_VERT_SEG(frappe_snowland,frappe_snowland_vertex) + COURSE_VERT_SEG(koopa_troopa_beach,koopa_troopa_beach_vertex) + COURSE_VERT_SEG(royal_raceway,royal_raceway_vertex) + COURSE_VERT_SEG(luigi_raceway,luigi_raceway_vertex) + COURSE_VERT_SEG(moo_moo_farm,moo_moo_farm_vertex) + COURSE_VERT_SEG(toads_turnpike,toads_turnpike_vertex) + COURSE_VERT_SEG(kalimari_desert,kalimari_desert_vertex) + COURSE_VERT_SEG(sherbet_land,sherbet_land_vertex) + COURSE_VERT_SEG(rainbow_road,rainbow_road_vertex) + COURSE_VERT_SEG(wario_stadium,wario_stadium_vertex) + COURSE_VERT_SEG(block_fort,block_fort_vertex) + COURSE_VERT_SEG(skyscraper,skyscraper_vertex) + COURSE_VERT_SEG(double_deck,double_deck_vertex) + COURSE_VERT_SEG(dks_jungle_parkway,dks_jungle_parkway_vertex) + COURSE_VERT_SEG(big_donut,big_donut_vertex) BEGIN_SEG(audio_banks, 0x0) { diff --git a/src/course_banshee_boardwalk_offsets.c b/src/course_banshee_boardwalk_offsets.c index 9b009baf1..662ab1c19 100644 --- a/src/course_banshee_boardwalk_offsets.c +++ b/src/course_banshee_boardwalk_offsets.c @@ -1,7 +1,7 @@ #include #include "PR/gbi.h" #include "course_offsets.h" -#include "courses/special_cup/banshee_boardwalk/course_data.inc.h" +#include "courses/banshee_boardwalk/course_data.inc.h" extern u8 gTexture6447C4[]; extern u8 gTexture676FB0[]; diff --git a/src/course_bowsers_castle_offsets.c b/src/course_bowsers_castle_offsets.c index c5af9d5c8..3e6df044e 100644 --- a/src/course_bowsers_castle_offsets.c +++ b/src/course_bowsers_castle_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/star_cup/bowsers_castle/course_data.inc.h" +#include "courses/bowsers_castle/course_data.inc.h" extern u8 gTexture64313C[]; extern u8 gTexture6528DC[]; diff --git a/src/course_choco_mountain_offsets.c b/src/course_choco_mountain_offsets.c index 3593bbb90..e139fb139 100644 --- a/src/course_choco_mountain_offsets.c +++ b/src/course_choco_mountain_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/flower_cup/choco_mountain/course_data.inc.h" +#include "courses/choco_mountain/course_data.inc.h" extern u8 gTexture64619C[]; extern u8 gTexture64647C[]; diff --git a/src/course_kalimari_desert_offsets.c b/src/course_kalimari_desert_offsets.c index 3ffd65c9d..dd7c044ba 100644 --- a/src/course_kalimari_desert_offsets.c +++ b/src/course_kalimari_desert_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/mushroom_cup/kalimari_desert/course_data.inc.h" +#include "courses/kalimari_desert/course_data.inc.h" extern u8 gTexture6684F8[]; extern u8 gTextureSignLuigis0[]; diff --git a/src/course_luigi_raceway_offsets.c b/src/course_luigi_raceway_offsets.c index c784c43bc..54278ec5f 100644 --- a/src/course_luigi_raceway_offsets.c +++ b/src/course_luigi_raceway_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/mushroom_cup/luigi_raceway/course_data.inc.h" +#include "courses/luigi_raceway/course_data.inc.h" extern u8 gTextureSignShellShot0[]; extern u8 gTextureSignShellShot1[]; diff --git a/src/course_mario_raceway_offsets.c b/src/course_mario_raceway_offsets.c index ded3fb768..6746fc5cb 100644 --- a/src/course_mario_raceway_offsets.c +++ b/src/course_mario_raceway_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/flower_cup/mario_raceway/course_data.inc.h" +#include "courses/mario_raceway/course_data.inc.h" extern u8 gTextureCheckerboardYellowPink[]; extern u8 gTexture64619C[]; diff --git a/src/course_moo_moo_farm_offsets.c b/src/course_moo_moo_farm_offsets.c index 8ce089d25..54d2b8caf 100644 --- a/src/course_moo_moo_farm_offsets.c +++ b/src/course_moo_moo_farm_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/mushroom_cup/moo_moo_farm/course_data.inc.h" +#include "courses/moo_moo_farm/course_data.inc.h" extern u8 gTextureWoodDoor0[]; extern u8 gTextureGrass2[]; diff --git a/src/course_royal_raceway_offsets.c b/src/course_royal_raceway_offsets.c index 996a8ffce..b632fdd0d 100644 --- a/src/course_royal_raceway_offsets.c +++ b/src/course_royal_raceway_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/star_cup/royal_raceway/course_data.inc.h" +#include "courses/royal_raceway/course_data.inc.h" extern u8 gTexture64619C[]; extern u8 gTexture645134[]; diff --git a/src/course_sherbet_land_offsets.c b/src/course_sherbet_land_offsets.c index ade76914d..2026dfb1e 100644 --- a/src/course_sherbet_land_offsets.c +++ b/src/course_sherbet_land_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/star_cup/sherbet_land/course_data.inc.h" +#include "courses/sherbet_land/course_data.inc.h" extern u8 gTexture643B3C[]; extern u8 gTexture66D024[]; diff --git a/src/course_toads_turnpike_offsets.c b/src/course_toads_turnpike_offsets.c index be7b0916e..01115a5b8 100644 --- a/src/course_toads_turnpike_offsets.c +++ b/src/course_toads_turnpike_offsets.c @@ -2,7 +2,7 @@ #include #include "common_textures.h" #include "course_offsets.h" -#include "courses/flower_cup/toads_turnpike/course_data.inc.h" +#include "courses/toads_turnpike/course_data.inc.h" extern u8 gTexture645134[]; extern u8 gTexture64FE68[]; diff --git a/src/course_wario_stadium_offsets.c b/src/course_wario_stadium_offsets.c index d3fee1d81..e7311ebe2 100644 --- a/src/course_wario_stadium_offsets.c +++ b/src/course_wario_stadium_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/star_cup/wario_stadium/course_data.inc.h" +#include "courses/wario_stadium/course_data.inc.h" extern u8 gTexture67F15C[]; extern u8 gTexture67F450[]; diff --git a/src/trophy_model.inc.c b/src/ending/ceremony_data.inc.c similarity index 100% rename from src/trophy_model.inc.c rename to src/ending/ceremony_data.inc.c