Anghelo Carvajal
ba4368d0e8
Macros for weekEventReg and eventInf ( #984 )
...
* make macros
* script
* Use the script on the whole codebase
* fix script
* Rename GET to CHECk
* More replacements
* Update weekeventflags on schedule scripts
* eventinf defines
* eventinfconvert
* run the scripts on the codebase
* format
* RACE_FLAGS
* format
* remove redundant parenthesis
* format
* add macros to permuter_settings
* comments on WEEKEVENTREG_
* format
* CHECK_WEEKEVENTREG_ALT
* don't automatically generate the macros on the script to allow naming them
* format D_801C66D0 a bit
* add TODOs
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_06/z_boss_06.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_En_Raf/z_en_raf.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* new files
* format
* weekeventreg
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* update
* format
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* flags
* a
* eventinf stuff
* format
* EnGakufu
* flags
* run the script
* format
* whoops
* cleanup
* fix
* update weekeventregs
* format
* format
* review
* format
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
2022-11-05 15:48:36 -03:00
Derek Hensley
fde3a29b17
Add ALIGN16 to GRAPH_ALLOC ( #1137 )
...
* Add ALIGN16 to GRAPH_ALLOC
* format
* DebugDisplay_PathDisplayList
* 1 more
* PR
* Format
* Reverse gfxHead and gfx
* PR
2022-10-28 14:09:16 -03:00
Derek Hensley
f191044a05
General Cleanup 12 ( #1139 )
...
* undefined syms
* fire footprint outnames
* material/model DLs
* iceblock
* enHorse
* const ActorInit
* Remove some &
* flash
* KusaBushTypeDL
* gWarpTagGoronTrialBaseCollider -> gWarpTagGoronTrialBaseCol
* iceblock col
2022-10-28 13:58:27 -03:00
Anghelo Carvajal
bd373940ac
z_player_lib: Part 2 (#938 )
...
* preparations
* import data
* PLAYER_STATE1
* PLAYER_STATE2
* PLAYER_STATE3
* import bss
* format stuff
* bss cleanup
* more cleaning and some naming
* face
* cleaning up link human object a bit
* Remove PHYSICAL_TO_VIRTUAL2
* Update src/code/z_player_lib.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* format
* /* CAT */
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com >
* naming some stuff on objects
* format
* invert flags endian
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* format
* drawmask
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com >
* naming
* another round of human object naming
* enum renames
* sActionModelGroups and use enum as types
* PlayerAnimType
* PLAYER_MODELTYPE_
* determined ranges of PlayerModelType
* name PLAYER_MODELGROUP_DEFAULT
* format
* sheath
* dlist groups placeholder namse
* PLAYER_MODELGROUP_BOTTLE
* Some fierce deity naming
* Right hands
* zora skel dlists
* deku limb dlists
* left hands
* name most modelgroups
* more hand naming
* regs as dec
* fix in horse
* Use BUTTON_ITEM_EQUIP macro
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* reformat D_801AED58
* Sword sheaths
* swords and shields
* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* playerForm on Player_DrawImpl
* fomat
* Update src/code/z_player_lib.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update assets/xml/objects/gameplay_keep.xml
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex))
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* singular limb enum names
* fix bss
* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* name goron shielding limbs
* name limb
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* bss
* bss
* format
* namefixer
* bss
* bss
* bss
* bss
* format
* bss
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* fix bss
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
2022-10-15 19:12:01 -03:00
Tom Overton
638f5062cb
Replace Actor_MarkForDeath with Actor_Kill ( #1118 )
...
* Replace `Actor_MarkForDeath` with `Actor_Kill`
* Replace if-else with early returns, as per hensldm's review
* Respond to Elliptic's review
* Redundant spelling
2022-10-15 05:35:55 +01:00
engineer124
a4f0d8ea88
Match 3 Functions (z_actor OK, z_mir_ray OK, z_mir_ray3 OK) ( #1122 )
...
* match MirRay_ReflectedBeam
* match Actor_DrawLensActors
* match func_80B9E8D4
* void
2022-10-15 02:05:20 +01:00
engineer124
f379012742
z_kaleido_map.c OK and Documented (Pause Menu Map Page) + related icon_item statics (dungeon/field/jpn) ( #1094 )
...
* import pause menu map page
* better owl-warp docs
* fix func name
* missed some owlwarps
* fix merge from master
* fix scene region code
* PR Suggestions
* add comment
* add description of gWorldMapImageTex, thanks @EllipticEllipsis
* clearup docs
* missed a comma
* bad formatter, drop comment
* more cleanup
2022-10-05 06:15:39 +01:00
petrie911
2006a65ba6
z_overlay and z_fbdemo_dlftbls (Transition overlay handling), clean up a lot of u32s used to store pointers ( #1073 )
...
* overlay matches
* prototypes
* fbdemo too
* virtual to physical
* names, cleanup, etc
* bss reordering
* uintptr stuff
* fixed now?
* one fix
* headers and such
* fixes'n'stuff
* XXX action
* docs of a sort
* useless error codes
* n
* format
* header? I barely know her!
Co-authored-by: petrie911 <petrie911@users.noreply.github.com >
2022-10-04 21:46:32 +01:00
Parker Burnett
6c414889c9
Fbdemo_circle OK ( #1024 )
...
* some progress, nasty draw func only thing to do
* pushing for engineer
* matching with no warnings
* fixes
* minor names
* PR feedback
* fixes for PR
* docs
* PR comments
* fixing format and found bit shift
2022-10-04 13:55:20 +01:00
engineer124
ab5fd663cc
Quake & Distortion Cleanup ( #1102 )
...
* quake cleanup
* cleanup
* more cleanup
* remove cast
* q comes before r...
* unname goron function, leave it to another PR
* PR Suggestions
2022-09-30 23:01:39 -03:00
Derek Hensley
3a723efb15
SceneNum -> SceneId ( #1036 )
...
* sceneNum -> sceneId
* horse data scene -> sceneId
* Clean up scene table
* format
* PR comments
* Some more
* It helps if you actually save the file
* PR
* Remove comment
* Format
* Conflicts
2022-09-30 03:22:59 +01:00
engineer124
5e860dd3e7
z_parameter: Hud Visibility (#942 )
...
* Begin interface alpha docs
* More Interface Alpha
* cleanup docs
* Minor fixes
* Apply Discord Discussions
* More discussions
* More suggestions from OoT
* fix merge
2022-09-28 19:47:46 -03:00
engineer124
37a9b8e3c4
ActorContext Flags ( #1060 )
...
* actor context flags
* bracket cleanup
* comment out recursive name-fixer
* Empty-Commit
2022-09-24 16:29:21 -03:00
Tom Overton
3d24a8be68
Document object_bdoor (Boss Doors) ( #1087 )
2022-09-24 16:15:18 -03:00
Parker Burnett
2c6816ba77
Add enum for tatl hint id ( #993 )
...
* first round, need to investigate the others
* naming the remainder
* changed my mind on the name
* foooooormat
* fixing a number
* ...another one...
* names galore
* PR feedback
* fixing
* fixes
* 4mat
* adding "POE_SISTER"
* forgot a rename
2022-09-14 14:01:06 -03:00
engineer124
6451bcf158
z_parameter: Magic (#934 )
...
* Document magic
* Cleanup
* Few fixes
* PR Suggestions, More Lens Docs
* Few comments
* missed a spot
* Better macros/names
* Deactivate Lens
* more PR suggestions
* fix names
2022-09-14 13:49:17 -03:00
Anghelo Carvajal
a67571c2bf
Purge ExchangeItemID enum ( #1026 )
...
* Purge ExchangeItemID enum
* Add stff to namefixer
* Rename FISHING_ROD
2022-08-15 15:04:42 -04:00
Tom Overton
78684187fe
Make names related to animations more consistent ( #998 )
...
* Make names related to animations more consistent
* Standardize on sAnimationInfo
* Respond to hensldm's review
* Standardize on ChangeAnim
* Respond to hensldm's review
* Small formatting thing
* Consistency after merging master
* A few more things I missed
* Respond to Elliptic's review
* Some more stuff that was requested
2022-08-15 14:51:38 -04:00
engineer124
82fe521721
Audio Sfx (code_801A5BD0 and selected sfx functions in code_8019AF00.c) OK and Documented ( #798 )
...
* Rename functions
* code_801A5BD0 OK
* PR 1, improve spacing
* Rename unused struct
* Rename Sfx Variables
* PR Feedback, update names
* Add comment
* cleanup vars
* Fix merge
* Rework documentation, include more functions in sfx system
* PR suggestions
* fix AudioSfx_MuteBanks
* missed enum
* more cleanup
* more suggestions
2022-08-15 14:39:57 -04:00
engineer124
a80637fd59
Decompile and Document Camera z_play functions ( #933 )
...
* Document z_play camera functions
* cleanup function names
* PR Suggestion
* Fix master merge, add comments
* fix merge
* small fix
Co-authored-by: angie <angheloalf95@gmail.com >
2022-08-09 20:01:55 -04:00
Derek Hensley
d0313fa766
Effect EnIce OK ( #976 )
...
* Ok
* Material/Model
* Cleanup
* format
* IceFragment Assets
* PR
2022-08-07 19:29:03 -04:00
Derek Hensley
9f6bacbb88
Effect Firetail OK ( #974 )
...
* OK
* description
* gEffFire1DL
* format
* PR
2022-08-07 19:18:54 -04:00
EllipticEllipsis
91b2bc3a88
EnGe1 OK and documented, document z_snap ( #952 )
...
* Move PictoActor typedefs to z64actor.h
* OK, data imported
* Minor snap stuff
* Name most functions and variables
* Name most of object, apart from animations
* Document snap
* Fix actors to use the PictoActor struct
* Format
* Finish documenting EnGe1
* Finish documenting z_snap and related actors
* Format
* Review, format
* Name last couple of things
* bss
* Review
* Review
* bss
* Introduce z64snap.h, add SCREEN_TO_DEVICE macros
* Back to PROJECTED_TO_SCREEN
2022-08-04 05:53:53 +01:00
louist103
fb445b7d4b
Z_DLF OK ( #965 )
...
* matched both
* use overlay reloc macro
* fix fake looking match
* PR fixes and change other overlay loading functions
* rename
* formatter
* fix build
* re format
2022-08-04 05:47:01 +01:00
engineer124
e75d7020a9
AudioOcarina (1 NonMatching) ( #911 )
...
* AudioOcarina OK
* rm some comments
* PR Suggestions
* Add define
* cleanup
2022-08-04 05:21:50 +01:00
engineer124
6fc12c3a70
Inventory Editor Ok and Documented (z_kaleido_debug.c) ( #954 )
...
* Match Debug Menu
* Many docs and discussions
* Missed one
* A bit more
* More PR Suggestions
* phrasing
* hex health
* Fix
2022-07-23 15:44:49 -04:00
Anghelo Carvajal
addfe3a613
Decomp Message_GetState, add TextState enum and some header reorganization ( #919 )
...
* Message_GetState
* Rename msgCtx->msgLength
* Replace some enums
* TEXT_STATE_CLOSING
* use enum on switches
* use enum when assigning to a variable
* some minor cleanups
* minor cleanup
* TEXT_STATE_CHOICE
* remove unused temp
* z64message.h and z64view.h
* steal some stuff from OoT
* add some stuff to namefixer
* fix shift
* minor doc comment
* Update MessageContext struct from andzura's branch
Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com >
* some other TextState uses I missed
* format
* statetimer in dec
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* format
* Batch () commit
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* format
* bss
* use text state defines on new actors
* fix matching
* bss
Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com >
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
2022-07-22 20:51:20 +01:00
engineer124
fda5da2500
Introducing z64camera.h ( #797 )
...
* Introduce z64camera.h
* format
* Oops
* Change paramData to u8
* BINANG_TO_DEGF and DEGF_TO_BINANG to z64camera.h
* Fix bss, thanks Anon
* Update with docs from OoT
* Cleanup
* Fix activeCamId
* underwater
* remove interface alpha stuff
* Oops
* To Hex
* Cleanup cam settings comments
* PR Suggestions
* More PR Suggestions
* trackActor -> focalActor
* Fix merge
* Fix bss, thanks Anon
2022-07-12 00:25:40 -04:00
Anghelo Carvajal
87506f7c19
z_player_lib: Part 1 (#688 )
...
* fix some symbols and file splits
* PLAYER_STATE macros
* Move over a few functions
* AP functions and update struct
* another small bunch
* Add player_lib prototypes
* A few more functions
* Some fixes and add stuff to actorfixer
* format
* bss
* Elliptic's review
* Engineer's review
* Some renames and cleanups
* bss
* A bit of cleaning up
* Player_DrawZoraShield
* format
* actorfixer, bss and format
* Forgot to merge master again
* Rename some LinkGoron dlists
* PlayerMeleeWeaponAnimation enum
* format
* actorfixer, bss and format
* more bss
* actorfixer
* format
* actorfixer and format
* bss
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* sEnvironmentTextTriggers
* Update include/z64save.h
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* breman mask march comment
* fix
* fixes
* bss
* RESPAWN_MODE_RETURN
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* format
* Engineer's review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_player_lib.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update include/z64player.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* format
* unused mwas
* fixes
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
2022-07-11 23:43:46 -04:00
Derek Hensley
85b19de4ab
General Cleanup 4 ( #871 )
...
* PartTimerWorker -> PartTimer
* cleanup
* format
* objChan draw macro
* Fix macro
* Fix warning
* PR Review
* Missed 1 ull
* UINT16_MAX
* Remove todo from footmark
* Remove * from tex in AnimatedMat_DrawTexCycle
2022-07-11 23:06:21 -04:00
Lucas
9726a30109
ovl_En_Part OK (#903 )
...
* `ovl_En_Part` decompiled
* Suggested changes
* Rename body part displaylist
* Suggested changes
* Rename displaylist and params enum
* Remove randvar, rename enum from params to type
2022-07-11 22:32:35 -04:00
Anghelo Carvajal
45eed680d6
code_8013EC10 and code_80182CE0 (z_rumble and sys_rumble) (#763 )
...
* First pass
* import bss
* cleanup warnings
* PadMgr_ControllerHasRumblePak
* z64rumble.h
* rename file to z_rumble.c
* format
* Update src/code/z_rumble.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/code/z_rumble.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* name a temp
* minor cleaning
* bss
* match code_80182CE0
* import data and cleanups
* Rename RumbleManager struct and sys_rumble file
* Rename functions from sys_rumble
* Rename parameter to distSq
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* more notes and a bit of cleaning
* Name Rumble_Add and Rumble_AddForced
* some extra notes
* Rename Rumble_Override and Rumble_Request
* document states
* minor renames
* actorfixer
* format
* very minor docs
* whoops
* remove redundant prevent_bss_reordering
* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* namefixer
* Update src/code/sys_rumble.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com >
* fix
* Elliptic review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* minor cleanups
* Update include/z64rumble.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/code/sys_rumble.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_rumble.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com >
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
2022-06-29 22:08:03 +01:00
Tom Overton
158d1b26b0
PlayState rename ( #835 )
...
* PlayState rename
* Make this work with the latest master and run format
* Respond to hensldm's review
* Respond to Elliptic's review
* Add Effect_GetPlayState to namefixer.py
* Add missed comma
2022-06-26 11:57:37 -04:00
Derek Hensley
37d3934e2c
Code_800E8EA0 Docs ( #832 )
...
* Start
* Add notes from OOT
* D_801D0D50 -> gDbgCamEnabled
* Rotation Functions
* Text function
* RotateBack -> RotateForward
* Flags functions
* Document rotation func returns
* Remove comment from play
* Rename play function, add notes about Flags, add notes about focus
* Update notes a little
* Update src/code/code_800E8EA0.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Fix apostrophes
* Bring over OoT changes
* TurnTo -> Track in SubS systesm
* format and remove OoT specific comment
* Remove old comments
* namefixer
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
2022-06-20 01:16:30 +01:00
EllipticEllipsis
7ca70d496d
Change Rand_Next to u32, document rand.c a bit more ( #819 )
...
* Change Rand_Next to u32, document rand.c a bit more
* Clean up the quotes a bit, add another note
* Format
* — -> -
* Review
* Remove unnecessary casts
* Remove quote, reformat the comments
* Fix new files
* Make docs a bit more consistent and specific
* Format
2022-06-19 04:14:55 +01:00
Derek Hensley
9bf84176d4
Load OK ( #792 )
...
* Progress
* cleanup
* Fix comment
* progress
* OK
* Review pt1
* Update comments
* update comments some more
* Renamings
* Add headers and some parens cleanup
* Remove zelda64
* PR review
* bss
* Explain each relocation type a bit in the header comment
* Relocate_Addr macro
* Split off into z64load.h
* Adjust comment slightly based on OOT review
* OverlayRelocationType -> MIPSRelocationType
* Last bit of cleanup from OoT
* format
* Split off functions
2022-06-19 03:28:55 +01:00
mzxrules
ec43a32c26
z_en_box.c, z_demo_tre_lgt.c OK, some object_box documentation ( #703 )
...
* All functions attempted, 2 NON_MATCHINGs
* z_en_box OK, more documentation
* format
* en_box cleanups, fix GI item table
* z_demo_tre_lgt OK
* format.sh
* pr suggestions 1
* object_box improvements
* Merge remote-tracking branch 'origin/master' into z_en_box
* Revert "Merge remote-tracking branch 'origin/master' into z_en_box"
This reverts commit 5aacdf26e4 .
* more suggested changes
* fix comment
2022-06-18 10:33:59 -04:00
EllipticEllipsis
8049dec339
sys_matrix OK, documented, rename some other mathematics functions (#787 )
...
* Import data and bss, add some name options
* Decomp rest of stack functions,
remove RSPMatrix,
split header
* sys_matrix OK (thanks Tharo)
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com >
* pragma weaks in sinf and cosf, change documentation
change mcros to use 0x8000
* Rename sinf and cosf
* Correct initialisation of sMtxFClear
* More minor cleanup
* Rename stack functions
* Matrix_InsertMatrix -> Matrix_Mult
* The big transpose rename
* Fix MirRay_DrawReflectedBeam
* Matrix_InsertTranslation -> Matrix_Translate
* Matrix_Insert.Rotation_s -> Matrix_Rotate$1S
+ RotateY -> RotateYS
* Matrix_Insert(.)Rotation_f -> Matrix_Rotate$1F
* Matrix_RotateStateAroundXAxis -> Matrix_RotateXFApply
Matrix_SetStateXRotation -> Matrix_RotateXFNew
* Matrix_MultiplyVector3fByState -> Matrix_MultVec3f
* Matrix_MultiplyVector3fXZByCurrentState -> Matrix_MultVec3fXZ
* Matrix_GetStateTranslation -> Matrix_MultZero
* Matrix_GetStateTranslationAndScaled(.) -> Matrix_MultVec$1
* Matrix_FromRSPMatrix -> Matrix_MtxToMtxF
* Matrix_MultiplyVector3fByMatrix -> Matrix_MultVec3fExt
* Matrix_TransposeXYZ -> Matrix_Transpose
* Matrix_ToRSPMatrix -> Matrix_MtxFToMtx
* Matrix_AppendToPolyOpaDisp -> Matrix_MtxFToNewMtx
and document the conversion functions
* Matrix_NormalizeXYZ -> Matrix_ReplaceRotation
* Matrix_InsertRotationAroundUnitVector_f -> Matrix_RotateAxisF and S
* Matrix_InsertRotation -> Matrix_RotateZYX
* Document the last functions
* Small cleanup
* Matrix_JointPosition -> Matrix_TranslateRotateZYX
* Matrix_SetStateRotationAndTranslation -> Matrix_SetTranslateRotateYXZ
* func_8018219C -> Matrix_MtxFToYXZRot
* func_801822C4 -> Matrix_MtxFToZYXRot
* Fix files
* Format
* Review 1
* Renames
* Fix warning in EnDragon
* Format
* Convert `mode` to an actual enum
* Add enums, typedefs, externs to sys_matrix header
* Review
* One more
* More review
* Fix function names
* Format
* Fix names
* Format
* Review
* engineer's review
* Fix build
* Format
* Fix again
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com >
2022-05-25 23:24:39 -04:00
engineer124
c2c7240634
Improve Various Matchings and Cleanup ( #809 )
...
* Improve various matchings and cleanup
* Fix warnings
* Missed 2
* Few hex to dec
* PR Suggestions
* More PR Suggestions
* Document time calculation
* Improved use of macros
* DAY_LENGTH macro
* More cleanup of functions
Co-authored-by: hensldm <https://github.com/hensldm >
* Missing a space
* PR Suggestions
* Use DAY_LENGTH more
2022-05-25 21:36:49 -04:00
EllipticEllipsis
31f0e19b57
Enable full IDO warnings ( #781 )
...
* Fix a lot of IDO warnings (and some Clang ones)
* Format
* Put FULL_DISASM=0 back
* Fix bss
2022-04-22 05:48:41 +01:00
Anghelo Carvajal
78acaef73d
ovl_Boss_03: Gyorg OK (#736 )
...
* Boss03_Init NON_EQUIVALENT
* rand functions
* Boss03_Draw
* match the limb draws
* Match Boss03_Init by Synray and Engineer
* A bit of cleanup
* a bunch of functions
* another bunch of functions
* func_809E299C and GyorgEffect
* import data
* A bit of cleanup
* effects related functions
* func_809E2DA0
* func_809E34B8 NON_EQUIVALENT
* func_809E3968 NON_EQUIVALENT
* func_809E3D98
* func_809E421C NON_EQUIVALENT
* func_809E475C
* func_809E497C
* func_809E4C90
* func_809E6640 NON_MATCHING
* func_809E6A38
* Match func_809E6640 by Tharo
* func_809E7D00
* func_809E8810
* func_809E4E80 NON_EQUIVALENT
* func_809E5B64
* func_809E6CB4
* Boss03_Update NON_EQUIVALENT
* func_809E81E4 attempt
* Boss03_Update improvement thanks to Petrie
* func_809E81E4 NON_MATCHING
* func_809E34B8 is at least equivalent
* cleanups
* format
* import bss
* more cleanup and minor renames
* Match func_809E81E4
* cleanup effect functions
* a few more renames
* func_809E4E80 matched by Maide
* documentation pass
* name workTimer
* macros
* More renames
* Improve func_809E34B8 a bit and match Boss03_ChewPlayer
* defines placeholders for work timer, enum for effects and other minor renames
* actorfixer
* some cleanups
* effects named
* Some more renames and cleanups
* more cleanups
* Boss03_UpdateCollision, Boss03_SeaweedUpdate and Boss03_SeaweedDraw
* Rename more actionfuncs
* cleanup undefined syms
* collision stuff and run formatter
* more cleanups
* more cleanups i forgot to commit
* and yet more clenaup
* Add notes
* Remove debugging stuff
* format
* Match the last 3 functions by Anon58
* bit of cleaning
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* PR
* format
* Remove some if (1) from Boss03_IntroCutscene
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.h
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* PR
* address pr
* prevent_bss_reordering
* Anon review
* seaweed stuff thanks to elliptic
* format
* whoops
* huh
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* address PR
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Address PR
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* Sectioning
* whoops
* a
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* a
* kinda
* ,
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* remove redundant comment
* actorfixer
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
2022-03-29 17:41:44 +01:00
Anghelo Carvajal
b08880f7a7
z_sram_NES with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs (#531 )
...
* Rename Sram_InitDebugSave
* Sram_InitDebugSave
* err
* Sram_IncrementDay
* non_matchings
* func_80146F5C and protos
* func_80146EE8
* func_80145698
* func_80143A54
* Split SaveContext
* problems with bss
* Fix bss
* more
* a small bunch
* Fix warnings
* almost everything
* two attempts
* at least compiles
* import data
* bss
* format
* stuff?
* Progress?
* More progress
* clean up data a little
* More progress
* disaster
* re split data
* A bit less of a disaster
* Fix renamed stuff
* data stuff
* fix conflicts
* format
* CycleSceneFlags
* some enums
* cleanup
* Fix merge issues
* format
* some changes
* format
* Lots of progress on z_sram_NES, but no matches yet
* SaveContent Documentation
* Oops
* Oops2
* Document more SaveContext
* Oops, don't need that anymore
* add small comment
* Another comment
* dekuPlaygroundPlayerName
* Fix merge issues
* format
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* remove magic number
* format
* fix merge issues
* bss
* format
* macro cleanup
* review
* merge issues
* review
* cleanup
* UNK_TYPE1
* Fix
* Remove comment
* small change
* conflicts
* review
* fix
* fixes
* format
* Update actorCtx renames part
* Match func_80143B0C thanks to Petrie and Anon
* minor cleaning pass
* format
* cleanup
* more minor cleanups
* Macros for accessing gSaveContext.save.stolenItems
* Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_
* format
* Update include/macros.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* @hensldm review
* 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 >
* Rename QUEST_SONG_NEW_WAVE
* Add scene name comments to D_801C5FC0
* rename horseData.yaw
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* // = CUR_UPG_VALUE(UPG_WALLET);
* run actorfixer and format
* fix bss
* Fix merge problems and run format
* Some improvements to func_801457CC by anon
* bss
* format
* run actorfixer
* actorfixer, bss and format
* Use original names for the RESPAWN_MODE enum because the current ones are bad
* QUEST_SONG_BOSSA_NOVA
* some minor fixes on the SaveContext struct according to the debug rom
* Merge Inventory.items and Inventory.masks
* a
* simplify saveBuf accesses
* A few func renames
* actorfixer
* bss
* fixes
* bss
* actorfixer
* actorfixer and format
* actorfixer
* whoops
* whops
* bss
Co-authored-by: engineer124 <engineer124engineer124@gmail.com >
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
2022-03-27 12:37:02 -03:00
engineer124
f1d1173558
River_Sound OK and Documented + River_Sound Related z_actor/Audio Functions ( #661 )
...
* 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
2022-03-27 11:42:19 -03:00
engineer124
fe32df0e82
Document Actor_DrawDamageEffects ( #645 )
...
* 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
2022-03-09 20:37:27 -03:00
Derek Hensley
1e4411a871
General Cleanup 2 ( #681 )
...
* 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 >
2022-03-05 12:03:20 -03:00
EllipticEllipsis
7fcefd8d3f
Decompile and partially document some functions in z_play ( #582 )
...
* 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
2022-03-05 11:57:28 -03:00
engineer124
fa069535d0
Camera Preparation ( #644 )
...
* 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
2022-02-20 00:33:47 +00:00
Maide
c98184f8e3
Cleanup various enums ( #612 )
...
* PR
* Add SQ and GI enums
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
2022-02-19 21:42:05 +00:00
Derek Hensley
6e62ae4075
SubS Animations and LimbRotTables ( #624 )
...
* 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
2022-02-14 02:10:56 +00:00
engineer124
2104c16362
code_8012EC80.c OK and Documented + parameter_static extraction ( #534 )
...
* 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
2022-02-05 01:49:21 +00:00