* Init, Destroy, Update, easy actions
* Just the hard 3 + 1 left
* One left
* OK
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
* Data/bss in, extract colheader
* Clean up externs
* Better match for func_809EECBC
* Sfx
* Lot of naming
* fix build
* Name skel stuff
* name limbdraws
* name colliders
* Document `object_boss05`
* Port some names from Odolwa
* Name bio baba types (and relatedly clean up EnPp)
* Better names for the LimbDraw functions + some related vars
* Name all functions
* Name a lot of struct vars
* Colliders and body parts
* Name all struct vars (might come back for a few of these though)
* Name most stack vars
* Fragment states, ice data
* Limb rot index
* Damage effects
* Enum for hit reactions
* Enums for movement state/attack state
* Finish up
* Missed this in EnPp
* Respond to reviews
* Fix comment
* Reverse order for postlimbdraw, etc. functions
* Remove blank line at the top
* Respond to review
* Make a "getter" macro for the force detach timer
* Respond to review
---------
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
* Move player function declarations to z64player.h
* rename Actor_MountHorse to Player_MountHorse and similar functions
* whoops
* add missing includes
* format
* whoops
* Add Tharo's documentation comments
* Voice progress
* Match osVoiceControlGain
* Match osVoiceStartReadData
* Cleanup
* Add docs from n64devkit
* WIP on osVoiceGetReadData
* Add comment
* Match voiceinit.c
* Remove CONT_ERR, already present in controller.h
* Really close to matching osVoiceStopReadData
* Progress on voicecheckword
* Match osVoiceSetWord
* Add error codes
* Matched __osVoiceContRead2... Somehow...
* Add small amount of docs
* __osVoiceContRead36 was basically identical from __osVoiceContRead2
* docs, but maybe a little carried away
* Match __osVoiceContWrite4, Write is very similar to Read
* Match __osVoiceContWrite20 from __osVoiceContWrite4, ez
* Some docs
* Improve osVoiceGetReadData
* Match osVoiceCheckWord
* currentSyllable -> currSyllable
* Match osVoiceMaskDictionary
* Match __osVoiceSetADConverter
* Meme matched osVoiceStopReadData
* small cleanup
* Missed macros
* osVoiceGetReadData Meme Match
* Small clean-up
* format
* Properly split voice files from code
* Use proper flags for voice files
* Add basic docs for func_801A5AF0
* Import Voice Data
* Update matching functions in code_801A51F0 from audio WIP
* Update matching functions in code_801A4EB0 from audio WIP
* Match func_801A5A1C
* Match func_801A5228
* Match func_801A54D0
* Doc padmgr functions used
* Match func_801A5680, it's near identical to func_801A54D0
* code_801A51F0 OK
* Match func_801A4EB8
* Match func_801A4FD8 (mips2c got it matching directly)
* code_801A4EB0 & all of voice, OK
* Import bss
* Better match for func_801A5A1C
* format
* Cleanup
* Clean up dictionary
* Introduce OSVoiceDictionary
* More voice docs
* Fix bss
* Import code_801A4EB0 data
* Introduce Word Id enum
* Dictionary: u8 -> u16
* Introduce bgms
* Fill in bgm enums
* Rename bgm to clearer names
* Fix spacing
* Fix "No_Music" define
* remove comment
* import rodata
* Improve bgm names, found another seqId function
* Another seqId function
* Another name change
* Woods of Mystery -> Sarias Song
* Fix match in osVoiceControlGain
* Fix bss reordering
* Fix bss file split
* add saria's song bgm to pierre
* Another bgm function found!
* Add bgm's to `gSaveContext.seqIndex`
* Fix BSS
* fix bss
* Fix bss
* cleanup
* more cleanup
* cow voice weekeventflag
* small cleanup
* some docs
* cleanup var
* global
* more docs
* PR Review
---------
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Some low-hanging UB
* document bug on z_file_nameset_NES.c
* ALIGNED on audio data
* document bug on decode
* document bugs on Message_Decode
* Format
* More ALIGNED
* Put the ALIGNED macro at the right like the other uses in the repo
* review
* fix Message Decode
(cherry picked from commit abfbc7068816756f7ea3fa4a36ee0fe664c54c72)
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* remove comments
* Update src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* format
---------
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Boss01 (Odolwa) OK and documented
* Unify existing InitRand implementations
* Remove newlines after `// fallthrough`
* Respond to the rest of engineer's review
* Respond to most of anon's review
* Try to comment the shadow thing correctly
* Fix boss_01 after merge
* SEGMENTED_TO_VIRTUAL -> SEGMENTED_TO_K0
* Review
* Use DMG_SWORD_BEAM and update the comment in z64collision_check.h
* Respond to engineer's review
* os symbols
* various variables
* more variables
* more cleanup
* yeet HW_REG
* OS_PHYSICAL_TO_K0 and other cleanups
* Rename r4300.h
* migrate pimgr data and cleanup on initialize.c
* rename osFlash symbols
* cleanup gu
* vimodes
* yeet rmon, do libc files
* some os files
* hardwareinterrupt
* cleanup a lot of os files
* cleanup osVirtualToPhysical
* various io files
* another io chunk
* final io chunk
* yeet hardware.h
* yeet PHYSICAL_TO_VIRTUAL and VIRTUAL_TO_PHYSICAL
* fix typo
* fix merge
* remove global.h from libultra files
* fixes and format
* brief explanation
* review
* review
* review
* review
* SEGMENTED_TO_K0
* Revert "SEGMENTED_TO_K0"
This reverts commit f8d62d670f.
* take two
* bss
* bss
* update makeyar.c
* xmls
* commit c files
* remove paddings and update the spec
* Tell ZAPD to not generate C files for the 2 problematic XMLs
* Rename symbols to follow style
* cleanup the generated files a bit
* comment on makeyar
* fix distclean deleting the `assets/c/` files
* actually fix distclean
* OK, start documentation
* More documentation
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Decompile func_80167F0C
* FbdemoWipe4 OK and documented
* Mark bug in Wipe4
* More docs
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Mark bug
* Few more notes
* Fix function in Play
* Format
* Review
* Name Play_PostWorldDraw
* functions.h...
* Revert func_80167F0C
* Review
* functions.h
* Review
* Update Wipe4
* Rename system
* Format
* Put skeleton back in the cupboard
* bss
* Fix build
* rename to z_visfbuf
* review
* format
* bss
* some bss cleanup
* review
* bss
* review
---------
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
* bring over the objects from the other branch
* kafeis mask
* use symbols
* dman naming after assets
* stateFlags
* remaining stuff
* anim array bug
* Name everything in DmGm after DmAn
* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED
* undef
* format
* idk
* ing
* format
* name animations from an4, thanks emil!
* emptydl
* disbelief
* review
* format
* Update assets/xml/objects/object_mask_kerfay.xml
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* internal_rsp; move size_t and NULL to ultratypes.h
* guint.h
* Move system variables to os_system.h
* controller, pi and vi
* osint.h
* piint.h
* siint, ucode, viint, voiceinternal
* Remove remaining variables from variables.h
* format
* final renames
* bss
* review
* review
* EnInvadepohDemo (Aliens cutscene actors) OK and documented
* Make bss variables non-static
* Provide type to Actor_SpawnAsChild
* Respond to hensldm's review
* Introduce obvious misformat
* Format again, see if that fixes it?
* Push the misformat up so I can see how Jenkins complains
* Fix formatting on my end (again)
* Apparently I had to merge master to fix the formatting issue??????
* Respond to engineer's review
* Document EnTanron5 (destructible props, fragments, and item drops in Twinmold's arena)
* Respond to engineer's review
* Updated the type names, used "ruin" instead of "prop" in comments, and addressed Anon's review
* Missed this instance of "prop"
* Respond to engineer's review
* Update OutNames too
* WIP
* map static
* finish english names
* jpn
* revert map name
* name prefix
* boss to big
* more comments
* item enums
* more items
* more
* PR Suggestions
* PR Suggestion
* Idle bss and cleanup
* main bss and cleanup
* format
* Remove pad comment about sAudioMgr
* PR
* Missed a couple size_t changes
* unused pads
* static
* Sync with OoT
* Macro cleanup
* Some cleanup/rename load system name to Fragment
* Format
* bss
* Some clarifying comments regarding fragments
* PR suggestions
* size_t and numRelocations
* Change `EN_SYATEKI_*` enums/defines to `SG_*`
* Name shooting gallery weekeventregs
* Get rid of names on unions (this is what I wanted to begin with!)
* Use ARRAY_COUNT(sGuayFlagsPerWave) instead of 3
* Actually give a proper name for SG_DEKU_GET_PARAM_FF00
* Use anon's suggestion for path param name
* Remove comment that isn't true? What was I cooking back then
* Animation naming stuff + comments
* Tons of score and shooting game logic cleanup
* Fix build issues
* Some more Octorok docs
* Use ANIMMODE enum in EnShn
* Put a bug tag on the weird behavior in EnSyatekiWf
* 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
* 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.
* 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>
* more boot files
* Add VT macros and script
* finish already existing boot files
* most of libultra
* fix 64bits libultra files
* Use C files for libultra, wrap some functions in NON_MATCHING
* Remove duplicate of OS_CLOCK_RATE from fault.c
* C files for fbdemos
* delete dumb files
* bootstrap C files, still need to add them to the spec
* update fixbaserom
* boot OK?
* I forgot to commit the spec
* C for gamestates
* C for kaleido
* Change all includes to ""
* copy actor sizes script from oot
* I forgot to delete those files
* Basic C files for effects
* Add effects initvars names
* Remove mislabelled boot functions from header/txt
* Begin porting bootstrap_fx, some sizes
* Fix <>
* Fix enum
* Fix diff.py
* fix libultra stuff
* update regconvert
* update setup warnings
* add some missing ;
* Fix some makefile stuff and other fixes on some non_matching functions
* add executable flag in extract_baserom and fixbaserom
* fix relative path
* copy assist from oot
* fix map path
* another assist path fix
* Delete C files for handwritten files
* add code_801A51F0 to spec
* add gfxbuffers to spec
* Move rodata to top of each file when possible
* UNK_TYPEs for func_801A51F0
* Remove kaleido rodata from spec
* Update spec and undefined_syms for recent merge
* GCC warnings and fix errors in nonmatchings,
* round percentage numbers
* progress script: format changes
* progress: error on non-existing files
* fix warning in z_scene_table
* Match 2 nonmatchings in z_actor
* Warnings in lightswitch and invadepoh
* Fix warning in z_actor_dlftbls
* I though I fixed this one
* whoops
* Comment out CC_CHECK
* Removed redundant ultra64.h includes
* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms
* Completed gamestates bootstrap
* Split kaleido_scope
* Remove section.h and segment.h, move keep object externs to a common location in variables.h
* Completed effects bootstrap
* Segmented address externs for effects, fbdemos, gamestates and kaleido
* Move actor data externs out of the if 0
* Segmented address externs for actors
* Prepare actionfunc detection
* fix script, how did it even work before
* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler
* Automated actionFunc detection in actors
* Segmented addresses from player .text
* rm old segment addrs script and fix build
* Move sizes folder to tools
* Make build.py executable
* New Jenkinsfile Prayge
* Remove numpy dependencies
* Add warnings_disasm_current.txt
* my bad
* Update spec and undefined_syms
* Add z_eff_ss_hahen to pametfrog
* git subrepo pull (merge) --force tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "163ca2af"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "163ca2af"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Make z64compress print to stdout
* sneeky commit to update warnings tooling
* test
* Another test
* Mark fixing overlay reloc generating as a TODO
* Update warnings stuff
* Communicate the return code from running z64compress back to the Makefile through the wrapper
* Run formatter, remove extra commented copy of function
* Re-fix some includes
* Convert atan to hex to conform to decided style
* Clean up most matching with rodata and most warnings
* Match Parallel1, minor improvement in Jump and KeepOn
* Begin Documentation
* More docs, fixed warnings
* cleanup
* Continuing with docs
* Small progress
* Fix BSS, All but 1 matching functions freed, continue docs
* Fix merge
* Many function names
* More Names
* Change name
* Docs
* Begin camera_data docs
* small progress
* Minor change
* Improve docs on functions
* Player to TrackActor, progress on camera_data
* Add Cam_Data Macro and fix warnings
* Progress on Camera_Data docs
* Document CsCamData
* Cleanup
* Minor clean up in Battle NON_MATCHING
* Small fixes
* Fix bss, OK
* typo
* revert some z64 macros and format
* OK
* minor settings docs
* Many flags, names, and other documentation
* Name many camera_data variables
* A few more small changes
* Refactoring Camera Action Function Structs WIP
* Finish Struct reworking
* Some door docs
* Add my findings of Camera Settings as comments
* More camera data names and comments cleanup
* A few names
* Slow progress on camera_data
* More camera_data progress, slow and steady
* Many renaming
* wip
* camera_data WIP
* The grind continues
* More data wip
* All the macros are in!
* Format and cleanup
* more docs
* format
* Breakup camera into pieces
* format
* PR Feedback round 1
* revert macro
* Fix header
* Document Play Camera and Screen pos
* cleanup
* revert camera split
* Start copying docs from OoT
* remaining CAM_INTERFACE_FLAGS
* roData and rwData
* Change paramData
* Flags
* More docs
* More Cleanup
* cleanup
* more
* More docs
* Standardize subcams
* macro
* Player_UpdateCamAndSeqModes
* cleanup from PR
* format
* sync with bgCam and actorsCsCam PR
* sync to z_play cam PR
* docs progress
* revert player changes
* helper function cleanup
* match Jump3, thanks petrie & synray
* camera bg docs
* brackets
* cam math docs
* more cam bg docs
* rename flags
* misc docs
* more cleanup
* some cam docs
* some PR
* hud visibility
* fix macros, sync with PR
* sync with PR
* sync with PR
* helper cleanup
* cleanup
* PR Suggestions
* more PR
* fix merge master
* PR review
* add comment
* more quake cleanup
* pr suggestions
---------
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Document EnAob01 (doggy racetrack owner) and use macros for weekEventRegs in all dog racing files
* Respond to first review
* Respond to anon's review
* Forgot a _FLAG_ on one of my flags
* Respond to anon's review
* Respond to engineer's review
* Delete extra period
* Undo the EVENTINF stuff I goofed up
* Update comment
* Fix bss
* Respond to engineer's review
* Rename LinkAnimation to PlayerAnimation
* remove the remaining link stuff
* Move functions out of functions.h
* cleanup returns
* more cleanups
* format
* format again
* format again again
* Remove internal functions from header
* legacy
* bss
* linkAnimSegment
* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* bss
* `DmaAnimation` rename
* more DMA i missed
* Revert "more DMA i missed"
This reverts commit 6c0ca44f45.
* Revert "`DmaAnimation` rename"
This reverts commit 1d2626514c.
* Add LinkAnimationHeader rename to namefixer.py
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* decomped init, draw
* started slime
* finished func decomp en_slime
* object_slime and en_slime updates
* updated a few names
* finished up some naming
* en_slime and object_slime OK and documented
* slime xml cleanup
* Code cleanup round 1
* Cleanup 1 - missed a note
* Fixed improper use of bgcheck flags
* Some cleanup
* Namefix, name cleanup
* Function name cleanup, misc cleanup
* More name cleanup (pre-merge)
* Update color filter flag constants
* Tidying
---------
Co-authored-by: Blythe Hospelhorn <35576053+bhospelhorn@users.noreply.github.com>
* Revert "ovl_Bg_Keikoku_Spr OK (#111)"
This reverts commit fed1b37da1.
* Revert "z_bg_tobira01 OK (#168)"
This reverts commit 54aef44a9e.
* Revert "Bg_Lotus OK (#86)"
This reverts commit d0af9587ba.
* Revert "Door_Spiral OK (from zel) (#87)"
This reverts commit 6e4d156ad7.
* Revert "en_invadepoh OK (#200)"
This reverts commit e1219e7351.
* Revert "ovl_Item_B_Heart OK (#110)"
This reverts commit f0cd2db055.
* Revert "ovl_Obj_Boyo OK (#112)"
This reverts commit 536a484f73.
* more reverts and fix building
* restore timeconv.py
* restore func_800BFD84
* Updated function names in ovl_En_Bom & added documentation from OoT
* Renamed BombType struct members
* Updated instances of BOMB_BODY
* Updated more instances of BombType
---------
Co-authored-by: swinginman <swinginman@DESKTOP-V7R1DTC.localdomain>
* begin room docs and decomp
* match Room_DrawImageSingle
* match Room_DrawImageMulti
* Room_AllocateAndLoad non-matching
* big improvements on Room_DrawCullable
* match Room_AllocateAndLoad
* improvement?
* cleanup
* comments
* cleanup
* small pr suggestions
* PR Suggestions
* cleanup sceneCmds
* some PR
* PR Suggestions
* more PR Suggestions
* col to collision
* time-tag docs
* simplify enums
* PR Reviews
* PR Suggestions
* small change
* small fix
* PR Suggestions
* add extra func ref
* rm raw text from first actor I decompiled
* Stock Pot Inn
* fix master merge
* Rename RegEditor and move it to regs.h
* bring over some minor doc from oot
* add missing include
* Update tools/disasm/variables.txt
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* update comment
* bss
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Use STACK and STACK_TOP everywhere
* format
* remove fake variable
* bss
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/boot_O2_g3/boot_main.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
* renames
* more renames
* and more
* whoopsie, forgot those too
* hopefully the last cleanup
* forgot some stuff
* a
* bss
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* OK, data imported
* Permuter settings
* Name data, a few functions and variables, cleanup
* Small amount of cleanup on some related actors
* Oops
* Document object
* Type and other macros
* Some cutscene stuff and temporary function names
* Proper path function names
* Name a couple more functions
* A couple more function names
* Name PathStatus enum
* Name rest of functions and formalise the documentation a bit
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* limbs
* Format
* Review
* format
* weekeventregconvert and format
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
* match MirRay_ReflectedBeam
* match Actor_DrawLensActors
* match func_80B9E8D4
* lens docs
* more lens docs
* fix
* cleanup
* move define down
* Actor_AddToLensActors
* small comment adj
* add one more comment
* fix bss
* OK, struct documented
* Data imported, update spec
* Name data
* Name all functions and variables
* Document object
* Bit more documentation
* Document Karebaba
* Add note to object_dekubaba
* Bit more cleanup
* Review
* Shadow
* Review
* Rename functions, add hit enum
* Figured out the enum
* Review
* MarkForDeath -> Kill
* File split
* Split, OK and documented
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* Document relevant parts of DmBal
* Some EnPaper docs
* Document EnPaper
* Name functions
* Defake Actor_UpdateActor a bit
* Reword
* \cdot
* Fiddle with the description of the DE again
* Actually force is probably more correct
* Probably time to stop fiddling
* Format?
* Review
* Remove bug comment
* Review
* Rename to su_mtx, split off code_80140CE0
* Format
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Tom Overton