* started init, not matched yet
* all except init matched
* haka_zou OK
* haka_zou done
* fix jenkins problem
* various improvements
* removed unused asm
* fixed things
* fixed new dyna names
* more dyna fixes
* ok now?????
* this better build OK
* applied roman's suggestions
* function renames
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Start work on Jya Cobra
* Match two functions
* Work on func_80896ABC
* func_80896CB4 and most of func_80896D78
* Fix func_80895BEC, clean up func_80896ABC
* Work on func_80896EE4
* Match func_80896EE4
* Nearly match func_80895A70, finish BgJyaCobra_Draw
* Match func_808969F8, start on func_80895C74
* Work on func_80895C74 and func_80895EF0, data move
Also ran permuter
* Some cleanup
* Almost match func_80895C74, tiny bit of work on func_80895EF0
* Remove variables in func_80895EF0
* Make init match nicer
* Work on func_80896518
* Progress in func_80896518
* Figured something out in func_80896518
Going to experiment with stack stuff
* func_80896518 has tiny stack and regalloc issues
* Work on func_80895EF0
* Some work on func_80895EF0
* Update diff script
* Work on func_90995EF0
Use 2d array indexing in func_80895EF0
Small regalloc improvement in func_80896518
Change not equal to to less than where possible
* match func_80896ABC and func_80896D78
* Improve func_80895EF0 a bit
* Do some cleanup
* Change commented out functions to ifdefs
* Another bit of cleanup
* Run formatter
* Remove now unused include
* Another another bit of cleanup
* Revert update to diff script
* PR suggestions
* PR comments
* PR comments, a bit of documentation
* Run formatter
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* More PR comments
* actor fixes
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Data migrated, all but Draw matched
* Draw likely equivalent
but serious regalloc issues,
and that last Gfx_TwoTexScroll is being very stubborn
* Merge remote-tracking branch 'upstream/master' into Thunder
* some improvements, set up to PR as nonmatching
* spec
* corrected header
* added function to functions.h
* delete asm
* Added new collider init
Co-authored-by: fig02 <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* some decomp
* still playing around with this
* rename functions
* ZAP again
* ZAP again
* the renaming begins
* more renaming. hopefully didn't break anything
* change all the things
* this and then merge
* and done
* one little thing
* small docs, small rename
* changed mind on cylinder and quad elements
* something
* more stuff
* more docs
* more adjustments
* Fixed some types
* more fixes
* all sorts of cleanup
* now with flags
* match!
* names and such
* update tools
* damage tables
* ColChkInfo
* one more thing
* formatting
* more formatting
* anime merge
* some stuff
* damage table
* again
* changes
* .s
* changes
* oc2 type
* a couple things
* format
* un-name magic arrows, not enough proof yet
* fix damage table script and remove old one
* EnAObj
* changes
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Fixed descriptions of Zelda's Lullaby, Song of Time, and Scarecrow's Song effect actors
* Added enums for song types
* fixes
Co-authored-by: Fig02 <fig02srl@gmail.com>
* matched functions, still need data
* shopnuts OK
* cleaned up some things in hintnuts by comparing to shopnuts
* merge with new animation stuff
* fixing merge 2
* suggested changes
* missed a DECR
* suggestions
* Add byte swap for v64 files
Signed-off-by: angie <angheloalf95@gmail.com>
* Reduce `len` function calls
Signed-off-by: angie <angheloalf95@gmail.com>
* Optimze a bit the byte-swapped v64 format
Signed-off-by: angie <angheloalf95@gmail.com>
* Strip the overdump before doing the byte-swap
The previous way wasted time by byte-swapping data that would be discarded anyway.
Signed-off-by: angie <angheloalf95@gmail.com>
* Swap twice the bytes per cycle to improve performance
Signed-off-by: angie <angheloalf95@gmail.com>
* Read and write 16 bytes at a time and specify explicit endianness
Reading more bytes per cycle allow to speed up the swapping proccess
Signed-off-by: angie <angheloalf95@gmail.com>
* Add v64 compatibility in the Readme
Signed-off-by: angie <angheloalf95@gmail.com>
* Read whole file as little endian and write it as big endian without the loop
Signed-off-by: angie <angheloalf95@gmail.com>
* Migrate data to C
* Partially decompile Init
* func_80B959D0 OK
* ObjKibako2_Destroy OK
* ObjKibako2_Update OK
* ObjKibako2_Draw OK
* func_80B95CA4 OK
* ObjKibako2_Init OK
* func_80B95DFC
* func_80B95ED4 OK
* func_80B95A28 OK
* Name functions
* Delete unused asm and update spec
* Fixup math post rebase
* Name statics
* Clean up variable names
* Run formatter
* xzDistFromLink -> xzDistToLink
* Respond to feedback in ObjKibako2_Break
* Type sp2C as a CollisionHeader* and initalize it when declaring it
* Respond to remaining review feedback
* Respond to review feedback from Roman
* z_lifemeter OK
There were a few versions that matched, so the duplicate `ddfactor`
might be fake. The `if (interfaceCtx)` at the start seems to be required.
I think `sHeartsPrimFactors[0]` vs `sHeartsDDPrimFactors[ddtype]` is
real, because the asm loads `sHeartsDDPrimFactors` for each access,
while it only loads `sHeartsPrimFactors` once. It could have something
to do with `reduceixa` in uopt.
* Make vars function-static
* Fix names
* Gameplay_Init ok
* add (void)0 to prevent warnings in gameplay_init
* update nigthflag
* .
* remove tools/ZAP2 from origin master
* made suggested change
* made sgugested changes
* z_lifemeter cleanup finished, one non-matching
* made Health_UpdateData a bit better, nowhere near matching still
* lifemeter done for now
* fixed define issue
* improve z_lifemeter, still doesn't match
* z_lifemeter done
* Rename functions
* Add files via upload
* Update Health_Update.s
* fix missing symbols in asm file
* Update Health_Update.s
* Update Health_Update.s
* fixed stuff
* Add files via upload
* Delete Health_Update.s
* Rename things according to Roman's suggestions
* lifemeter done hopefully
* fix unused asm that for some reason didn't merge
* fix feedback
* compiles right now
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
* beginning of migrating changes
* got matching
* changed order a bit
* clean up bgcheck
* fix conflict
* fix conflict again
* first stab at identifying types, some oks
* Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs
* more OKs, z_bgcheck.bss migration, update some sys_math3d.c args
* couple more OKs
* pushing some OKs
* fix compilation issues
* code_800430A0.c OK, more files decomp'd
* 8003A3E0 big OK :)
* Decomp most of func_8003C614, decomp helper funcs
* Decomp SurfaceType, CamData, and WaterBox property related functions
* more OKs, big OK in 8003C078
* more OKs, more progress, move a function definition in z_collision_check to functions.h
* more clean-ups, more OKs, dyn_vtx is now defined as u8*
* 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better
* data migrated, more OKs
* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled
* func_80040284, 800409A8 non_matching, add IS_ZERO macro
* All asm files have C representations, some big OKs, lots of minor tweaks
* More OKs, non-matching code cleanup
* 8003FBF4 and 80040BE4 OK, improve codegen for most functions
* format z_bgcheck.c
* fix warnings, compile errors on NON_MATCHING
* func_8003EE80 is now NON_MATCHING
* begin documenting some functions
* formatting
* more documentation, func_8003A95C OK
* fix PHYSICAL_TO_VIRTUAL changes
* fix var rename
* More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP
* func_8004239C ok, more NON_MATCHING improvements, more documentation
* Implement most suggested changes
* Convert comments to slower comments
* /**
* Implement ZAP2 changes
* my anti-virus ate my format.sh results
* Rename a couple hundred functions, fix minor stuff
* rename var so that clang formats correctly
* run format.sh
* implement Petrie's matches/suggestions
* format
* matches
* and the asm
* slight error
* Add SSList
* two more matches
* stuff
* implement code changes
* clean up Petrie's matchings
Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* EnTite_Update matching
* Fixes to update
* made good progress, func_80B1A2A0 is in a good place to be matching soon
* Merge stuff
* func_80B19E94 done, func_80B18CC4 done
* EnTite_Destroy and EnTite_Init done
* Commenting out sDamageTable and EnTite_Init until all the data matches
* Some more small functions done
* more progress
* func_80B19918 done
* func_80B18E7C done
* func_80B19524 done
* more progress
* EnTite_Draw equiv but nonmatching, file otherwise done
* Found some unstaged changed on old laptop
* Draw matching: File fully matching!
* Documentation
* finished documentation
* deleted data files
* update spec
* fixed waterY -> yDistToWater rename after merge
* ran format.sh
* fixing accidental renames in camera
* Fixed some obvious number/comment formatting issues
* Removed unecessary prototypes
* merge
* running format.sh
* suggestions
* more pr comment changes
* format to push
* one more change
* more renames (see pr comments)
* merge
* renames
* format.sh
* fix renames
* function comment formatting
* merge + format
* endless merge fixes
* merge fixes until die
* yet again a merge fix
* pr suggestions
