mirror of
https://github.com/izzy2lost/Diddy-Kong-Racing.git
synced 2026-06-19 01:16:26 -07:00
Fix warnings and polish build environment a little (#489)
* First pass * Fix n64crc and add submodules properly * Fix other versions * Match func_8005B818 for v80 code. * Formatting * Fix build for JPN in last commit. Still broken in post v77 roms though. * Fix builds for other versions. * Match load_menu_text for other versions. * Fix progress script * update m2c * Modify asset tools to remove the LD script code. * Fix asm file macro inclue * Get a working splat version for us_1.0 to build from the assets tool. * update asm differ * Update tools again * Fix the makefile to only compile assets when requested. This will build all versions successfully, and compile assets for us_1.0 when requested. * First round of suggestions * Small cleanup * Fix the gcc_generate.py path. * Make entrypointThreadStack * Small addition to the last commit * "Fix" score script. Still need to fix the score values themselves, but at least it runs and is kind of close. * Much closer matching score script * Fix the splat version due to a breaking change in 0.33.0 for this repo for now. * Fix the main function name * Add gitignore entries * Fix the padding problem to be handled by objcopy instead of a binary pad from splat. * Update the README and change dependencies to setup. * Have a hasm header that can be tweaked. * Still calculate the checksum on no_verify builds or they won't work. * Add support for boot_custom.bin * Fix custom boot ld code. * Fix score script * Fix gcc building. * Update m2c * Fix warning, stop ignoring mod assets, and add some handy make rules. * Uggh, serves me right for not testing. * First stab at modifiable entrypoint. * Fix typo, and small README change * Stop n64crd from defaulting to returning 6105, so we can properly fail if the CIC checksum fails. Also, fix the * fix a whole heaping spaghetti pile of warnings * stack sizes and header depdendancies * more warns * fix bug oops * t * Update Makefile Create extract_boot.py * Update extract_custom_boot.py * somehow this blew up again in the merge * Update Makefile * fix these * Delete extract_boot.py * simplification * Sage is stoopid * Update controller.c * permissions * Update get-binutils.sh --------- Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
This commit is contained in:
@@ -33,16 +33,26 @@ def boot_extract(input_file, output_file="boot_custom.bin"):
|
||||
output_file = "./mods/boot_custom.bin"
|
||||
mods_missing = False
|
||||
cictype = N64GetCIC(data)
|
||||
if os.path.isfile("makefile"):
|
||||
if (cictype == 0):
|
||||
if data.find(b"Libdragon IPL3"):
|
||||
print("CIC: Libdragon")
|
||||
else:
|
||||
print("Unknown CIC, assume 6102 just in case, but don't assume the CIC itself is valid.")
|
||||
cictype = 6102
|
||||
else:
|
||||
print("CIC: " + str(cictype))
|
||||
if os.path.isfile("Makefile"):
|
||||
print("Makefile detected, modifying CIC type.")
|
||||
with open("makefile", 'r') as f:
|
||||
with open("Makefile", 'r') as f:
|
||||
lines = f.readlines()
|
||||
with open("makefile", 'w') as f:
|
||||
with open("Makefile", 'w') as f:
|
||||
for line in lines:
|
||||
if line.startswith("BOOT_CIC ?="):
|
||||
f.write("BOOT_CIC ?= " + str(cictype) + "\n")
|
||||
else:
|
||||
f.write(line)
|
||||
if os.path.isfile("./build/asm/header.s.o"):
|
||||
os.remove("./build/asm/header.s.o")
|
||||
|
||||
|
||||
with open(output_file, "wb") as f:
|
||||
|
||||
Reference in New Issue
Block a user