21 Commits
Author SHA1 Message Date
David BenepeandGitHub c8a755a5c9 DKR Assets Tool v0.5 (#577)
* Saving files before attempting to integrate custom crash screen

* Put code under DkrAssetsTool namespace

* More progress

* Lots of work done.

* Forgot to revert back to v77 in the makefile

* Included cstdint in bytes_view.hpp

* Hopefully fixed issue with CEnum::tostring(), removed asset_enums from tracking, and modified gitignore to allow obj files from the mods folder

* .mtl file and the textures should now check if the path is absolute or relative.

* Fixed compile_all.sh

* Doing a thing that is technically not valid.

* Removed 'make assets', now assets are built in the normal 'make' setting.
2025-05-16 17:51:40 -04:00
150a56cf01 Use different linker script for nonmatching builds (#505)
* got overzealous with the alignments

* small knowledge improvement on models

* true

* add enum size entries for easy ref

* bgload names I forgot to merge in

* transition memes

* absinthe

* brug

* anguish

* hell

* getting there

* misery

* Update README.md

* Update include/structs.h

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* format moment

* Delete object_animate.s

* Update obj_animate.s

* remembered to rename this

* clear mem properly

* Update waves.c

* custom linker override for nonmatching builds

* fix warns

* format

* Update Makefile

* Update dkr.custom.ld

* Update Makefile

* Update waves.c

* Update audio_spatial.c

* Update dkr.custom.ld

* Update dkr.custom.ld

* Update Makefile

---------

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
2025-05-09 18:50:32 +01:00
3f48db7616 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>
2025-03-26 12:56:16 +00:00
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
Ryan MyersandGitHub efc8a5b095 Match func_80054FD0 (#471)
* Match func_80054FD0

* Update README
2025-03-05 16:23:56 -05:00
FazanaandGitHub e73b533cbb Support for MacOS on ARM (#456)
* initial attempt

works on WSL, boutta test on macos

* attempt 2

* Update Makefile
2025-02-11 19:44:41 +00:00
Bl00D4NGEL f6a4a27a93 fix: update .gitignore to not ignore .github directory 2025-01-02 21:18:21 +01:00
FazanaandGitHub b92f46a46c Label rumble system, various missing bits of HUD, fix object ID references and label debug text (#445)
* bumble

* rumble done basically

* printf is looking better now too

* racer stuff

* model offsets

* two wave things

* obj id

* fix object ids

* randomly remembered to fix alignment on these

* fix ids part 2

* format

* fix warning

* identify baseline table

* boss race IDs

* lots of hud

* last of the current feasible hud stuff

* Update README.md

* this name
2024-04-29 23:15:00 +01:00
David a9de721b0c Dont overwrite prebuild files if they haven't changed. 2024-04-10 15:02:22 -04:00
David fcc9c24c59 Created mods folder 2024-04-10 14:57:24 -04:00
14970cac4b Identity crisis with a helping of war crimes (#404)
* Update Makefile

* rename object stack tracing

* no

* name the timer of pure unadulterated rage

* rename rendering

* So much

* Label boss racer anims

* organise boss racers

* remove some unused funcs from headers

* dialogue

* there we go

* Update vehicle_bluey.c

* Update README.md

* quick fixes

* quicker fixes

* finally rename unknown_0255E0.c

* 💡

* more

* ops fixed buildng

* Fix warning

* Update objects.c

* label memory.c a bit.

* Some object things

* Fix warnings

* name last decompression related things

* identify water effect

* Update structs.h

* Update memory.c

* mem

* document game text

* more

* :)

* Fix UB in thread30

* Update game_ui.c

* match func_8009ECF0

* new names

* Update game_ui.c

* Fix warnings

* Update game.c

* Fix nonequiv building

* rename

* Update include/structs.h

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

---------

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
2023-09-14 22:50:44 +01:00
Ryan MyersandGitHub f723489a0f Match 7 different functions, and several more WIP (#401)
* Explicitly mark some object functions as void, which exposed a minor flaw in render_hud.

* WIP func_80006FC8

* More func_80006FC8 WIP

* MORE WIP

* Much progress, such wow.

* Look at all the commits I have!

* Score to 35k

* 15529

* BEEP BOOP

* Remove file

* 14973

* 8482

* 8046

* 7300

* func_80006AC8 near match

* Move some asm files into more apprproate folders for the file they are part of.

* Match func_800050D0

* Match func_80006AC8

* func_80006FC8 4894

* 3569!

* 3024, if statement fix.

* Make a m2cfiles dir so I stop accidentally committing those files.

* Score improvement

* Make func_80005254 buildable, but not anything mor

* func_80005254 29432

* func_80005254 16987

* func_80005254 15632

* func_80006BFC 1015

* Match func_80006BFC

* Update score

* func_80005D08 5605

* func_80005D08 3190

* func_80005D08 2386

* func_80005D08 165

* func_80005D08 score 65.

* Promote func_80005D08 to NON_MATCHING

* Matched func_80005D08!

* func_80005254 3347

* func_80005254 3185

* parking func_80005254 for now.

* func_800063EC compiling

* Park func_800063EC at 3011

* Fix func_80004B40 for M2C

* Start func_80004B40

* REALLY ROUGH func_80004B40

* Kind of wandering ROUGHLY Towards correct on func_80004B40

* Rename a field to make it clear it's currently just padding space

* Bring func_8002E234 to a reasonably close match WIP

* func_8002E234 2359

* Update sprintf signature

* func_8002E234 993 with shenanigans

* Woops

* Increase score for func_80005254

* func_8002FA64 score 10.

* Match func_8002FA64

* Start identifying some var types

* Little more variable identifcations

* Match func_8002C0C4

* Really close on func_8000C8F8

* Make func_8000C8F8 NON_MATCHING

* Match func_8000E898

* Add UNUSED tags to a couple functions

* Update score
2023-09-01 08:17:01 -04:00
028cfd01bb Match a batch (#252)
* Squashed commit of the following:

commit 3ab4716110
Author: Fazana <52551480+FazanaJ@users.noreply.github.com>
Date:   Mon May 23 23:11:46 2022 +0100

    Mostly misc labelling, but also weather too (#232)

    * bit more labelling

    * identify some weather stuff

    * Update sound_ids.h

    * yum

    * more random identification

    * last weather stuff for now

    * Update README.md

    * Update README.md

    * Fix non equivalent

* I found the 60fps button

* match func_80052B64

* match racer_attack_handler

* match func_80048C7C

* buncha function declaring

* e

* tweak

* match func_8004DE38

oh man oh man

* Small bit of labelling

* Merge remote-tracking branch 'upstream/master' into the-many-against-the-few

* Update README.md

* Fix monumentally poor bout of misinformation in the readme

we wouldn't want to mislead the readers, would we?

* github please

* Update README.md

* requested changes

kinda funny because I knew this struct existed, and knew it was used for this, but never made the connection lol

* Update objects.c

* match racer_enter_door

A nice easy one after the pure hellscape of the last few days :)

* names

* renames

* match func_8005250C

* heehee

* Update racer.c

* identify some misc asset calls

* identify some surface types

* match func_8005492C

* Delete func_8005492C.s

* match func_80052D7C

* move some enums

* label all existing misc asset calls

granted I know what almost none of them are lmao, buut will make things slightly easier in the long run

* Update README.md

* requested changes

pain

* Update README.md

* just a bit of labelling

* labbel

* more

* Update structs.h

* file select

* file struct

* Update menu.c

* multiplayer box

* texture naming

* realised why there's 3 indices lol

* rounding

* Update menu.c

* identify textures

* pain

* fix non equiv

* Update src/menu.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* Update src/unknown_078050.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* Update src/menu.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* more texture identification

* character select bytes

actually hate this so much

* Update menu.c

* I aged about 50 years doing this

* character select data

* fix conflicts

* match func_8007A98C

* fix video.c warnings

* rename func

* more video.c labels

* Update video.c

* blacklist windows script files

Mostly a me thing, so I can have some scripts in the root directory without them getting in the way. Since the repo operates exclusively on Linux, this shouldn't have any consequense

* fix build warnings in unknown_078050.c

* More.

* Update sched.c

* object name enum

* match gParticlePtrList_flush

* Update objects.c

* match func_8000E2B4

* Update .gitignore

* object ID enum

* match func_8000B290

* main game loop (and friends)

* Update racer.c

* match render_textured_rectangle

* match various funcs

* fix non equiv

* requested changes

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
2022-10-16 19:55:59 +01:00
Ryan Myers a3f1ed5821 Match func_800AD40C 2021-10-24 22:09:53 -04:00
Ryan Myers 719488f4d4 Added a mips_to_c script to make it easier to use it 2021-10-06 21:50:04 -04:00
David Benepe 8ef4dd20fa (8.08%) Overhauled assets & decompiled 5 functions in unknown_0777A0 2020-08-15 18:54:40 -05:00
David Benepe e279a23f77 Updated repo setup to no longer need setup.sh 2020-08-05 08:19:20 -05:00
David Benepe a3ddd79d5d Removed .vscode folder 2020-08-01 07:57:32 -05:00
David Benepe 8b0d8d457b Started decompilation! 2020-06-27 20:31:57 -05:00
David Benepe 9d7c9b035a Overhauled texture building to be much faster, and hopefully fixed file permissions. 2020-06-24 14:33:15 -05:00
David Benepe 34c7ea7476 Added Files 2020-05-27 19:14:56 -05:00