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

@@ -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 $@
 

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

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

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()
 

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)

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

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

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

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)

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

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)

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

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

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)

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

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

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

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

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

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)

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

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

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

courses/banshee_boardwalk/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/special_cup/banshee_boardwalk/packed.inc.h>
+#include <courses/banshee_boardwalk/course_displaylists.inc.h>
 
 Gfx d_course_banshee_boardwalk_dl_0[] =
 {

courses/banshee_boardwalk/course_displaylists.inc.c

@@ -4,7 +4,7 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/special_cup/banshee_boardwalk/packed.inc.h>
+#include <courses/banshee_boardwalk/course_displaylists.inc.h>
 
 Gfx d_course_banshee_boardwalk_packed_dl_0[] =
 {

courses/big_donut/course_data.inc.c

@@ -4,7 +4,7 @@
 #include <PR/gbi.h>
 #include <actor_types.h>
 
-#include <courses/battle/big_donut/packed.inc.h>
+#include <courses/big_donut/course_displaylists.inc.h>
 
 Gfx d_course_big_donut_dl[] = {
     gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),

courses/big_donut/course_displaylists.inc.c

@@ -5,7 +5,7 @@
 #include <course.h>
 #include <types.h>
 
-#include <courses/battle/big_donut/packed.inc.h>
+#include <courses/big_donut/course_displaylists.inc.h>
 
 Gfx d_course_big_donut_packed_dl_0[] =
 {

courses/block_fort/course_data.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <actor_types.h>
 
-#include <courses/battle/block_fort/packed.inc.h>
+#include <courses/block_fort/course_displaylists.inc.h>
 
 Gfx d_course_block_fort_dl[] = {
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),

courses/block_fort/course_displaylists.inc.c

@@ -4,7 +4,7 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/battle/block_fort/packed.inc.h>
+#include <courses/block_fort/course_displaylists.inc.h>
 
 Gfx d_course_block_fort_packed_dl_0[] =
 {

courses/bowsers_castle/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/star_cup/bowsers_castle/packed.inc.h>
+#include <courses/bowsers_castle/course_displaylists.inc.h>
 
 Gfx d_course_bowsers_castle_dl_0[] =
 {

courses/bowsers_castle/course_displaylists.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/star_cup/bowsers_castle/packed.inc.h>
+#include <courses/bowsers_castle/course_displaylists.inc.h>
 
 Gfx d_course_bowsers_castle_packed_dl_0[] =
 {

courses/choco_mountain/course_data.inc.c

@@ -5,7 +5,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/flower_cup/choco_mountain/packed.inc.h>
+#include <courses/choco_mountain/course_displaylists.inc.h>
 
 Gfx d_course_choco_mountain_dl_0[] =
 {

courses/choco_mountain/course_displaylists.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/flower_cup/choco_mountain/packed.inc.h>
+#include <courses/choco_mountain/course_displaylists.inc.h>
 
 Gfx d_course_choco_mountain_packed_dl_0[] =
 {

courses/courseTable.h

@@ -1,3 +1,6 @@
+#ifndef COURSE_TABLE_H
+#define COURSE_TABLE_H
+
 #include <ultra64.h>
 #include <macros.h>
 #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

courses/dks_jungle_parkway/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/special_cup/dks_jungle_parkway/packed.inc.h>
+#include <courses/dks_jungle_parkway/course_displaylists.inc.h>
 
 Gfx d_course_dks_jungle_parkway_dl_0[] =
 {

courses/dks_jungle_parkway/course_displaylists.inc.c

@@ -4,7 +4,7 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/special_cup/dks_jungle_parkway/packed.inc.h>
+#include <courses/dks_jungle_parkway/course_displaylists.inc.h>
 
 Gfx d_course_dks_jungle_parkway_packed_dl_0[] =
 {

courses/double_deck/course_data.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <actor_types.h>
 
-#include <courses/battle/double_deck/packed.inc.h>
+#include <courses/double_deck/course_displaylists.inc.h>
 
 Gfx d_course_double_deck_dl[] = {
     gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),

courses/double_deck/course_displaylists.inc.c

@@ -4,7 +4,7 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/battle/double_deck/packed.inc.h>
+#include <courses/double_deck/course_displaylists.inc.h>
 
 Gfx d_course_double_deck_packed_dl_0[] =
 {

courses/frappe_snowland/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/flower_cup/frappe_snowland/packed.inc.h>
+#include <courses/frappe_snowland/course_displaylists.inc.h>
 
 Gfx d_course_frappe_snowland_dl_0[] =
 {

courses/frappe_snowland/course_displaylists.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/flower_cup/frappe_snowland/packed.inc.h>
+#include <courses/frappe_snowland/course_displaylists.inc.h>
 
 Gfx d_course_frappe_snowland_packed_dl_0[] =
 {

courses/kalimari_desert/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/mushroom_cup/kalimari_desert/packed.inc.h>
+#include <courses/kalimari_desert/course_displaylists.inc.h>
 
 Gfx d_course_kalimari_desert_dl_0[] =
 {

courses/kalimari_desert/course_displaylists.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/mushroom_cup/kalimari_desert/packed.inc.h>
+#include <courses/kalimari_desert/course_displaylists.inc.h>
 
 Gfx d_course_kalimari_desert_packed_dl_0[] =
 {

courses/koopa_troopa_beach/course_data.inc.c

@@ -7,7 +7,7 @@
 #include <course.h>
 #include <code_80004740.h>
 
-#include <courses/mushroom_cup/koopa_troopa_beach/packed.inc.h>
+#include <courses/koopa_troopa_beach/course_displaylists.inc.h>
 
 Gfx d_course_koopa_troopa_beach_dl_0[] =
 {

courses/koopa_troopa_beach/course_displaylists.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/mushroom_cup/koopa_troopa_beach/packed.inc.h>
+#include <courses/koopa_troopa_beach/course_displaylists.inc.h>
 
 Gfx d_course_koopa_troopa_beach_packed_dl_0[] =
 {

courses/luigi_raceway/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/mushroom_cup/luigi_raceway/packed.inc.h>
+#include <courses/luigi_raceway/course_displaylists.inc.h>
 
 Gfx d_course_luigi_raceway_dl_0[] =
 {

courses/luigi_raceway/course_displaylists.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/mushroom_cup/luigi_raceway/packed.inc.h>
+#include <courses/luigi_raceway/course_displaylists.inc.h>
 
 Gfx d_course_luigi_raceway_packed_dl_0[] =
 {

courses/mario_raceway/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <course.h>
 #include <waypoints.h>
 
-#include <courses/flower_cup/mario_raceway/packed.inc.h>
+#include "course_displaylists.inc.h"
 
 Gfx d_course_mario_raceway_dl_0[] =
 {

courses/mario_raceway/course_displaylists.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/flower_cup/mario_raceway/packed.inc.h>
+#include <courses/mario_raceway/course_displaylists.inc.h>
 
 Gfx d_course_mario_raceway_packed_dl_0[] =
 {

courses/moo_moo_farm/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/mushroom_cup/moo_moo_farm/packed.inc.h>
+#include <courses/moo_moo_farm/course_displaylists.inc.h>
 
 Gfx d_course_moo_moo_farm_dl_0[] =
 {

courses/moo_moo_farm/course_displaylists.inc.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/mushroom_cup/moo_moo_farm/packed.inc.h>
+#include <courses/moo_moo_farm/course_displaylists.inc.h>
 
 Gfx d_course_moo_moo_farm_packed_dl_0[] =
 {

courses/rainbow_road/course_data.inc.c

@@ -7,7 +7,7 @@
 #include <course.h>
 #include <code_80004740.h>
 
-#include <courses/special_cup/rainbow_road/packed.inc.h>
+#include <courses/rainbow_road/course_displaylists.inc.h>
 
 Gfx d_course_rainbow_road_dl_0[] =
 {

courses/rainbow_road/course_displaylists.inc.c

@@ -4,7 +4,7 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/special_cup/rainbow_road/packed.inc.h>
+#include <courses/rainbow_road/course_displaylists.inc.h>
 
 Gfx d_course_rainbow_road_packed_dl_0[] =
 {

courses/royal_raceway/course_data.inc.c

@@ -6,7 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/star_cup/royal_raceway/packed.inc.h>
+#include <courses/royal_raceway/course_displaylists.inc.h>
 
 Gfx d_course_royal_raceway_dl_0[] =
 {

courses/royal_raceway/course_displaylists.inc.c

@@ -4,7 +4,7 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/star_cup/royal_raceway/packed.inc.h>
+#include <courses/royal_raceway/course_displaylists.inc.h>
 
 Gfx d_course_royal_raceway_packed_dl_0[] =
 {