Commit Graph
269 Commits
Author SHA1 Message Date
Ryan MyersandGitHub c9050f4e3e Upgrade IDO Static Recomp to fix a bug, and slip in a few other minor changes (#384) 2023-04-18 21:52:18 -04: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
98d3be1b8f 50%! (#373)
* WIP

* WIP

* WIP func_80078190

* Do some minor documenting and cleanup in sched.c

* Restart func_80078190 and check in the WIP

* Get func_80078190 back to something looking presentable

* WIP render_texture_rectangle_scaled

* Just about matched render_texture_rectangle_scaled

* Match render_texture_rectangle_scaled

* Minor documenting and cleanup

* Minor cleanup

* Cleanup

* Some documenting

* Match func_8006ECFC

* Move some function definitions

* Match func_8006EFDC

* Minor documentation updates

* NAme some functions, and do some documneting on fade transitons

---------

Co-authored-by: Ryan Myers <foldor@gmail.com>
2023-02-17 10:04:49 -05:00
David BenepeandGitHub 754b84e67a Merge pull request #362 from RenaKunisaki/master
import several names from JFG symbol table
2023-02-02 16:39:23 -06:00
Rena Kunisaki bcd0e5a54b add comments for some official names 2023-01-31 12:02:37 -05:00
Ryan MyersandGitHub 023dbb2126 Match and split unknown_003260.c into audiomgr.c and audiosfx.c (#364)
* Minor code cleanup and documenting in audio.c

* Match to func_80002DF8 to _amDmaNew

* Match func_800042CC

* Match func_8000410C

* Match func_800041FC as _removeEvents, and rename thread4_main to __amMain while also getting it's code to closer resemble the example code

* Add missing file

* MAtch __clearAudioDMA

* Cleanup __clearAudioDMA to match our code style a little better

* Match __amHandleFrameMsg

* Rename audio microcode from unknown, and clean up some code styles and variables names

* WIP audioNewThread

* Update WIP for audioNewThread

* Close to matching audioNewThread

* Match amCreateAudioMgr

* Match __amDMA

* Add constants, and remove static functions from header

* Make funcitons static where the originals were

* Fix score.py

* Split audiomgr and audiosfx files

* WIP clean up of audiomgr.c

* Finalize split of audiomgr and audiosfx

* Use AMAudioMgr

* Move the deck chairs

* Clean up sfx header

* Cleanup

* Cleanup sfx file, and move asm files

* Update score

* Fix NON_EQUIVALENT

* Match _sndpVoiceHandler

* Update some types
2023-01-31 07:39:22 -05:00
Rena Kunisaki f3da7f8f11 import several names from JFG symbol table 2023-01-28 20:25:21 -05:00
8b230b0d43 couple funcs (#361)
* match set_render_printf_position

* Update printf.c

* fix macro

* match func_80066610 and print_debug_strings

* rename

* rename

* Update camera.c

* Update camera.c

* taj related labelling

* tracks.c shenanigans

* printf

* match func_8003EC14

* match func_8003EDD8

* fix warnings

* comments

* rework boss vehicle struct

* Update objects.c

* fix warnings

* qukc fixes

* Update src/object_functions.c

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

* Update src/object_functions.c

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

* Update src/object_functions.c

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

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
2023-01-23 12:54:17 +00:00
FazanaandGitHub 9ef055e6ae Bit of renaming, bit of cleanup, bit of matching it has it all (#350)
* Update racer.c

* name two stack vars

* name few func

* match func_8002AD08

* bit of cleanup

* m

* stack related cleanup

* Update game.c

* changed my mind

* simplification

* more

* Update osCreatePiManager.c
2023-01-05 17:37:08 +00:00
c6351af6c3 lots of matching involving misc racers (#346)
* match func_8005E4C0

* label vehicle enums

* prelim

* match func_800B1130

* match func_8005F310

* prelim

* match func_8005C364

* rename and warning fix

* another wave of particle cleanup

* match func_8005E204

* fixed warnings

though it's just a plaster

* Update objects.c

* match func_8005D0D0

* macros

* some labels

* match func_8005D820

* reorganise boss headers

* stuff that I don't really feel like describing it's just lots of dumb stuff lol

* add collision.c

* one more

* some racer documentation

* fix blacklist bug in score.py

* more.

* nonequiv func_800314DC

* Update collision.c

* Update unknown_0255E0.h

* document two camera funcs

* Update racer.c

* quick fixes

* Update src/vehicle_tricky.c

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

* Update src/vehicle_smokey.c

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

* Update src/vehicle_misc.h

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

* Update src/particles.h

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

* Update src/vehicle_bluey.c

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

* requested changes

* Update vehicle_smokey.c

* oops missed one

* Update object_functions.c

* Update racer.c

Co-authored-by: David Benepe <benepe96@gmail.com>
2022-12-30 14:14:53 +00:00
041a3927b9 Few matches + renames (#340)
* implicit errors

* good lord that was a lot

* Update csplayer.c

* Update game.c

* give names to the image segments

* Update csplayer.c

* whole bunch of nonmatching stuff

* rename a thing

* match func_8001BB68

* match func_8001A7D8 and document checkpoints

* match func_8000F648

* match func_800214E4

* Head.

* match func_8002342C

* nonmatching obj_loop_weaponballoon

* match func_8001709C

* match func_8003E694

* Update object_functions.c

* name a field

* match new_memory_pool

* we do a little labelling

* label function rendermode flags

* name interacted objects

* Update object_functions.c

* quick fixes

* Update unknown_05FF10.c

* alakazoom

* 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 include/structs.h

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

* oh this is necessary because recursive lol

Co-authored-by: David Benepe <benepe96@gmail.com>
Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
2022-12-15 20:19:28 +00:00
FazanaandGitHub 1d53b19f36 add implicit declaration errors (#337)
* implicit errors

* good lord that was a lot

* Update csplayer.c
2022-12-10 23:34:00 +00: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
c8710bc97a Menu Matches, cleanup and documentation (#247)
* Match func_80097D10 and near match func_80097918

* Rename some funcs

* Decompiled 4 functions in unknown_078050

* Renamed decompiled functions.

* Cleaned up a partial match

* Match menu_file_select_loop

* Match func_8008D5F8

* Match func_8008D8BC

* Match func_8008C168

* Match func_8008C698

* Minor updates

* Near match func_80081F4C

* MAtch func_80081F4C

* Apply some constants for half screen width

* Minor code cleanup and warning fixes

* Match menu_game_select_init

* Use constants

* Fix issue from last merge

* Update progress in README

Co-authored-by: David Benepe <benepe96@gmail.com>
Co-authored-by: Ryan Myers <foldor@gmail.com>
2022-10-03 08:07:23 -04:00
FazanaandGitHub f396463e95 Minor misc labelling (#246)
* 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
2022-09-29 11:06:38 -04:00
Ryan MyersandGitHub 3a2fa13e5c Fixed all lib file warnings (#240) 2022-08-09 13:13:33 -04:00
924b89cc80 Match most of the remaining unmatched libultra functions, mostly from the audio library (#239)
* Fix alSynAllocFX

* Match alCSPNew and __CSPVoiceHandler, which had slight differences from libreultra

* WIP __CSPHandleMIDIMsg

* Match alFxPull

* Match func_8006492C and func_8006493C

* Match alFxParamHdl

* Match _loadOutputBuffer:

* Match _doModFunc and with it finish reverb.c

* Match alSynNew and finish synthesizer.c

* Match some unknown funcs cleaner

* Clean up func_80063BA0

* Clean up func_80063A90

* Fix warning

* Add missing header files from previous commits

* Match alBnkfNew.c

* Match alCSPGetState

* Match several more audio lib funcs

* Match alSynDelete, and alSynSetFXMix

* Properly move __osRcpImTable data into osSetIntMask and our of alSynSetPriority

* Kind of match alSynSetPriority, and match alSynSetVol

* Delcare functions as static again to fix the score script regex

* Seperate some al files out like they seem to be in ultralib

* Match event.c

* Match synallocvoice.c

* Match some more audio funcs

* More audio matches

* Yaya more audio, I know

* Couple more matched files

* Match filter.c

* Match resample.c

* Match load.c

* Get env.c closer to a real match

* Fix some code related to an assert in env.c

* Match env.c, which has many differences from later public versions

* Finish matching audio library code

* Deleted unnecessary asm files, and made tweaks to al files to fix score script

* Fix codebreaking formatting error ;)

* Update include/PR/libaudio.h

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

* Update include/audio_internal.h

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

* Renamed sl.c.c to fix that, and renamed NOPSNEEDED to make it more clear it's not to be used.

Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>
2022-08-08 07:35:44 -04:00
FazanaandGitHub 9c8456cfee 25% (#235)
Match and label various racer.c funcs
2022-05-28 23:41:26 +01:00
David Benepe 3e416d33dd Decompiled 4 functions from unknown_0ABDF0 2022-04-06 19:58:23 -04: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
David Benepe 5d18088f62 Even more progress with object_functions 2022-02-13 18:05:12 -05:00
David Benepe cc66641750 Fixed osMotor bss variables. 2022-02-13 13:04:59 -05:00
b36d96a655 Matched and documented a lot of functions in controller pak (#201)
* Matched and documented a lot of functions in controller pak

* Clean up warnings on controller pak funcs

* Match func_80076A38

* Rename string_to_font_codes as I had it backwards

* Rename func_80076A38 to it's proper name

* Update and name some more funcs

* Near match for tt_menu_loop

* Remove M2C code, made SIDeviceStatus a type where possible, and reverted ghost header struct changes as I'm not happy with them

* Fix typo

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

* Better names for SIDeviceStatus enum UNK vals.

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

* Implement further suggestions

* Attempt to decompile func_80093D40, and got relatively close, identified some variables, but never got there yet

* Identify a couple more variables

* Match menu_boot_loop, it was *so* close, and just needed moving the s32 temp declaration.

* New matches from David just being added to my PR.

* Update return type of func_80087F14 to SIDeviceStatus, and make the #if 1 into a NON_EQUIVALENT for menu_character_loop for consistency

* Update src/unknown_0ABDF0.c

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

Co-authored-by: Ryan Myers <foldor@gmail.com>
Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>
2022-02-07 08:55:50 -05:00
Ryan MyersandGitHub c014cdd52a alFxNew Updates from libreultra (#197)
* Fix many warnings, mostly when using funcitons without including headers, and mostly in libultra files. Included a few warning ignores as well

* Add another warning fix

* Update alFxNew from libreultra's drvrNew.c file, to have some better matches and warning fixes

* Match alFxNew

* Redo the trailing comma, and a slight bit of documentation added

* Rename alLoadPull file to match what it's called in libreultra, alAdpcmPull

* Forgot to change the name in the GLOBAL_ASM

* Potentially identify a function name, but don't commit to it yet
2021-12-16 08:20:50 -05:00