* 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
* Fix colchkinfoinit, add damage_table
* DMG macros, format existing DamageTables
* Convert preset damage tables to new format
* Minor tweak to colchkinfoinit output
* Manually add Fishing data and Syokudai struct vars
* Automatically import data
* Fix to use #if 0
* Format
* Name cylinders in obj_syokudai.h
* correct some ichains
* Fix top-of-file comments
* Redo files to include externs
* Fix Fishing
* #if(0) -> #if 0
* Fix mysteriously wiped actors (I blame VSCode)
* 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
* 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
* Fix colchkinfoinit, add damage_table
* DMG macros, format existing DamageTables
* Convert preset damage tables to new format
* 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>
* 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>
* 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>
* Fixed names of global context related structs to their OoT counterparts + to avoid auto-complete code issues
* Removed unused global context struct
* Fully renamed to OoT counterparts
* 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
* Added data_parser.py to assist in moving data over to c files more easily.
* Update data_parser.py
Added UNK_TYPE to extern
Added newline at end of file
* 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
Derek Hensley