* 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
