Commit Graph
530 Commits
Author SHA1 Message Date
FazanaandGitHub 2149dedfd4 Adventure 2 30% (#414)
* struct sizeofs

* snowblal struct is become dead

* Some debug string relocation

* printf

* Floaties

* rename four unused particle funcs

* Particle cleanup part 1

* oh god I'm actually starting to understand this system

* am straight blasting

* Update particles.c

* more

* l

* Label camera.c

* Update game.c

* Fix warnings

* Fix names in the memory pool

* menu time

* more

* menu :))))

* finished with the inits

* youre gonna love this

* Update README.md
2023-10-06 14:40:45 +01:00
027cba8f99 We are collecting silver coins in Crescent Island. (0/8 silver coins) (#413)
* Match menu_results_loop

* Match menu_options_loop

* func_80059BF0 matched

* Various small changes

* Match func_8002125C

* func_80021104 matched

* Match func_800A0BD4 and _itoa

* Match func_800A47A0

* Match func_800A7A60

* Match func_8000418C

* Update README score

* Match func_8001F23C

* Rename gParticlePtrList_addObject to despawn_object

* Rename it again

* Apply suggestions from code review

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

---------

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
2023-10-04 11:57:53 -04:00
Ryan MyersandGitHub 1ceb8d800f Fun with Functions! (#412)
* Match func_80094A5C

* Cleanup on func_80094A5C

* Reduce indentation on func_80094A5C with early returns

* calculate_and_display_rom_checksum and menu_trophy_race_rankings_loop matched

* Forgotten cleanup

* Cleanup some funcs

* Match menu_magic_codes_loop

* menu_magic_codes_loop cleanup

* "Match" free_texture...

* Match free_sprite

* Fix build issues.

* Update score in readme
2023-09-29 18:50:06 -04:00
Ryan MyersandGitHub b9f2dff589 Matches at 55%! We are collecting silver coins in Whale Bay. (2/8 silver coins) (#411)
* Match 3 new funcs

* Match 3 more funcs

* Update some var types

* Match func_800A36CC

* WIP func_800A7A60

* Match menu_trophy_race_rankings_init

* Fix NON_EQUIVALENT builds
2023-09-27 10:31:26 -04:00
14b1e4d554 Someone needs to slow down!😉 (#410)
* WIP func_800A36CC

* Match setup_lights and func_800337E4

* Match func_800AD030

* Match func_800AC0C8

* Match func_800AC8A8

* Match func_800C1130

* README update

* Apply suggestions from code review

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Add fakematch comment

---------

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
2023-09-25 15:34:17 -04:00
fd40898eee We are battling in Darkwater Beach. (1 opponent remains) (#409)
* func_8000418C WIP

* func_8000418C progress

* Mach func_80030664

* Match func_80030DE0

* func_8001CC48 NON_MATCHING

* Match func_8001B3C4

* Match func_80036040

* Match func_8001EFA4

* Match func_80016C68

* Update README

* Remove func_80030DE0 asm

* Update src/objects.c

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

* Match free_hud

---------

Co-authored-by: David Benepe <benepe96@gmail.com>
2023-09-23 18:20:08 -04:00
FazanaandGitHub 888e4cde8b Making some sense of particle hell (#408)
* struct sizeofs

* snowblal struct is become dead

* Some debug string relocation

* printf

* Floaties

* rename four unused particle funcs

* Particle cleanup part 1

* oh god I'm actually starting to understand this system

* am straight blasting

* Update particles.c

* more

* l
2023-09-22 16:49:22 +01:00
f4197853b4 Many new matches (#407)
* Match func_8002DE30

* func_80046524 code cleanup and score improvement.

* Match func_800B45C4

* Match func_800B461C

* Match func_800B4668 and func_800B46BC

* Match func_800B3140

* Match strcpy and split other funcs into their own files.

* unused_string.c

* Match func_800B3240

* Match func_800A1C04

* Match func_800A22F4

* Better func_800A22F4

* Match all of unused_string.c now.

* Split two new funcs out of func_80011264 and match them.

* Do some documenting of the new funcs so they count for adventure two.

* Get func_80011264 to a really close match

* Workaround for the update_spatial_audio_position issue

* Come up with a cleaner fix for update_spatial_audio_position

* Soundmask updates

* Rename SoundMask struct

* Match func_800B34B0 and func_800B3358

* Apply suggestions from code review

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update READEME score

* Fix 31 to 21

---------

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
2023-09-21 07:37:07 -04:00
Ryan MyersandGitHub 7202d9efa5 # GLOBAL_ASM remaining: 300 (#405)
* Declare free_texture and free_sprite as NON_MATCHING now

* Match func_8007B380 and split func_800149C0 from func_80014814

* Match func_800149C0

* Move weather asm to its own folder

* Rename the unknown_05CEF0 folder to vehicle_tricky

* 2 matches, remove matched asm files, and fix other things

* WIP func_800BEFC4

* WIP update on func_800BEFC4

* Match func_800BEEB4

* Maybe better func_800BEEB4

* Update Score

* Fix NON_EQUIVALENT build.
2023-09-18 14:46:32 -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 34b3c51ffb 6 new matches (#403)
* Minor code cleanup

* Match func_800235DC

* Minor code cleanup

* Big progress on spawn_object

* Cleanup Object struct a little

* Big type and warning changes / fixes

* spawn_object 90%

* spawn_object 92%

* gThread30Message needs to be an array of 2

* Minor cleanup

* WIP func_80059BF0 and func_800A277C

* func_800A277C should be just regalloc and stack now

* Very close on func_800A277C

* Increase func_800A277C score

* Rename func_8006BD88 to get_current_map_id and fix a bug in func_800A277C

* Match func_8009ECF0

* Cleanup some warnings in func_8009ECF0

* Match func_8007C52C

* Match update_colour_cycle

* Update score

* Match get_texture_size_from_id

* Update score again

* Match load_sprite_info
2023-09-14 16:37:32 -04:00
Ryan MyersandGitHub 4a2f202442 Low hanging Object Fruit (#402)
* Match func_8001D2A0

* Match func_8001D4B4

* Match func_8000F7EC

* Match func_8000C718

* Match func_8000F99C
2023-09-05 10:54:46 -04: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
Ryan MyersandGitHub 72e55efcb4 New Match 52% + A LOT OF RENAMES (#397)
* Remove separate RODATA declarations for debug strings.

* Migrate thread1 stack

* func_80031F88 WIP

* Match func_80031F88

* Rename some funcs using JFG as basis.

* Rename unknown_032760 to lights, and move asm files around.

* More names, and a slightly better score for setup_lights

* Couple of possible names.

* Support expansion pak without resorting to fake matches.

* Rename and move bcmp to a libultra folder and leave it as asm.

* Rename unknown_0255E0 to tracks

* Rename unknown_078050 to rcp.

* Update score
2023-06-22 15:13:36 -04:00
FazanaandGitHub 4d668a1ef4 Lots of Labelling (#394)
* 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
2023-05-20 23:03:06 +01:00
df514e5f4e Matches, and split game.c into two (#393)
* Cleanup func_8007B46C, and WIP func_800143A8

* Match func_800143A8

* Match render_fade_circle and put the WIP func_8007CDC0

* Near match func_800B3740

* Add decomp me links to WIP funcs, and fix previous commit.

* Match func_800B3740

* Matched render_fade_waves

* Much better score for func_80066CDC

* WIP func_80080580

* Minor work in progress being saved

* Finish __osFinalrom naming mixup

* Move weather and particles rodata to fix a file split.

* Split game.c into another file thread3_main.c

* Update src/camera.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/fade_transition.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/fade_transition.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/objects.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/objects.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/objects.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

* Update src/objects.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>

---------

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
2023-05-19 13:13:26 -04:00
FazanaandGitHub 9aff97c71e Organise textures_sprites.c with macros (#392)
* Update object_functions.c

* step 1

* stage 2

* stage 3

* Update particles.h

* stage 3

* Update particles.h

* Update particles.h

* gave preliminary names to things that have obvious looking properties

* rename camera strusct cars

* last minute changes

* rename draw commands

* Add macros for render mode tables

* rename

* Make them grouped entries

* fix some oopsies and name the draw tables

* funny flag

* name another flag

* comment render modes

* Update objects.c

* water

* Fix oopsie regarding viewports in tracks.c

* rename unknown_B7B30.c

surprised I hadn't done this earlier

* Fill some gaps I should've filled in yonks ago

* Try again with the assert rename

I should've known there was already a file called that lol
2023-05-17 18:48:28 +01:00
FazanaandGitHub 444afbb470 I can't stop I can't stop I can't stop I can't stop (#389)
* yo I finally went and figured out what the majority of unk6 is lmao

* rename entry

* man honestly game.c is a mess they really did just throw every old thing here

* Name some initialiser funcs

* more

* destroyed another temp struct

* potassium

* tweak

* pain

* it never ends

* a new pain arises

* Update README.md

* quick fixes

* add colour macro
2023-05-01 14:32:25 +01:00
Ryan MyersandGitHub 3f37109e59 Matches and documenting (#388)
* Near match for render_3d_model

* Stack diffs only on render_3d_model

* Matched render_3d_model!

* Delete accidentally added files.

* Some naming of things

* Match func_8007C660

* Update some more names

* WIP func_80012F94

* Fix non equivalent build

* Update func_80012F94 score

* Update score
2023-04-28 14:54:27 -04:00
FazanaandGitHub 6e8ee67cf6 Adventure two 25% (#387)
* identify transition bug

* Document fog system

* Label fogchanger attributes

* and more

* anti aliasing

* name some object vars

* block the racer inputs

* Update unknown_0255E0.c

* Update README.md

* Update src/object_functions.c

* I just did thing I guess???

* me when I realise almost all the pass through discs are just copy and pasted code.

* YOU'RE PUSHING THEM?!?!

bruh bruh bruh bruh

* I guess I'm in the object naming rabbit hole now

wow maybe I'll actually get these looking good 😳

* i did frogs

* got it

* Quick fixes
2023-04-28 17:52:12 +01:00
FazanaandGitHub d54031c3a6 Document fog system, and label some object behaviour (#386)
* identify transition bug

* Document fog system

* Label fogchanger attributes

* and more

* anti aliasing

* name some object vars

* block the racer inputs

* Update unknown_0255E0.c

* Update README.md

* Update src/object_functions.c
2023-04-25 10:49:29 +01:00
3c97d5ea99 Identify and label a bunch of game.c stuff (#385)
* Fix warnings

* Update src/thread0_epc.c

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

* identify some texture init stuff

* match _Litob

* match cosf

* match sinf

* formatting

* Update math.h

* Delete sinf.s

* quick fix

* Update unknown_078050.c

* identify some time trial stuff

* my honest reaction

* Add a define for F3DDKR_GBI

* Add GCC define for stubbed_printf

Fixes a bunch of warnings, because IDO is such a brilliant compiler with zero flaws that for some reasons decides "#define text(...)" is against federal law.

* Update racer speed errors

* identify some game.c stuff

* Rename

* Fix inaccurate names for the displaylist heap

* more.

* quick fixes

* Update src/racer.c

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

* Update src/objects.c

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

* Update src/objects.c

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

* quicker fixes

---------

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
Co-authored-by: David Benepe <benepe96@gmail.com>
2023-04-23 20:21:39 +01:00
c41bbf9131 Match 3 libultra funcs + some texture init labels (#383)
* Fix warnings

* Update src/thread0_epc.c

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

* identify some texture init stuff

* match _Litob

* match cosf

* match sinf

* formatting

* Update math.h

* Delete sinf.s

* quick fix

---------

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
2023-04-16 14:50:14 +01:00
b61e4c3fa4 Bump score to 51% with 6 new matches (#381)
* Very minor cleanup of init_controllers after consulting JFG

* really rough starts to some funcs

* some labeling, and match thread0_Main

* Some documenting, and better match for a couple of memory funcs

* Add more official names for vars and funcs, as well as clean up some matches a little

* Force No Shadows on Surfaces

Force No Shadows on Surfaces
Committer: sixtyfour

 On branch DKRsixtyfour
 Changes to be committed:
	modified:   src/unknown_0255E0.h

* identify shadows and fix mislabelling from past-me (#380)

* Removed outdated comment

* split some funcs out of printf that aren't related

* Move funcs to particles that should belong there

* Some printf documenting

* Do some documenting on the debug font details

* Get func_800B63F4 in a good place for now

* Match func_800B63F4

* Match render_printf and do some more documenting

* Move some functions around into different files.

* Match func_800AA3EC

* Fix some warnings in func_800AA3EC

* Rename the thread 0 assert

* Migrate BSS from particles to thread0 and printf

* Find and split out a function in particles and do more documenting

* Rename sprintf and vsprintf stuff to match JFG

* Clean up the texAnimateTexture function, and document some more places.

* WIP build_tex_display_list and documenting

* Missing file check in

* Match memset

* build_tex_display_list update with macros

* MAssive cleanup of build_tex_display_list that brings the score down in a big way.

* Removed a massive amount of extra lines in build_tex_display_list

* Match texInitTextures

* Update README score

* Fix comment

* Rename some funcs

* Commit suggestions from Fazana

* Fix for last commit

---------

Co-authored-by: Turok64Nukem <Duke64Nukem@gmail.com>
Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
2023-04-12 07:55:53 -04:00
FazanaandGitHub c9fa292c3d identify shadows and fix mislabelling from past-me (#380) 2023-03-20 16:22:17 +00:00