* EnKakasi: rebase progress into one commit
* EnKakasi: fixes to get compiling on master, still doesn't match
* EnKakasi: is this even progress?
* EnKakasi: docs and cleaning
* EnKaksi: damn it, that master merge really messed up more than I thought, after clean build something really weird is going on and now I REALLY need firstdiff
* EnKakasi: Back to building, NOT OK
* fixed a code
* only rodata left to fix
* EnKakasi: functions got removed in included functions
* EnKakasi: thanks to fig mentioning there were missing cases, OK
* EnKakasi: (OK) docs and cleaning
* EnKakasi: Init now matches
* EnKakasi: cleaning and docs
* EnKakasi: more cleaning and docs
* EnKakasi: forgot function declarations
* EnKakasi: spec
* EnKakasi: animation array symbols added
* EnKakasi: formater pass
* EnKakasi: type warning fix
* EnKakasi: little descriptor
* EnKakasi: OK thanks to AngheloAlf
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Apply suggestions from code review
Splitting this into pieces to not have a huge pile of bugs
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnKakasi: wrong type of inverse flag
* Apply suggestions from code review
Batch 2
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnKakasi: RIP Anime
* Apply suggestions from code review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnKakasi: Anim enum update
* EnKakasi: Removed text documentation
* EnKakas: return of THIS
* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnKakasi: mystery solved but not understood
* Apply suggestions from code review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnKakasi: rename EnKakasi_CheckAnimateSFX to EnKakasi_CheckAnimationSfx (no real reason to shorten Animation to Animate, and SFX is not initialism, its a shorten)
* EnKakasi: minor change to touch jenkins
* EnKakasi: is it loise-uni?
* EnKakasi: fixed skelanime changes
* EnKakasi: formater pass
* EnKakasi: requested changes
* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* EnKakasi: removed un needed pad
* EnKakasi: removed redundant documentation comment
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Moves func_800CB000 to z_bg_item, decompiles func_800CB000, and documents z_bg_item and a few DynaPolyActor struct members.
* Adding usage of dynapoly state flag defines.
* Formats z_bg_item
* Update z_bg_item.c
* Update z_bg_collect.c
* Update z_bg_item.c
* Update z_bg_item.c
* Renames z_bg_item system to DynaPolyActor
* Format
* inital commit with a good chunk done
* adsjfkalsdfh
* can't figure this out for the life of me...
* I'll come back to this later
* not finished, but at least OKs
* blah, still stuck
* en_hakurock OK
* minor clean up
* formatting and pushing up changes
* fixing spec
* fixing warnings and addressing feedback
* addressing PR comments from engineer
* fixing enum
* format
* Migrate data to C
* EnBaguo_Init OK
* EnBaguo_Destroy OK
* func_80A3B220 OK
* func_80A3B2CC OK
* func_80A3B2CC OK
* func_80A3B794 OK
* func_80A3B5E0 OK
* func_80A3B7B8 OK
* EnBaguo_Update OK
* func_80A3B8F8
* func_80A3BE24 OK, some other not-OK junk
* func_80A3BE60 OK (wow this is bad!)
* Document the blink system
* func_80A3C17C OK
* Document timer and fix warnings
* func_80A3C008 OK
* Rename x/y/z so it's clear they are positions
* func_80A3BE60 OK in a not-crazy way
* func_80A3B958 OK
* func_80A3BF0C OK
* Make the rotation a Vec3s
* Update the spec to use the built reloc
* Use ARRAY_COUNT instead of hardcoded length
* Document the state stuff
* Document NejironParticle
* Document the rolling rotation stuff
* unk_1BC -> maxDistanceFromHome
* unk_1B8 -> zRollDirection
* Name the two draw functions
* Name the static variables properly
* Name all other functions
* Clean up forward declares
* Last bit of documentation and cleanup
* Add an enum for the rolling direction
* Add explanatory comment
* state -> action and move action descriptions inline
* Use enum for Stone Mask
* Use "Setup" for the setup function
* Document the damage effect
* Add some space around the for-loop
* ./format.sh
* Use % 8 everywhere
* Use -= instead of += a negative number
* Switch order of max check
* Use CLEAR_TAG_POP enum value
* eyeIndexTemp -> eyeIndex
* visible -> isVisible
* Move enums above structs
* Merge animation system changes
* yDist fix
* Respond to review feedback
* WIP
* done?
* remove something from variables.h
* missed a warning
* PR fixes (AngheloAlf)
* fix lights
* restore ZAPD makefile
* format
* format again
* fix a graph alloc
* Missed one in skin
* Migrate data to C
* EnElforg_Init OK
* func_80ACC470 OK
* EnElforg_Destroy OK
* EnElforg_Update OK
* func_80ACCBD0 OK
* func_80ACCBB8 OK
* func_80ACD6EC OK
* func_80ACD59C OK
* func_80ACD6A8 OK
* func_80ACD610 OK
* func_80ACD878 OK
* Declare animated materials for Elforg
* EnElforg_Draw OK
* func_80ACCC98 OK
* func_80ACC7E4 OK
* func_80ACC8D4 OK
* func_80ACCEB0 OK
* func_80ACC994 OK
* PLAYER -> GET_PLAYER
* func_80ACCE4C OK
* func_80ACC934 OK
* func_80ACCAC0 OK
* func_80ACD2E4 OK
* func_80ACD1F0 OK
* func_80ACD164 OK
* func_80ACD1B0 OK (maybe fakematch but oh well)
* func_80ACD088 OK
* Better match for func_80ACD1B0
* Use compiled reloc
* Move static data to appropriate function
* Name sCylinderInit appropriately
* Add explanatory comment
* Clean up forward declarations
* Add macro for the flag
* Macro and enum for type
* Add STRAY_FAIRY_GET_PARAM_1C0 macro (no clue what this does)
* Document the area stuff
* Name some functions
* Document timer and direction
* Eliminate some early returns
* Tons more documentation
* Name remaining functions
* Document flags
* Name targetDistanceFromHome
* fairyFountainTimer -> secondaryTimer, since it's used outside of Fairy Fountains
* Name the unknown flag
* Name the collider fairy type
* Last bit of renaming/documenting
* Remove zero check
* Use hex constant for newAngle
* Merge animation updates
* Use 0x10000 instead of 65536.0f
* Use decimal for alpha
* Move yDifference initialization up to the same line as declaration
* Use +=/-=
* <= 30 instead of < 31
* += -1 -> --
* >= 81 -> > 80
* 0xDFFFFFFF -> ~0x20000000
* EnElforg_InitializeSpeedAndRotation -> EnElforg_InitializeParams
* Migrate data to C
* EnGiant_Destroy OK
* EnGiant_Init OK
* func_80B01A74 OK
* Comment what each of the quest items are
* Put a little comment for myself on func_80B01A74 because it was confusing me lol
* Very early names (they're all bad)
* func_80B01990 OK
* EnGiant_Update OK
* func_80B024AC OK
* func_80B023D0 OK
* func_80B024D8 OK
* func_80B02354 OK (this function is bad!)
* func_80B020A0 OK
* func_80B01EE8 OK
* func_80B01E84 OK
* func_80B0211C OK
* func_80B02234 OK
* unk_250 -> sfxId and label SFX
* func_80B02688 OK
* func_80B026C4 OK
* EnGiant_Draw OK
* Update spec
* Fix up the static data
* unk_24E -> alpha
* Document some of the animation stuff
* Name EnGiant_IsNotFreed
* Document the giant types better
* Minor cleanup
* Add explanatory comment
* Rename the functions in functions.txt too, whoops
* Document sFaceTextures and blink routine
* Document all the various animations
* Name EnGiant_PlaySound
* Document some functions and change an unknown to action
* Add an SFX id I missed
* Name all the action funcs
* Name last two functions
* Mark one case as unused
* Change func_800F5A8C to use arg0, arg1, arg2, etc.
* Move sFaceTextures to EnGiant_Draw and comment what they are
* EnGiant_IsNotFreed -> EnGiant_IsImprisoned
* Use booleans in EnGiant_IsImprisoned
* **/ -> */
* action -> csAction
* Make macros for all type conditional checks
* Add warning about inconsistency
* Document the cs actions
* Add some documentation to animation-changing functions
* Update the function name in functions.txt too
* Improve GIANT_TYPE macros
* Remove an unncessary early return
* Incorporate animation changes
* 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
* remove old effects enum
* gamealloc.c OK
* added more files
* motor.c almost done
* motor.c OK
* updates
* migration of two files
* listalloc.c oK
* z_fcurve_data_skelanime split
* z_fcurve_data_skelanime.c decompiled
* more files split
* z_malloc.c OK
* contpfs.c OK
* fault.c rodata migrated
* migrated fault_drawer rodata
* update
* update preprocess.py
* renamed functions in z_skelanime
* started z_skelanime cleanup
* like halfway through fixing z_skelanime
* animation system updated to meet oot standards
* remove unused animation structs
* rename matrix structs to fit oot
* Add -woff 712
* fix diff_settings.py because i accidentally broke it before
* fixed merge conflict, doesn't match though
* It matches now
* Updates
* Fixed warnings...added gcc code syntax checking
* Remove gcc check, added in Tharo's PR
* warnings fixed (i think)
* fixed all warnings i think
* ok
* not sure what to do
* Fix all warnings i think (z_en_a_keep needs some file cleanup thouguh)
* it matches if i do this
* remove comment
* accidentally put osPfsFreeBlocks in epilinkhandle.c
* memcmp -> bcmp
* change u32 size to size_t size, delete string.h because it caused unnecessary confusion with defining size_t twice
* format.sh
* MTXMODE_NEW and MTXMODE_APPLY to matrix functions
* Made suggested changes
* pragma sFaultDrawerFont instead of including in repo
* add some functions to functions.h
* Bss reordering fixed in z_collision_check...added hack to disasm.py
* Updated z_en_a_keep.c
* Missed suggestion in EnAObj_Destroy
* .
* update z_fcurve_Data_skelanime and z_skelanime with suggestions
* devmgr.c ok
* minor changes
* Addressed comments
* remove redundant file
* gfxp -> dlist in game.c
* updated actorfixer.py
* fixed warnings in z_malloc
* Change void* back to Actor*
* format
* Add the soft_sprit comments back
* Rename SV->Flex
* remove .common
* run format
* Update src/code/z_skelanime.c
* u32 channel
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Draw OK, Update very much not
* Flag table imported
* Update OK
* Actually OK this time
* Begin documenting
* Rename some stuff
* Rename functions
* spec
* Review
* Format
* Anghelo's review
* Fix lifemeter bss
* Format
* Missed one
* idle.c bss
* Migrate data and ArrowIce_Init OK
* ArrowIce_Destroy OK (also define func_80115D5C in functions.h, maybe a bad thing???)
* ArrowIce_SetupAction OK
* func_809224DC OK
* ArrowIce_Update OK
* func_809227F4 OK (but with hacky float constant)
* func_809225D0 OK and use float constant in func_809227F4
* func_80922628 OK
* ArrowIce_Draw OK
* Migrate D_80924200.s to C
* Apply better names in ice_gfx, and document Draw slightly
* Name struct vars to match OoT
* Update function names to match OoT
* Explain that arrow's timer and hitFlags came from OoT
* Update spec + "migrate" bss to C
* Do a hex -> decimal conversion I missed
* Remove blank line in-between headers
* Remove extraneous forward declare
* Move initialization of arrow up one line
* Remove parentheses
* Use else if
* Use decrement operation
* Use decimal for an alpha calculation
* Switch func_80115D5C to take GameState*
* Put pad on the top of Draw
* Move initialization of arrow up (again)
* Early return from Update if we're killed
* Extract assets instead of putting them in the repo
* Add explanatory comment to top of file
* += 1 -> ++
* Use VEC3F_LERPIMPDST macro
* Force a jenkins rerun by adding a space
* Remove the space from the last commit
* Move literal to the back of the conditional
* Respond to review feedback
* Add ArrowIce_LerpFiredPosition to functions.txt
* Migrate data to C
* ObjEtcetera_Init OK
* ObjEtcetera_Destroy OK
* ObjEtcetera_Update OK
* func_80A7C690 OK
* func_80A7C718 OK
* func_80A7C168 OK
* func_80A7BE8C OK
* Make the draw functions take Actor*
* CollisionCheck_SetAC should take a Collider
* func_80A7BDC8 OK (with silly dummy label meme)
* func_80A7C1F0 OK
* unk_276 is almost certainly a u16 since I constantly have to cast it, so just retype it
* func_80A7BF08 OK
* Some minor cleanup
* Convert D_80A7C80C to array of CollisionHeader*
* Finish defining struct to prepare for func_80A7C308
* func_80A7C308 OK
* Move gameplay_keep symbols to variables.h
* Explanatory comment at the top
* Type gameplay_keep animation headers too
* Update the spec (why do I always forget this?)
* Rename func_80A7BDC8 to ObjEtcetera_PerformFlutter (name still up for debate)
* Name objIndex
* Document the types of flowers
* Name displayListPtr
* Name burrowFlag and provide a macro
* Name specialFlutterScale and clean up some things with newer understanding
* Give the draw functions (bad) names
* Name ObjEtcetera_Idle
* Name ObjEtcetera_Setup (name sucks but oh well lol)
* Name ObjEtcetera_ReturnToIdle. These names all suck but they're a start
* Document some of ObjEtcetera_Idle's behavior
* Name and document objectIds
* Remove the burrow macro because it's frankly more confusing for now
* Name the draw functions something slightly better
* MUCH better names for things + more documentation
* Clean up ObjEtcetera_Setup a bit
* Call it NUMBER_OF_FLOWER_TYPES instead
* A few more name changes
* Link -> Player in comments
* displayListPtr -> dList
* Trailing commas + format
* Move initialization of type up
* Improve conditional check
* Use BGCHECK_SCENE macro
* Move initialization of floorBgId up
* Use documentation comment style
* Match ObjEtcetera_DoNormalOscillation without a dummy label
* param_2 -> arg1
* Insert blank line after scoped pad
* OBJETCETERA_TYPE -> DEKU_FLOWER_TYPE
* Cleanup and rename enum
* Break up ObjEtcetera_Setup a bit and convert DekuFlowerType to an s32 to remove warnings
* Whoops, run format
* Delete leading 0 on struct comments
* Rename pad to requiredScopeTemp to match my other PR
* Modify Kibako to use the same ID/FLAG macros as Kibako2
* Define KIBAKO_BANK_INDEX
* Add explanatory comment at the top of the file
* Add Kibako function names to functions.txt
* Define KIBAKO_BOMBER_CAN_HIDE_IN_BOX
* EnBigpo: start
* EnBigpo: uhh, this struct is weird
* EnBigpo: progress
* EnBigpo: so many of these functions are tiny
* EnBigpo nasty four loop function
* EnBigpo: hate draw functions
* EnBigpo: all functions attempted
* EnBigpo: data migrated, does not OK, 2 bytes off...
* Multi: Attempting to OK, issues
* EnBigpo: more docs
* EnBigpo: more docs2
* EnBigpo: more docs and cleaning
* EnBigpo: removed data to try to find the issues, matched a draw function thanks to Tharo
* EnBigpo: progress? maybe not
* EnBigpo: matched another function
* EnBigpo: overwrite limbdraw matches now
* EnBigpo: one more nonmatching rejected
* EnBigPo: not actual progress, probably
* Match Init, down to single stack pointer on second func
* EnBigPo OK
* EnBigpo: docs and cleaning
* EnBigpo: more docs and cleaning
* EnBigpo: back to OK with no warnings
* EnBigpo: more docs and cleaning
* EnBigpo: docs and cleaning
* EnBigpo: hmm, rename_sym doesn't like renaming system functions but I'm 98% sure I know what these are
* Multiple: changed some function names, maybe changed too much... hmm
* EnBigpo: even more changes to docs
* EnBigpo: formater pass
* EnBigpo: small fixes
* EnBigpo: c file description
* Apply suggestions from code review
Apply camera suggestions from eng124
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnBigpo: updating all requested changes and reverting one incorrect macro
* Apply suggestions from code review
Some of eng124's recommendations, need to add the last by hand
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnBigpo: back to OK
* EnBigpo: Minor cleanup changes
* Functions fixed: added function changes to actorfixer and fixed dinofos
* EnBigpo: BINANG_ROT180
* Apply suggestions from code review
First batch of requested changes, the simpler ones that shouldn't require checking
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnBigpo: fixes to recommended changes, back to OK
* EnBigpo: move idleTimer docs out of struct
* Sprite: removed old commented out pragma, it matches, I still dont get it
* EnBigpo: more changes I had to check first
* EnBigpo: more requested changes, and some macro uses found
* EnBigpo: forgot a requested change
* Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnBigPo: missed a disphead array access
* Apply suggestions from code review
More requested changes
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnBigpo: more hex to dec
* EnBigpo: more hex to dec 2
* Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnBigpo: build being weird
* EnBigpo: weird, rename_sym didn't catch this earlier
* Tools: fixed actorfixer to use Play_CameraSetAtEye forgot I blew this change away trying to get build again,
* Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* EnBigpo: cutscene functions changed name to indicate they are stages
* EnBigpo: Rename Particles to Effect
* EnBigpo: changed draw function names, changed function comment format
* EnBigpo: renamed limbdraw functions, formater pass
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Data migrated and ObjKibako2_Init OK
* ObjKibako2_Destroy OK
* func_8098EC68 OK
* Commit what I have on Update as I figure it out
* Name skulltulaNoiseTimer and get a little closer to matching Update
* Wrap Update in NON_MATCHING for now
* Get this ready to push up
* func_8098ED20 OK (but it's not an actionFunc???)
* ObjKibako2_Draw OK
* func_8098E9C4 OK
* Turns out globalCtx *is* needed
* func_8098E8A8 OK
* Save my progress on func_8098E5C0 for now
* func_8098E900 OK
* func_8098EB78 OK
* Clean up some if-conditionals
* Delete pointless forward declaration
* ObjKibako2_Break OK
* Update names to match OoT equivalent
* func_8098E5C0 OK (though a little weird)
* ObjKibako2_Update OK
* Clean, document, and name ObjKibako2_ShouldBreak
* Clean and name ObjKibako2_ContainsSkulltula
* Some more cleanup
* Why did I mix snake case with camel case lol
* Update spec now that everything matches
* Actually rename the data
* sn/cs -> sin/cos
* Use true/false in ObjKibako2_ShouldBreak
* Use the AC_HIT macro and don't use the temp where it isn't needed
* Use macro and enum for contents
* Get rid of fake temp in Init
* Macros for collectible ID/Flag
* 0xFFFD -> ~AC_HIT
* In macros, x -> this
* Just kidding, use thisx for macros
* Add description to the top of C file
* Run ./format.sh after installing clang-format-11
* char -> UNK_TYPE1
* Remove unnecessary struct padding
* Initialize thisPos at the same time it's declared
* Clean up parentheses for bitwise operations to make it clearer what they do
* Clean up control flow in ObjKibako2_Idle
* Remove extraneous parentheses
* Move instantialization up in ObjKibako2_ContainsSkulltula
* Move tempRand instantiation up in ObjKibako2_Break
* Move collectible instantiation up in ObjKibako2_SpawnCollectible
* Remove extra brackets
* Remove extra brackets (again)
* Move contents instantiation up in ObjKibako2_Init
* match function and split data
* import data
* Rename function and variable
* format data
* Fix data
* { 0 }
* Update src/code/z_face_reaction.c
Co-authored-by: rylieb <31797144+rylieb@users.noreply.github.com>
* Rename return variable in en_ossan
* textId
* Rylie's review
* Try to format this properly
* Format again
Co-authored-by: rylieb <31797144+rylieb@users.noreply.github.com>
* Fix actor_symbols.py
* Temporary fix to rename_sym.sh
* Fix the few Type1 cylinders
* Rename main -> Main
* chmod rename_global_asm, fix asm in rename_syms
* Format
Anghelo Carvajal