5 Commits
Author SHA1 Message Date
Ryan MyersandGitHub 6db9a8d6ea Splat merge (#470)
* 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

* Extract custom boot script

* Update automated scripts.

* Woops, fixed the MAXCONTROLLERS thing now.

* Add the method for building binutils back. Sorry!

* Only use -m32 when the longbit says we're on a 64 bit platform.

* Woops....

* Hopefully fix arm detection for raspi ido downloads.
2025-03-25 09:07:00 -04:00
658ab3f5f0 Update makefile, and include many new matches (#421)
* Fix the sins of the past

* Fix makefile extra messages, and add a patching option

* Match func_8001955C

* Match func_80016500

* Match func_8000C8F8

* WIP func_8000CC7C

* Removed old competing misc asset enums, and migrated to the better standard.

* Fix last commit

* Minor documenting of an unused asset.

* Match func_8001B4FC

* Match func_8009963C

* Match render_enter_filename_ui

* Match randomise_ai_racer_slots

* Fix NON_EQUIVALENT builds

* Update README

* A little text documenting

* Update src/menu.c

Co-authored-by: David Benepe <benepe96@gmail.com>

* Remove already matched asm file

---------

Co-authored-by: David Benepe <benepe96@gmail.com>
2023-10-12 08:35:23 -04:00
6d99776962 Several matches, documentation, and tool updates (#377)
* WIP func_80068FA8

* WIP func_80069790

* Match func_80069790

* WIP func_80068FA8

* WIP func_80068FA8

* Near match func_80068FA8

* Regalloc diff with func_80068FA8

* Match func_80068FA8

* Cleanup casts we don't need, and get rid of unused symbols from undefined_syms.txt

* Increase score for func_80066CDC

* Increased score of render_fade_circle

* Get func_80031BB8 back to NON_MATCHING after one struct definition got updated

* Make asm_processor linked to the original repository as a submodule to keep it up to date

* Update recomp to latest

* Updated diff.py to the latest version. One of the recent tools updates gives me line diffs in diff.py finally!

* WIP func_80010994

* Update func_80010994 WIP

* D_8011AD21 is not an array

* Cleanup

* Match func_800155B8

* WIP func_80010994

* Get func_80010994 to NON_MATCHING status

* WIP render_3d_model

* Update render_3d_model WIP

* WIP render_3d_model

* Match unused func_8001E13C

* WIP func_80011264

* Match func_800113CC

* Udpate func_80011AD0 and then use that knowledge to add some details to a few objects

* Fix warnings

* Bring func_80011AD0 closer to matching

* Match func_80011AD0

* MAtch func_800138A8

* Cleanup

* Change variable type for D_8011AEDC to be an Object as it matches what it's used as in func_8001BDD4

* Match func_8001BDD4

* Match func_8001BC54 and document the camera obj list

* Accidentally deleted the generate_ctx.sh somehow. Adding it back in

* Match func_8002A31C

* Make D_800DC8AC an array of Vec3f instead

* Update src/object_functions.c

Co-authored-by: David Benepe <benepe96@gmail.com>

* Update src/object_functions.c

Co-authored-by: David Benepe <benepe96@gmail.com>

---------

Co-authored-by: David Benepe <benepe96@gmail.com>
2023-03-07 14:30:24 -05:00
d2eb45ff48 XYZ struct proposal (#213)
* Ignore IDO warnings with styles we don't follow

* Fix multiple warnings in game_ui.c

* Define an Object_XYZ struct

* Replaced values in Object for Object_XYZ

* Documenting some values

* Update XYZ to ObjectTransform

* Match render_borders_for_multiplayer and convert #if 1 and #if 0 to #ifdef NON_EQUIVALENT

* Try using more libultra code for the gDPSetFillColor values

* Fix some broken NON_EQUIVALENT code

* Fix a couple of minor warnings in unknown_078050

* More warnings

* Match thread1_main, and clean up all warnings in main.c

* Matched main.c

* Document and cleanup some code in thread0_epc.c

* Fix all warnings in unknown_0255E0.c

* Document unknown_078050.c stuff

* Fix warnings in asset_loading.c

* Fix font warnings

* Fix minor memory.c warnings

* Fix warnings in camera.c

* Fix many more warnings in game.c

* racer.c warning fixes

* Match func_80008140

* func_800092A8 is close, but not quite matching

* Reconfigured unk80120AC0 to be ObjectSegment and have Object match it. Maybe it should be merged in?

* Make changes to get NON_EQUIVALENT building.

* Nearly match func_800092A8

* Get func_800092A8 REALLY close, and update the submodule to point to the newer location

* Matched func_800092A8 thanks to Synray

* Not sure why the commit value changed, but this is the latest

* Fix makefile for updated recomp project builds

* Match update_controller_sticks

* Do some documenting

* Implement suggestions from PR, and add ObjectSegment into Object struct

* Match two more funcs

* An if(0){} seems more appropriate after second thought

* Add size to ObjectSegment

* Update include/structs.h

Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>

Co-authored-by: Ryan Myers <foldor@gmail.com>
Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>
2022-03-10 09:01:18 -05:00
Ryan Myers 77b03c353c Add ido-static-recomp as a submodule, and update the Makefile to use it. This was necessary because the recomp built originally had some different output that was non matching 2021-09-29 15:23:45 -04:00