* EnBji01_Init OK and Partially Documented.
* EnBji01_Destroy OK and Fully Documented.
* func_809CCE98 OK and partially documented.
* Removed goto in func_809CCE98().
* func_809CD6C0 matching and partly documented.
* Pasted raw mips_to_c into EnBji01_Update().
* EnBji01_Update() matching and partially documented.
* EnBji01_Update() matching and partially documented.
* func_809CDA4C() matching and partially documented.
* func_809CDA4C actually matching this time, and partially documented.
* func_809CDB04() matching and partially documented.
* func_809CD028() matching and mostly documented.
* func_809CD6B0() matching.
* func_809CD328() matching and partially documented.
* func_809CCDE0() matching and partially documented, func_8013E950()
prototyped.
* func_809CD634() and func_809CD70C() matching and partially documented.
func_801A5BD0() prototyped.
* func_809CD77C() matching and mostly documented. All functions now
matching.
* Imported data from ovl_En_Bji_01_data.asm to z_en_bji_01.c. Updated
object_script.txt and code_script.txt. Ran format.sh. Builds OK.
* Documented all of the unks in Shikashi's struct. Build still OK.
* Fixed new warning in Bg_Haka_Tomb resulting from my new prototype of
func_8013E3B8().
* Renamed remaining instances of unk160 to cutscenes.
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
Remove unnecessary comment about compiler padding.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
Correct stack declaration spacing.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h
Remove unnecessary comment about compiler alignment padding.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
Remove unnecessary padding comment.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Batch commit for comments during code review.
* Apply suggestions from code review (trailing Us)
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Deleted exteraneous space at the bottom of En_Bji_01 struct in the
header file.
* Used params enum for switch cases.
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
* Apply suggestions from code review
replacing magic numbers with limb enums
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Renamed func_809CD328 to EnBji01_DialogueHandler per code review.
* ObjWarpstone_Init() matching and mostly documented.
* ObjWarpstone_Destroy() matching and fully documented.
* ObjWarpstone_Update() matching and partially documented.
* ObjWarpstone_Draw() matching and partially documented.
* func_80B92B10() matching and partially documented.
* func_80B92C00() matching and mostly documented.
* func_80B92C48() matching and mostly documented.
* func_80B92CD0() matching and partially documented.
* func_80B92DC4() matching and fully documented.
* Obj_Warpstone OK.
* Obj_Warpstone OK and mostly documented.
* Changed "actionFunc" return values from 0/1 to false/true.
* Apply suggestions from code review
Change colors to decimal, and use matrix defines/enums instead of magic numbers.
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
* Convert more colors to decimal and replace more magic nums with mtx
defines/enums.
* Ran format.sh after adding (wordy) mtx defines.
* Ran format.sh which updated ginko_man.
* Update src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c
Switch to line comments.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Changed floating point constants in ObjWarpstone_Draw to hex per code review.
* Rename timer and timer enums.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* wip
* fix
* add disassembler
* Disasm builds OK
* Variable addends
* More wip
* Rodata migration implemented
* Cleanup old tools
* Try fix submodule -> subrepo merge
* git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "602e609"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "602e609"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Builds again but assets are totally broken
* git subrepo pull --force tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "1ffdb08a"
upstream:
origin: "https://github.com/simonlindholm/asm-processor.git"
branch: "master"
commit: "1ffdb08a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables
* rm z64compress in preparation for subrepo
* git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "eb11085c"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "eb11085c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Fix asset extraction
* Fix diff-init make rule
* Split code bss
* Split assumed linker bug padding from assembly files
* add filelists for mm.us.rev1
* Maybe working, but I'm not sure
* add overlays to spec
* Add rodata to actos
* Everything compiles
* Make a lot of C files for code
* Add almost every file in code to spec
* whoops
* 3 code files left
* add scenes to spec
* More progress on progress.py
* Fix skelanime in spec
* audio files!
* Fix merge issues
* Fix some C files in code
* Fix remaining code files
* Use existing O1 C files in spec
* reorder boot order in spec
* update spec
* fault.c
* Convert relocs on completed actors, fixbaserom uses current rom name
* more boot files
* Add VT macros and script
* finish already existing boot files
* most of libultra
* fix 64bits libultra files
* Use C files for libultra, wrap some functions in NON_MATCHING
* Remove duplicate of OS_CLOCK_RATE from fault.c
* C files for fbdemos
* delete dumb files
* bootstrap C files, still need to add them to the spec
* update fixbaserom
* boot OK?
* I forgot to commit the spec
* C for gamestates
* C for kaleido
* Change all includes to ""
* copy actor sizes script from oot
* I forgot to delete those files
* Basic C files for effects
* Add effects initvars names
* Remove mislabelled boot functions from header/txt
* Begin porting bootstrap_fx, some sizes
* Fix <>
* Fix enum
* Fix diff.py
* fix libultra stuff
* update regconvert
* update setup warnings
* add some missing ;
* Fix some makefile stuff and other fixes on some non_matching functions
* add executable flag in extract_baserom and fixbaserom
* fix relative path
* copy assist from oot
* fix map path
* another assist path fix
* Delete C files for handwritten files
* add code_801A51F0 to spec
* add gfxbuffers to spec
* Move rodata to top of each file when possible
* UNK_TYPEs for func_801A51F0
* Remove kaleido rodata from spec
* Update spec and undefined_syms for recent merge
* GCC warnings and fix errors in nonmatchings,
* round percentage numbers
* progress script: format changes
* progress: error on non-existing files
* fix warning in z_scene_table
* Match 2 nonmatchings in z_actor
* Warnings in lightswitch and invadepoh
* Fix warning in z_actor_dlftbls
* I though I fixed this one
* whoops
* Comment out CC_CHECK
* Removed redundant ultra64.h includes
* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms
* Completed gamestates bootstrap
* Split kaleido_scope
* Remove section.h and segment.h, move keep object externs to a common location in variables.h
* Completed effects bootstrap
* Segmented address externs for effects, fbdemos, gamestates and kaleido
* Move actor data externs out of the if 0
* Segmented address externs for actors
* Prepare actionfunc detection
* fix script, how did it even work before
* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler
* Automated actionFunc detection in actors
* Segmented addresses from player .text
* rm old segment addrs script and fix build
* Move sizes folder to tools
* Make build.py executable
* New Jenkinsfile Prayge
* Remove numpy dependencies
* Add warnings_disasm_current.txt
* my bad
* Update spec and undefined_syms
* Add z_eff_ss_hahen to pametfrog
* git subrepo pull (merge) --force tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "163ca2af"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "163ca2af"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Make z64compress print to stdout
* sneeky commit to update warnings tooling
* test
* Another test
* Mark fixing overlay reloc generating as a TODO
* Update warnings stuff
* Communicate the return code from running z64compress back to the Makefile through the wrapper
* Run formatter, remove extra commented copy of function
* Re-fix some includes
* Convert atan to hex to conform to decided style
* Some tidying up, remove c for fp and the other two handwritten code files
* BSS in z_collision_check & z_scene_proc
* add static back in
* Fix timerintr bss, add file to spec, some cleanup
* Remove externs
* Newline
* Readd enums
* Typo
* Colours
* Comments for hitmark enum values
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Improvements and suggestions
* Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* all functions decomped, just need the OK
* ....5 differing words....
* Pamera OK
* addressing PR comments, plus some documenting
* addressing some of the comments
* another small typo...
* wrapping up PR comments
* EnMaYto_Update
* init
* func_80B8E84C
* CURRENT_DAY and run format
* a few other functions
* symlink to diff.py
* identify lots of functions
* and more functions
* small
* and a bunch more
* Another bunch
* small
* another bunch of functions
* And so on
* Another bunch
* func_80B8E6E0
* func_80B8E938
* func_80B8EA38
* Fix conflicts
* Another bunch
* two functions
* func_80B9083C
* func_80B8FA14
* OK
* Import data
* params and a bit of function renaming
* Minor reorder in object_script
* Fix merge issues and warnings
* Rename a few stuff
* fix merge issues
* And more renames
* More renames
* And moreeee
* Almost everything renamed
* Clock time and reformat
* Fix merge issues and add some undeclared functions
* Reorder alphabetically
* run format
* Minor styling stuff
* review changes
* Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Kenix's suggestions
* engineer's suggestions
* Run formatter
* whoops
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnBji01_Init OK and Partially Documented.
* EnBji01_Destroy OK and Fully Documented.
* func_809CCE98 OK and partially documented.
* Removed goto in func_809CCE98().
* func_809CD6C0 matching and partly documented.
* Pasted raw mips_to_c into EnBji01_Update().
* EnBji01_Update() matching and partially documented.
* EnBji01_Update() matching and partially documented.
* func_809CDA4C() matching and partially documented.
* func_809CDA4C actually matching this time, and partially documented.
* func_809CDB04() matching and partially documented.
* func_809CD028() matching and mostly documented.
* func_809CD6B0() matching.
* func_809CD328() matching and partially documented.
* func_809CCDE0() matching and partially documented, func_8013E950()
prototyped.
* func_809CD634() and func_809CD70C() matching and partially documented.
func_801A5BD0() prototyped.
* func_809CD77C() matching and mostly documented. All functions now
matching.
* Imported data from ovl_En_Bji_01_data.asm to z_en_bji_01.c. Updated
object_script.txt and code_script.txt. Ran format.sh. Builds OK.
* Documented all of the unks in Shikashi's struct. Build still OK.
* Fixed new warning in Bg_Haka_Tomb resulting from my new prototype of
func_8013E3B8().
* Renamed remaining instances of unk160 to cutscenes.
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
Remove unnecessary comment about compiler padding.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
Correct stack declaration spacing.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h
Remove unnecessary comment about compiler alignment padding.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
Remove unnecessary padding comment.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Batch commit for comments during code review.
* Apply suggestions from code review (trailing Us)
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Deleted exteraneous space at the bottom of En_Bji_01 struct in the
header file.
* Used params enum for switch cases.
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
* Apply suggestions from code review
replacing magic numbers with limb enums
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Renamed func_809CD328 to EnBji01_DialogueHandler per code review.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
* merge main
* Match Init
* Clear_Tag OK
* Full documentation
* More docs
* Fix function
* Fix MakeFile for assets and Fix texture swapped names
* Fix name
* Improve name and remove pad
* Can't stop the minor tweeks
* Adding potential Makefile fixes
* Minor name change
* Another name fix... and format
* PR Suggestion & Add Overlay File Description
* Re-documentation to match OoT WIP (more to come)
* Finish docs from OoT
* Fix merge and format
* Minor touch-ups
* Cleaner conditional
* First decomp pass: Matched everything w/ data
* Minor cleanup of func_80AE2F78
* Documented
* Format
* Some cleanup and PR suggestions
* Format
* Add the word player to a few functions to specify it is the player trying to buy
* Add controller macros
* Move common shopkeeper defines
* name unk274 and add note to unk27A
* Remove macros and just use flag defines
* Convert Controller Macros to take globalCtx
* Fix merge conflicts
* Create z_quake.c file
* Match all quake functions with OoT counterparts (quake2 left)
* z_quake OK
* Document first half of quake
* More docs
* more cleanup
* remember to format!
* PR Suggestions
* More PR Suggestions
* Applied changes to master on new branch
* some docs
* minor change
* Slight improvement to last draw func
* Got rid of all warnings
* Removed extra text file
* Readded warnings text file
* Fixed warnings text file
* Some cleanup, added engineer's new matched functions!
* Marked non-equivalent functions as such
* Improved last draw func (still non-equivalent)
* Made most of anghelo's suggested changes
* Slightly better code for func_80B4A350, though it's not matching still
* Engineer matched 2 funcs so I'm pushing those
* Added a function from engineer and one of my own
* Fixed warning
* Slightly better code for func_80B44C80
* Slightly better code for func_80B44C80
* Matched func_80B44C80
* Pushing engineer's matched draw func. All rodata funcs matched!
* Build NOT OK - rodata. Pushing anyway because I did a lot of work and it's close
* Build NOT OK (see previous commit) - func_80B440B8 matched
* Build NOT OK (see previous commit) - func_80B43BC8 matched
* All funcs matched! Build not OK still though
* almost ok
* OK now
* Fixed some warnings
* Fixed more warnings
* More warnings work
* Fixed all warnings (I think)
* Fixed all warnings (I think)
* Moderate amount of cleanup
* More cleanup
* More cleanup and some slight documentation
* Decent amount of documentation
* More documentation
* Fixed build (forgot to replace one struct member)
* More documentation and cleanup
* Fixed merge conflict, added binang_sub macro usages, and otherwise added most of the suggested changes f
git commit
* Organized things a bit, added a few more CLOCKTIME macros
* Added extra output to timeconvert.py
* Formatting
* Made all suggested changes
* 'Downgraded' timeconv script to version without seconds
* Added a macro for part of the params usages plus an enum
* Actually fixed header file (didn't save before)
* Renamed milk get item in enum
* Fixed GI enum update
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
Co-authored-by: Zelllll <elilee968@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
* 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>
* 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
* 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
* 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>
* Fix `extract_assets` not properly checking if scenes files were updated
* fix `first_diff.py` path due to the baserom renaming
* FlexSkeletonHeader and other stuff
* fix some SkeletonHeader instead of FlexSkeletonHeader
* Add blob compilation to makefile
* CURRENT_DAY and type swaps
* Remove extra cast
* run format
* zbanks suggestions
* 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
* 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>
* 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
* 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_haka_curtain OK
* Renamed InitVars back to its symbol name, plus converted the actor to a dynaActor like it should be
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Maide