* object_firefly dLists and skel
* most limbs, textures
* more limbs, comments, outnames.
* fixed d list name in z_en_firefly
* enum name fix, limbIndex numbers fix, root name fix
* llvm changes because of format.py
* deleted llvms and max limbs number fixed
* z_en_firefly changes after clang format
* error in the build because of these two
* fixed limbIndex issue and added enum names instead
* equal sign that was missing
* limbIndex number was wrong
* z_en_firefly.h include changes and morph/joint table changes
* build retry
* format.py again and build retry
* Initial docs
* Tons of stuff done
* Fix spacing thing now that the function is actually named
* Temporarily add un-macro'd flags as comment
* Name and document EnSyatekiOkuta_IsHiddenByAnotherOctorok
* Finish naming all functions
* Better macros + explanations
* Comments on a lot of functions
* Some stuff I was supposed to revert
* Fix merge issue
* Another merge fix
* Make data static + move it in-function
* Respond to engineer's review
* circleOrCrossAlpha -> hitResultAlpha
* Respond to more of engineer's feedback
* octorokHitType -> lastHitOctorokType
* Animation enum stuff
* begin next cleanup
* more cleanup
* climbAnim
* more cleanup
* more
* quick, a few more before anyone looks
* PR
* another fix
* table
* another small cleanup
* PR Suggestion
* Start
* Try every function
* Import data
* Docs from message branch
* Fix non-equivalency for func_8016AE1C
* Everything looks NON_MATCHING
* Some more clean up and docs
* Some cleanup
* Small format
* Small improvements here and there
* Match a couple
* Anotha one
* and than there was 1
* and than there were none :)
* Lots of docs
* Finish code docs
* schedule static
* Macros + cleanup
* text ids array cleanup
* Entries cleanup
* Use sBombersNotebookEntries in macros
* Some docs from message branch
* eventIndex -> event
* Remove outdated comments
* PR
* BOMBERS_NOTEBOOK_ENTRY_SIZE
* tables
* Token pasting to simplify
* Some more fixes
* PR pt 1
* Format
* Bring over BombersNotebook docs from z_message branch
Co-authored-by: ZoeyZolotova <zoey.zolotova@gmail.com>
* Full enum glory
* Format
* Name weekeventregs
* typo
* Some comments
* bss
* Review
* bss
* Update src/code/z_play_hireso.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Fix
* Namefixer
* bss
* Format
* 0 = 0x0000
---------
Co-authored-by: ZoeyZolotova <zoey.zolotova@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Everything below Main OK,
and some small ones at the top
* 3 more short ones
* FileChoose_Main
* SelectModeUpdate/Draw
* SelectMode update functions done
* 2 more small ones
* ConfigModeDraw
* SetWindowVtx
* FileChoose_FadeInMenuElements
* Rest of the Config Mode Update Functions
* Minor cleanup
* FileChoose_UpdateMainMenu
* Make xml for title_static
* Minor correction
* One nasty draw, thanks Synray
Co-Authored-By: Synray <31429825+Synray@users.noreply.github.com>
* import data
* some cleanup
* import OoT docs
* missed some docs
* some progress
* FileSelect_SetWindowContentVtx WIP
* improve FileSelect_SetWindowContentVtx
* match z_file_nameset_NES
* cleanup and docs
* title static
* a few more functions
* even more functions
* small cleanup
* Data Cleanup
* 2 more matches
* z_file_choose_80807940 OK
* cleanup
* fix merge master
* FileSelect_DrawFileInfo wip
* small cleanup
* minor
* fix merge
* match FileSelect_DrawFileInfo
* cleanup
* fix merge
* fix merge
* sram cleanup
* document select mode
* many docs
* more docs
* more cleanup
* small nitpick
* consistency
* more cleanup
* more cleanup
* small
* small typos
* octal bad
* pr review
* noop
* elliptic review
* more review
* non-matching
* oops
* more suggestions
* keyboard formatting
* fix master
* sound
* padding
---------
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* Some pathing docs
* Missed one
* Uno mas
* Uno mas x2
* Cleanup
* fix
* namefixer
* NULL
* More
* PR
* Actually remove SQ
* -1 define, plus some more pathing cleanup
* Actor macros instead
* Format
* ADDITIONAL_PATH_INDEX_NONE
* Remove reliance on PATH_INDEX_NONE
* Missed some PathIndex cleanup
* Review
* format
* a lot of brackets, and some other things
* oops
* another bracket
* check flag all
* just a few more...
* PR suggestions
* PR comment
* pr
* one more bracket
* Match remaining functions in z_en_go:
- Changed some already matching functions for uniformity with the tricky match (early continue from loop). In some cases, this eliminated some strange constructs, in others, it didn't leave much difference.
- Comments/Notes to start understanding/naming process.
* WIP renaming
* More WIP renaming.
* More renaming, Effects (See oot for continuation) and some flags)
* MessageScript documenting.
* Util for dumping message data by textId value.
* Identify some messages.
* Formatting, figuring out event flags.
* More WIP naming
* WIP renaming.
* WIP renaming
* WIP naming and organizing
* WIP more renaming.
* WIP renaming/organizing.
* Near-Final Cleanup before review.
* Rename Taisou and Hakugin animations and associated functions/variables.
* Misc Cleanup.
* Undo changes to variables.txt
* Removed msgtableparser.py (Split to another branch)
* Removal of uncompiled Message Script details.
* Fixup spec file
* First part of hensldm's suggested changes from review. Awaiting discussion.
* Second part of hensldm's suggested changes.
* Fixup missed 'Animation' suffix and functions.txt
* Update .xml files and related source per tom-overton's comments
* Align w/ engineer124's Quake Cleanup #1102
* fixup
* Run format.sh after merge.
* Add brackets around one-line conditional blocks
* Remainder of hensldm's comments from review.
* First pass at Elliptic's comments.
* Rename functions UpdateToX -> ChangeToX
* Header cleanup.
* Run Format, remove accidental commit of .orig file.
* Fixup ActorInit
* Review comments addressed, plus a few unsolicited changes.
- Location of function declarations moved above static data, below types: References in the codebase were mixed, but this just made more sense.
- Function name changes: It didn't fit into subsystems based on Goron Type, so I quit trying to name functions that way. Loss of a bit of "which function applies to which type", but it looks a bit cleaner, sooo...
- Took a stab at making effectTable usage a bit clearer. Just using a EnGoEffect* everywhere and not inherently knowing if it was for one element, or an array really bugged me.
- "GraveBro" names changed. They're all "brothers".
* Changes from engineer124's review.
- "Stretcher" replaced with "Athletic" as a descriptor of goron type.
- Misc formatting and naming changes
* Restructure switch-case statment for early break, and added missing default cases. Removed #define for 0 for actionFlags bitmask.
* Relocate WEEKEVENTREG comments, remove SCENE comments.
* Updated WEEKEVENTREG define names
* Update WEEKEVENTREG names in Goron Shrine Door.
* ELDER -> ELDERS, and revert formatting on z64save.h
* Fixed re-applying changes over wrong defines.
* Adjust Weekeventreg names and comments.
* Update comment as well.
* Progress
* one more
* OK
* update
* finished z_demo_moonend
* update reloc
* actually updated reloc
* fix symbols
* made suggested changes
* reformat
* Made suggested changes
* forgot to run format.py
* made suggested changes
* made suggested changes
* moved cueid to be in scope
* Begin Kaleido
* WIP
* DW macros for gbi
* More Progress
* Match KaleidoScope_GrayOutTextureRGBA32
* DrawGameOver wip
* Add some function names
* A few more matching, some docs
* More docs, data wip
* Import Kaleido Data
* Data cleanup
* Some progress
* Match TitleCard_Draw Again (Thanks Roman)
* Match KaleidoScope_DrawDebugEditor
* KaleidoScope_UpdateDebugEditor WIP
* Some cleanup
* z_kaleido_debug.c OK
* Cleanup
* match func_8081B6EC
* more wip, data cleanup
* match func_80825A50
* match KaleidoScope_InitVertices
* cursor progress
* name func
* item headers
* match KaleidoScope_DrawItemSelect
* KaleidoScope_UpdateItemEquip WIP
* match kaleido item
* doc kaleido item
* z_kaleido_prompt ok
* kaleido mask setup
* small cleanup
* kaleido mask OK
* mask cleanup
* small fix
* quest page setup
* doc save prompt
* sync with prompt docs
* KaleidoScope_Update WIP
* More progress on KaleidoScope_Update
* kaleido update cleanup
* KaleidoScope_Update OK
* Slightly cleaner match in KaleidoScope_Update
* match KaleidoScope_DrawPages and KaleidoScope_DrawGameOver, organize data
* more cleanup
* match KaleidoScope_Draw and KaleidoScope_SetView
* match KaleidoScope_UpdateNamePanel
* match another 2 funcs, segment docs
* another KaleidoScope_UpdateNamePanel ?
* swap update name panel names
* another match, only 2 large/similar vtx function in kaleido nes
* more setup for drawInfoPanel
* match KaleidoScope_DrawDungeonStrayFairyCount, 8 funcs left
* document KaleidoScope_DrawDungeonStrayFairyCount
* KaleidoScope_DrawInfoPanel1 WIP
* match KaleidoScope_DrawInfoPanel2
* gameover pause states
* name two pause states
* match KaleidoScope_UpdateDungeonCursor and KaleidoScope_UpdateWorldMapCursor
* match KaleidoScope_DrawDungeonMap
* KaleidoScope_DrawWorldMap WIP
* cleanup map
* some cursor/texture docs
* more cursor docs
* KaleidoScope_UpdateQuestCursor wip
* match KaleidoScope_UpdateQuestCursor
* quest cleanup
* KaleidoScope_DrawQuestStatus WIP, broke gakufu
* match KaleidoScope_DrawInfoPanel1, Kaleido NES OK
* pause substates
* more cleanup
* map progress
* very small improvements to KaleidoScope_DrawWorldMap
* match KaleidoScope_DrawWorldMap
* cleanup KaleidoScope_DrawWorldMap
* rematch EnGakufu_ProcessNotes, thanks anon58
* gameover and misc docs
* more docs
* small cleanup of maps
* owl warp and other docs
* symmetry in pause state
* some docs and cleanup
* docs
* more docs from OoT WIP
* fix
* quest page docs
* more enums
* more cleanup and enums
* another round of docs
* doc cursor indices
* map docs
* some docs
* cleanup for-loops
* cleanup
* else if
* small docs
* icon_item_field_static
* dungeon static
* eol
* icon item jpn static
* vtx static
* jpn static comments
* import parameter texture functions
* mask cleanup
* sync with PRs
* some docs
* more docs
* fix bss
* some docs
* sync with PR
* quest docs
* fix quest vtx
* sync with PR
* sync with PR
* fix typo
* small cleanup
* vtx madness
* more vtx
* add quad docs
* cleanup vtx
* cleanup
* cleanup
* revert gbi changes
* cleanup
* more cleanup
* another cleanup
* remove empty comment
* some PR review
* more naming suggestions
* namefixer
* L button to Z button
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* ItemBHeart (Heart Container) OK and Documented
* Add missing spawn params.
* z_item_b_heart updates from review.
* Rename ItemBHeart_UpdateRotationAndScale to ItemBHeart_UpdateModel
* Address comments from review.
* Rename unitScale to baseScale.
* Fixed function names after master merge.
* Rename Player_UpdateBottleHeld
* Match func_808497A0
* func_80852290 NON_MATCHING
* Match func_8083B3B4
* Params cleanup
* Match func_8083FBC4
* sfxId cleanups and others
* Fix declaration of functions from D_8085D990
* Change D_8085BE84 to be a 2D array
* ARRAY_COUNT_2D
* Match func_8085ADA0
* func_808426F0 nonmatching
* Match func_80852290
* Match func_808426F0
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* Add notes to Player_SetDoAction
* Name putAwayCountdown
* rebase
* Match func_80856918
* format
* func_8084933C nonmatching
small amount of boomerang documentation
* Progress on moving data near where it is used
* finish moving data
* format
* cleanup up remaining data
* more match
* Some minor cleanups
* PlayerCsMode enum
* func_80851F18 nonmatching
* Fix unk_B10
* Purge ExchangeItemID enum
* Rename `targetActor` to `talkActor`
* Name `targetedActor`
* PLAYER_LIMB_BUF_SIZE
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
* Change SkelAnime Player functions to take a void pointer for the corresponding buffers
* Use PlayerAnimationFrame on Player_DrawImpl
* Match func_8082F1AC
* Match func_8083D23C
* cleanup
* Match and clean up func_808373F8
* Match and document func_8083A98C
* PLAYER_PARAMS macro and PlayerInitMode enum
* Preliminary names for InitMode functions
* Match func_8083C8E8
* remove redundant externs
* Match func_8084933C
* cleanup func_8084933C
* Access D_8085BE84 directly instead of using a macro
* Match func_8084AC84
* Fix boomearng typo
* OK boomerang
* cleanup func_8083D168
* untargetedRotY
* this->unk_14E = ABS_ALT(var_v1);
* GIFIELD macros
* sort of a match
* Match func_8084C16C
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
* Use the same trick to match func_808573A4
* Add note on Deku spinning
* Match func_8084D18C
* Match func_80850D68
* Improve func_80832660
* Match func_80854EFC
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
* Rename unk_B2A to getItemDrawId
* Some cleanup
* fix merge issues
* format
* minor anim docs
* Match func_808553F4
* Cleanup func_808553F4
* func_8083D860 nonmatching
* Match func_8083D860
* Defake func_80859BA8
* ()
* Add notes to PlayerAnimGroup enum
* underwaterTimer
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* some stateFlags cleaning
* more stateFlags cleaning
* some notes and minor cleanups
* more general cleanups
* Slightly less fake func_80832CAC
* Document some melee weapon damage stuff
* Mark lunge storage
* Note PCS patch
* match
* add notes to bss
* yeet extra indentation
* add reloc as nonmatching to spec
* floorSfxOffset
* Player_GetFloorSfx
* Player_GetFloorSfxByAge
* Comments for AnimSfx dunctions
* Name some AnimSfx functions
* Name AnimSfx stuff
* Some PlayerAgeProperties notes
* use animflag defines
* Player_SpawnExplosive
* fix enum and some other minor fixes
* Bit more misc. cleanup
* Use OoT's version of func_808333CC
* Note on quickspin buffer
* Final nonmatching, func_80851F18
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* RIP player.c
* Name Player_StopHorizontalMovement
* misc fixes
* Actor_DeactivateLens
* fixes
* typos and tweaks
* minor stuff
* add names as comments on the animgoup array
* Correct some function names and data type
* add anim commets to ageproperties
* some notes
* De-fake func_80840F90
* Defake & clean up func_8085ADA0
* Improve func_80859BA8
* Enums in func_80852B28
* Name some secret-related things
* 3 small things
* stuff
* Player_TalkWithPlayer
* SurfaceType_GetFloorType
* SurfaceType_GetWallFlags
* and more bgcheck stuff
* more bss naming
* sPlayerControlInput
* clean up func_80836F10 a bit
* name the parameters of func_80835BF8
* door stuff
* remove NON_MATCHING
* remove D_8085D2B0 padding
* Name some Player_Cutscene_ functions
* various cleanups
* format
* remainingHopsCounter
* some cleanups on the struct
* Actor_RequestRumble
* this->exchangeItemId = PLAYER_AP_NONE;
* fix merge stuff
* format
* PlayerUnkAA5
* Name two cylinder-related functions
* BSS
* Add MagicConsume's enum, treat lensActive as bool
* Update func_808332A0 based on better info
* fix merge
* fix merge issues
* remove redundant comments
* Name Player_AddQuake
* ANIM_FLAG_UPDATE*_*Y
* Format
* AT_TYPE_ENEMY
* fix merge issues
* format
* fix uintptr_ts
* Rename
* Name leftHandMf
* fix merge issues
* format
* exchangeItemId <= PLAYER_IA_MINUS1
* getItemDrawIdPlusOne
* currentActorCsIndex
* <= PLAYER_IA_MINUS1
* fix merge issues
* format
* namefixer and bss
* fix build
* bombs parameters cleanup
* bss
* Fix building
* fix building
* Fix building
* Fix building and cleanups
* Pre-PR cleanup
* really...
* format
* review
* stateFlag Mistakes
* 268 * 0.1f
* z64door.h
* fix cutscene stuff
* bss
* Update include/z64player.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update include/z64player.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* reiew
* PR Review
* collision
* review
* format and a few stuff i missed
* EnBomExplosiveType
* weekeventregconvert and eventinfconvert
* more review
* review
* bss
* review
* re format sGetItemTable
* Entangle PlayerMask and PlayerItemAction
* a few extra cases i missed
* bss
* review
* EnArrow stuff
* ARROW_MAGIC_DEKU_BUBBLE
* minor format
* merge
* fix bss
* review
* !ARROW_IS_ARROW
* review
* bool cleanup
* fix merge
* review
* Player_StopCutscene
* Player_RequestQuake
* quakeIndex
* Player_RequestQuakeAndRumble
* knobDoor and slidingDoor
* bss
* fix
* review
* dog and float
---------
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* Decompiled source of tobira01
* Documented and formatted in prep for merge request
* Added spacing, renamed unused back to what it was, added definitions, changed 1.6666 to division
* Ran weekeventreg script, added additional spaces throughout the file, removed the macros for 0 and 60, updated some missed this casts, renamed spot11 out names
* Converted gSaveContext calls over to CLEAR_WEEKEVENTREG calls from review feedback
* Reformatted some files
* More review feedback
* Removed _tex
