mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-08 12:56:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added recomp and fixed course vertex shiftability. (#20)

Browse Source 
* Added recomp and made course vertex shiftable again
This commit is contained in:
CoderStig
2021-03-09 17:39:58 -07:00
committed by GitHub
parent a0e31c27ff
commit 09ec45adc9
2 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+9 -3
View File
@@ -256,7 +256,7 @@ $(mushroom_cup)/luigi_raceway/%.inc.mio0.o: courses/mushroom_cup/luigi_raceway/%
$(LD) -t -e 0 -Ttext=0F000000 -Map $(mushroom_cup)/luigi_raceway/$*.inc.elf.map -o $(mushroom_cup)/luigi_raceway/$*.inc.elf $(mushroom_cup)/luigi_raceway/$*.inc.o --no-check-sections
$(V)$(EXTRACT_DATA_FOR_MIO) $(mushroom_cup)/luigi_raceway/$*.inc.elf $(mushroom_cup)/luigi_raceway/$*.inc.bin
$(MIO0TOOL) -c $(mushroom_cup)/luigi_raceway/$*.inc.bin $(mushroom_cup)/luigi_raceway/$*.inc.mio0
printf ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.balign 4\n\n.incbin \"build/us/courses/mushroom_cup/luigi_raceway/model.inc.mio0\"\n\n.balign 4\n\nglabel d_course_luigi_raceway_packed\n\n.incbin \"bin/course_luigi_raceway_packed.bin\"\n" > build/us/courses/mushroom_cup/luigi_raceway/model.inc.mio0.s
printf ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"build/us/courses/mushroom_cup/luigi_raceway/model.inc.mio0\"\n\n.balign 4\n\nglabel d_course_luigi_raceway_packed\n\n.incbin \"bin/course_luigi_raceway_packed.bin\"\n" > build/us/courses/mushroom_cup/luigi_raceway/model.inc.mio0.s
$(AS) $(ASFLAGS) -o $(mushroom_cup)/luigi_raceway/$*.inc.mio0.o $(mushroom_cup)/luigi_raceway/$*.inc.mio0.s
$(mushroom_cup)/moo_moo_farm/%.inc.mio0.o: courses/mushroom_cup/moo_moo_farm/%.inc.c
@@ -396,7 +396,13 @@ $(battle)/skyscraper/%.inc.mio0.o: courses/battle/skyscraper/%.inc.c
$(BUILD_DIR)/$(TARGET).elf: $(O_FILES) $(COURSE_MIO0_OBJ_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(LD_COURSE_VERTEX_DEPENDENCIES) undefined_syms.txt
$(LD) $(LDFLAGS) -o $@ $(O_FILES)
$(LD) $(LDFLAGS) \
-R $(mushroom_cup)/luigi_raceway/model.inc.elf -R $(mushroom_cup)/moo_moo_farm/model.inc.elf -R $(mushroom_cup)/koopa_beach/model.inc.elf -R $(mushroom_cup)/kalimari_desert/model.inc.elf \
-R $(flower_cup)/toads_turnpike/model.inc.elf -R $(flower_cup)/frappe_snowland/model.inc.elf -R $(flower_cup)/choco_mountain/model.inc.elf -R $(flower_cup)/mario_raceway/model.inc.elf \
-R $(star_cup)/wario_stadium/model.inc.elf -R $(star_cup)/sherbet_land/model.inc.elf -R $(star_cup)/royal_raceway/model.inc.elf -R $(star_cup)/bowsers_castle/model.inc.elf \
-R $(special_cup)/dks_jungle_parkway/model.inc.elf -R $(special_cup)/yoshi_valley/model.inc.elf -R $(special_cup)/banshee_boardwalk/model.inc.elf -R $(special_cup)/rainbow_road/model.inc.elf \
-R $(battle)/double_deck/model.inc.elf -R $(battle)/big_donut/model.inc.elf -R $(battle)/block_fort/model.inc.elf -R $(battle)/skyscraper/model.inc.elf \
-o $@ $(O_FILES)
$(BUILD_DIR)/$(TARGET).z64: $(BUILD_DIR)/$(TARGET).elf
$(OBJCOPY) $(OBJCOPYFLAGS) $< $(@:.z64=.bin) -O binary
@@ -405,7 +411,7 @@ $(BUILD_DIR)/$(TARGET).z64: $(BUILD_DIR)/$(TARGET).elf
$(BUILD_DIR)/$(TARGET).hex: $(TARGET).z64
xxd $< > $@
$(BUILD_DIR)/$(TARGET).objdump: $(BUILD_DIR)/$(TARGET).elf
$(BUILD_DIR)/$(TARGET).objdump: $(BUILD_DIR)/$(TARGET).elf
$(OBJDUMP) -D $< > $@
test: $(TARGET).z64
undefined_syms.txt
-21
View File
@@ -669,27 +669,6 @@ D_8028461C = 0x8028461C;
D_802874A0 = 0x802874A0; /* Very end of data_credits_128480.s unused? */
D_802874BE = 0x802874BE; /* unused? */
d_course_mario_raceway_vertex = 0x0F000000;
d_course_moo_moo_farm_vertex = 0x0F000000;
d_course_luigi_raceway_vertex = 0x0F000000;
d_course_sherbet_land_vertex = 0x0F000000;
d_course_kalimari_desert_vertex = 0x0F000000;
d_course_koopa_troopa_beach_vertex = 0x0F000000;
d_course_choco_mountain_vertex = 0x0F000000;
d_course_frappe_snowland_vertex = 0x0F000000;
d_course_toads_turnpike_vertex = 0x0F000000;
d_course_banshee_boardwalk_vertex = 0x0F000000;
d_course_dks_jungle_parkway_vertex = 0x0F000000;
d_course_rainbow_road_vertex = 0x0F000000;
d_course_yoshi_valley_vertex = 0x0F000000;
d_course_bowsers_castle_vertex = 0x0F000000;
d_course_royal_raceway_vertex = 0x0F000000;
d_course_wario_stadium_vertex = 0x0F000000;
d_course_big_donut_vertex = 0x0F000000;
d_course_block_fort_vertex = 0x0F000000;
d_course_double_deck_vertex = 0x0F000000;
d_course_skyscraper_vertex = 0x0F000000;
d_course_luigi_raceway_packed = 0x0F009800;
d_course_mario_raceway_packed = 0x0F0096f4;
d_course_choco_mountain_packed = 0x0F00A0B4;