diff --git a/Makefile b/Makefile index 52682667f..8e8b5748d 100644 --- a/Makefile +++ b/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 $@ diff --git a/assets/include/blueshell.mk b/assets/include/blueshell.mk index 02251ab6a..8eb445627 100644 --- a/assets/include/blueshell.mk +++ b/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 diff --git a/assets/include/bomb.mk b/assets/include/bomb.mk index 54bdf7ce5..0266bf6c6 100644 --- a/assets/include/bomb.mk +++ b/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) diff --git a/assets/include/character_portraits.mk b/assets/include/character_portraits.mk index 7ba69c314..37414f8a8 100644 --- a/assets/include/character_portraits.mk +++ b/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 diff --git a/assets/include/course_previews.mk b/assets/include/course_previews.mk index 1d6f84149..deedcb477 100644 --- a/assets/include/course_previews.mk +++ b/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 $< $@ diff --git a/assets/include/courses/banshee_boardwalk.mk b/assets/include/courses/banshee_boardwalk.mk index 6479abfbc..fc8d675af 100644 --- a/assets/include/courses/banshee_boardwalk.mk +++ b/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) diff --git a/assets/include/courses/bowsers_castle.mk b/assets/include/courses/bowsers_castle.mk index eb4b81a01..15506e1bb 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/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 diff --git a/assets/include/courses/choco_mountain.mk b/assets/include/courses/choco_mountain.mk index cd7efbb4f..c3455aec7 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/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 diff --git a/assets/include/courses/dks_jungle_parkway.mk b/assets/include/courses/dks_jungle_parkway.mk index 88e5cd706..433ef86a6 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/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 diff --git a/assets/include/courses/frappe_snowland.mk b/assets/include/courses/frappe_snowland.mk index b9dd2a139..9f0df49b2 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/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) diff --git a/assets/include/courses/kalimari_desert.mk b/assets/include/courses/kalimari_desert.mk index 879dac2a3..6d447c1a6 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/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 diff --git a/assets/include/courses/koopa_troopa_beach.mk b/assets/include/courses/koopa_troopa_beach.mk index 06fdaa198..790cf8c04 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/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) diff --git a/assets/include/courses/luigi_raceway.mk b/assets/include/courses/luigi_raceway.mk index 1e21e29d2..b43609882 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/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 diff --git a/assets/include/courses/mario_raceway.mk b/assets/include/courses/mario_raceway.mk index 97140fcfc..50ea257a7 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/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 diff --git a/assets/include/courses/moo_moo_farm.mk b/assets/include/courses/moo_moo_farm.mk index 60661f221..45fac3870 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/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) diff --git a/assets/include/courses/rainbow_road.mk b/assets/include/courses/rainbow_road.mk index 682eeb4c6..f10089899 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/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 diff --git a/assets/include/courses/royal_raceway.mk b/assets/include/courses/royal_raceway.mk index b5f48ae91..7013554be 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/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 diff --git a/assets/include/courses/sherbet_land.mk b/assets/include/courses/sherbet_land.mk index 0cb240700..cb7d21b6d 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/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 diff --git a/assets/include/courses/toads_turnpike.mk b/assets/include/courses/toads_turnpike.mk index 3f9613d33..2704e99c2 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/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 diff --git a/assets/include/courses/wario_stadium.mk b/assets/include/courses/wario_stadium.mk index 1d168be9f..6bfb28fc2 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/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 diff --git a/assets/include/courses/yoshi_valley.mk b/assets/include/courses/yoshi_valley.mk index 188cfc3a5..454f9b467 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/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) diff --git a/assets/include/debug_font.mk b/assets/include/debug_font.mk index 99eb902f1..047175d51 100644 --- a/assets/include/debug_font.mk +++ b/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) diff --git a/assets/include/ending_ceremony.mk b/assets/include/ending_ceremony.mk index 758b58ffb..1fcb971b1 100644 --- a/assets/include/ending_ceremony.mk +++ b/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 diff --git a/assets/include/finish_line_banner.mk b/assets/include/finish_line_banner.mk index 08fa6c6f3..504d52545 100644 --- a/assets/include/finish_line_banner.mk +++ b/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 diff --git a/assets/include/greenshell.mk b/assets/include/greenshell.mk index f63e0743f..ba34dbca7 100644 --- a/assets/include/greenshell.mk +++ b/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 diff --git a/assets/include/hud_type_c.mk b/assets/include/hud_type_c.mk index 8041d6080..9c314e725 100644 --- a/assets/include/hud_type_c.mk +++ b/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) diff --git a/assets/include/item_window.mk b/assets/include/item_window.mk index d396f4352..d7042b640 100644 --- a/assets/include/item_window.mk +++ b/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 diff --git a/assets/include/lakitu/bluelight.mk b/assets/include/lakitu/bluelight.mk index eccbaef75..8735c449e 100644 --- a/assets/include/lakitu/bluelight.mk +++ b/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 diff --git a/assets/include/lakitu/checkeredflag.mk b/assets/include/lakitu/checkeredflag.mk index e288914e3..1e1160eaa 100644 --- a/assets/include/lakitu/checkeredflag.mk +++ b/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 diff --git a/assets/include/lakitu/finallap.mk b/assets/include/lakitu/finallap.mk index 51d216c39..2cbd7ced3 100644 --- a/assets/include/lakitu/finallap.mk +++ b/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 diff --git a/assets/include/lakitu/fishing.mk b/assets/include/lakitu/fishing.mk index b7986e069..0c927624e 100644 --- a/assets/include/lakitu/fishing.mk +++ b/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 diff --git a/assets/include/lakitu/nolights.mk b/assets/include/lakitu/nolights.mk index 758f178bb..0094d3c52 100644 --- a/assets/include/lakitu/nolights.mk +++ b/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 diff --git a/assets/include/lakitu/redlights.mk b/assets/include/lakitu/redlights.mk index e39f2e7b5..b34ea7945 100644 --- a/assets/include/lakitu/redlights.mk +++ b/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 diff --git a/assets/include/lakitu/reverse.mk b/assets/include/lakitu/reverse.mk index a4ba4101e..03c88dca3 100644 --- a/assets/include/lakitu/reverse.mk +++ b/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 diff --git a/assets/include/lakitu/secondlap.mk b/assets/include/lakitu/secondlap.mk index 1bb5b6da2..640184a9b 100644 --- a/assets/include/lakitu/secondlap.mk +++ b/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 diff --git a/assets/include/minimap_icons.mk b/assets/include/minimap_icons.mk index e14a8f9f8..554ceab4f 100644 --- a/assets/include/minimap_icons.mk +++ b/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 diff --git a/assets/include/player_emblems.mk b/assets/include/player_emblems.mk index f5f6ae5d7..6c9451e78 100644 --- a/assets/include/player_emblems.mk +++ b/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) diff --git a/assets/include/startup_logo.mk b/assets/include/startup_logo.mk index 2a16f3ad4..b8c70d485 100644 --- a/assets/include/startup_logo.mk +++ b/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 diff --git a/assets/include/trees.mk b/assets/include/trees.mk index 238797cf1..7c60c4bdc 100644 --- a/assets/include/trees.mk +++ b/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 diff --git a/assets/include/unused_traffic_light.mk b/assets/include/unused_traffic_light.mk index 4608e903d..54021a70d 100644 --- a/assets/include/unused_traffic_light.mk +++ b/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) diff --git a/courses/all_course_data.h b/courses/all_course_data.h index 3a2c16f56..bde518b5a 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/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 diff --git a/courses/banshee_boardwalk/course_data.inc.c b/courses/banshee_boardwalk/course_data.c similarity index 99% rename from courses/banshee_boardwalk/course_data.inc.c rename to courses/banshee_boardwalk/course_data.c index 86b668e0f..69de3a934 100644 --- a/courses/banshee_boardwalk/course_data.inc.c +++ b/courses/banshee_boardwalk/course_data.c @@ -6,8 +6,7 @@ #include #include -#include - +#include "course_displaylists.inc.h" Gfx d_course_banshee_boardwalk_dl_0[] = { gsSPEndDisplayList(), diff --git a/courses/banshee_boardwalk/course_data.inc.h b/courses/banshee_boardwalk/course_data.h similarity index 100% rename from courses/banshee_boardwalk/course_data.inc.h rename to courses/banshee_boardwalk/course_data.h diff --git a/courses/banshee_boardwalk/course_displaylists.inc.c b/courses/banshee_boardwalk/course_displaylists.inc.c index 510fb055a..381f746f0 100644 --- a/courses/banshee_boardwalk/course_displaylists.inc.c +++ b/courses/banshee_boardwalk/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_banshee_boardwalk_packed_dl_0[] = { diff --git a/courses/banshee_boardwalk/course_offsets.inc.c b/courses/banshee_boardwalk/course_offsets.c similarity index 99% rename from courses/banshee_boardwalk/course_offsets.inc.c rename to courses/banshee_boardwalk/course_offsets.c index a1dac3d5d..39c00b570 100644 --- a/courses/banshee_boardwalk/course_offsets.inc.c +++ b/courses/banshee_boardwalk/course_offsets.c @@ -1,7 +1,7 @@ #include #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[]; diff --git a/courses/big_donut/course_data.inc.c b/courses/big_donut/course_data.c similarity index 96% rename from courses/big_donut/course_data.inc.c rename to courses/big_donut/course_data.c index 73d10ad48..4909ad5b8 100644 --- a/courses/big_donut/course_data.inc.c +++ b/courses/big_donut/course_data.c @@ -4,7 +4,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_big_donut_dl[] = { gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), diff --git a/courses/big_donut/course_data.inc.h b/courses/big_donut/course_data.h similarity index 100% rename from courses/big_donut/course_data.inc.h rename to courses/big_donut/course_data.h diff --git a/courses/big_donut/course_displaylists.inc.c b/courses/big_donut/course_displaylists.inc.c index 12c4caf77..f5184e620 100644 --- a/courses/big_donut/course_displaylists.inc.c +++ b/courses/big_donut/course_displaylists.inc.c @@ -5,8 +5,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_big_donut_packed_dl_0[] = { diff --git a/courses/big_donut/course_offsets.inc.c b/courses/big_donut/course_offsets.c similarity index 100% rename from courses/big_donut/course_offsets.inc.c rename to courses/big_donut/course_offsets.c diff --git a/courses/block_fort/course_data.inc.c b/courses/block_fort/course_data.c similarity index 96% rename from courses/block_fort/course_data.inc.c rename to courses/block_fort/course_data.c index 630519013..de1cda9bd 100644 --- a/courses/block_fort/course_data.inc.c +++ b/courses/block_fort/course_data.c @@ -3,7 +3,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_block_fort_dl[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), diff --git a/courses/block_fort/course_data.inc.h b/courses/block_fort/course_data.h similarity index 100% rename from courses/block_fort/course_data.inc.h rename to courses/block_fort/course_data.h diff --git a/courses/block_fort/course_displaylists.inc.c b/courses/block_fort/course_displaylists.inc.c index 9bb4be9ce..762604b3d 100644 --- a/courses/block_fort/course_displaylists.inc.c +++ b/courses/block_fort/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_block_fort_packed_dl_0[] = { diff --git a/courses/block_fort/course_offsets.inc.c b/courses/block_fort/course_offsets.c similarity index 100% rename from courses/block_fort/course_offsets.inc.c rename to courses/block_fort/course_offsets.c diff --git a/courses/bowsers_castle/course_data.inc.c b/courses/bowsers_castle/course_data.c similarity index 99% rename from courses/bowsers_castle/course_data.inc.c rename to courses/bowsers_castle/course_data.c index 8afc7bf7b..55360bb7f 100644 --- a/courses/bowsers_castle/course_data.inc.c +++ b/courses/bowsers_castle/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_bowsers_castle_dl_0[] = { diff --git a/courses/bowsers_castle/course_data.inc.h b/courses/bowsers_castle/course_data.h similarity index 100% rename from courses/bowsers_castle/course_data.inc.h rename to courses/bowsers_castle/course_data.h diff --git a/courses/bowsers_castle/course_displaylists.inc.c b/courses/bowsers_castle/course_displaylists.inc.c index 5973cb063..7162aedff 100644 --- a/courses/bowsers_castle/course_displaylists.inc.c +++ b/courses/bowsers_castle/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_bowsers_castle_packed_dl_0[] = { diff --git a/courses/bowsers_castle/course_offsets.inc.c b/courses/bowsers_castle/course_offsets.c similarity index 99% rename from courses/bowsers_castle/course_offsets.inc.c rename to courses/bowsers_castle/course_offsets.c index bcb381d9c..3d840e873 100644 --- a/courses/bowsers_castle/course_offsets.inc.c +++ b/courses/bowsers_castle/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/bowsers_castle/course_data.inc.h" +#include "course_data.h" extern u8 gTexture64313C[]; extern u8 gTexture6528DC[]; diff --git a/courses/choco_mountain/course_data.inc.c b/courses/choco_mountain/course_data.c similarity index 99% rename from courses/choco_mountain/course_data.inc.c rename to courses/choco_mountain/course_data.c index 091674118..72e927c6e 100644 --- a/courses/choco_mountain/course_data.inc.c +++ b/courses/choco_mountain/course_data.c @@ -5,7 +5,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_choco_mountain_dl_0[] = { diff --git a/courses/choco_mountain/course_data.inc.h b/courses/choco_mountain/course_data.h similarity index 100% rename from courses/choco_mountain/course_data.inc.h rename to courses/choco_mountain/course_data.h diff --git a/courses/choco_mountain/course_displaylists.inc.c b/courses/choco_mountain/course_displaylists.inc.c index 674618e03..acf65bcdb 100644 --- a/courses/choco_mountain/course_displaylists.inc.c +++ b/courses/choco_mountain/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_choco_mountain_packed_dl_0[] = { diff --git a/courses/choco_mountain/course_offsets.inc.c b/courses/choco_mountain/course_offsets.c similarity index 99% rename from courses/choco_mountain/course_offsets.inc.c rename to courses/choco_mountain/course_offsets.c index 29efe563c..6ccb45107 100644 --- a/courses/choco_mountain/course_offsets.inc.c +++ b/courses/choco_mountain/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/choco_mountain/course_data.inc.h" +#include "course_data.h" extern u8 gTexture64619C[]; extern u8 gTexture64647C[]; diff --git a/courses/courseTable.inc.c b/courses/courseTable.c similarity index 100% rename from courses/courseTable.inc.c rename to courses/courseTable.c diff --git a/courses/dks_jungle_parkway/course_data.inc.c b/courses/dks_jungle_parkway/course_data.c similarity index 99% rename from courses/dks_jungle_parkway/course_data.inc.c rename to courses/dks_jungle_parkway/course_data.c index 2aaa92e74..9fb5b2807 100644 --- a/courses/dks_jungle_parkway/course_data.inc.c +++ b/courses/dks_jungle_parkway/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_dks_jungle_parkway_dl_0[] = { diff --git a/courses/dks_jungle_parkway/course_data.inc.h b/courses/dks_jungle_parkway/course_data.h similarity index 100% rename from courses/dks_jungle_parkway/course_data.inc.h rename to courses/dks_jungle_parkway/course_data.h diff --git a/courses/dks_jungle_parkway/course_displaylists.inc.c b/courses/dks_jungle_parkway/course_displaylists.inc.c index 93633aa0c..2b789d787 100644 --- a/courses/dks_jungle_parkway/course_displaylists.inc.c +++ b/courses/dks_jungle_parkway/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_dks_jungle_parkway_packed_dl_0[] = { diff --git a/courses/dks_jungle_parkway/course_offsets.inc.c b/courses/dks_jungle_parkway/course_offsets.c similarity index 100% rename from courses/dks_jungle_parkway/course_offsets.inc.c rename to courses/dks_jungle_parkway/course_offsets.c diff --git a/courses/double_deck/course_data.inc.c b/courses/double_deck/course_data.c similarity index 96% rename from courses/double_deck/course_data.inc.c rename to courses/double_deck/course_data.c index 38da49b43..6a3b3294a 100644 --- a/courses/double_deck/course_data.inc.c +++ b/courses/double_deck/course_data.c @@ -3,7 +3,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_double_deck_dl[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), diff --git a/courses/double_deck/course_data.inc.h b/courses/double_deck/course_data.h similarity index 100% rename from courses/double_deck/course_data.inc.h rename to courses/double_deck/course_data.h diff --git a/courses/double_deck/course_displaylists.inc.c b/courses/double_deck/course_displaylists.inc.c index d45ab2bdb..a82236ba8 100644 --- a/courses/double_deck/course_displaylists.inc.c +++ b/courses/double_deck/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_double_deck_packed_dl_0[] = { diff --git a/courses/double_deck/course_offsets.inc.c b/courses/double_deck/course_offsets.c similarity index 100% rename from courses/double_deck/course_offsets.inc.c rename to courses/double_deck/course_offsets.c diff --git a/courses/frappe_snowland/course_data.inc.c b/courses/frappe_snowland/course_data.c similarity index 99% rename from courses/frappe_snowland/course_data.inc.c rename to courses/frappe_snowland/course_data.c index 942e3e25d..08b5a7872 100644 --- a/courses/frappe_snowland/course_data.inc.c +++ b/courses/frappe_snowland/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_frappe_snowland_dl_0[] = { diff --git a/courses/frappe_snowland/course_data.inc.h b/courses/frappe_snowland/course_data.h similarity index 100% rename from courses/frappe_snowland/course_data.inc.h rename to courses/frappe_snowland/course_data.h diff --git a/courses/frappe_snowland/course_displaylists.inc.c b/courses/frappe_snowland/course_displaylists.inc.c index f2c4dd288..2f8c18f2e 100644 --- a/courses/frappe_snowland/course_displaylists.inc.c +++ b/courses/frappe_snowland/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_frappe_snowland_packed_dl_0[] = { diff --git a/courses/frappe_snowland/course_offsets.inc.c b/courses/frappe_snowland/course_offsets.c similarity index 100% rename from courses/frappe_snowland/course_offsets.inc.c rename to courses/frappe_snowland/course_offsets.c diff --git a/courses/kalimari_desert/course_data.inc.c b/courses/kalimari_desert/course_data.c similarity index 99% rename from courses/kalimari_desert/course_data.inc.c rename to courses/kalimari_desert/course_data.c index e9f9efd9e..ed591a654 100644 --- a/courses/kalimari_desert/course_data.inc.c +++ b/courses/kalimari_desert/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_kalimari_desert_dl_0[] = { diff --git a/courses/kalimari_desert/course_data.inc.h b/courses/kalimari_desert/course_data.h similarity index 100% rename from courses/kalimari_desert/course_data.inc.h rename to courses/kalimari_desert/course_data.h diff --git a/courses/kalimari_desert/course_displaylists.inc.c b/courses/kalimari_desert/course_displaylists.inc.c index 0e8bb02df..c7d76edc4 100644 --- a/courses/kalimari_desert/course_displaylists.inc.c +++ b/courses/kalimari_desert/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_kalimari_desert_packed_dl_0[] = { diff --git a/courses/kalimari_desert/course_offsets.inc.c b/courses/kalimari_desert/course_offsets.c similarity index 99% rename from courses/kalimari_desert/course_offsets.inc.c rename to courses/kalimari_desert/course_offsets.c index 461a1df9c..08bd004a1 100644 --- a/courses/kalimari_desert/course_offsets.inc.c +++ b/courses/kalimari_desert/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/kalimari_desert/course_data.inc.h" +#include "course_data.h" extern u8 gTexture6684F8[]; extern u8 gTextureSignLuigis0[]; diff --git a/courses/koopa_troopa_beach/course_data.inc.c b/courses/koopa_troopa_beach/course_data.c similarity index 99% rename from courses/koopa_troopa_beach/course_data.inc.c rename to courses/koopa_troopa_beach/course_data.c index 52bbfa504..25e28ce8b 100644 --- a/courses/koopa_troopa_beach/course_data.inc.c +++ b/courses/koopa_troopa_beach/course_data.c @@ -7,7 +7,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_koopa_troopa_beach_dl_0[] = { diff --git a/courses/koopa_troopa_beach/course_data.inc.h b/courses/koopa_troopa_beach/course_data.h similarity index 100% rename from courses/koopa_troopa_beach/course_data.inc.h rename to courses/koopa_troopa_beach/course_data.h diff --git a/courses/koopa_troopa_beach/course_displaylists.inc.c b/courses/koopa_troopa_beach/course_displaylists.inc.c index cda5897ac..27ad79b3f 100644 --- a/courses/koopa_troopa_beach/course_displaylists.inc.c +++ b/courses/koopa_troopa_beach/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_koopa_troopa_beach_packed_dl_0[] = { diff --git a/courses/koopa_troopa_beach/course_offsets.inc.c b/courses/koopa_troopa_beach/course_offsets.c similarity index 100% rename from courses/koopa_troopa_beach/course_offsets.inc.c rename to courses/koopa_troopa_beach/course_offsets.c diff --git a/courses/luigi_raceway/course_data.inc.c b/courses/luigi_raceway/course_data.c similarity index 99% rename from courses/luigi_raceway/course_data.inc.c rename to courses/luigi_raceway/course_data.c index aab51fca6..a496c7848 100644 --- a/courses/luigi_raceway/course_data.inc.c +++ b/courses/luigi_raceway/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_luigi_raceway_dl_0[] = { diff --git a/courses/luigi_raceway/course_data.inc.h b/courses/luigi_raceway/course_data.h similarity index 100% rename from courses/luigi_raceway/course_data.inc.h rename to courses/luigi_raceway/course_data.h diff --git a/courses/luigi_raceway/course_displaylists.inc.c b/courses/luigi_raceway/course_displaylists.inc.c index 9985dd11c..e61eae27f 100644 --- a/courses/luigi_raceway/course_displaylists.inc.c +++ b/courses/luigi_raceway/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_luigi_raceway_packed_dl_0[] = { diff --git a/courses/luigi_raceway/course_offsets.inc.c b/courses/luigi_raceway/course_offsets.c similarity index 99% rename from courses/luigi_raceway/course_offsets.inc.c rename to courses/luigi_raceway/course_offsets.c index c3c4364f9..ac95af599 100644 --- a/courses/luigi_raceway/course_offsets.inc.c +++ b/courses/luigi_raceway/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/luigi_raceway/course_data.inc.h" +#include "course_data.h" extern u8 gTextureSignShellShot0[]; extern u8 gTextureSignShellShot1[]; diff --git a/courses/luigi_raceway/staff_ghost.incl.c b/courses/luigi_raceway/staff_ghost.inc.c similarity index 100% rename from courses/luigi_raceway/staff_ghost.incl.c rename to courses/luigi_raceway/staff_ghost.inc.c diff --git a/courses/mario_raceway/course_data.inc.c b/courses/mario_raceway/course_data.c similarity index 100% rename from courses/mario_raceway/course_data.inc.c rename to courses/mario_raceway/course_data.c diff --git a/courses/mario_raceway/course_data.inc.h b/courses/mario_raceway/course_data.h similarity index 100% rename from courses/mario_raceway/course_data.inc.h rename to courses/mario_raceway/course_data.h diff --git a/courses/mario_raceway/course_displaylists.inc.c b/courses/mario_raceway/course_displaylists.inc.c index b81b009b2..750285deb 100644 --- a/courses/mario_raceway/course_displaylists.inc.c +++ b/courses/mario_raceway/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_mario_raceway_packed_dl_0[] = { diff --git a/courses/mario_raceway/course_offsets.inc.c b/courses/mario_raceway/course_offsets.c similarity index 99% rename from courses/mario_raceway/course_offsets.inc.c rename to courses/mario_raceway/course_offsets.c index 60b9cef90..87d3e0f3a 100644 --- a/courses/mario_raceway/course_offsets.inc.c +++ b/courses/mario_raceway/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/mario_raceway/course_data.inc.h" +#include "course_data.h" extern u8 gTextureCheckerboardYellowPink[]; extern u8 gTexture64619C[]; diff --git a/courses/mario_raceway/staff_ghost.incl.c b/courses/mario_raceway/staff_ghost.inc.c similarity index 100% rename from courses/mario_raceway/staff_ghost.incl.c rename to courses/mario_raceway/staff_ghost.inc.c diff --git a/courses/moo_moo_farm/course_data.inc.c b/courses/moo_moo_farm/course_data.c similarity index 99% rename from courses/moo_moo_farm/course_data.inc.c rename to courses/moo_moo_farm/course_data.c index 1d0c2a3ab..74936e9c5 100644 --- a/courses/moo_moo_farm/course_data.inc.c +++ b/courses/moo_moo_farm/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_moo_moo_farm_dl_0[] = { diff --git a/courses/moo_moo_farm/course_data.inc.h b/courses/moo_moo_farm/course_data.h similarity index 100% rename from courses/moo_moo_farm/course_data.inc.h rename to courses/moo_moo_farm/course_data.h diff --git a/courses/moo_moo_farm/course_displaylists.inc.c b/courses/moo_moo_farm/course_displaylists.inc.c index 74f8dff19..c4ae8da5d 100644 --- a/courses/moo_moo_farm/course_displaylists.inc.c +++ b/courses/moo_moo_farm/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_moo_moo_farm_packed_dl_0[] = { diff --git a/courses/moo_moo_farm/course_offsets.inc.c b/courses/moo_moo_farm/course_offsets.c similarity index 99% rename from courses/moo_moo_farm/course_offsets.inc.c rename to courses/moo_moo_farm/course_offsets.c index f75b5dd65..e31b570e4 100644 --- a/courses/moo_moo_farm/course_offsets.inc.c +++ b/courses/moo_moo_farm/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/moo_moo_farm/course_data.inc.h" +#include "course_data.h" extern u8 gTextureWoodDoor0[]; extern u8 gTextureGrass2[]; diff --git a/courses/rainbow_road/course_data.inc.c b/courses/rainbow_road/course_data.c similarity index 99% rename from courses/rainbow_road/course_data.inc.c rename to courses/rainbow_road/course_data.c index fddda29c0..baca547cf 100644 --- a/courses/rainbow_road/course_data.inc.c +++ b/courses/rainbow_road/course_data.c @@ -7,7 +7,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_rainbow_road_dl_0[] = { diff --git a/courses/rainbow_road/course_data.inc.h b/courses/rainbow_road/course_data.h similarity index 100% rename from courses/rainbow_road/course_data.inc.h rename to courses/rainbow_road/course_data.h diff --git a/courses/rainbow_road/course_displaylists.inc.c b/courses/rainbow_road/course_displaylists.inc.c index 219e90609..4ffe95176 100644 --- a/courses/rainbow_road/course_displaylists.inc.c +++ b/courses/rainbow_road/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_rainbow_road_packed_dl_0[] = { diff --git a/courses/rainbow_road/course_offsets.inc.c b/courses/rainbow_road/course_offsets.c similarity index 100% rename from courses/rainbow_road/course_offsets.inc.c rename to courses/rainbow_road/course_offsets.c diff --git a/courses/royal_raceway/course_data.inc.c b/courses/royal_raceway/course_data.c similarity index 99% rename from courses/royal_raceway/course_data.inc.c rename to courses/royal_raceway/course_data.c index 3e6ff3a97..4e7e1a7b8 100644 --- a/courses/royal_raceway/course_data.inc.c +++ b/courses/royal_raceway/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_royal_raceway_dl_0[] = { diff --git a/courses/royal_raceway/course_data.inc.h b/courses/royal_raceway/course_data.h similarity index 100% rename from courses/royal_raceway/course_data.inc.h rename to courses/royal_raceway/course_data.h diff --git a/courses/royal_raceway/course_displaylists.inc.c b/courses/royal_raceway/course_displaylists.inc.c index 65ec339df..a51c7ca58 100644 --- a/courses/royal_raceway/course_displaylists.inc.c +++ b/courses/royal_raceway/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_royal_raceway_packed_dl_0[] = { diff --git a/courses/royal_raceway/course_offsets.inc.c b/courses/royal_raceway/course_offsets.c similarity index 99% rename from courses/royal_raceway/course_offsets.inc.c rename to courses/royal_raceway/course_offsets.c index 101713e62..8b74e33be 100644 --- a/courses/royal_raceway/course_offsets.inc.c +++ b/courses/royal_raceway/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/royal_raceway/course_data.inc.h" +#include "course_data.h" extern u8 gTexture64619C[]; extern u8 gTexture645134[]; diff --git a/courses/royal_raceway/staff_ghost.incl.c b/courses/royal_raceway/staff_ghost.inc.c similarity index 100% rename from courses/royal_raceway/staff_ghost.incl.c rename to courses/royal_raceway/staff_ghost.inc.c diff --git a/courses/sherbet_land/course_data.inc.c b/courses/sherbet_land/course_data.c similarity index 99% rename from courses/sherbet_land/course_data.inc.c rename to courses/sherbet_land/course_data.c index a04c06bdf..264e19aae 100644 --- a/courses/sherbet_land/course_data.inc.c +++ b/courses/sherbet_land/course_data.c @@ -7,7 +7,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_sherbet_land_dl_0[] = { diff --git a/courses/sherbet_land/course_data.inc.h b/courses/sherbet_land/course_data.h similarity index 100% rename from courses/sherbet_land/course_data.inc.h rename to courses/sherbet_land/course_data.h diff --git a/courses/sherbet_land/course_displaylists.inc.c b/courses/sherbet_land/course_displaylists.inc.c index 2c1b0f0aa..6e7416e68 100644 --- a/courses/sherbet_land/course_displaylists.inc.c +++ b/courses/sherbet_land/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_sherbet_land_packed_dl_0[] = { diff --git a/courses/sherbet_land/course_offsets.inc.c b/courses/sherbet_land/course_offsets.c similarity index 99% rename from courses/sherbet_land/course_offsets.inc.c rename to courses/sherbet_land/course_offsets.c index 30af625fd..a55981bdf 100644 --- a/courses/sherbet_land/course_offsets.inc.c +++ b/courses/sherbet_land/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/sherbet_land/course_data.inc.h" +#include "course_data.h" extern u8 gTexture643B3C[]; extern u8 gTexture66D024[]; diff --git a/courses/skyscraper/course_data.inc.c b/courses/skyscraper/course_data.c similarity index 97% rename from courses/skyscraper/course_data.inc.c rename to courses/skyscraper/course_data.c index b3c8592fb..03c5e996e 100644 --- a/courses/skyscraper/course_data.inc.c +++ b/courses/skyscraper/course_data.c @@ -3,7 +3,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_skyscraper_dl[] = { gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), diff --git a/courses/skyscraper/course_data.inc.h b/courses/skyscraper/course_data.h similarity index 100% rename from courses/skyscraper/course_data.inc.h rename to courses/skyscraper/course_data.h diff --git a/courses/skyscraper/course_displaylists.inc.c b/courses/skyscraper/course_displaylists.inc.c index 109d93d32..0294b58f2 100644 --- a/courses/skyscraper/course_displaylists.inc.c +++ b/courses/skyscraper/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_skyscraper_packed_dl_0[] = { diff --git a/courses/skyscraper/course_offsets.inc.c b/courses/skyscraper/course_offsets.c similarity index 100% rename from courses/skyscraper/course_offsets.inc.c rename to courses/skyscraper/course_offsets.c diff --git a/courses/staff_ghosts.inc.c b/courses/staff_ghost_data.c similarity index 74% rename from courses/staff_ghosts.inc.c rename to courses/staff_ghost_data.c index a7f7e4907..47691c058 100644 --- a/courses/staff_ghosts.inc.c +++ b/courses/staff_ghost_data.c @@ -9,15 +9,15 @@ */ StaffGhost d_mario_raceway_staff_ghost[] = { - #include "courses/mario_raceway/staff_ghost.incl.c" + #include "courses/mario_raceway/staff_ghost.inc.c" }; StaffGhost d_luigi_raceway_staff_ghost[1046] = { - #include "courses/luigi_raceway/staff_ghost.incl.c" + #include "courses/luigi_raceway/staff_ghost.inc.c" }; StaffGhost d_royal_raceway_staff_ghost[] = { - #include "courses/royal_raceway/staff_ghost.incl.c" + #include "courses/royal_raceway/staff_ghost.inc.c" }; // Unknown data. Perhaps colour or lights diff --git a/courses/toads_turnpike/course_data.inc.c b/courses/toads_turnpike/course_data.c similarity index 99% rename from courses/toads_turnpike/course_data.inc.c rename to courses/toads_turnpike/course_data.c index 8ac66bca6..709ddf1ac 100644 --- a/courses/toads_turnpike/course_data.inc.c +++ b/courses/toads_turnpike/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_toads_turnpike_dl_0[] = { diff --git a/courses/toads_turnpike/course_data.inc.h b/courses/toads_turnpike/course_data.h similarity index 100% rename from courses/toads_turnpike/course_data.inc.h rename to courses/toads_turnpike/course_data.h diff --git a/courses/toads_turnpike/course_displaylists.inc.c b/courses/toads_turnpike/course_displaylists.inc.c index 22f07ce38..9c6705620 100644 --- a/courses/toads_turnpike/course_displaylists.inc.c +++ b/courses/toads_turnpike/course_displaylists.inc.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_toads_turnpike_packed_dl_0[] = { diff --git a/courses/toads_turnpike/course_offsets.inc.c b/courses/toads_turnpike/course_offsets.c similarity index 99% rename from courses/toads_turnpike/course_offsets.inc.c rename to courses/toads_turnpike/course_offsets.c index 816edc27d..d8136403f 100644 --- a/courses/toads_turnpike/course_offsets.inc.c +++ b/courses/toads_turnpike/course_offsets.c @@ -2,7 +2,7 @@ #include #include "common_textures.h" #include "course_offsets.h" -#include "courses/toads_turnpike/course_data.inc.h" +#include "course_data.h" extern u8 gTexture645134[]; extern u8 gTexture64FE68[]; diff --git a/courses/wario_stadium/course_data.inc.c b/courses/wario_stadium/course_data.c similarity index 99% rename from courses/wario_stadium/course_data.inc.c rename to courses/wario_stadium/course_data.c index 33d3e8e17..2854cfdad 100644 --- a/courses/wario_stadium/course_data.inc.c +++ b/courses/wario_stadium/course_data.c @@ -6,7 +6,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_wario_stadium_dl_0[] = { diff --git a/courses/wario_stadium/course_data.inc.h b/courses/wario_stadium/course_data.h similarity index 100% rename from courses/wario_stadium/course_data.inc.h rename to courses/wario_stadium/course_data.h diff --git a/courses/wario_stadium/course_displaylists.inc.c b/courses/wario_stadium/course_displaylists.inc.c index 47ab2f306..1b0b71ab9 100644 --- a/courses/wario_stadium/course_displaylists.inc.c +++ b/courses/wario_stadium/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_wario_stadium_packed_dl_0[] = { diff --git a/courses/wario_stadium/course_offsets.inc.c b/courses/wario_stadium/course_offsets.c similarity index 99% rename from courses/wario_stadium/course_offsets.inc.c rename to courses/wario_stadium/course_offsets.c index a911d4bf6..ec01ebe9f 100644 --- a/courses/wario_stadium/course_offsets.inc.c +++ b/courses/wario_stadium/course_offsets.c @@ -1,6 +1,6 @@ #include #include "course_offsets.h" -#include "courses/wario_stadium/course_data.inc.h" +#include "course_data.h" extern u8 gTexture67F15C[]; extern u8 gTexture67F450[]; diff --git a/courses/yoshi_valley/course_data.inc.c b/courses/yoshi_valley/course_data.c similarity index 99% rename from courses/yoshi_valley/course_data.inc.c rename to courses/yoshi_valley/course_data.c index f0cbeaaa9..ddac83046 100644 --- a/courses/yoshi_valley/course_data.inc.c +++ b/courses/yoshi_valley/course_data.c @@ -7,7 +7,7 @@ #include #include -#include +#include "course_displaylists.inc.h" Gfx d_course_yoshi_valley_dl_0[] = { diff --git a/courses/yoshi_valley/course_data.inc.h b/courses/yoshi_valley/course_data.h similarity index 100% rename from courses/yoshi_valley/course_data.inc.h rename to courses/yoshi_valley/course_data.h diff --git a/courses/yoshi_valley/course_displaylists.inc.c b/courses/yoshi_valley/course_displaylists.inc.c index 29c7b953a..c1efa0f59 100644 --- a/courses/yoshi_valley/course_displaylists.inc.c +++ b/courses/yoshi_valley/course_displaylists.inc.c @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "course_displaylists.inc.h" +#include "course_textures.linkonly.h" Gfx d_course_yoshi_valley_packed_dl_0[] = { diff --git a/courses/yoshi_valley/course_offsets.inc.c b/courses/yoshi_valley/course_offsets.c similarity index 100% rename from courses/yoshi_valley/course_offsets.inc.c rename to courses/yoshi_valley/course_offsets.c diff --git a/docs/basics/controlflow.md b/docs/basics/controlflow.md index d53d46357..1790244c8 100644 --- a/docs/basics/controlflow.md +++ b/docs/basics/controlflow.md @@ -67,7 +67,7 @@ Racing segment loads after selecting a grand prix. Note that it is always reload |---|---| |[menus](@ref menus.c)| Menu related code | |[save](@ref save.c)| Save related | -|[startup_logo](@ref data/startup_logo.inc.c)|Startup logo| +|[startup_logo](@ref data/startup_logo.c)|Startup logo| ## Players Player related code resides in @@ -100,16 +100,16 @@ Course related code resides in |---|---| |[memory](@ref memory.c)| Loads and extracts course data| |[render_courses](@ref render_courses.c)|Renders course content| -|[common_textures](@ref common_textures.inc.c)|Content accessible to every course such as items and portraits| +|[common_textures](@ref common_textures.c)|Content accessible to every course such as items and portraits| ### Course Folder [course folder link][@ref courses] |file|desc| |---|---| -|courses/course_name/course_data.inc.c|Course data| +|courses/course_name/course_data.c|Course data| |courses/course_name/course_vertices.inc.c|Course vertices (this + _displaylists.inc.c makes the course geography)| |courses/course_name/course_displaylists.inc.c|Course displaylists (these get compressed during compile)| -|courses/course_name/course_offsets.inc.c|Textures used in the course| +|courses/course_name/course_offsets.c|Textures used in the course| ## UI & Other 2D Screen data |file|desc| @@ -134,5 +134,5 @@ Math related code resides in |---|---| |[ceremony_and_credits](@ref ceremony_and_credits.c)|Camera rails for podium ceremony and credits| |[podium_ceremony_actors](@ref podium_ceremony_actors.c)|Fireworks and balloons for podium ceremony| -|[ceremony_data](@ref ceremony_data.inc.c)|Trophies and podium models. Paths.| +|[ceremony_data](@ref ceremony_data.c)|Trophies and podium models. Paths.| |[credits](@ref credits.c)|Credits text and UI positions| diff --git a/include/PR/gbi.h b/include/PR/gbi.h index 6680268e8..a1b8eb0c0 100644 --- a/include/PR/gbi.h +++ b/include/PR/gbi.h @@ -2169,7 +2169,7 @@ typedef union { // Early revision of quadrangle command uses G_QUAD instead of G_TRI2. // It does not have a flag argument, this was added for compatibility. -// MK64: Appears to only be used in startup_logo.inc.c +// MK64: Appears to only be used in startup_logo.c #ifdef F3D_OLD /*** *** 1 Quadrangle diff --git a/include/actor_types.h b/include/actor_types.h index 1579a5300..050d96132 100644 --- a/include/actor_types.h +++ b/include/actor_types.h @@ -72,7 +72,7 @@ enum ActorType { ACTOR_BLUE_SPINY_SHELL, ACTOR_HOT_AIR_BALLOON_ITEM_BOX, ACTOR_CAR, - ACTOR_KIWANO_FRUIT, + ACTOR_KIWANO_FRUIT }; #define ACTOR_LIST_SIZE 100 @@ -91,7 +91,7 @@ enum ShellState { TRIPLE_RED_SHELL, // Loses triple shell state when shot. DESTROYED_SHELL, // Collision with the shell. BLUE_SHELL_LOCK_ON, // A blue shell has found a target and is hastily approaching it. - BLUE_SHELL_TARGET_ELIMINATED, // Mission completed, well done boss. + BLUE_SHELL_TARGET_ELIMINATED // Mission completed, well done boss. }; // Actor banana->state @@ -101,7 +101,7 @@ enum BananaState { FIRST_BANANA_BUNCH_BANANA, // The first banana of the banana bunch BANANA_BUNCH_BANANA, // Every banana of the banana bunch except the first one. BANANA_ON_GROUND, // A banana sitting on the ground. - DESTROYED_BANANA, // Collision with the banana. + DESTROYED_BANANA // Collision with the banana. }; // Actor fakeItemBox->state diff --git a/mk64.ld b/mk64.ld index 49aacb1d4..8c2cef0bd 100644 --- a/mk64.ld +++ b/mk64.ld @@ -213,7 +213,7 @@ SECTIONS BUILD_DIR/src/camera.o(.data); BUILD_DIR/src/render_player.o(.data); BUILD_DIR/src/kart_dma.o(.data); - BUILD_DIR/src/data/kart_attributes.inc.o(.data); + BUILD_DIR/src/data/kart_attributes.o(.data); BUILD_DIR/src/player_controller.o(.data); BUILD_DIR/src/spawn_players.o(.data); BUILD_DIR/src/update_objects.o(.data); @@ -368,7 +368,7 @@ SECTIONS BUILD_DIR/src/racing/actors.o(.data*); BUILD_DIR/src/racing/skybox_and_splitscreen.o(.data); BUILD_DIR/src/racing/memory.o(.data*); - BUILD_DIR/courses/courseTable.inc.o(.data); + BUILD_DIR/courses/courseTable.o(.data); BUILD_DIR/src/racing/actors_extended.o(.data); BUILD_DIR/src/racing/math_util.o(.data*); BUILD_DIR/src/racing/race_logic.o(.rodata*); @@ -415,7 +415,7 @@ SECTIONS BUILD_DIR/src/ending/ceremony_and_credits.o(.text); BUILD_DIR/src/ending/podium_ceremony_actors.o(.data); BUILD_DIR/src/ending/code_80281780.o(.data); - BUILD_DIR/src/ending/dl_unk_80284EE0.inc.o(.data); + BUILD_DIR/src/ending/dl_unk_80284EE0.o(.data); BUILD_DIR/src/ending/credits.jp.o(.data); BUILD_DIR/src/ending/ceremony_and_credits.o(.data); BUILD_DIR/src/ending/podium_ceremony_actors.o(.rodata); @@ -437,8 +437,8 @@ SECTIONS /* texture tables and DLs, set as segment 0x02 */ BEGIN_SEG(data_segment2, 0x02000000) { - BUILD_DIR/src/data/textures.inc.o(.data); - BUILD_DIR/src/data/data_segment2.inc.o(.data); + BUILD_DIR/src/data/textures.o(.data); + BUILD_DIR/src/data/data_segment2.o(.data); } END_SEG(data_segment2) @@ -446,7 +446,7 @@ SECTIONS /* common textures, decompressed and set as segment 0x0D */ BEGIN_SEG(common_textures, 0x0D000000) { - BUILD_DIR/src/data/common_textures.inc.mio0.o(.data); + BUILD_DIR/src/data/common_textures.mio0.o(.data); . = ALIGN(0x10); } END_SEG(common_textures) @@ -463,7 +463,7 @@ SECTIONS BUILD_DIR/data/karts/toad_kart.o(.data); BUILD_DIR/data/karts/donkeykong_kart.o(.data); BUILD_DIR/data/karts/bowser_kart.o(.data); - BUILD_DIR/courses/staff_ghosts.inc.o(.data); + BUILD_DIR/courses/staff_ghost_data.o(.data); } END_SEG(kart_textures) @@ -504,14 +504,14 @@ SECTIONS 0x828400 -> 0x8028DE30 (0xD0) */ BEGIN_SEG(ceremonyData, 0x0B000000) { - BUILD_DIR/src/ending/ceremony_data.inc.mio0.o(.data); + BUILD_DIR/src/ending/ceremony_data.mio0.o(.data); . = ALIGN(0x10); } END_SEG(ceremonyData) BEGIN_SEG(startupLogo, 0x06000000) { - BUILD_DIR/src/data/startup_logo.inc.mio0.o(.data); + BUILD_DIR/src/data/startup_logo.mio0.o(.data); . = ALIGN(0x10); } END_SEG(startupLogo) @@ -522,7 +522,7 @@ SECTIONS #define COURSE_DATA_SEG(dir, name) \ BEGIN_SEG(name##_mio0, 0x06000000) \ { \ - BUILD_DIR/courses/dir/course_data.inc.mio0.o(.data); \ + BUILD_DIR/courses/dir/course_data.mio0.o(.data); \ . = ALIGN(0x10); \ } \ END_SEG(name##_mio0) @@ -551,7 +551,7 @@ SECTIONS #define COURSE_OFFSETS_SEG(dir, name) \ BEGIN_SEG(name, 0x09000000) \ { \ - BUILD_DIR/courses/dir/course_offsets.inc.o(.data); \ + BUILD_DIR/courses/dir/course_offsets.o(.data); \ . = ALIGN(0x10); \ } \ END_SEG(name) @@ -582,7 +582,7 @@ SECTIONS #define COURSE_VERT_SEG(dir, name) \ BEGIN_SEG(name, 0x0F000000) \ { \ - BUILD_DIR/courses/dir/course_geography.inc.mio0.o(.data); \ + BUILD_DIR/courses/dir/course_geography.mio0.o(.data); \ . = ALIGN(0x10); \ } \ END_SEG(name) diff --git a/src/code_80091750.c b/src/code_80091750.c index 2f7956a33..371041813 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -26,7 +26,7 @@ #include "save_data.h" #include "podium_ceremony_actors.h" #include "skybox_and_splitscreen.h" -#include "src/data/startup_logo.inc.h" +#include "src/data/startup_logo.h" #include "buffers.h" #include "racing/race_logic.h" #include "ending/code_80281C40.h" diff --git a/src/data/common_textures.inc.c b/src/data/common_textures.c similarity index 99% rename from src/data/common_textures.inc.c rename to src/data/common_textures.c index 086af810e..b67c00d4a 100644 --- a/src/data/common_textures.inc.c +++ b/src/data/common_textures.c @@ -3012,7 +3012,7 @@ u8 common_tlut_lakitu_countdown[][512] = { /** * @todo Generate tlut based on the actual texture. - * The textures these tluts are for are not in common_textures.inc.c + * The textures these tluts are for are not in common_textures.c * This applies to common_tlut_lakitu_checkered_flag, common_tlut_lakitu_second_lap, * common_tlut_lakitu_final_lap, common_tlut_lakitu_reverse, common_tlut_lakitu_fishing * Appears to be animation textures. diff --git a/src/data/data_segment2.inc.c b/src/data/data_segment2.c similarity index 99% rename from src/data/data_segment2.inc.c rename to src/data/data_segment2.c index 7ce08d6e1..f87108293 100644 --- a/src/data/data_segment2.inc.c +++ b/src/data/data_segment2.c @@ -3,7 +3,7 @@ #include #include #include "data_segment2.h" -#include "src/data/startup_logo.inc.h" +#include "src/data/startup_logo.h" Gfx D_02007650[] = { gsDPPipeSync(), diff --git a/src/data/kart_attributes.inc.c b/src/data/kart_attributes.c similarity index 100% rename from src/data/kart_attributes.inc.c rename to src/data/kart_attributes.c diff --git a/src/data/path_spawn_data.c b/src/data/path_spawn_data.c index 01f070243..8f9f1be68 100644 --- a/src/data/path_spawn_data.c +++ b/src/data/path_spawn_data.c @@ -1,6 +1,6 @@ #include "data/path_spawn_data.h" #include "courses/all_course_data.h" -#include "ending/ceremony_data.inc.h" +#include "ending/ceremony_data.h" UnkCommonTextureStruct0 *D_800DC720[] = { D_0D008F28, D_0D008F80, D_0D008FB8, D_0D009058, diff --git a/src/data/startup_logo.inc.c b/src/data/startup_logo.c similarity index 100% rename from src/data/startup_logo.inc.c rename to src/data/startup_logo.c diff --git a/src/data/startup_logo.inc.h b/src/data/startup_logo.h similarity index 100% rename from src/data/startup_logo.inc.h rename to src/data/startup_logo.h diff --git a/src/data/textures.inc.c b/src/data/textures.c similarity index 99% rename from src/data/textures.inc.c rename to src/data/textures.c index 2d59c2186..e6c059452 100644 --- a/src/data/textures.inc.c +++ b/src/data/textures.c @@ -1,5 +1,5 @@ /** - * @file textures.inc.c + * @file textures.c * @brief Texture data. * start in ram 0x801978D0 * look like link to code_80091750 diff --git a/src/ending/ceremony_data.inc.c b/src/ending/ceremony_data.c similarity index 99% rename from src/ending/ceremony_data.inc.c rename to src/ending/ceremony_data.c index 2fac983a7..fb7bdbf80 100644 --- a/src/ending/ceremony_data.inc.c +++ b/src/ending/ceremony_data.c @@ -1,4 +1,4 @@ -#include "src/ending/ceremony_data.inc.h" +#include "src/ending/ceremony_data.h" Vtx silver_trophy_model[] = { diff --git a/src/ending/ceremony_data.inc.h b/src/ending/ceremony_data.h similarity index 100% rename from src/ending/ceremony_data.inc.h rename to src/ending/ceremony_data.h diff --git a/src/ending/dl_unk_80284EE0.inc.c b/src/ending/dl_unk_80284EE0.c similarity index 100% rename from src/ending/dl_unk_80284EE0.inc.c rename to src/ending/dl_unk_80284EE0.c diff --git a/src/update_objects.c b/src/update_objects.c index decde7c65..a5c0d5bb0 100644 --- a/src/update_objects.c +++ b/src/update_objects.c @@ -28,7 +28,7 @@ #include "code_80091750.h" #include "podium_ceremony_actors.h" #include "courses/all_course_data.h" -#include "src/ending/ceremony_data.inc.h" +#include "src/ending/ceremony_data.h" #include "src/ending/ceremony_and_credits.h" #include "menus.h" #include "data/other_textures.h" diff --git a/tools/linkonly_generator.py b/tools/linkonly_generator.py index f0534d064..16ef21e6d 100644 --- a/tools/linkonly_generator.py +++ b/tools/linkonly_generator.py @@ -312,14 +312,14 @@ texture_map = { # Usage: linkonly_generator.py course_name = sys.argv[1] -# This depends on the texture lists in each courses//course_offsets.inc.c +# This depends on the texture lists in each courses//course_offsets.c # look like: `{gTexture6447C4, 0x0106, 0x0800, 0x0},` texture_regex = re.compile(r"{(\S+),\s+\S+,\s+(\S+),\s+\S+}") h_string = "" c_string = "" -with open(f"courses/{course_name}/course_offsets.inc.c", "r") as offsets: +with open(f"courses/{course_name}/course_offsets.c", "r") as offsets: h_string += "#ifndef COURSE_TEXTURES_H" h_string += "\n#define COURSE_TEXTURES_H" @@ -331,7 +331,7 @@ with open(f"courses/{course_name}/course_offsets.inc.c", "r") as offsets: # Something wrong has occurred if not textures: - print(f"Failed to find any texture entries in courses/{course_name}/course_offsets.inc.c") + print(f"Failed to find any texture entries in courses/{course_name}/course_offsets.c") exit(1) current_offset = 0