* First pass: matched everything with data
* Better matching of data and ObjRaillift_Init
* Documented
* Added clarifying comment
* Change 0 and 1 to false and true for isColorful
* PR Comments
* PR name suggestions
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
* ObjEnding Matches but with unkStruct and no data
* Removed inital code comments
* Added data as a comment
* Add missing semicolon
* Addressed PR comments
* Added data
* Cleanup
* Some documentation
* Change 0 to NULL
* Remove redundant array size
* Cleanup
* Fix Format
* Rename D_80C25CE0
* Change this to thisx for indexing sGraphics
* Change this to thisx
* PR suggestions
* rename graphics
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
* Data imported, 8/30 functions done
* OK
* Delete ASM references, add SFX
* Named functions
* more naming
* Type the nop ActorFunc correctly
* A couple more bits of documentation
* Sorted object_script
* Merge remote-tracking branch 'upstream/master' into Firefly
* format
* Update other includes
* Review suggestions
* Review changes; named Actor_Noop
* Format
* Rename Player, name some of its struct vars,
add collision flag macros to actors missing them
* Name Player_GetMask/RemoveMask, add a few macros
* Format
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Fix unk_14B in a non-matching
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnNiw: Rebase of WIP to work on collsion
init almost matches
EnNiw: WIP
EnNiw: running low, and too many not-matches for my liking
EnNiw: WIP 3
* EnNiw: update to master
* EnNiw: fix late rodata
* wtf is going on
* EnNiw: update is a thing, glad I'm doing it last
* EnNiw: likely branch mysery
* EnNiw: a horrible little draw function
* EnNiw: nope, feather draw still fucked
* EnNiw: fixing merge issues with master
* EnNiw: update is no longer non-matching
* EnNiw: cleaning/docs
* EnNiw: cleaning/docs 3
* EnNiw: more docs 4
* EnNiw: OKs again now that data was removed
* EnNiw: Docs and cleaning 5
* EnNiw: Docs and cleaning 6
* EnNiw: Docs/cleaning and changed a function and that changed a bunch ugh
* EnNiw: format and make check
* EnNiw: data re-merged, and matches
* EnNiw: forgot about these
* EnNiw: another attempt at feather draw, still not even close
* Multiple: now that we know the last paramter is a flag, change all to hex
* Player: fix wrong padding
* EnNiw
parameter name consistency
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
REG
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnNiw: Likely suggestions first
easy suggestions first, then I'll attempt the stuff I'm not sure will match
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnNiw: compiling again
* EnNiw: more suggestions added
* EnNiw: last of minor changes
* EnNiw: shorten overly long float
* EnNiw: feather counts as define
* EnNiw: add c file description
* EnNiw: Some Suggested Changes
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* EnNiw: more suggestions
* EnNiw: More suggestions
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* EnNiw: moved OPEN_DISPS to contentional location, still not close
* BgIcicle/EnSb: renamed func_800B78B8 to Actor_UpdateBgCheckInfo
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* iknv_obj ok
* Documented a few more functions and updated type enum
* Added engineer's changes
* Changed negations at engineer's request (casts required)
* Changed negations at engineer's request (casts required)
* Got rid of extra parentheses
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnGirlA Matches
* Convert func to boolean
* Cleanup
* missed a little cleanup
* Update with new MACRO
* revert z_en_item00.c macro, and add one more macro
* Documented
* Format macros.h
* Fix VTX format
* rename isBought to isOutOfStock
* PR suggestions
* Document a bug
* PR comments
* First pass, 5 still non matching
* data
* cleanup
* Progress on func_808F33B8
* func_808F33B8 is ugly but it matches
* func_808F5728 ugly but matches
* cleanup
* More cleanup/doc a possible inifite loop bug
* Cleanup of the switch
* Readd functions returns
* More progress on THE switch
* Everything matches but the MACROS
* OK
* Add new global Animaion struct
* fix arg name
* PR suggestions pt 1
* PR suggestions pt 2
* Fix up a few things
* Add comment about walking flag
* update functions.txt
* Update 7 to more explicit bits
* More PR cleanup
* Everything matches but func_80BDABCC
* Better names, still stuck on func_80BDABCC
* Some cleanup
* Add param macros and document not matching
* format
* PR suggestions
* Bring over data to c file
* Retry Jenkins
* Retry Jenkins take 2
* PR suggestions for comments
* PR comments
* Lots of progress
* OK
* Removed casts
* Run format.sh
* cleanup
* More cleanup
* Minor Doc
* More cleanup
* Format
* Add header description
* PR comments
* Convert raw pointers
* Update to new gSaveContext
* PR suggestions
* not ok, why?
* OK!
* fix data
* finish data etc
* work on save context
* save finished
* first func done
* roomInf
* done for now
* add missing file
* add most og names for struct members
* fix accidental change
* Update z_en_ginko_man.c
* Update z_scene.c
* maybe fix stuff hopefully
* proto
* sasa
* Update include/z64save.h
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update z64save.h
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* almost every function
* atans ok
* import data and rodata
* format `atan_first_8th_array`
* fix signature and rodata
* rename to angle
* Rename the functions to match their OoT counterparts
* rename code_0x8017FEB0 to sys_math_atan
* BgCtowerGear OK
* Added description header
* Updated functions.txt
* Added MACRO to get type
* Renamed init chains to match tyype
* Added one more use of Macro, and addressed PR comment
* Fixed data copy error and better naming
* Restore padding in ObjVisiblock struct
* Copy overlays out of compiled `code.elf` to put into the ROM
This is just a "tempory fix"
It seems like the built code/assets in `code.elf` should not be copied
into `build/baserom/...` (over the original ROM's files) but instead
into a `build/decomp/...` tree or similar.
`dmadata_table.txt` would also need to be updated to read from the
correct location.
* Use dmadata_table.txt to generate build rules
`makerom_files.txt` & `makerom_uncompressed_files.txt` contained a lot
of the same data in `dmadata_table.txt`, so I added a small python
script to generate this information into `build/`
Segments are no longer dumped out of `code.elf` into `build/baserom/``,
instead they are put in `build/binary/`.
`linker_scripts/dmadata_script.txt` was checked in, but generated by
`dmadata.py`. I deleted it / moved it to `build/dmadata_script.txt.pre`.
I also introduced some sentinel files (`dep`). I ended up needing these
to make incremental builds work smoothly? (Without them, there were a
lot of steps that were getting re-triggered on every build.) If this
style isn't welcome, I can try to fiddle with the Makefile more to try
to avoid having them?
* Restore padding in BgLbfshot struct
* Touch sentinel file before command; rm on failure
* Restore padding in ObjKepnKoya struct
* Ensure asm/ directories exist before disasm steps
* Clean up Makefile rules
* Set default goal; silent objcopy; fix code_script path
* Fix ovl_En_Ginko_Man, ovl_Obj_Lightswitch merge
ovl_En_Encount2 still needs work to bring back to matching
* Fix ovl_En_Encount2 merge
* EnEncount2: start
* EnEncount2: got some easy functions down, but now I have a really weird unk struct
* EnEncount2: draw function nowhere close
* EnEncount2: cleaning/docs
* EnEncount2: removed bad function attempt
* EnEncount2: function name change to match mster changes
* EnEncount2: corrected old BgMeshheader to CollisionHeader
* EnEncount2: requested changes
* EnEncount2: forgot to add these requested changes
* EnEncount2: requested changes
Co-authored-by: isghj8 <isghj8@gmail.com>
* match function
* major cleanups
* rename switch functions
* use graph_alloc to fix fake matches
* more documentation
* more matches, lots of changes
* lots more work
* format
* Update z_scene_proc.c
* very hard lagrange interpolation function OK!
* remove any remaining
* documentation done, only two functions left
* a few more things
* one function left!
* document another oot leftover
* last function decompiled, not matched yet
* scene_proc complete
* start work on z_scene
* done with z_scene
* remove unessecary typedefs
* fix some things to remove warnings
* Add z_scene_table and decomp data
* Delete ctx.c
* add draw cfg enum
* cleanup
* most scene table functions done
* done for now
* all scene files done
* Update include/z64scene.h
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* add missing macros
* fix some renames
* scene texture file rename
* added temporary structs so it still builds
* more structs
* even more old structs
* fix boyo
* should fix compile error
* lets hope nothing broke
* ub comment back
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* EnNutsball Match but one function with sp issues
* Updated ActorPlayer
* Renamed unk144 to timer and added data as comment
* Got update matched but stack issues with two vars
* add back new line
* Fixed stack issue based on PR comments. Added data
* more descriptive variable names
* Use OPEN_DISPS/CLOSE_DISPS macros in draw
* Address PR comments
* ovl_Dm_Ravine OK (Link Riding Through Lost Woods Cutscene - Tree Trunk)
* ovl_Dm_Ravine: respond to PR comments
* Rename/retype DmRavine_Action -> DmRavine_DoNothing
* ovl_Dm_Ravine: incorporate PR feedback from kyleburnette
* ovl_Dm_Ravine: rename fields; use enum for state
* starting actor
* close to being done
* updating txt files
* z_en_jc_mato OK
* Merge branch 'master' into en_jc_mato
* fixing some suggestions
* adding names
* changing name to movement
* initial fence work
* more fence work
* bg_kin2_fence OK and documented
* removed ctx file
* got rid of unk283 which didn't exist
* Renamed the array of eye sparkle particle spawns locations as suggested
* reok-ed kin2_fence
* start prerender
* match func_8016FDB8
* fix fake af match
* actually add prerender
* Delete ctx.c
* test
* lots of oot transfers
* lots of new functions done
* match even more functions
* slowly thread functions
* two prerender functions left
* some docs
* make names more consistent with oot
* ready for pr?
* Update PreRender.c
Derek Hensley