* 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
* Matched ObjHsStump_Appear
* 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
* getting ghaka started
* two more matching funcs
* functions all match, but no OK...yet....
* some clean up stuff
* uhhh lets try this?
* fixing save context stuff
* z_obj_ghaka OK
* fixing small changes
* adding in new suggestions
* fixing error
* ringing in the bell
* another matching func
* stuck on func_80A357A8, needs a z_actor func...
* no luck on a fix, but got further...
* matched func_80A357A8, one left
* might be on the right track? saving progress...
* getting closer
* pushing up matching, it has warnign regarding Vecs
* all functions matching
* obj_bell OK, time for bed
* prepping for PR
* fixing suggestions
* 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
* First pass
* second pass
* Everything matches now
* Fix ori
* final pass
* Add description
* Fix warnings (I hope)
* move dlist to top of the file
* Fix conflicts
* 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>
* some easy functions
Signed-off-by: Angie <angheloalf95@gmail.com>
* init is cursed
Signed-off-by: Angie <angheloalf95@gmail.com>
* func_80919230 is weird
Signed-off-by: Angie <angheloalf95@gmail.com>
* I'm dumb
Signed-off-by: Angie <angheloalf95@gmail.com>
* func_80919768 nonmatching
Signed-off-by: Angie <angheloalf95@gmail.com>
* everything is wrong
Signed-off-by: Angie <angheloalf95@gmail.com>
* This thing still doesn't want to match
Signed-off-by: Angie <angheloalf95@gmail.com>
* improved a bit
Signed-off-by: Angie <angheloalf95@gmail.com>
* a bit of renaming, but it still doesn't work
Signed-off-by: Angie <angheloalf95@gmail.com>
* almost matching
* func_80919768 ok
* func_809199FC ok
* init was dumb
* add enum and other minor changes
* run format
* 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
* 1 scene done, Z2_SOUGEN OK
* All scenes OK
* Makefile improvements
* Use WIP ZAPD branch as submodule
* Add spawn rotation flag macro
* Fix bad merge
* Move scenes to be in their own subfolders
* Rename and restructure extracted baserom files
* Progress tracking for assets
* Add asset progress to csv
* Use master ZAPD
* Use distclean like in OOT
* Fix up a few things with the makefile
* Fix scenes not being dumped from ELF
Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
* z_en_item00 WIP 17/21 match, rest close to matching
* Split .rodata for z_en_item00
* Item00 documentation, some misc cleanup
* Minor cleanup
* Fixup for z_collision_check
* Address feedback
* Delete old file
* Fix bad merge
* Progress on various files
* gfxprint stuff
* split some rodata, add iconv for rodata string parsing
* z_std_dma rodata
* 2 nonmatchings in gfxprint
* mtxuty-cvt ok
* more
* match a function in idle.c
* progress
* Cleanup
* Rename BgPolygon to CollisionPoly
* progress
* some effect stuff
* more effect progress
* updates
* made suggested changes
* z_effect_soft_sprite_old_init mostly ok
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
* EnTuboTrap: All but one, non-matching: minor regalloc
* EnTuboTrap: updates to zel's actor struct changes and cleaning
* EnTuboTrap: fullgrowngaming's requested changes
* EnTuboTrap: changed non-matching asm to new location
* Update src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
* EnTuboTrap: moved dlist externs to segment, and objects up to top of object_script.txt
* EnTuboTrap: requested changes
* EnTuboTrap: Fix GLOBAL_ASM, updated to Tharo's collision
* EnTuboTrap: collision enum was added
* EnTuboTrap: Update sfx function name
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
* TwoHeadArena and TwoHeadGfxArena OK
* Changed negatives to ~ in TwoHeadArena.c
* Renamed functions to match OoT
* Formatted code files
* Removed dispbuf
* Initial shutter work
* Fixed types.h
* bg_ikana_shutter OK
* Reverted errant change to ultratypes
* Adjusted to use new actor field names
* fixed submodules
* Cleaned up a comment I left by accident
Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
* Initial scopecoin work
* Scopecoin OK
* Updated submodules
* Fixed newline on macros.h, fixed a few minor details in scopecoin.c
* Made requested minor adjustments
* merge
* Matching (last thing to figure out is ColliderInit)
* nnh work
* Working on collider
* formatting
* Fixing en_nnh
* Fixed build error. The issue was a collider init, not sure what made me think it was OK before
* Removed overlay helper stuff
* Removed weird qemu file
* Fixed collider once and for all.
Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
* All but 2 functions matched
* More work on hookshot
* hookshot work
* 2 functions left (and one is almost done)
* sp issues with draw, but matching otherwise
* hookshot matching
* Changed rodata inclusion for armshook
* Hookshot OK
* Resolve script conflicts
* Rename unk variables to match MM standard
* Made requested changes
* bg_market_step OK
* Ran formatting script
* Converted arrays to Gfx* arrays and formatted init vars properly
* Propery formed display lists and arrays
EllipticEllipsis