* 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>
* 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
* 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>
* 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
* 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
* 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
* 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>
* 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
Derek Hensley