Remove inc from linked file names (#593)

* Remove inc from linked file names

Makefile

@@ -235,7 +235,9 @@ include $(MAKEFILE_SPLIT)
 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_FILES := $(foreach dir,$(COURSE_DIRS),$(wildcard $(dir)/*.inc.c))
+# Include source files in courses/course_name/files.c but exclude .inc.c files.
+COURSE_FILES := $(foreach dir,$(COURSE_DIRS),$(filter-out %.inc.c,$(wildcard $(dir)/*.c)))
+
 
 # Object files
 O_FILES := \
@@ -475,7 +477,7 @@ $(TEXTURE_FILES_TLUT):
 	$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/$@.inc.c -g $@.png -f $(lastword $(subst ., ,$@)) -s u8 -c $(lastword $(subst ., ,$(subst .$(lastword $(subst ., ,$(TEXTURE_FILES_TLUT))), ,$(TEXTURE_FILES_TLUT)))) -p $(BUILD_DIR)/$@.tlut.inc.c
 
 # common textures
-$(BUILD_DIR)/src/data/common_textures.inc.o: src/data/common_textures.inc.c $(TEXTURE_FILES) $(TEXTURE_FILES_TLUT)
+$(BUILD_DIR)/src/data/common_textures.o: src/data/common_textures.c $(TEXTURE_FILES) $(TEXTURE_FILES_TLUT)
 	@$(PRINT) "$(GREEN)Compiling Common Textures:  $(BLUE)$@ $(NO_COL)\n"
 	@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
 	$(V)$(CC) -c $(CFLAGS) -o $@ $<
@@ -488,7 +490,7 @@ $(BUILD_DIR)/src/data/common_textures.inc.o: src/data/common_textures.inc.c $(TE
 #==============================================================================#
 
 
-%/course_textures.linkonly.c %/course_textures.linkonly.h: %/course_offsets.inc.c
+%/course_textures.linkonly.c %/course_textures.linkonly.h: %/course_offsets.c
 	$(V)$(LINKONLY_GENERATOR) $(lastword $(subst /, ,$*))
 
 # Its unclear why this is necessary. Everything I undesrtand about `make` says that just
@@ -517,7 +519,7 @@ $(COURSE_DISPLAYLIST_OFILES): $(BUILD_DIR)/%/course_displaylists.inc.o: %/course
 # Course Geography Generation                                                  #
 #==============================================================================#
 
-COURSE_GEOGRAPHY_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_geography.inc.mio0.o)
+COURSE_GEOGRAPHY_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_geography.mio0.o)
 
 %/course_vertices.inc.elf: %/course_vertices.inc.o
 	$(V)$(LD) -t -e 0 -Ttext=0F000000 -Map $@.map -o $@ $< --no-check-sections
@@ -530,30 +532,31 @@ COURSE_GEOGRAPHY_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/cou
 	$(V)$(MIO0TOOL) -c $< $@
 
 # 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
+%/course_geography.mio0.s: %/course_vertices.inc.mio0 %/course_displaylists_packed.inc.bin
 	$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_vertex\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" > $@
 
 
+
 #==============================================================================#
 # Course Data Generation                                                       #
 #==============================================================================#
 
-COURSE_DATA_ELFS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_data.inc.elf)
+COURSE_DATA_ELFS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_data.elf)
 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_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_data.mio0.o)
 
-%/course_data.inc.elf: %/course_data.inc.o %/course_displaylists.inc.elf
+%/course_data.elf: %/course_data.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
+%/course_data.bin: %/course_data.elf
 	$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
 
-%/course_data.inc.mio0: %/course_data.inc.bin
+%/course_data.mio0: %/course_data.bin
 	@$(PRINT) "$(GREEN)Compressing Course Data:  $(BLUE)$@ $(NO_COL)\n"
 	$(V)$(MIO0TOOL) -c $< $@
 
-%/course_data.inc.mio0.s: %/course_data.inc.mio0
+%/course_data.mio0.s: %/course_data.mio0
 	$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@
 
 
@@ -619,19 +622,19 @@ endif
 # Compile Trophy and Podium Models                                             #
 #==============================================================================#
 
-LDFLAGS += -R $(BUILD_DIR)/src/ending/ceremony_data.inc.elf
+LDFLAGS += -R $(BUILD_DIR)/src/ending/ceremony_data.elf
 
-%/ceremony_data.inc.elf: %/ceremony_data.inc.o
+%/ceremony_data.elf: %/ceremony_data.o
 	$(V)$(LD) -t -e 0 -Ttext=0B000000 -Map $@.map -o $@ $< --no-check-sections
 
-%/ceremony_data.inc.bin: %/ceremony_data.inc.elf
+%/ceremony_data.bin: %/ceremony_data.elf
 	$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
 
-%/ceremony_data.inc.mio0: %/ceremony_data.inc.bin
+%/ceremony_data.mio0: %/ceremony_data.bin
 	@$(PRINT) "$(GREEN)Compressing Trophy Model:  $(BLUE)$@ $(NO_COL)\n"
 	$(V)$(MIO0TOOL) -c $< $@
 
-%/ceremony_data.inc.mio0.s: %/ceremony_data.inc.mio0
+%/ceremony_data.mio0.s: %/ceremony_data.mio0
 	$(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel ceremony_data\n\n.incbin \"$<\"\n\n.balign 16\nglabel ceremonyData_end\n" > $@
 
 
@@ -639,38 +642,38 @@ LDFLAGS += -R $(BUILD_DIR)/src/ending/ceremony_data.inc.elf
 # Compile Startup Logo                                                         #
 #==============================================================================#
 
-LDFLAGS += -R $(BUILD_DIR)/src/data/startup_logo.inc.elf
+LDFLAGS += -R $(BUILD_DIR)/src/data/startup_logo.elf
 
-%/startup_logo.inc.elf: %/startup_logo.inc.o
+%/startup_logo.elf: %/startup_logo.o
 	$(V)$(LD) -t -e 0 -Ttext=06000000 -Map $@.map -o $@ $< --no-check-sections
 
-%/startup_logo.inc.bin: %/startup_logo.inc.elf
+%/startup_logo.bin: %/startup_logo.elf
 	$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
 
-%/startup_logo.inc.mio0: %/startup_logo.inc.bin
+%/startup_logo.mio0: %/startup_logo.bin
 	@$(PRINT) "$(GREEN)Compressing Startup Logo Model:  $(BLUE)$@ $(NO_COL)\n"
 	$(V)$(MIO0TOOL) -c $< $@
 
-%/startup_logo.inc.mio0.s: %/startup_logo.inc.mio0
+%/startup_logo.mio0.s: %/startup_logo.mio0
 	$(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel startup_logo\n\n.incbin \"$<\"\n\n.balign 16\n\nglabel startupLogo_end\n" > $@
 
 #==============================================================================#
 # Compile Common Textures                                                      #
 #==============================================================================#
 
-LDFLAGS += -R $(BUILD_DIR)/src/data/common_textures.inc.elf
+LDFLAGS += -R $(BUILD_DIR)/src/data/common_textures.elf
 
-%/common_textures.inc.elf: %/common_textures.inc.o
+%/common_textures.elf: %/common_textures.o
 	$(V)$(LD) -t -e 0 -Ttext=0D000000 -Map $@.map -o $@ $< --no-check-sections
 
-%/common_textures.inc.bin: %/common_textures.inc.elf
+%/common_textures.bin: %/common_textures.elf
 	$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
 
-%/common_textures.inc.mio0: %/common_textures.inc.bin
+%/common_textures.mio0: %/common_textures.bin
 	@$(PRINT) "$(GREEN)Compressing Common Textures:  $(BLUE)$@ $(NO_COL)\n"
 	$(V)$(MIO0TOOL) -c $< $@
 
-%/common_textures.inc.mio0.s: %/common_textures.inc.mio0
+%/common_textures.mio0.s: %/common_textures.mio0
 	$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@
 
 
@@ -685,7 +688,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): $(O_FILES) $(COURSE_DATA_TARGETS) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/src/data/startup_logo.inc.mio0.o $(BUILD_DIR)/src/ending/ceremony_data.inc.mio0.o $(BUILD_DIR)/src/data/common_textures.inc.mio0.o $(COURSE_GEOGRAPHY_TARGETS) undefined_syms.txt
+$(ELF): $(O_FILES) $(COURSE_DATA_TARGETS) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/src/data/startup_logo.mio0.o $(BUILD_DIR)/src/ending/ceremony_data.mio0.o $(BUILD_DIR)/src/data/common_textures.mio0.o $(COURSE_GEOGRAPHY_TARGETS) undefined_syms.txt
 	@$(PRINT) "$(GREEN)Linking ELF file:  $(BLUE)$@ $(NO_COL)\n"
 	$(V)$(LD) $(LDFLAGS) -o $@
 

assets/include/blueshell.mk

@@ -22,7 +22,7 @@ $(BLUESHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin
 $(BLUESHELL_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUESHELL_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(BLUESHELL_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(BLUESHELL_PALETTE:%.png=%.inc.c)
 
 $(BLUESHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/bomb.mk

@@ -10,7 +10,7 @@ $(BOMB_DIR)/common_texture_bomb_4.png
 
 BOMB_EXPORT_SENTINEL := $(BOMB_DIR)/.export
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(BOMB_FRAMES:%.png=%.inc.c) $(BOMB_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(BOMB_FRAMES:%.png=%.inc.c) $(BOMB_PALETTE:%.png=%.inc.c)
 
 $(BOMB_FRAMES:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BOMB_PALETTE)

assets/include/character_portraits.mk

@@ -31,8 +31,8 @@ $(PORTRAITS_DIR)/common_texture_portrait_question_mark.png
 
 PORTRAIT_EXPORT_SENTINEL := $(PORTRAITS_DIR)/.export
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(PORTRAIT_PNG:%.png=%.inc.c) $(PORTRAIT_PALETTES:%.png=%.inc.c)
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c) $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(PORTRAIT_PNG:%.png=%.inc.c) $(PORTRAIT_PALETTES:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c) $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c)
 
 $(PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png
 	$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/common_tlut_portrait_$*.png

assets/include/course_previews.mk

@@ -24,7 +24,7 @@ $(COURSE_PREVIEW_DIR)/gTextureCoursePreviewBigDonut.png
 
 COURSE_PREVIEW_EXPORT_SENTINEL := $(COURSE_PREVIEW_DIR)/.export
 
-$(BUILD_DIR)/src/data/textures.inc.o: $(COURSE_PREVIEW_PNG:%.png=%.mio0)
+$(BUILD_DIR)/src/data/textures.o: $(COURSE_PREVIEW_PNG:%.png=%.mio0)
 
 $(COURSE_PREVIEW_PNG:%.png=%.mio0): %.mio0 : %.bin
 	$(MIO0TOOL) -c $< $@

assets/include/courses/banshee_boardwalk.mk

@@ -65,9 +65,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/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)
+$(BUILD_DIR)/courses/banshee_boardwalk/course_data.o: $(BANSHEE_BOARDWALK_BOO_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/courses/banshee_boardwalk/course_data.o: $(BANSHEE_BOARDWALK_BAT_PALETTE:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_FRAMES:%.png=%.inc.c)
+$(BUILD_DIR)/courses/banshee_boardwalk/course_data.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/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)
+$(BUILD_DIR)/courses/bowsers_castle/course_data.o: $(THWOMP_FACE_FRAMES:%.png=%.inc.c) $(THWOMP_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/courses/bowsers_castle/course_data.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/choco_mountain/course_data.inc.o: $(CHOCO_MOUNTAIN_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/choco_mountain/course_data.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/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)
+$(BUILD_DIR)/courses/dks_jungle_parkway/course_data.o: $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/courses/dks_jungle_parkway/course_data.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/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)
+$(BUILD_DIR)/courses/frappe_snowland/course_data.o: $(FRAPPE_SNOWLAND_SNOWMAN_PNG:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOW_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/frappe_snowland/course_data.o: $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOW_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/courses/frappe_snowland/course_data.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/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.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/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)
+$(BUILD_DIR)/courses/koopa_troopa_beach/course_data.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.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/luigi_raceway/course_data.inc.o: $(LUIGI_RACEWAY_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/luigi_raceway/course_data.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/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.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/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)
+$(BUILD_DIR)/courses/moo_moo_farm/course_data.o: $(MOLE_PALETTE:%.png=%.inc.c) $(MOLE_FRAMES:%.png=%.inc.c)
+$(BUILD_DIR)/courses/moo_moo_farm/course_data.o: $(COW_PALETTE_IMPORT:%.png=%.inc.c)
+$(BUILD_DIR)/courses/moo_moo_farm/course_data.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/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)
+$(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_MUSHROOM_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_MARIO_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_BOO_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_CHARACTER_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_MUSHROOM_PALETTES:%.png=%.inc.c)
+$(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_MARIO_PALETTES:%.png=%.inc.c)
+$(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_BOO_PALETTES:%.png=%.inc.c)
+$(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_CHARACTER_PALETTES:%.png=%.inc.c)
+$(BUILD_DIR)/courses/rainbow_road/course_data.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/royal_raceway/course_data.inc.o: $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/courses/royal_raceway/course_data.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/sherbet_land/course_data.inc.o: $(SHERBET_LAND_ICE:%.png=%.inc.c) $(PENGUIN_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/sherbet_land/course_data.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/toads_turnpike/course_data.inc.o: $(TOADS_TURNPIKE_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/toads_turnpike/course_data.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/wario_stadium/course_data.inc.o: $(WARIO_STADIUM_SIGN:%.png=%.inc.c)
+$(BUILD_DIR)/courses/wario_stadium/course_data.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/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)
+$(BUILD_DIR)/courses/yoshi_valley/course_data.o: $(YOSHI_VALLEY_HEDGEHOG_PALETTE:%.png=%.inc.c) $(YOSHI_VALLEY_HEDGEHOG_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/courses/yoshi_valley/course_data.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)

assets/include/debug_font.mk

@@ -6,7 +6,7 @@ DEBUG_FONT_PNG := $(DEBUG_FONT_DIR)/common_texture_debug_font.png
 
 DEBUG_FONT_EXPORT_SENTINEL := $(DEBUG_FONT_DIR)/.export
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(DEBUG_FONT_PNG:%.png=%.inc.c) $(DEBUG_FONT_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(DEBUG_FONT_PNG:%.png=%.inc.c) $(DEBUG_FONT_PALETTE:%.png=%.inc.c)
 
 $(DEBUG_FONT_PNG:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci4 -c rgba16 -p $(DEBUG_FONT_PALETTE)

assets/include/ending_ceremony.mk

@@ -12,7 +12,7 @@ $(ENDING_CEREMONY)/gTexturePodium3.png
 
 ENDING_CEREMONY_EXPORT_SENTINEL := $(ENDING_CEREMONY)/.export
 
-$(BUILD_DIR)/src/ending/ceremony_data.inc.o: $(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/src/ending/ceremony_data.o: $(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c)
 
 $(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/finish_line_banner.mk

@@ -22,7 +22,7 @@ $(FINISH_LINE_BANNER_PNG:%.png=%.mio0): %.mio0 : %.bin
 $(FINISH_LINE_BANNER_PNG:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINISH_LINE_BANNER_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(FINISH_LINE_BANNER_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(FINISH_LINE_BANNER_PALETTE:%.png=%.inc.c)
 
 $(FINISH_LINE_BANNER_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/greenshell.mk

@@ -22,7 +22,7 @@ $(GREENSHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin
 $(GREENSHELL_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(GREENSHELL_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(GREENSHELL_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(GREENSHELL_PALETTE:%.png=%.inc.c)
 
 $(GREENSHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/hud_type_c.mk

@@ -30,9 +30,9 @@ HUD_TYPE_C_PORTRAIT_BORDER_PNG := $(HUD_TYPE_C_DIR)/common_texture_character_por
 
 HUD_TYPE_C_EXPORT_SENTINEL := $(HUD_TYPE_C_DIR)/.export
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(HUD_TYPE_C_FONT_PNG:%.png=%.inc.c) $(HUD_TYPE_C_FONT_PALETTE:%.png=%.inc.c)
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(HUD_TYPE_C_TINY_FONT_PNG:%.png=%.inc.c) $(HUD_TYPE_C_TINY_FONT_PALETTE:%.png=%.inc.c)
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(HUD_TYPE_C_PORTRAIT_BORDER_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(HUD_TYPE_C_FONT_PNG:%.png=%.inc.c) $(HUD_TYPE_C_FONT_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(HUD_TYPE_C_TINY_FONT_PNG:%.png=%.inc.c) $(HUD_TYPE_C_TINY_FONT_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(HUD_TYPE_C_PORTRAIT_BORDER_PNG:%.png=%.inc.c)
 
 $(HUD_TYPE_C_FONT_PNG:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(HUD_TYPE_C_FONT_PALETTE)

assets/include/item_window.mk

@@ -38,7 +38,7 @@ $(ITEM_WINDOW_DIR)/common_texture_item_window_fake_item_box.png
 
 ITEM_WINDOW_EXPORT_SENTINEL := $(ITEM_WINDOW_DIR)/.export
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(ITEM_WINDOW_PNG:%.png=%.inc.c) $(ITEM_WINDOW_PALETTES:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(ITEM_WINDOW_PNG:%.png=%.inc.c) $(ITEM_WINDOW_PALETTES:%.png=%.inc.c)
 
 $(ITEM_WINDOW_DIR)/common_texture_%.inc.c: $(ITEM_WINDOW_DIR)/common_texture_%.png
 	$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(ITEM_WINDOW_DIR)/common_tlut_$*.png

assets/include/lakitu/bluelight.mk

@@ -19,7 +19,7 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(BLUELIGHT_FRAMES:%.png=%.bin)
 $(BLUELIGHT_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUELIGHT_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(BLUELIGHT_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(BLUELIGHT_PALETTE:%.png=%.inc.c)
 
 $(BLUELIGHT_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/lakitu/checkeredflag.mk

@@ -43,7 +43,7 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(CHECKEREDFLAG_FRAMES:%.png=%.bin)
 $(CHECKEREDFLAG_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(CHECKEREDFLAG_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c)
 
 $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/lakitu/finallap.mk

@@ -27,7 +27,7 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FINALLAP_FRAMES:%.png=%.bin)
 $(FINALLAP_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINALLAP_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(FINALLAP_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(FINALLAP_PALETTE:%.png=%.inc.c)
 
 $(FINALLAP_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/lakitu/fishing.mk

@@ -15,7 +15,7 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FISHING_FRAMES:%.png=%.bin)
 $(FISHING_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FISHING_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(FISHING_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(FISHING_PALETTE:%.png=%.inc.c)
 
 $(FISHING_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/lakitu/nolights.mk

@@ -19,7 +19,7 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(NOLIGHTS_FRAMES:%.png=%.bin)
 $(NOLIGHTS_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(NOLIGHTS_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(NOLIGHTS_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(NOLIGHTS_PALETTE:%.png=%.inc.c)
 
 $(NOLIGHTS_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/lakitu/redlights.mk

@@ -27,7 +27,7 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(REDLIGHTS_FRAMES:%.png=%.bin)
 $(REDLIGHTS_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REDLIGHTS_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(REDLIGHTS_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(REDLIGHTS_PALETTE:%.png=%.inc.c)
 
 $(REDLIGHTS_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/lakitu/reverse.mk

@@ -27,7 +27,7 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(REVERSE_FRAMES:%.png=%.bin)
 $(REVERSE_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REVERSE_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(REVERSE_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(REVERSE_PALETTE:%.png=%.inc.c)
 
 $(REVERSE_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/lakitu/secondlap.mk

@@ -27,7 +27,7 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(SECONDLAP_FRAMES:%.png=%.bin)
 $(SECONDLAP_FRAMES:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(SECONDLAP_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(SECONDLAP_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(SECONDLAP_PALETTE:%.png=%.inc.c)
 
 $(SECONDLAP_PALETTE:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/minimap_icons.mk

@@ -14,7 +14,7 @@ $(MINIMAP_ICONS_DIR)/common_texture_minimap_progress_dot.png
 
 MINIMAP_ICONS_EXPORT_SENTINEL := $(MINIMAP_ICONS_DIR)/.export
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(MINIMAP_ICONS_PNG:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(MINIMAP_ICONS_PNG:%.png=%.inc.c)
 
 $(MINIMAP_ICONS_PNG:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/player_emblems.mk

@@ -10,7 +10,7 @@ $(PLAYER_EMBLEM_DIR)/common_texture_player_emblem_4p.png
 
 PLAYER_EMBLEM_EXPORT_SENTINEL := $(PLAYER_EMBLEM_DIR)/.export
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(PLAYER_EMBLEM_PNGS:%.png=%.inc.c) $(PLAYER_EMBLEM_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(PLAYER_EMBLEM_PNGS:%.png=%.inc.c) $(PLAYER_EMBLEM_PALETTE:%.png=%.inc.c)
 
 $(PLAYER_EMBLEM_PNGS:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PLAYER_EMBLEM_PALETTE)

assets/include/startup_logo.mk

@@ -4,7 +4,7 @@ REFLECTION_MAP := $(STARTUP_LOGO)/gTextureReflectionMapGold.png
 
 STARTUP_LOGO_EXPORT_SENTINEL := $(STARTUP_LOGO)/.export
 
-$(BUILD_DIR)/src/data/startup_logo.inc.o: $(REFLECTION_MAP:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/startup_logo.o: $(REFLECTION_MAP:%.png=%.inc.c)
 
 $(REFLECTION_MAP:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/trees.mk

@@ -29,7 +29,7 @@ $(TREES_PNG:%.png=%.mio0): %.mio0 : %.bin
 $(TREES_PNG:%.png=%.bin): %.bin : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(TREES_PALETTE)
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(TREES_PALETTE_IMPORT:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(TREES_PALETTE_IMPORT:%.png=%.inc.c)
 
 $(TREES_PALETTE:%.png=%.inc.c) $(TREES_PALETTE_IMPORT:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16

assets/include/unused_traffic_light.mk

@@ -16,7 +16,7 @@ $(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_10.png
 
 UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL := $(UNUSED_TRAFFIC_LIGHT_DIR)/.export
 
-$(BUILD_DIR)/src/data/common_textures.inc.o: $(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c) $(UNUSED_TRAFFIC_LIGHT_PALETTE:%.png=%.inc.c)
+$(BUILD_DIR)/src/data/common_textures.o: $(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c) $(UNUSED_TRAFFIC_LIGHT_PALETTE:%.png=%.inc.c)
 
 $(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c): %.inc.c : %.png
 	$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(UNUSED_TRAFFIC_LIGHT_PALETTE)

courses/all_course_data.h

@@ -1,25 +1,25 @@
 #ifndef ALL_COURSE_DATA_H
 #define ALL_COURSE_DATA_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"
+#include "courses/big_donut/course_data.h"
+#include "courses/block_fort/course_data.h"
+#include "courses/double_deck/course_data.h"
+#include "courses/skyscraper/course_data.h"
+#include "courses/choco_mountain/course_data.h"
+#include "courses/frappe_snowland/course_data.h"
+#include "courses/mario_raceway/course_data.h"
+#include "courses/toads_turnpike/course_data.h"
+#include "courses/kalimari_desert/course_data.h"
+#include "courses/koopa_troopa_beach/course_data.h"
+#include "courses/luigi_raceway/course_data.h"
+#include "courses/moo_moo_farm/course_data.h"
+#include "courses/banshee_boardwalk/course_data.h"
+#include "courses/dks_jungle_parkway/course_data.h"
+#include "courses/rainbow_road/course_data.h"
+#include "courses/yoshi_valley/course_data.h"
+#include "courses/bowsers_castle/course_data.h"
+#include "courses/royal_raceway/course_data.h"
+#include "courses/sherbet_land/course_data.h"
+#include "courses/wario_stadium/course_data.h"
 
 #endif // ALL_COURSE_DATA_H

courses/banshee_boardwalk/course_data.c

@@ -6,8 +6,7 @@
 #include <waypoints.h>
 #include <course.h>
 
-#include <courses/banshee_boardwalk/course_displaylists.inc.h>
-
+#include "course_displaylists.inc.h"
 Gfx d_course_banshee_boardwalk_dl_0[] =
 {
     gsSPEndDisplayList(),

courses/banshee_boardwalk/course_displaylists.inc.c

@@ -4,8 +4,8 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/banshee_boardwalk/course_displaylists.inc.h>
-#include <courses/banshee_boardwalk/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_banshee_boardwalk_packed_dl_0[] =
 {

courses/banshee_boardwalk/course_offsets.c

@@ -1,7 +1,7 @@
 #include <PR/ultratypes.h>
 #include "PR/gbi.h"
 #include "course_offsets.h"
-#include "courses/banshee_boardwalk/course_data.inc.h"
+#include "courses/banshee_boardwalk/course_data.h"
 
 extern u8 gTexture6447C4[];
 extern u8 gTexture676FB0[];

courses/big_donut/course_data.c

@@ -4,7 +4,7 @@
 #include <PR/gbi.h>
 #include <actor_types.h>
 
-#include <courses/big_donut/course_displaylists.inc.h>
+#include "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,8 +5,8 @@
 #include <course.h>
 #include <types.h>
 
-#include <courses/big_donut/course_displaylists.inc.h>
-#include <courses/big_donut/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_big_donut_packed_dl_0[] =
 {

courses/block_fort/course_data.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <actor_types.h>
 
-#include <courses/block_fort/course_displaylists.inc.h>
+#include "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,8 +4,8 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/block_fort/course_displaylists.inc.h>
-#include <courses/block_fort/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_block_fort_packed_dl_0[] =
 {

courses/bowsers_castle/course_data.c

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

courses/bowsers_castle/course_displaylists.inc.c

@@ -3,8 +3,8 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/bowsers_castle/course_displaylists.inc.h>
-#include <courses/bowsers_castle/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_bowsers_castle_packed_dl_0[] =
 {

courses/bowsers_castle/course_offsets.c

@@ -1,6 +1,6 @@
 #include <PR/ultratypes.h>
 #include "course_offsets.h"
-#include "courses/bowsers_castle/course_data.inc.h"
+#include "course_data.h"
 
 extern u8 gTexture64313C[];
 extern u8 gTexture6528DC[];

courses/choco_mountain/course_data.c

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

courses/choco_mountain/course_displaylists.inc.c

@@ -3,8 +3,8 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/choco_mountain/course_displaylists.inc.h>
-#include <courses/choco_mountain/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_choco_mountain_packed_dl_0[] =
 {

courses/choco_mountain/course_offsets.c

@@ -1,6 +1,6 @@
 #include <PR/ultratypes.h>
 #include "course_offsets.h"
-#include "courses/choco_mountain/course_data.inc.h"
+#include "course_data.h"
 
 extern u8 gTexture64619C[];
 extern u8 gTexture64647C[];

courses/dks_jungle_parkway/course_data.c

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

courses/dks_jungle_parkway/course_displaylists.inc.c

@@ -4,8 +4,8 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/dks_jungle_parkway/course_displaylists.inc.h>
-#include <courses/dks_jungle_parkway/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_dks_jungle_parkway_packed_dl_0[] =
 {

courses/double_deck/course_data.c

@@ -3,7 +3,7 @@
 #include <PR/gbi.h>
 #include <actor_types.h>
 
-#include <courses/double_deck/course_displaylists.inc.h>
+#include "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,8 +4,8 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/double_deck/course_displaylists.inc.h>
-#include <courses/double_deck/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_double_deck_packed_dl_0[] =
 {

courses/frappe_snowland/course_data.c

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

courses/frappe_snowland/course_displaylists.inc.c

@@ -3,8 +3,8 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/frappe_snowland/course_displaylists.inc.h>
-#include <courses/frappe_snowland/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_frappe_snowland_packed_dl_0[] =
 {

courses/kalimari_desert/course_data.c

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

courses/kalimari_desert/course_displaylists.inc.c

@@ -3,8 +3,8 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/kalimari_desert/course_displaylists.inc.h>
-#include <courses/kalimari_desert/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_kalimari_desert_packed_dl_0[] =
 {

courses/kalimari_desert/course_offsets.c

@@ -1,6 +1,6 @@
 #include <PR/ultratypes.h>
 #include "course_offsets.h"
-#include "courses/kalimari_desert/course_data.inc.h"
+#include "course_data.h"
 
 extern u8 gTexture6684F8[];
 extern u8 gTextureSignLuigis0[];

courses/koopa_troopa_beach/course_data.c

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

courses/koopa_troopa_beach/course_displaylists.inc.c

@@ -3,8 +3,8 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/koopa_troopa_beach/course_displaylists.inc.h>
-#include <courses/koopa_troopa_beach/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_koopa_troopa_beach_packed_dl_0[] =
 {

courses/luigi_raceway/course_data.c

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

courses/luigi_raceway/course_displaylists.inc.c

@@ -3,8 +3,8 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/luigi_raceway/course_displaylists.inc.h>
-#include <courses/luigi_raceway/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_luigi_raceway_packed_dl_0[] =
 {

courses/luigi_raceway/course_offsets.c

@@ -1,6 +1,6 @@
 #include <PR/ultratypes.h>
 #include "course_offsets.h"
-#include "courses/luigi_raceway/course_data.inc.h"
+#include "course_data.h"
 
 extern u8 gTextureSignShellShot0[];
 extern u8 gTextureSignShellShot1[];

courses/mario_raceway/course_displaylists.inc.c

@@ -3,8 +3,8 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/mario_raceway/course_displaylists.inc.h>
-#include <courses/mario_raceway/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_mario_raceway_packed_dl_0[] =
 {

courses/mario_raceway/course_offsets.c

@@ -1,6 +1,6 @@
 #include <PR/ultratypes.h>
 #include "course_offsets.h"
-#include "courses/mario_raceway/course_data.inc.h"
+#include "course_data.h"
 
 extern u8 gTextureCheckerboardYellowPink[];
 extern u8 gTexture64619C[];

courses/moo_moo_farm/course_data.c

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

courses/moo_moo_farm/course_displaylists.inc.c

@@ -3,8 +3,8 @@
 #include <PR/gbi.h>
 #include <course.h>
 
-#include <courses/moo_moo_farm/course_displaylists.inc.h>
-#include <courses/moo_moo_farm/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_moo_moo_farm_packed_dl_0[] =
 {

courses/moo_moo_farm/course_offsets.c

@@ -1,6 +1,6 @@
 #include <PR/ultratypes.h>
 #include "course_offsets.h"
-#include "courses/moo_moo_farm/course_data.inc.h"
+#include "course_data.h"
 
 extern u8 gTextureWoodDoor0[];
 extern u8 gTextureGrass2[];

courses/rainbow_road/course_data.c

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

courses/rainbow_road/course_displaylists.inc.c

@@ -4,8 +4,8 @@
 #include <actor_types.h>
 #include <course.h>
 
-#include <courses/rainbow_road/course_displaylists.inc.h>
-#include <courses/rainbow_road/course_textures.linkonly.h>
+#include "course_displaylists.inc.h"
+#include "course_textures.linkonly.h"
 
 Gfx d_course_rainbow_road_packed_dl_0[] =
 {