c8c55a15d3
EnBjt OK and documented ( #912 )
...
* OK, data imported
* Fix some typos
* Start docs
* Struct almost finished
* Start object, add state enum
* undefined_syms
* Finish object, name some more stuff
* Name a few states and another function
* PlayState
* Minor tweaks in z_room and z_sub_s
* Complete documentation
* spec
* Review 1
* functions.txt
* Schedule result enum
* Rename schedule results
* Review
* Remove update comments
* Inventory_DeleteItem
* PLAYER_STATE
* Format
* Review
* Update struct name
2022-07-22 05:17:06 +01:00
cbeeeb172a
EnBaba Documented (Bomb Shop Lady) ( #825 )
...
* Merge in sub_s_models
* Update subs DL names
* Unused Weight pathing
* Function headers for weightpathing
* TimePathing WIP
* Timepathing, still unsure about unk184
* Move subs functions from functions.h to z64subs.h
* Add fake comment
* Some cleanup and renames
* Renames/cleanup of actors that use timepath
* Cleanup
* More cleanup
* Rename unk stuff
* Merge in upstream/master
* TimeElapsed -> elapsedTime
* Fix
* Final cleanup
* SubS Time Paths
* Still needs dialog action functions
* Fix waypoint comments
* Review pt. 1
* Baba review
* ScheduleResult -> ScheduleOutput
* Forgot to update functions.txt oops
* Add clarifying comment to SubS_TimePathing_FillWeightArray
* format.sh
* Finish up docs
* Fix order comments
* Fix
* Change bombShopkeeper struct member to
* Fix a few merge mistakes
* Add ScheduleOutput to namefixer
* format
* Format and fix merge
* Review
* PR
* z64schedule.h
* text summary
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-07-22 05:05:28 +01:00
8e45eb7b1f
`z_parameter`: Items & Import Data ( #799 )
...
* Import Data
* More functions
* cleanup
* Add Enum
* Many changes, PR and add-ons
* Fix bss
* Better data
* Extra space
* DoubleDefense is boolean
* Missed a macro
* More enums missed
* macro -> enum
* More item cleanup...
* missing/wrong quest items
* Next PR Review
* Revert Interface_AddMagic to Parameter_AddMagic
* Remove QUEST_HEART_CONTAINER
* Fix bss
* Move Color_RGB16 up + fix incorrect numbers
* Add texture pointers
* Add comment
* EQUIP_SLOT_A
* rm redundant comment
* Fix merge
* PR Suggestions
* fix bss
2022-07-12 00:45:55 -04:00
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
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
e9d4b31c3d
z_map_exp OK and somewhat documented ( #877 )
...
* z_map_exp OK
* some names
* Some more docs
* Update prototypes in functions.h
* Use reg name
* namefixer
* Respond to review
* Respond to review
* Respond to review
* Add some blank lines after breaks, whoops
* Respond to review
* Respond to Engineer's review, pt 2
* Respond to Engineer's review, Pt 3
* Add newline char to end of z64map.h
* Respond to engineer's review, Pt 4
* Respond to multiple reviews
2022-07-11 23:23:01 -04:00
ab6ef2535e
Match and Document code_80172BC0.c ( #909 )
...
* Match code_80172BC0.c
* Better match
* brackets
* Fix
2022-07-11 23:14:07 -04:00
2995d72965
`ovl_En_Fall2` OK ( #916 )
...
* `ovl_En_Fall2` decompiled
* Suggested changes
* Minor suggestions
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Don't commit directly from github
* Define vertices in xml, add macro
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 22:44:19 -04:00
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
f85a398162
Effect Hahen Ok ( #875 )
...
* OK
* format
* gameplay keep
* undef syms
* drawFlags -> params
* Format
* Fix railskb include
* DL consistency with OoT
* Hex
2022-07-11 21:48:37 -04:00
94372c3670
Effect Hitmark Ok ( #874 )
...
* OK
* gameplay keep
* undef syms
* Cleanup
* format
* HitMark -> Hitmark
* Remove EffectSsHitmark_Spawn from functions.h
* PR
2022-07-11 21:45:03 -04:00
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
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
361d8573e9
z_obj_tsubo OK ( #784 )
...
* 4 unattempts left
* z_obj_tsubo OK
* name some functions
* implement suggestions
* implement EllipticEllipsis changes
* implement more suggestions
2022-06-20 20:44:12 +01:00
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
d318b1f285
SubS Time Paths (Finale) ( #823 )
...
* Merge in sub_s_models
* Update subs DL names
* Unused Weight pathing
* Function headers for weightpathing
* TimePathing WIP
* Timepathing, still unsure about unk184
* Move subs functions from functions.h to z64subs.h
* Add fake comment
* Some cleanup and renames
* Renames/cleanup of actors that use timepath
* Cleanup
* More cleanup
* Rename unk stuff
* Merge in upstream/master
* TimeElapsed -> elapsedTime
* Fix
* Final cleanup
* Fix waypoint comments
* Review pt. 1
* Add clarifying comment to SubS_TimePathing_FillWeightArray
* format.sh
* Fix order comments
* weightArray -> knots
* Review pt 1
* Review pt 2
* Update src/code/z_sub_s.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update src/code/z_sub_s.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-20 00:49:20 +01:00
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
56c517dc07
Obj_Toge ( #815 )
...
* Obj_Toge
* Wat
* One more thing
* PR
* PR
* a
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-19 03:45:09 +01:00
af0123de1e
`z_fcurve_data` OK, match last function in `z_fcurve_data_skelanime`, document SkelCurve system ( #776 )
...
* Match SkelCurve_Update
Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>
* Match and document z_fcurve_data
* Begin documenting SkelCurve
* More documentation
* Deformat header
* Pluralise knotCount
* Sort out jointTable
* Rename frameCount
* Format
* More documentation
* Cleanup on DemoEffect
* Remove space on typedef
* Format, couple of fixes in the header
* Review
* Oops
* Fix EnBox, DemoTreLgt, use macros in EnTorch
Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>
2022-06-19 03:38:10 +01:00
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
271b7c7827
Gfxprint OK ( #826 )
...
* Match last two functions as well as some cleanup
* One more small cleanup
* Reviews
* format
* Move internal GFXP_FLAG defines to c file
* Format
2022-06-19 02:56:10 +01:00
d1b75e4c4b
VisMono OK and documented ( #829 )
...
* VisMono OK and documented
* Add some more parentheses
* Fix functions.h
* Respond to hansldm's review
2022-06-19 02:46:41 +01:00
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
2022-06-18 10:33:59 -04:00
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
e1477702ca
EffectSsKirakira OK ( #801 )
...
* OK
* cleanup
* KiraKira -> Kirakira
2022-05-25 22:23:27 -04:00
12b995093f
`EnNwc` OK and three objects documented (`object_niw` and `object_nwc` and `object_hs`) and some Actor docs( `EnNiw` and `EnAttackNiw` and `EnHg`) ( #715 )
...
* EnNwc: OK and some Niw Docs
* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
* EnNwc: Overwrite->Override
* EnAttackNiw: fix merges
* AttackNiw and Niw: some docs
* formater pass
* EnNwc: fixed savecontext change
* Niw and Attackniw: more docs
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Nwc,Niw: requested doc changes
* Nwc: extracted and marked broken texture
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* EnNwc: more requested changes
* Nwc: more requested changes
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* EnHs: object_hs documented, some ovl_En_Hs docs
* EnHs: animation names
* EnHs: some text docs
* EnHs: fear anim changed to shivering now that we know it was used in OOT
* EnHs: more docs and format pass
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* EnHs: more docs and updates to var name changes
* Niw,Nwc,Hs: added description to object files
* Hs: changed from playerOffset to offset
Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-05-25 22:19:38 -04:00
a6e90d144c
SubS models ( #807 )
...
* Bring model code over
* SubS_UpdateLimb
* SubS_TurnToPoint
* SubS_TurnToPointMultiTarget
* Adjust comment
* Another comment
* Review
* options as structs
* bss
* adj -> step, SubS_TurnToPointMultiTarget -> SubS_TurnToPointStep, various comment cleanups
* Fix SubS_TurnToPointStep header comment
2022-05-25 21:44:09 -04:00
e227684d9b
En_Boom ( #813 )
...
* En_Boom
* Match (thanks Anon)
* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-05-25 21:04:10 -04:00
e67fb5cf16
code_801323D0 (z_schedule) ( #509 )
...
* OK
* Initial documentation pass
* Pass 2. Add script by Tharo
* Renamed source file
* Documentation cleanup
* Update to latest master
* Feedback
* Bad merge
* Permissions
* Clang format
* Feedback
* format
* Use calculation instead of constant
* Rename as per suggestions
* Fix bss ordering and minor merge conflicts (from Maide)
* Update to current codebase and address feedback
* Fixup names to match new enums
* Format
* Fix duplicate include
* BSS shenanigans
2022-05-21 12:08:19 -04:00
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
e50c346ab8
SubS Shadows, Cutscenes, Exchange, and Planes ( #773 )
...
* Bring code over
* Rename
* clean up variables.h
* Bring over some more code as well as cleanup
* remove newline in functions.h
* format
* Add plane functions
* Remove from actorfixer
* Add some more docs to plane functions
* Use temp for better format
* change func_8013E8F8 to return an s32
* rename origin back to pos
* format
* Add docs to SubS_ComputePlane
* format
* gfxContextPtr -> globalCtx
* bss
* Better docs of SubS_ComputePlane
* Normal -> unitVec
* Review pt. 1
* Update plane comment
* SubS_ActorAndPlayerAreFacing -> SubS_ActorAndPlayerFaceEachOther
* Add subs texture defines
* Update include/z64math.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-04-22 05:11:54 +01:00
bfe22610f7
EffectSsStone1 Ok ( #730 )
...
* EffectSsStone1 OK
* gameplay object stuff
* unk_C -> reg0
* Fix
* Reverse order of stone textures
* undef syms
2022-04-17 19:35:13 +01:00
afd3ae243d
En_Test6 ( #627 )
...
* En_Test6
* ArrCount
* Always forget params
* PR
* Move defs
* PR
* Fix
* PR
* Merge
* Merge
* PR
* Fix
* PR
* PR
* Fix bss
* Match (thanks Anon)
* bss
* PR
* Merge
* bss
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2022-04-09 05:38:54 +01:00
7280d10404
En_Horse (2 non-matching) ( #413 )
...
* En_Horse
* a
* Warnings
* Warnigns 2
* PR
* Formats
* Fix
* PR
* Merge
* Merge
* Merge
2022-03-29 22:15:26 +01:00
72bae2b6ba
`z_kaleido_setup` ( #768 )
...
* KaleidoSetup_Init
* func_800F4C0C
* func_800F4A10 NON_EQUIVALENT
* fixes
* func_800F4A10
* import data
* Rename Play_InCsMode
* Name KaleidoSetup_Update
* minor cleanup
* Update src/code/z_play.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c
* unname D_801BDB00
* format
* a
* actorfixer
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-29 22:04:41 +01:00
486e7cbe83
SubS General Pathing Helpers ( #760 )
...
* Brought code over and cleanup
* cleanup functions.h and format
* add comment
* Whitespace
* Format
* Update src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Format
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 21:37:58 +01:00
f5ba6986f9
Obj_Pzlblock ( #755 )
...
* Obj_Pzlblock
* PR
2022-03-29 21:05:33 +01:00
ec9909c65c
Boot_800862E0 OK ( #769 )
...
* boot_800862E0 OK
* Ran format.sh
* attempt at fixing bss reordering
* boot_800862E0 OK (for real this time)
* Run formatter
* Changes u32 pointers to uintptr_t and sizes to size_t
* Run formatter
* Fix bss reordering
* Delete baserom.mm.us.rev1.z64:Zone.Identifier
* Cleanup and some notes
* Try my best to document
* remove comments
* Remove D_80097508 from variables.h
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 20:42:44 +01:00
cbffe83c9b
EnWarpTag OK (Warping pedestals in Goron Trial) ( #747 )
...
* EnWarpTag: OK
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* WarpTag: move macros
* WarpTag: format
* WarpTag: fix save entrance index
Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 18:21:36 +01:00
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
348e87083b
Bg_Breakwall ( #733 )
...
* Bg_Breakwall
* PR and match (thanks petrie)
* PR
* Merge
2022-03-29 17:11:08 +01:00
1ff183bc05
En_Test7 ( #628 )
...
* En_Test7
* Clean some stuff
* I hate BSS
* PR
* Fix
* Merge
* Fix
* Match (thanks Anon)
* PR
* PR
* PR
* Fix
2022-03-28 21:25:08 -04:00
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
4f3202fd7e
z_message progress ( #701 )
...
* 8 functions matching, 1 non-matching, 45 untouched
* match func_801518B0
* match func_8014CC14
* matching 8 func, 1 non-matching
* matched func_80148CBC
* matched func_80156758
* matched func_80147564
* matched func_80151BB4
* matched func80152EC0/Message_Spawn_Song_Effect
* matched func_80151C9C
* WIP func_80148B98
* WIP func_80151938
* matched func_80151938
* matched func_80148B98
* matched func_80147734
* matched func_80147624
* WIP func_8014EBC
* match func_801518B0
* matched func_80147564
* matched func80152EC0/Message_Spawn_Song_Effect
* matched func_80151C9C
* WIP func_80148B98
* matched func_80151938
* matched func_80148B98
* matched func_80147734
* matched func_80147624
* WIP#2 func_8014EBC
* matched func_80149EBC
* WIP func_8014CCB4
* matched func_8014CCB4
* matched func_80151A68
* WIP func_8014D62C
* fix func_8015A68 signature
* z_message_nes & z_message_staff progress
* z_message_nes & z_message_staff renaming
* documenting z_message
* cleaning & renaming
* documenting MessageContext
* matched func_80151A68
* format
* naming convention fix
* re-add func_80147564
* apply renaming of Message_ShouldAdvanceSilent on the whole project
* re-format, add clang-format off/on in z_message.c needed for matching
* rename staff => credits; add renames in actorfixer.
* change rupees array to ascii
* remove useless comments
* change MessageContext.decodedBuffer to a union
* remove decodedBuffer from actorfixer
* applied AngheloAlf suggestions & ran sfxconvert on z_message.c
* rename message_struct => message_data_static; revert decodedBuffer as union creating differences.
* use true/false instead of 1/0
* use SET_FULLSCREEN_VIEWPORT macro in func_80152c64
* AngheloAlf suggestions.
* extract assign from dayTime calculation for readability in Message_LoadTimeNES
* remove bss_reordering from osFlash, idle & boot_main to typedef MessageTableEntry in message_data_static & make decodedBuffer an union.
* remove useless casts
* Changes hexa to ascii chars when it's meaningful;
add comments to func_8014CCB4 to show what hexa constant means.
* Hensldm suggestions
* ran actorfixer on new changes; fix new bss reordering error introduced with rebase
* use new TIME_TO_MINUTES_F macro
* re-ran format.sh
* hensldm suggestions #2 + overall cleaning
* remove useless parenthesis
* Update include/message_data_static.h
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* actorfixer and format
* more fixes
Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: abaud <adrien.baud@inria.fr>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 12:09:47 -03:00
02cb971616
En_Gakufu OK and Documented + Related Audio Functions ( #662 )
...
* Gakufu OK, copy progress from audio WIP
* Extraction
* import wip in prep for audio data import
* Add in `code_8019AF00.c` functions
* Finish docs
* Spacing
* Add enum
* Many PR suggestions
* Another enum
* PR Suggestions
* Fix bss
* Move comment higher
* Fix bss
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:52:43 -03:00
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
9a41b76f35
SubS ActorPathing ( #689 )
...
* Bring code over
* Clean up
* Renames
* Cleanup
* Split SubS stuff from z64 into z64subs
* newline
* Bss
* Name callbacks
* bss
* bss
2022-03-26 02:43:14 +00:00
ce7aa87454
Oceff wipe6 ( #686 )
...
* Uncorrupted; Not OK
* Merged upstream -- actually OK
* Update assets/xml/overlays/ovl_Oceff_Wipe6.xml
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* - Removed Extra 0 characters; clang-format-11
* Removed new warnings.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-24 23:45:37 -03:00
80cbdb956d
En_Tanron4 OK (seagulls) ( #714 )
...
* Seagull OK
* small fixes
* review 1
* review 2
2022-03-24 23:39:34 -03:00
5684b342b6
En_Vm ( #678 )
...
* En_Vm
* Hidden funcs >:
* PR
* PR
2022-03-24 22:55:58 -03:00
EllipticEllipsis