| Age | Commit message (Collapse) | Author |
|
* 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
|
|
* First pass: Matched everything but func_80A8E26C
* Matched func_80A8E26C
* Documented
* Cleanup
* Some renames
* Update EnTrt struct
* Move init chain out of the function
* Change unreferenced rodata implementation
* Texture stuff
* PR suggestions from other PRs that apply here
* Fix syntax error and other cleanup
* add cutscene state enum
* PR suggestions except color
* Update src/overlays/actors/ovl_En_Trt/z_en_trt.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Trt/z_en_trt.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Trt/z_en_trt.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Better bitflags
* Fix
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
|
|
* Get Minislime code from Bigslime Branch
* format
* PR Feedback, add Damage Effects Enum, add +1 use of Room Coordinates Macro
|
|
* All but two match
* format
* Matched the last two functions
* Merge updates
* Bring data over as a comment
* Brought data over
* Cleanup and start documenting
* Documented
* Removed NON_MATCHING define
* Actually save the .h file
* Format and add items comment
* Add comment
* Add header to .c file
* Cleanup
* Rename EnSob1_GetGoodbyeBombShop
* Update items comment
* Final cleanup
* Rename InitialUpdate
* PR suggestions except enum for objIndices
* Add todo about objIndices index enum
* Change char to UNK_TYPE1 for padding
* Textures and convert weekEvents to hex
* PR suggestions
* Format
* Cleanup function declaration and add cutscene state enum
* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
|
|
* Player C file
* Fix rodata issue in player and remove some actors that doesn't have rodata issues from the list
* Check every asm with rodata issues
* Add fishing relocs and change clang-format version to a generic one
* undo clang-format version
|
|
* starting on en_hg
* working on another func
* fixing some stuff in ghaka, and tweaks in en_hg
* fixing some stuff
* fixing state flags
* all functions matching just data issues
* en_hg OK
* fixed to give OK
* some docs, and fixes
* fixing warnings
* fixing some things
* fixing warning
* adding pr comments
* fixing a typo
|
|
* Lots of progress, some came for OOT WIP
* Some small cleanup
* Fix merge conflict
* Bring over updated z_en_girla.h
* Fix merge error
* some cleanup
* fix msgcontext and add sfx ids
* func_808AAB30 is ugly but it matches
* Cleanup
* More cleanup and matched func_808AA8E8
* Matched last two functions
* Brought over data as a comment
* Figured out data, but not late rodata
* Document EnOssan
* Cleanup
* Added ShopItemIds
* Cleanup
* Switch left and right stick prompts
* Remove testing NON_MATCHING define
* Cleanup
* Add header to .c file
* Adjust header
* Rename InitCutscenes to GetCutscenes
* Cleanup
* Cleanup before merge with upstream
* More cleanup
* Lower case Shopkeeper
* More cleanup
* More general cleaning
* Found the late rodata issue
* Format
* Rename InitalUpdate
* PR suggestions except texture stuff
* Texture stuff
* Rename Texture typedef to UNK_TEXPTR
* One more rename
* Remove * from TexturePtr arrays
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
|
|
* Decomp pass
* Fix merge conflict'
* Convert damage table to new format
* Cleanup function declarations
* Some cleanup
* Cleanup and minor docs
* Add Header and Scene stuff
* More light docs and cleanup
* Rename one more function
* Remove duplicate macro
* PR suggestions except naviActor change
* Change navi to tatl
* Update include/functions.h
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
|
|
* 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>
|
|
|
|
* Niw OK
* Fix snake case
* PR Cleanup
* Improve docs from PR suggestions
|
|
* 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
|
|
* AudioMgr OK
* Cleanup
* Improve naming from PR Feedback
|
|
* 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>
|
|
(#210)
* Improve match in EnFirefly_Draw
* Vestigial fishing files, add enums
* Improve scripts, add ColChkInfo one
* Some minor actor cleanup (static etc)
* C file for Fishing, remove some local vars from variables.h
* Remove comma and format
* Newline
* Review suggestions
|
|
* 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>
|
|
* En_Guruguru OK and partially documented
* Renamed texture arrays
* Made text ID array static
* Made most of the suggested changes
|
|
* Obj_Lightswitch OK
* Minor improvement
* PR Cleanup
|
|
* en_baisen OK and mostly documented
* Fixed warning
* Made all suggested changes
|
|
* z_olib.c OK
* Clean-Up Clamp
* Take out extra space
|
|
* First pass
* limbdraw
* another one
* lots of stuff
* stuff
* big one
* func_80ABEB6C
* The NON_MATCHING that matches in reality
* "Fix" some cases
* Fix merge issues
* fix func_80ABF254
* match a pair
* func_80ABF7C8
* func_80ABE1C4
* func_80ABF354
* func_80ABF534
* Import data
* Limb fixes
* Minor renames
* Fix merge issues
* A few renames
* Rename half the functions
* More renames
* More renaming
* documentation finished
* Format
* fix typo
* whoops
* Fix merge issues
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update variables names
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
|
|
* 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>
|
|
* doesn't build for some reason..?
* some formatting fixes
* windows calculator is trash
* fix!
* fix2
* most of global context documented
* interfacectx
* hopefully fix interface
* document restrictions
* envCtx done
* revert accidental change
* fix
* pause ctx done
* fixxxxxxxxxxxxxxx
* remove unintended zapd change
* fix..?
* format files
* Update include/z64.h
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* ocarinstaff
* Update include/z64.h
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Update include/z64.h
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* suggestions
* fix mistake in pausectx
* typo
* door context
* renames
* all nb removed
* Update include/z64.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* fix kanfont, new docs
* format files, merge master
* fix typo in linker script
* extract asm properly
* door context rename
* fixes in door context
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.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
|
|
* 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>
|
|
* inital commit
* FeelsRegAllocMan
* obj_mu_pict OK
* fixing small things
* fixing pr suggestions
|
|
* en_sb OK
* fixing pr suggestions
* naming final struct members
* undoing a name, leaving it unknown
|
|
* remove ZAPD submodule
* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "ca229f19"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "ca229f19"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter
subrepo:
subdir: "tools/decomp-permuter"
merged: "1e4b85a7"
upstream:
origin: "https://github.com/simonlindholm/decomp-permuter.git"
branch: "main"
commit: "1e4b85a7"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Remove asm-differ
* git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "eaf72269"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git"
branch: "master"
commit: "eaf72269"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* remove asm-processor
* git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "85288fcd"
upstream:
origin: "https://github.com/simonlindholm/asm-processor.git"
branch: "master"
commit: "85288fcd"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* remove .gitmodules file
* Update REAMDE
* OK
* Import data
* Begin naming
* Delete asm references
* Main type enum
* Rename in functions.txt
* Review changes
Co-authored-by: angie <angheloalf95@gmail.com>
|
|
* obj_hgdoor OK and partially documented
* Made unused variables static and ran formatter
* Made all suggested changes
* Made all suggested changes
|
|
* Formats files and updates functions.h
* Made all suggested changes
* Fixed new warning
|
|
* 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
|
|
* 6 functions left
* All but one function matched
* all functions decomped
* Formatted files
* Added switch flag define
* Made all suggested changes
|
|
* 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
|
|
* data merge
* two funcs
* one left
* actor OK
* file done
* fix warnings with jenkins
* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update z_bg_tobira01.c
* Update z_en_encount2.h
* Update z_obj_bell.c
* Update z_en_pametfrog.c
* Update z_en_minifrog.c
* Update include/functions.h
Co-authored-by: Zach Banks <zjbanks@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Zach Banks <zjbanks@gmail.com>
|
|
* EnWeatherTag: Start
* EnWeatherTag: matching function, but suspicious
* EnWeatherTag: two non-matching functions, rest match
* EnWeatherTag: cleaning and docs
* EnWeatherTag: more docs
* WeatherTag: more docs
* WeatherTag: cleaning
* WeatherTag: pad renamed to unk to match
* Update include/z64save.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update include/z64.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* WeatherTag: requested changes
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
|
|
* 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
|
|
* Init, 14 of 70 decompiled
* En_Pametfrog 26/70 functions decompiled
* 35/70 funcs
* Fully Matching!
* Documentation
* Fix merge from master
* PR suggestions
* minor improvements
* Fix functions.h
* Oopsie
* Oopsie Part 2
* Remove Pametfrog from split_asm.py rodata_excluded
* Better use of MACROS + animation docs
Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
|
|
|
|
* 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
|
|
* En_Minifrog first few funcs decompiled
* more matching
* En_Minifrog 3 non_matching functions left
* two functions left
* Start Documentation
* Fully Matching!
* Documentation
* Fix merge with master
* minor pr changes
* Minor improvements
* PR Suggestions + Minor docs
* Fix bool
* PR suggestions
Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
|
|
* Clean dist.
* ovl_Obj_Kibako OK
* Run clang-format
* Suggested changes.
* Suggested Changes
* Consistency change.
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* PLAYER macro
* Suggested Changes
* Suggested Changes
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
|
|
* Dm_Char07 Ok
* Cleanup
* Documented
* Add small documentation to en_toto and run format
* Better documenting of spotlight flags
* PR suggestions
|
|
* EnGinkoMan OK
* Cleanup
* Minor PR suggestion
|
|
* destroy
* moar
* limbdraw
* some setups identified
* func_80B8D6F8
* func_80B8E0BC
* fix unmatching
* func_80B8D12C
* func_80B8D1E8
* func_80B8DBB8
* some renaiming
* some renaimings
* symbols
* small renaming and a few functions
* Almost every function done
* lots of renames
* Fix merge conflicts
* misc notes
* struct_800BD888_arg1
* some renamings and enum
* func_80B8D2D8
* func_80B8DA28
* import data and cleanup
* format
* minor changes
* Documentation pass
* update enum name
* Remove object XML
* run format
* Move EN_MA_YTS_PARSE_TYPE to header
* fix conflicts
* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* move struct to z64animation
* Change PARSE_TYPE macro to accept actor param
* format
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
|
|
* 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
|