* Limbs, skeleton, limb DLs, main textures
* Finish documenting object_shn
* Name the eyeIndex variable in syateki_man
* Use limb enum in syateki_man
* One more limb enum I forgot, sorry
* Respond to Elliptic's review
* Bring code over
* Rename
* clean up variables.h
* Bring over some more code as well as cleanup
* remove newline in functions.h
* format
* Add plane functions
* Remove from actorfixer
* Add some more docs to plane functions
* Use temp for better format
* change func_8013E8F8 to return an s32
* rename origin back to pos
* format
* Add docs to SubS_ComputePlane
* format
* gfxContextPtr -> globalCtx
* bss
* Better docs of SubS_ComputePlane
* Normal -> unitVec
* Review pt. 1
* Update plane comment
* SubS_ActorAndPlayerAreFacing -> SubS_ActorAndPlayerFaceEachOther
* Add subs texture defines
* Update include/z64math.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Dog color documentation
* Simplify floats
* Text ID and some speed doc
* Macros for condition
* Index documentation
* Name the sprint speed multiplier
* Racedog animations
* Document a few things regarding the race start
* Doc selection arrow stuff
* Some low-hanging fruit
* Some path stuff, mostly copied from Jg
* Some speed docs
* More race stuff
* Add a ton of documentation, mostly so I can go to bed
* Document rotation stuff (but I'm not super confident in it)
* Port very low-hanging fruit from Racedog to Dg
* Document cross-product stuff
* Finish docs
* Fix Aob_01
* First response to reviews
* Change it to GetFloorRot
* init and func_809466F0 matching
* fully matching
* renamed functions
* added include and used oshihiki macro
* fixed spec to use correct reloc
* ran format
* cleaned up comments
* addressed the suggestions and used macro in ObjBlockstop_Update
* fixed one more cast
* ran format.sh
* EllipticEllipsis changes
* ran format
* renamed CheckCollision to CheckForBlock
* EnRaf_Init OK
* func_80A17060, func_80A18080, and func_80A180B4 OK
* EnRaf_Destroy, func_80A1712C, func_80A171D8, and func_80A17414 OK
* func_80A17464 and func_80A17530 OK
* EnRaf_Draw OK
* func_80A175E4, func_80A17848, and func_80A178A0 OK
* func_80A18A90 OK
* func_80A179C8 and func_80A17C6C OK
* func_80A1859C OK
* func_80A17D14 and EnRaf_Update OK
* func_80A18B8C and func_80A18DA0 OK, EnRafParticle documented
* func_80A16D40, func_80A16D6C, func_80A17D54, and func_80A17DDC OK
* func_80A17E1C OK
* Use object symbols
* Import data to C and use generated reloc
* Misc cleanup
* Document animations and skeleton
* Finish documenting object_raf
* Some low-hanging fruit
* Some actions I figured out
* Name revival stuff
* Document type stuff
* Bob and player height stuff
* Name a few more things (some of the names are bad but whatever)
* Finally move Vec3f data inline like I've wanted to do for ages
* Some more low-hanging fruit
* limbRot name
* Name the chew stuff
* First pass names on everything, even if they're bad
* Some last-minute stuff before PR
* Respond to Elliptic's review
* Manually specify texture dimensions
* Format
* Add comment about pointless check
* Respond to Elliptic's second review
* EnBbfall_Init OK
* EnBbfall_Destroy, func_808BF5E0, and func_808BF734 OK
* func_808BF578 and func_808BF7A0 OK
* func_808BF4B4, func_808BF830, and func_808BF894 OK
* func_808BF438, func_808BF514, func_808BF8DC OK
* func_808BFA18 and func_808BFA3C OK
* EnBbfall_Draw OK, thanks Tharo, Anon, and Maide!
* LimbDraw functions OK
* All functions OK, thanks Anon for the loop in Update!
* Migrate data to C
* Use generated reloc and object symbols
* Port over a ton of documentation from EnBb
* Use ARRAY_COUNT for all loops
* Do a ton more documentation
* Name unused animation in object_bb
* Copy "floorType" variable name from OoT
* Use enum values for collider type
* Respond to reviews
* Add comment explaining EnBbfall_IsTouchingLava
* EnSyatekiOkuta_Init and EnSyatekiOkuta_Destroy OK
* func_80A36260, func_80A362A8, func_80A362F8, and func_80A36350 OK
* func_80A361F4 OK
* Decomp a bunch of functions
* Better match for func_80A368E0
* func_80A36CB0 OK
* Draw functions OK
* All functions OK
* Import data to C
* Use object symbols
* Final cleanup and generated spec
* Remove something I missed
* char -> UNK_TYPE1
* Respond to reviews
* Remove static from unnamed variables, whoops
* EnDragon_Init OK
* func_80B5EDF0 OK
* func_80B5EAA0 OK
* EnDragon_Destroy OK
* EnDragon_Update OK
* func_80B60138 OK
* func_80B5EE3C OK
* func_80B5EF88 OK
* func_80B5F418 OK
* func_80B5ED90 OK
* func_80B5EB40 OK (commented out because data is not imported yet)
* Import data into C
* Uncomment func_80B5EB40
* func_80B5EFD0 OK
* func_80B5F3A4 OK
* func_80B5F888 OK
* func_80B5FCC0 OK
* Draw functions OK
* func_80B5FD68 OK
* func_80B5F508 OK
* func_80B5F8D8 OK
* Better match on func_80B5FD68
* Use generated reloc
* Remove undefined_syms for this actor
* Some minor cleanup
* Make the data like Anghelo said
* Document object_utubo
* Name a bunch of stuff
* Name some more stuff
* Some documentation around death
* Documentation for actions
* Name a bunch of junk
* Use regs instead of directly accessing gGameInfo
* Name the player position vars
* Update weekEventReg references
* Name and list out states
* Name timer
* Document extend stuff
* Finish documentation
* Respond to Anghelo's review
* Respond to hensldm's review
* The thing Anghelo suggested *actually* matches
* EnWallmas_Init and EnWallmas_Destroy OK
* func_80874B88 OK
* func_80874BE4 OK
* func_80874D1C OK
* func_80874DE8 OK
* func_80874F14 OK
* A bunch of small functions OK
* A bunch of smaller functions OK again
* func_808752CC OK
* func_808758C8 OK
* func_80875910 and func_8087596C OK
* func_808756AC and func_8087571C OK
* EnWallmas_Update OK
* func_80875A74 OK
* func_80874A88 and func_80874B04 OK
* A bunch of functions OK
* func_808759B8 and func_80875A0C
* EnWallmas_Draw OK
* func_808760A4 and func_80876118 OK
* func_80875F04 OK
* Use object symbols
* Import data to C
* Use generated reloc
* Document object_wallmaster
* Misc cleanup
* Name the DrawDamageEffects variables
* Name draw functions
* Enum for damage values
* Port function names from OoT
* Last cleanup before PR
* Respond to Elliptic's review
* Respond to Elliptic's second review
* gWallmasterWaitAnim -> gWallmasterIdleAnim
* Change all EnWallmas to Wallmaster (except the actor's name itself)
* Respond to hensldm's review
* Fix merge conflicts
* boot_800862E0 OK
* Ran format.sh
* attempt at fixing bss reordering
* boot_800862E0 OK (for real this time)
* Run formatter
* Changes u32 pointers to uintptr_t and sizes to size_t
* Run formatter
* Fix bss reordering
* Delete baserom.mm.us.rev1.z64:Zone.Identifier
* Cleanup and some notes
* Try my best to document
* remove comments
* Remove D_80097508 from variables.h
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* this is the guay
* do you know the guay?
* No guay!
* got too excited to pr lol, fixes are here
* Majoras Mask: No Guay Home
* fixing objects
* 4mattt
* First pass of `func_800BCCDC`
* river_sound OK (copy progress from audio WIP)
* Copy progress from `code_8019AF00.c` (still waiting for data to be imported)
* More docs
* feedback
* Add in `code_8019AF00.c` functions
* format
* params
* Minor cleanup
* Small fix
* one more
* Better names
* Add comment, cleanup Idx
* Fix bss
* Fix BSS
* z_obj_chan OK
* update Obj_Chan
* Obj_Chan updates
* Update for name changes. gameplay_keep object header is needed
* format
* more updates
* more changes
* Simplify floats
Co-authored-by: angie <angheloalf95@gmail.com>
* Import data to C
* EnSyatekiDekunuts_Init OK
* EnSyatekiDekunuts_Destroy OK
* func_80A2BE54 OK
* func_80A2BF18 OK
* func_80A2BFC4 OK
* func_80A2C0F8 OK
* func_80A2C150 and func_80A2C168 OK
* func_80A2C1AC OK and better match on func_80A2BFC4
* func_80A2C208 OK
* func_80A2C27C OK
* func_80A2C2E0 and func_80A2C33C OK
* func_80A2C3F0 OK
* func_80A2C478 and func_80A2C48C OK
* EnSyatekiDekunuts_Update OK
* func_80A2C4D0 OK
* func_80A2C5DC OK
* EnSyatekiDekunuts_Draw OK
* func_80A2C8A0 OK
* Use generated reloc and minor cleanup
* Use object symbols
* Last bit of cleanup
* Use limb enum values for all syateki actors I've worked on
* M_PI / 4
* EnBb_Init OK
* EnBb_Destroy OK
* func_808C20D4 OK
* func_808C2238 OK
* func_808C1FF4 OK
* func_808C1E94 OK
* func_808C2344 OK
* func_808C23EC OK
* EnBb_Update OK
* func_808C2E34 OK
* func_808C254C OK
* func_808C272C OK
* func_808C2B94 OK
* func_808C2A00 OK
* func_808C1F00 OK
* func_808C1F74 OK
* func_808C25E0 OK
* func_808C28CC OK
* func_808C2B1C OK
* func_808C2BD0 OK
* func_808C2C38 OK
* func_808C2CB4 OK
* func_808C2CF0 OK
* func_808C2D78 OK
* EnBb_Draw OK
* func_808C32EC OK
* func_808C3324 OK
* Migrate data to C
* Use generated reloc
* Object symbols and misc cleanup
* Name struct vars that are used with Actor_DrawDamageEffects
* Name most things in the object
* Name attackRange
* Good enough names for limbs for now
* Might as well name the limb draw stuff for now
* Name flame width/height
* Enum for damage effects
* Name some more stuff from OoT
* Name a lot more stuff
* First pass names on all functions
* Name jinxTimer on gSaveContext
* Name sLimbIndexToLimbPos
* First pass name to the rest of the limb draw system
* More cleanup
* Last cleanup before PR
* Incorporate Actor_DrawDamageEffect stuff
* Respond to hensldm's review
* matched one function
* More matches
* more matches
* cleaning up some stuff
* making some progress
* two new matches, and a partial match
* meh...i'll come back to this
* fixing ctx names
* more matches
* OK and documented
* fixing data stuff
* PR suggestions
* fixing name and DL issues
* fixing pr suggestions
* PR feedback
* ....format....
* PR fix
* fixes
* dang format
* fixing name
* I'm blind
* fixing obj_grass
* Cleanup some shopkeepers
* More cleanup
* Document animations
* General cleanup
* Animation enums
* Limb maxes
* More Cleanup
* Some more minor stuff
* fsn cutscene state
* Parens and postlimbdraw
* Ossan Limbs
* Remove ENFSN_LIMB_MAX
* SI_MAX
* Compound macro
* Document gameplayKeep textures used by shopkeepers
* Ani Limbs in Ossan
* Format
* PR suggestion
* Remove trueTmp from EnFsn
* EnBomChu_Init OK
* EnBomChu_Destroy OK
* func_808F7868 OK
* func_808F79D4 OK
* func_808F7E74 OK
* func_808F7FA0 OK
* func_808F77E4 OK
* func_808F75D0 OK
* func_808F7944 OK
* func_808F7A84 OK
* func_808F818C OK
* func_808F8080 OK
* func_808F7FD0 OK
* EnBomChu_Update OK
* EnBomChu_Draw OK
* Drop unnecessary cast in Update
* Import data into C
* Object symbol
* Use generated reloc
* Port over OoT struct var names
* Name all statics
* Misc cleanup
* Name some of the new struct vars introduced in MM
* Port over most OoT function names
* Name movingSpeed based on in-game observation
* Name final param in EnBomChu_SpawnRipplesAndSplashes
* More cleanup and OOT port
* Some more names
* More docs
* Name last function
* Final little cleanup
* First round of review fixes
* Change the name of that one function
* More precise comment
* EnMttag_Init OK
* EnMttag_Destroy OK
* EnMttag_Update OK
* func_809CF9A0 OK
* Update struct
* func_809CF444 OK
* func_809CFA00 OK
* func_809CF394 OK
* func_809CF8EC OK
* func_809CFA54 OK
* func_809CF350 OK
* func_809CF848 OK
* func_809CF950 OK
* func_809CFBC4 OK
* func_809CFD98 OK
* func_809CFE28 OK
* func_809CFF94 OK
* func_809CFC38 OK
* Get super close on func_809CF4EC
* Import data
* Get a start on func_809CF67C
* func_809CF4EC OK, thanks engineer!
* func_809CF67C OK, thanks engineer!
* Use the generated reloc
* Name message functions and raceGorons array
* Name some more stuff
* Name more functions
* Name most functions
* Take a stab at trying to figure out what the data represents
* Much better naming and understanding
* Name more
* Strip out debugging junk
* Better name
* Name the rest of the variables
* Describe bug
* Document the h*ck out of things
* Simplify PlayerCheatStatus a bit
* Use sCheckpointPositions as per engineer's advice
* Do some really stupid naming nonsense to explain the side effect of a function
* Fix Racing/RaceGoron inconsistency
* Decimal weekEventReg accesses
* Rename to EnMttag_UpdateCheckPoints
* Capitalization consistency + update functions.txt
* Respond to review
* Respond to review
* Respond to Elliptic's review
* idk if Elliptic meant the function name or the variable so let's just do both lol
* Fix function name changed by z_demo merge
* Being documenting `Actor_DrawDamageEffects` and apply to actors
* More doc progress
* Small cleanup
* Document display lists
* more cleanup
* Fix Typo
* PR Review
* Shock -> Spark
* Missed one
* Missed another
* Fix dust textures
* Remove `_tex` from `light_orb_tex` (so that it matches convention)
* electric stun -> electric spark
* Fix mistake
* Fix float
* spark -> sparks where applicable
* Missed even more shocks...
* Name `drawDmgEffTimer` for consistency
* Fix BSS
* Building on Macs
* Add Mac building documentation
* Review
* Update for new z64compress
* Review
* getting some matching done
* gettting some more matches
* actor fixer
* almost OK
* Shn OK
* fixing data and warnings
* finishing touches
* forgot to update spec
* dang comments not being formatted
* this should fix things
* fixing feedback and other fixes
* fixing things
* fixing things
* addressing PR
* format and minor fix
* actorfixer
* fixing actor
* fixing enum
* yay format
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* cleanup
* Clean up toto
* More ClockTime macro
* rename pad
* EnGo and format
* EntityLineTest booleans
* Other bgcheck tests
* Graph Allocs
* Lib_Segmented
* Fix toto comment
* Remove macro comment for EnBigpo_DrawLantern
* Format and remove sym from undefined_syms.txt
* PR suggestions
* BgIkanaRay params
* One day i'll remember
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Decomp 10 functions in z_play, start documentation
* Add numbers to enums in z_en_torch2.h
* Decompile a 5 more functions (56 unattempted)
* Add more details, name some more variables
* Bit more Doxygen
* Format
* Fix arguments
* Add symbols to actorfixer.py
* Merge branch 'master' into play
* Fix z_actor
* Review
* Deduplicate CycleSceneFlags
* Fix warning
* Fix unk4
* Review
* func_80B24630 OK
* func_80B248B8 OK
* func_80B246F4 OK
* func_80B25448 OK
* func_80B256BC OK
* EnRacedog_Draw OK
* LimbDraw functions OK
* func_80B2583C OK
* func_80B258D8 OK
* EnRacedog_Update OK
* func_80B255AC OK
* func_80B2538C OK
* func_80B252F8 OK
* Data imported to C
* Update struct to have everything Init needs
* func_80B24E14 OK
* EnRacedog_Destroy OK
* func_80B24C14 OK
* EnRacedog_Init OK
* func_80B2478C OK
* func_80B24CB4 OK
* func_80B251EC OK
* func_80B24F08 OK
* func_80B25490 OK
* Use generated reloc
* Object symbols and other misc cleanup
* More cleanup
* Move data to be in-function like how Dg does it
* Rename to ENRACEDOG_GET_3E0 until this actor is actually documented
* Last itty bitty cleanup
* Better header
* Forgot to name the LimbDraw functions, whoops
* Respond to reviews
* Match how Dg does weekEventReg stuff
* Respond to review
* EnSyatekiCrow_Init OK
* EnSyatekiCrow_Destroy OK
* func_809CA5D4
* func_809CA67C OK
* func_809CA71C OK
* func_809CA840 OK
* func_809CA8E4 OK
* EnSyatekiCrow_Update OK
* func_809CAAF8 OK
* func_809CABC0 OK
* func_809CACD0 OK
* EnSyatekiCrow_Draw OK
* func_809CAE5C OK
* func_809CAF2C OK
* Migrate data to C
* Object symbols
* Use generated reloc
* Name static variables
* Name LimbDraw functions
* Remove struct padding
* Respond to review
* Respond to Elliptic's review
* EnHeishi first pass
* fixed references to updated function names
* fixed references to updated function names part 2
* removed unnecessary externs
* pr fixes
* fix header
* fix object files to match demoheishi changes
* cleanup
* PR comments addressed
* merge master
* use actors flags with change for demoheishi too
* starting
* a bunch
* and another bunch
* a bunch
* Match func_800EB1DC
* func_800EB4B4
* func_800EB6F8
* 2 more
* fix prototype of a random kankyo function
* func_800EBD60 non matching
* func_800EC678 matched?
* func_800EC6D4
* break
* func_800ECD7C
* A bunch of functions
* func_800EE200
* func_800EDF78 and func_800EE0CC
* func_800EDBE0 NON_MATCHING
* Cutscene_Init NON_MATCHING
* func_800EA324 NON_EQUIVALENT
* Fix warnings
* func_800EC924 NON_EQUIVALENT
* Cutscene_ProcessCommands NON_EQUIVALENT
* Format
* Split z_demo data and import it
* Import bss
* Match func_800EB364
* Rename Cutscene_Command_SetTime
* Improve Cutscene_ProcessCommands a bit (still not equivalent, probably)
* Improve Cutscene_ProcessCommands thanks to engineer and anon
* Cutscene_ProcessCommands NON_MATCHING
* Name some commands
* Fix
* Renames based on Engineer knowledge of Audio stuff
* More command names
* Cutscene_Command_GiveTatlToPlayer
* Some cutscene commands macros
* more command macros
* Macros for unknown commands
* Improve Cutscene_Command_Textbox a bit
* Rename stuff
* Name Terminator and Camera
* MOTIONBLUR
* Macros for textbox commands
* CS_PLAYER_ACTION_LIST
* A few macro renames
* Small cleaning
* A bit more of cleanup
* Rumble
* Entrance comments in func_800EB6F8
* Some var renames
* CS_CMD_FADESCREEN
* More clean up
* Clean functions protos
* Move CutsceneStateHandler out of z64.h
* Cutscene_DoNothing
* Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex
* And more renames
* name some stuff in the cutscenecontext struct
* npcActionIndex->actorActionIndex
* Undo names of CS_STATE_ enum
* Name Cutscene_ActorTranslate family of functions
* small docs pass
* sfxconvert and format
* Hopefully last cleanup
* Add some missing functions to actorfixer
* Fix merge issues and remove trailing commas
* Cutscene commands fix
* Cutscene_Command_Misc improved by engineer
* Update src/code/z_demo.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>
* Address review
* bss
* Match Cutscene_Command_Textbox by anon58
* Fix merge issues
* Match Cutscene_Command_Misc by @hensldm
* review
* float time macros
* fix merge issues
* format
* Fix building assets
* fix merge issues
* format
* Fix
* format
* fix merge issues
* fix
* fix
* format
* fix issues and run format
* bss
* Fix conflicts, bss and formatter
* Update include/functions.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>
* Update include/z64.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* address review and fix some stuff
* fix merge problems
* more fixes and format
* Fixes
* Update include/functions.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>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Engineer suggestions
* format
* Elliptic review
* Use dec for ShrinkWindow_SetLetterboxTarget
* add a few comments
* Cutscene_Command_ChooseCreditsScenes
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* format
* some cleanups and some comments
* change actorActionCmd from hex to dec in the codebase
* minor comment on textboxcmd
* ahhhh
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* brackets
* minor comments
* rewording
* im dumb
* brackets
* another bracket
* Dawn of the New Day
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* fixes
* Cutscene_Command_TransitionFX by Anon
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* progress
* it matches mostly
* symbols
* done for now
* fix warnings and stuff
* formatter
* NON_EQUIVALENT
* pr fixes
* formatter and actorfixer
* fix pm
* more fixes
* PR fixes
* it actually builds again
* matching function
Co-authored-by: Louis <louist103@pop-os.localdomain>
* Copy progress from z_camera
* cleanup functions.h
* Oops
* Revert `SUB16` and `ADD16` back to original names
* PR Suggestions
* PR Suggestions
* Fix merge with master
* Bring cutscene code over
* Document cutscene functions
* Bring over flags code
* Document flags
* Bring Object code over
* Document object functions
* Better infinite loop comment
* Remove Effect_add correction
* Bring func_8013D5E8 code over
* Document angle helper
* ActorFixer
* Rename angle helper
* Missed gs
* Should probably test before commiting
* Better angle helper name as well as typo fix
* English is hard
* Len to num
* Fix merge
* Fix merge
* Format
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Decomp Bba_01
* Doc bba01
* Document object_bba
* Remove new line
* Cleanup/rename EnHy to help differentiate it from overlays
* Adjust xml comment
* PR suggestions
* English is hard
* English is hard 2
* Add note about invalid textIds
* typo
* Fix merge
* Remove 0 defines
* EnSyatekiWf_Init and EnSyatekiWf_Destroy OK
* func_80A201CC OK
* func_80A20284 OK
* func_80A2030C and func_80A20320 OK
* func_80A20378 OK
* func_80A200E0 OK
* func_80A203DC OK
* func_80A20670 OK
* func_80A206DC and func_80A20710 OK
* func_80A2075C OK
* func_80A2079C and func_80A20800 OK
* func_80A208F8 OK
* Import data to C
* func_80A20858 OK
* EnSyatekiWf_Update OK
* Draw functions OK
* Use generated reloc
* Delete struct padding
* Use object symbols
* Name the statics
* ANIMMODE enum
* Misc cleanup
* Format
* Respond to review
* Change do-while loops to just be while loops
* Decimal counter
* Import data to C
* BgNumaHana_Init OK
* BgNumaHana_Destroy OK
* BgNumaHana_Update OK
* func_80A1A500 OK
* func_80A1AE08 and func_80A1AE1C OK
* func_80A1AA14 and func_80A1AA28 OK
* func_80A1AA38 and func_80A1AA4C OK
* A few more functions
* Finish most functions
* func_80A1A56C OK
* BgNumaHana_Draw OK
* Use generated reloc
* Use object symbols
* Actor flags
* Minor cleanup
* Some initial documentation
* More documentation
* Document flower petal struct
* Some more struct vars
* Name everything else
* Finish documenting the object for the flower
* Final doc pass
* UNK_TYPE
* Respond to review and fix build
* Document object_rd + use it in rd and railgibud
* Move limb enum to rd.h, share it across all redead actors
* Copy over head/body rotation and effect documentation from Talk_Gibud to the other two
* Minor spacing things in Talk_Gibud
* Import tons of symbols from Talk_Gibud into Railgibud
* Always set actionFunc last in Setup functions
* Document the isInvincible struct var (thanks kz)
* More railgibud struct documentation
* Cutscene-related struct names
* Damage effect enum for Railgibud
* Damage effect enum for Rd
* Use the UpdateDamage name that everyone else uses
* Grab/Type enums in Railgibud
* Document EnRailgibud_MoveGrabbedPlayerAwayFromWall
* Document EnRailgibud_PlayerInRangeWithCorrectState
* Document EnRailgibud_PlayerOutOfRange
* Document path stuff in Railgibud
* More Railgibud junk
* Enum for animations
* Minor documentation on effect stuff
* Document Railgibud sink into ground
* Document most of Railgibud that was left
* Clarify one function name
* Use player2, since I guess func_800B8E58 takes Player* now
* Make Talk_Gibud/Railgibud consistent with each other in style
* Name a few Rd functions
* Name some dancing functions
* Make define for is Redead
* Define for if the Redead is frozen
* Make most params access use TYPE
* Document some Rd types
* Document grab fail functions
* Port a few more names from other Gibdo actors
* More Rd documentation
* Document alpha
* Document walk to home functions
* Document deathTimer in Rd
* Some more timers documented
* Document damageEffect struct var
* Name all functions in Rd
* Document unk_3E4
* Document grab stuff
* Document mourning state
* Document action states
* Name all remaining variables
* Document remaining EnRdType
* Document all types of Redead
* Use ACTOR_FLAGs
* Verbose player stateflags
* CheckCollision -> UpdateCollision
* Try to explain what makes Rd different from the others better
* Last changes before PR
* Move the limb enum to the object
* Remove unnecessary includes from the .c files
* Format after sync
* EnAni:Start
* EnAni: done with matching
* EnAni: docs
* EnAni: forgot the display lists, they wouldnt load in z64utils, had to use limb->DL to name them
* EnAni: forgot the spec, so rusty
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* EnAni: more requested changes
* EnAni: format pass
* EnAni: remove typedef warning
* EnAni: typdef attempt
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnAni: changed ani state flags from enum to defines
* EnAni: formatter no
* EnAni: undefined behavior
* EnAni: chest rot discovered
* EnAni: fixes after merging
* EnAni: flags docs
* EnAni: flags at top using enum
* EnAni: jenkins bait
* EnAni: revert bgcheck flag
* EnAni: single doc
* EnOssan: format after fix to EnAni
* EnAni: requested changes, some documentation changes
* EnAni: forgot to re-extract
* EnAni: better object naming
* EnAni: changed STATE_SUFFERING to STATE_WRITHING to match object docs, removed extra whitespace from defines
* EnAni: removed object comment about z64util not rendering them
* EnAni: flipped actor flag to match OOT
* EnAni: formater pls
* EnAni: Animatation Enum values in Animation_change calls
Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnYb: start
* EnYb: ah I broke it
* EnYb: well at least the draw function matched...
* EnYb: back to semi-matching
* EnYb: Back to OK, workable again
* EnYb: init matches now, ugly as it is for dma padding
* EnYb: probably not progress
* EnYb: fixes to master merge, back to OK
* EnYb: custom shadow function matches
* EnYb: more docs, this last function sucks
* EnYb: OK thanks to Anon and myxrules
* EnYb: docs
* EnYb: more docs
* EnYb: formatter pass
* EnYb: removed unused symbols
* Requested changes part 1
* EnYb: Minor changes
* EnYb: forgot the spec
* EnYb: some display lists documented based on limbs, but two remain because their limbs dont highlight in z64Utils
* EnYb:one wrong entry
* EnYb: maybe better object documentation
* EnYb: fix warnings
* EnYb: flag docs
* EnYb: changed function
* EnYb: more documentation
* EnYb: flags enum at top
* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnYb: PR fixes
* EnYb: formater is picky
* EnYb: jenkins bait
* EnYb: correct array access
* EnYb: formater pass
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* EnYb: fixes
* EnYb: more requested changes, formater pass
* EnYb: renamed padding
* EnYb: object xml name updates
* EnYb: merge fix
* EnYb: limb enum and small changes
* EnYb: scale float fraction found
* EnYb: better object limb naming
* EnYb: formater pls
* EnYb: flipped actor flags to match OOT
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* EnYb: more requested changes
* EnYb: more animMode enum found
* EnYb: doc player playing ocarina
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Bring over the matching code, rename struct vars to be consistent, and move animation structs to z64animation.h
* Clean up function prototypes
* Format and some stack var renames
* Update tutorial
* Rename animation structs
* Rename SubS functions
* Rename Actor function
* Rename arg names
* Bring over code for func_8013D9C8
* Rename and cleanup
* Some more cleanup
* Small cleanup
* Animmode enum
* Adjust actorfixer
* More uses of animmode enum, as well as fixing typo
* Change hex 0xD to 13
* typo
* Fix merge
* Format
* Fix merge
* Actorfixer
* Format
* Migrate data to C
* Init / Destroy / Update / Draw
* Functions called from Update
* Better Init match
* A few more functions
* A few more functions
* Drum-spawning function OK
* EnJg OK
* Name a few struct vars
* Name some static vars
* Name limbs
* Name limb DLs
* Name some textures
* Name all remaining textures
* First pass animation names + use object in actor file
* Add drum to XML + clean it up
* Better translations, thanks Emily!
* Some more documentation
* Improvements
* Params accessor for s_goro
* Proper object symbols for Jg_Gakki
* Delete unnecessary undefined_syms
* Text defines for my own sanity
* Some more names
* Document point/path stuff
* Name every function, even if the names are bad
* Params macro for if he's in goron shrine
* Some misc improvements
* Document EnJg_GetShrineGoronToFocusOn better
* Final cleanup before PR
* Change action name because this actor is dumb!
* Run actorfixer
* Rename some variables now that a function is named
* ProcessTalkRequest takes GameState
* Run actorfixer
* Use new actor flags
* Update text ID names to match my text ID PR
* Define the limb enum in the object
* Be consistent about where the EnumName is
* Don't name limbs after the actor
* Basic enum for drum limb
* Fix stuff after merge
* Do if/else if/else
* Remove textId defines
* Decimal weekEventReg accesses
* en_am ok
* clean up
* applying feedback and some docs, need finish still
* this should fix things
* fixing things
* fixing things and running format
* post actor_fixer
* adding object header and fixing comments
* formatting and adding enum for limbs
* addressing pr, naming things, cleanup
* fixing enum in header
* doing some docs and fixing format
* EnDemoheishi decomp first pass
* object decomp
* whitespace between declarations and statements added
* various PR fixes
* format for CI
* various PR fixes 2 + format
* missed one texture output name
* fix texture docs in unrelated files
* fix demoheishi shared texture naming
* made object sdn properties generic for soldiers
* missed outName modifications
* fixed references to updated function names
* reverting some texture changes to unrelated objects & use object specific names for lips and fingers textures
* added textId comment
* various PR comments addressed
* added enum for animations
* reverting halt animation naming
* moved animation enum to actor class
* fixed enum names
* fix typo
* more PR fixes
* format
* fix for broken build after other PR merge
* format
* merge fixes
* isTalking
* Enum - Calf to shin
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Object - Calf to shin
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* DList - Calf to Shin
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Match remaining functions of code_8012EC80.c
* parameter_static extracted and OK
* Small Progress
* Documentation all over the place
* Finish Documenting
* Cleanup
* Name more textures
* Update knowledge on deku playground player name
* All textures from parameter_static known now
* Finish documenting and validating parameter_static
* More up-to-date SaveContext docs
* More docs
* More cleanup
* Sun -> Star
* Minor touchup
* More cleanup
* pictograph -> pictoBox
* Remove the "unused" part
* More accurate name: hour lines
* It's gsDPLoadTextureBlock, not gsDPSetTextureImage
* Fix parameter_static and merge issues
* More docs from new PRs and Parameter WIP
* Missed a name
* Move parameter_static to interface assets
* Clean up code_8012EC80.c data
* Fix comment
* Add comments to parameter_static
* Oops
* fix merge
* Missed a PR review suggestion
* Fix merge
* EnZo OK, sort of documented
* fix variable naming
* fix suspicious match, add -ing to `PlayWalkSound`
* name `FollowPath`, waypoint struct member
* update description to say unused
* name `TreadWater`, fix a snake case i missed
* name `Walk`
* cleanup a bit
* address comments
pointers -> symbols, remove static and array length, inline data,
define var on same line, update file description, use ARRAY_COUNT
* space things out, move data, add ENZO_NO_PATH
* fix ENZO_NO_PATH define
* remove array pad, dec for size, thisx in limbdraw, renames in draw
* name some object_zo stuff, use symbols
* funny single member damage enum
* name textures
* name the rest of the used items in object_zo
* name the dlist
* suggestions
* actually fix the return false
* formatting
* rename `quake2` -> `distortion`
* Small touch-up
* cleanup and better spacing
* PR Feedback from OoT
* missed a small thing
* Name `billboardMtx` using better knowledge of sys_matrix functions thanks to `z_view`
* Add documentation to `SurfaceType_GetConveyorType`
* Cleanup Conveyor Type docs
* update cycle to phase
* Document object_obj_tokeidai XML
* Change "outer ring" to "minute ring" to better describe what it is
* Rename "sun and moon disk" to "sun and moon panel"
* Preserve ordering
* Standardize on "staircase to rooftop"
* Standardize on calling it "Exterior Gear" to contrast with all the interior stuff
* Lots more documentation
* Make it more obvious that the macros refer to clock time, not regular time
* More documentation and spacing
* Better document counterweight draw
* Respond to Anghelo's and engineer's reviews
* Split tokeidai into separate files
* Revert "Split tokeidai into separate files"
This reverts commit eed1fe5ff6.
* Document lodmoon
* Document moonston
* Document the open-mouth moon part of fall2
* Document object_fall
* Move flags to .c
* palette -> tlut
* File header comment
* OPEN_DISPS/CLOSE_DISPS spacing
* Lots more spacing
* Add spaces after breaks
* Better describe the subtypes
* More fixes
* Be a little more specific in fireball comments
* Respond to Elliptic's second review
* I need to stop forgetting to run ./format.sh
* Single line comment styling
* Preserve ordering
* EnBigokuta like half matched
* match all but 2 functions
* match all the functions
* import data
* name object stuff
* use new object symbols, do some documenting
* fix name of headUndersideTex
* name some struct members
* finish documenting
* Address comments
spacing, unkFunc comments, temp names, remove parens, reorder pads,
data formatting, limb enum
* address comments
* move empty line
* change the ARRAY_COUNT
* ovl_Obj_Kzsaku OK
* add packing macro
* made suggested changes
* switch pad order
* made some suggested changes. still don't know completely about naming
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Bring code over
* Change ActorDraw typedefs from actor to thisx
* Rename functions
* Format
* Rename and clean up limb draws
* Some more limb draw cleanup
* Some more cleanup
* Function comments
* Last bit of cleanup
* update tutorial
* More tutorial and format
* Remove extra newlines form actorfixer
* Missed one
* Remove some unnecessary casts
* Fix SkelAnime transform functions in functions.h
* Remove bug comments, and add note
* Remove some more unneeded casts and rename one variable
* format
* Fix merge
* Format
* Name textures in object_mag
* Corrections
* tabs -> spaces
* OK, data imported
* Remove obsolete comment
* Start documentation
* Defines for most texture sizes
* Name most static variables, add state enum
* Macros, name all the statics
* Couple of minor tweaks to other files
* Name some more effect stuff
* Fix kanfont data
* Name everything else, move macros
* Format
* Review
* en_hgo OK
* Formatting changed somehow?...hopefully this fixes
* who would win, Cammoguy or one letter?
* format
* addressing review comments
* fixing PR comments
* fixing and merging master
* forgot to format
* fixes warnings?
* minor documentation...don't have tools to do more
* Fixing things, hopefully OK
* formatting...
* clean-up undefined syms
* Match Player_GetHeight
* Another bunch
* Fix merge conflict
* rename Gfx_DrawDListXlu
* add WEEROR
* Actor_Spawn
* almost Actor_SpawnTransitionActors and Actor_Delete
* A bunch of small actors
* More renames
* format
* Some Player renames
* a few more
* import data
* run formatter
* func_800B7170
* whoops
* Fix merge issues
* Whoops 2
* func_800B83BC and func_800B83F8
* Actor_IsActorFacingPlayerAndWithinRange
* add some prototypes
* match Actor_UpdateBgCheckInfo
* func_800B7678
* mark Actor_SpawnAsChildAndCutscene as non_matching
* Actor_Draw
* Update is chaotic
* 2 new matches
* func_800BC8B8
* Another bunch
* function renames
* run formatter
* cleanup
* remove unnecesary casts
* add missing sfx
* Fix renames
* fix merge
* func_800BF7CC
* small bunch
* another bunch
* func_800BE184 non_matching
* two more
* split z_cheap_proc
* Another bunch
* another bunch
* a few and a non matching
* yeee
* a
* Actor_DrawAll non_equivalent
* Actor_RecordUndrawnActor
* i don't know what to put in this commit message
* func_800B4B50 non matching
* func_800B42F8 non matching
* func_800B5040
* func_800B5814 non_equiv
* func_800B6584
* func_800B6608
* func_800B6680
* func_800B7E04
* func_800B8118
* func_800b9170
* ,
* func_800BC4EC
* func_800BA6FC
* func_800BA798
* func_800BA8B8
* Actor_LoadOverlay
* small cleanup
* func_800BB2D0
* meh
* func_800BBAC0
* func_800BC270
* func_800B5208 non matching
* Fix warnings
* meh
* rename some ActorShadow_ functions
* fairy
* Flags_
* fix warnings
* format
* Actor_PickUp and family
* func_800B8E58
* match Actor_RemoveFromCategory
* another bit of docs
* Match func_800B86C8
* And another bit
* rename Player_GetRunSpeedLimit
* func_800B9E84
* func_800BE63C
* func_800BB8EC
* match func_800B5814
* match func_800B9334
* cleanup
* fix conflicts: first pass
* another fix
* actorfixer fix
* fix conflicts
* func_800BE680 non_equivalent
* Improve func_800BE680 a bit
* func_800BE680 equivalent (?)
* func_800BE680 equivalent
* Actor_UpdateActor equivalent
* format
* use some ExchangeItemID enum values
* Some more cleaning
* more cleanup
* More name stealing from OoT
* match func_800B82EC
* match func_800B9D1C and a bit of cleanup
* Add ACTOR_FLAGS placeholders
* Renames and match func_800BE184
* last pass of name stealing
* format
* fix conflicts
* more cleanup
* more cleanup
* cleanup and OVERLAY_RELOCATION_OFFSET macro
* Remove prototypes of obviously internal-only functions,
update variable names,
forward declare where necessary,
remove all `param_\d`s
* remove newlines
* minor rename
* Use ACTOR_FLAGS in z_actor
* Match func_800BE3D0
* Rename movement functions
* Document Actor_CalcOffsetOrientedToDrawRotation
* velX -> horizontalSpeed
* A bit of documentation for actor movement functions
* format
* Fix merge issues
* format
* Format
* Fix renames
* fix warnings
* fix conflicts
* review :D
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Fix
* format
* Actor_SpawnSetupActors
* engineer review
* Update src/code/z_actor.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* A bunch of Engineer's reviews
* more Engineer's review
* a
* whoops
* run actorfixer
* c'mon
* 😮💨
* whoops
* warning
* More engineer's review
* run format
* I'm dumb
* a
* match func_800BE680
* Match Actor_DrawZTarget
* Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor
* Fix merge issue
* format
* update actor
* Steal a bit of @Thar0 documentation from OoT's z_message
* Run actorfixer
* Fix renames
* Match func_800B4B50 thanks to @hensldm
* Improve ActorShadow_DrawFeet thanks to @hensldm
* whoops
* Actor_PlaySfxAtProjectedPos
* Actor_UpdateActor matched by @hensldm
* Match func_800BA2FC by @hensldm
* Match Actor_SpawnTransitionActors by @hensldm
* Match func_800BB604 by @hensldm
* Match Actor_DrawAll by @hensldm
* ActorShadow_DrawFeet by @hensldm
* Actor_UpdateAll by @hensldm
* Match func_800BCCDC by @engineer124
* Small Actor_PlaySfxAtPos by @engineer124
* ACTOR_FLAGS_ALL and a bit of cleanup
* Add invisible comment
* Small docs pass
* Fix merge
* Engineer's review
* format lol
* Actor_DrawDoorLock docs
* Actor_SpawnShieldParticlesMetal
* fix merge issues
* sActorFaultClient
* fix
* commit message
* Run actorfixer.py && format.sh
* Fix warnings
* fixes
* format
* bss
* Update include/functions.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Address review
* Fix merge issues, format and such
* fix merge issues
* Add ACTORCAT_MAX
* actorList -> actorLists
* Fix merge issues
* format
* Enable WERROR on jenkinsfile
* Fix merge
* Use object symbols
* address review
* format
* review
* fix merge issues
* fix
* VRAM_PTR_SIZE, small cleanup and format
* review
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* Bring over matching actor getters
* Add arg names
* Rename functions
* Adjust rename_sym script to update sizes csvs
* Fix wrong function prototype
* whitespace
* Rename functions
* Fix actorfixer
* Format
* Add function comments and file header
* Fix merge
* format
* Fix merge
* format
* Move D_0407D590 down
* Fix merge
* Steal idea from z_actor PR to return directly
* Swap function name order
* Fix merge
* all matching except draw
* all matching
* done except importing data
* data extracted
* added xml for asset extraction
* clang format
* remove global_asm macros
* bit of documentation
* format
* use THIS macro
* remove unnecessary &
* space between vars and code
* feedback
* use OPEN_DISPS, CLOSE_DISPS, and POLY_OPA_DISP++ macros
* remove comment
* use matrix macros
* change comment format
* change comment format
* rename assets in xml
* fix indent
* Good start
* More progress
* More progress, need to try importing data now
* Import data to C
* Match a tricky item function
* Matched another item function
* Improve definition of EnTalkGibudUnkStruct
* func_80AFFD3C OK
* Draw functions done
* EnTalkGibud_Init OK
* EnTalkGibud OK
* Document item and switch flag stuff
* Name all static variables
* Enum for animations
* Document type
* Document limb stuff
* Tons of documentation
* Document effect stuff
* Document most unknown struct vars
* Name most functions
* Name final function + document text IDs
* Organize forward declarations
* Name stack variables
* Document damage effects
* Document limbs
* One final pass
* Respond to Anghelo's review
* Respond to Anghelo's second review
* Add space to force Jenkins to rerun (testing PR dashboard, please ignore)
* Removing previously added space
* Fix limb enum to add LIMB_NONE
* Run ./format.sh, whoops
* Respond to hensldm review + small cleanup
* Respond to engineer's review
* Fix item enum
* This is a legacy PR, so using autogenned object symbols
* Fix merge conflict
* Move Talk_Gibud specific enums to .c
* Migrate data to C
* ObjTokeidai_Init OK
* ObjTokeidai_Destroy OK
* func_80AB2BBC OK
* func_80AB3BB0 OK
* func_80AB29F8 OK
* func_80AB27B4 OK
* func_80AB2834 OK
* func_80AB2790 OK
* func_80AB28C8 OK
* ObjTokeidai_Update OK
* func_80AB4040 OK
* func_80AB3010 OK
* func_80AB3CCC OK
* func_80AB3240 OK
* func_80AB3C50 OK
* func_80AB4080 OK
* func_80AB4160 OK
* func_80AB319C OK
* func_80AB3BE8 OK
* func_80AB3BD8 OK
* func_80AB3B34 OK
* func_80AB3A7C OK
* func_80AB3ED0 OK
* func_80AB39BC OK
* func_80AB38B0 OK
* func_80AB3880 OK
* func_80AB363C OK
* func_80AB36C4 OK
* func_80AB3808 OK
* func_80AB365C OK
* func_80AB3598 OK
* func_80AB3544 OK
* func_80AB34CC OK
* func_80AB3370 OK
* func_80AB32F0 OK
* ObjTokeidai_Draw OK
* func_80AB4894 OK
* func_80AB4664 OK
* func_80AB4394 OK
* Use compiled reloc
* Initial documentation pass
* Little more documentation
* Last bit of first pass documentation
* Finish documentation
* Respond to review feedback
* Respond to Anghelo's feedback
* Incorporate new enum
* Respond to engineer's feedback
* Respond to engineer's feedback
* Update comments because the things I thought were unused ARE actually used
* Switch to using "Open" instead of "Transform"
* Run ./format.sh
* Respond to engineer + hensldm by removing some macros
* Fix func_801A3F54 argument
* Fix func_801A3F54 argument
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* This is a legacy PR, so using autogenned object symbols
* Move enum to .c
* Revert "Move enum to .c"
This reverts commit de13c50f0a.
* Move tokeidai-specific defines to .c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnFall_Init OK
* EnFall_Destroy OK
* EnFall_Update OK
* func_80A6C3AC and func_80A6C3FC OK
* func_80A6BF90 OK
* func_80A6CA9C OK
* func_80A6CD38 OK
* func_80A6CF60 OK
* func_80A6C9A8 OK
* Import data into C
* func_80A6CB74 OK
* func_80A6CD74 OK
* func_80A6CF70 OK
* func_80A6CECC OK
* func_80A6D698 OK
* func_80A6D220 OK
* func_80A6D100 OK
* func_80A6D75C OK
* func_80A6D88C OK
* func_80A6D98C OK
* func_80A6DC20 OK
* func_80A6DA7C OK
* func_80A6DC40 OK
* func_80A6DD3C OK
* func_80A6E214 OK
* func_80A6E37C OK
* func_80A6C7C0 OK
* func_80A6D444 OK
* func_80A6C1DC OK
* func_80A6D504 OK
* func_80A6E07C OK
* Move all statics to in-function
* Migrate bss to C and use compiled reloc
* Clean up UnkFallStruct
* Initial documentation pass
* Some more function names
* Name some more unknowns
* Name yet more unknowns
* Name all struct variables and static data
* Do one last documentation pass
* Respond to engineer's style review
* Respond to hensldm's review
* This is a legacy PR, so using autogenned object symbols
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data
* z_kaleido_manager OK
* add to functions.h variables.h and variables.txt
* init
* rename parameters in func_80163700
* rename func_80163700 to KaleidoManager_FaultAddrConvFunc
* change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match
* ran format, uintptr_t
* made suggested changes
* code_80194710.c OK
* Add new line after variable declaration
* format
* Function declarations
* Name changes to match OoT
* Rename file
* s32 -> size_t
* Bigpo: object documentation starts and already issues
* Bigpo: almost all named
* Bigpo: done with object except ubused blobs
* Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass
* Bigpo: forgot to remove sym and replace everywhere, with formater pass
* Bigpo: forgot about actorfixer
* Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now
* Bigpo: warnings
* Bigpo: remove extern for gameplay_keep display list reference from aqua
* EnBigpo: suggested fixes to header calls and function name
Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Decompile various effect files and cleanup z_effect.c
* Decompile z_eff_tire_mark.c and cleanup structs
* Small cleanups
* Apply most review suggestions
* Apply more review suggestions
* Change eff_shield_particle vertices to be extracted as an asset
* Add relevant effect functions to actorfixer.py
* Import data to C
* EnTanron3_Init OK
* EnTanron3_Destroy OK
* func_80BB897C OK
* func_80BB91D4 OK
* func_80BB9288 OK
* EnTanron3_Draw OK
* func_80BB95FC OK
* EnTanron3_Update OK
* func_80BB9308 OK
* func_80BB87D4 OK
* func_80BB85A0 OK
* func_80BB8A48 OK
* Update spec with compiled reloc
* Name most of the functions
* Name a few more things
* Merge animation system changes
* Name remaining unnamed variables
* Finish documentation
* Use modulo for fogTimer
* Move enum/structs to .h
* boss03Parent -> sGyorg
* D_80BB9720 -> sZeroVec
* Move initialization of effectPtr up
* Use 2 * M_PI
* Use MTXMODE_NEW
* 65536.0f -> 0x10000
* timer += 1 -> timer++
* Timer cleanup
* Remove unneccesary parentheses
* When performing bitwise operations on timer, use hex
* Lowercase "fish" in the comment at the top
* Respond to jpburnett's feedback
* Respond to Elliptic and Kenix's reviews
* Undo renaming the Gyorg var, but keep the comment
* Add a little bit more documentation
* Variable renames
* Remove a comment that no longer applies
* Document some swimming behavior
* PICK_DIRECTION -> PICK_NEW_DEVIATION
* Minor comment tweak
* Respond to Elliptic's review
* Remove timer inconsistency
* ObjTree OK, data imported
* EnMs OK, data imported
* And the spec
* OK
* Some minor edits
* A lot of preliminary stuff
* Mostly complete beginning
* First draft of other functions doc
* Whoops, forgot the GlobalContext pad
* Draw functions (minus colour), create Data
* Data
* gitignore, some progress on documenting
* Review comments, continue documenting
* spec
* Finish off documentation
* undefined_syms
* Add a couple of todos
* One more
* At least add tools for object decomp
* Start conversion table stuff
* Document ObjTree
* Document EnMs
* Add more tables to conversions
* Maide's review
* Review
* Review
* Typos and incomplete thoughts
* Update vscode.md
* Correct function/variable names
* Review suggestions
* Format
* Missed one
* Rename functions and format
* Fix ObjTree
* Update actorfixer.py, fix some variable names
* Some review
* Review suggestions
* More review
* Hopefully fix all the thisx references
* Missed one
* EnHitTag all matching, data still not imported
* rename loop counter variable to i
* imported data
* use generated reloc
* cleanup
* name func_80BE20E8, document with ITEM00_RUPEE_GREEN enum, use if-return-implication in WaitForHit
* add switchflag param macro
* use previously unused pCylinder as function arguments
* use THIS macro and change switchflag macro to take actor pointer
* space between var declaration and code
* format
* rename pCylinder to cylinder
* rename cylinder to collider
* change ColliderCylinder* to pad
Co-authored-by: retro <retro@DESKTOP-KGV19SQ.localdomain>
* a bunch of OKs and close functions
* OK All but 1 function
* Clean up code
* Match
* implement suggestions
* OBJMURE_CHILD_STATE_DEAD
* Update src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* use enum for type tests
* add OBJMURE_TYPE_MAX
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* first few functions
* two more almost matching functions
* Rebase to NBS, get it to compile
* BgCheck_RaycastFloorStaticList OK, fix-up some functions
* BgCheck_SphVsStaticWall OK! and a few others
* more z_bgcheck NON_MATCHINGS
* OK more functions, reorganize external reference #defines
* More functions OK, more struct fixes
* More OKs
* Decomp all the way to the end of bgcheck
* All functions attempted
* Rename functions
* formatting, data migration
* Give names to unk structs, rename some structs, fix some non-equivalent functions
* WaterBox_GetSurfaceImpl OK
* BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source.
* BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings
* pr change requests
* fix crc maybe
* implement more changes
* implement alf's changes
* Introduce bgms
* Fill in bgm enums
* Rename bgm to clearer names
* Fix spacing
* Fix "No_Music" define
* remove comment
* Improve bgm names, found another seqId function
* Another seqId function
* Another name change
* Woods of Mystery -> Sarias Song
* add saria's song bgm to pierre
* Another bgm function found!
* Add bgm's to `gSaveContext.seqIndex`
* 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
Tom Overton