f54a9b2831
Some Gameplay keep docs (starts at the top) ( #1310 )
...
* bottles
* hookshot
* swords
* masks
* remove _tex from outnames
* Headers
* 003400 Vtx
* unknown mask
* LinkMask name based on renders
2023-06-28 23:49:15 -04:00
543c38ae06
`z_player_lib`: Dawn of the final PR ( #1142 )
...
* Player_GetMask and Player_RemoveMask
* some comments
* Player_ActionToBottle and Player_GetBottleHeld
* Player_DrawGetItemImpl and Player_DrawGetItem
* func_80123420 OK
* Decompile a few more functions
* Decompile a few more functions
* func_80122760
* func_80122868, func_801229A0 and func_801229EC
* func_80122F28
* func_8012301C
* func_801242B4
* func_801242DC
* func_80124420 nonmatching
* func_80126440
* func_801240C8 and func_801240DC
* func_8012405C and func_80124088
* func_80124020
* Player_IsBurningStickInRange
* func_8012754C
* func_80125318 and func_80125CE0
* func_801229FC
* func_80127B64
* func_80127488
* func_80122D44
* func_80122BA4
* func_80122C20 attempt
* func_80122EEC
* func_80122F9C
* func_80122FCC and func_8012300C
* func_80123448
* func_801234D4
* func_801235DC
* func_80123960
* func_80123BD4
* func_80123AA4
* func_801239AC
* func_801241B4
* func_80123C58 and func_80123C90
* func_80123D50 and func_80123DA4
* func_80123DC0, func_80123E90 and func_80123F14
* func_80124110 and func_80124148
* func_80124168 and func_80124190
* func_80124278
* func_80124F18 non_equivalent
* func_80125340 and func_8012536C
* func_801263FC
* func_801265C8
* func_8012669C
* func_80128B74
* func_80123140
* func_801246F4
* func_801253A4 NON_MATCHING
* func_801262C8
* func_80126AB4
* func_80126B8C
* func_80127438
* func_801278F8 NON_MATCHING
* Fix data split
* cleanup externs
* func_80128BD0 compiles...
* Rename Player_SetEquipmentData
* fix merge issues
* Fix types
* Improvement? Worse? I don't know at this point
* func_80128640 attempt
* func_80127BE8
* func_80127A60
* func_80127594 attempt
* func_801271B0
* func_8012364C NON_MATCHING
* func_80124618
* func_80124CC4 non matching
* func_801251C4
* func_80125580 non equivalent
* func_80128388
* cleanup
* remove some hardcoded pointers
* object symbol cleanup
* func_80124870 NON_EQUIVALENT
* name overridlimbdraw arguments
* func_80125D4C NON_EQUIVALENT
* func_80126BD0 NON_MATCHING
* Match func_80126BD0 thanks to anon58
* func_80127DA4 NON_EQUIVALENT
* fix merge issues
* some stealing from OoT
* small rename pass and cleanup
* Improve some
* CLAMP and fix warnings
* func_80125580 matched by mzx
* cleanup func_80128BD0 a bit
* import data
* func_80124CC4
* Rename objectFileTable to gObjectTable
* Improve func_80124FF0 thanks to maide
* fix renames
* Match func_80124FF0 thanks to Maide
* cleanup
* More cleaning up
* import bss
* Add PLAYER_STATE macros
* a bit more of cleanup
* run formatter
* func_80128BD0 a bit more deecent
* Add player limb enum
* Use limb enum
* cleanup and format
* Use symbols for player dlists groups
* A bunch more of pointers
* more object pointers
* Change the remaining object pointers
* Add a few missing dlist in link_child
* Small rename
* whoops
* Work on NON_MATCHINGs
* Cleanup
* Steal OoT renames from "sword" to "meleeWeapon"
* Fix some symbols
* Match func_80127594 and format
* Match func_80127DA4
* Matched func_801284A0
* Annotate D_801F59AC
* Matched func_80128640
* Some cleanup
* format
* stuffs
* some cleanups
* import stuff from pr
* swords and shields
* fixes
* bss
* cleanup Player_OverrideLimbDrawGameplayCommon
* progress on func_80125D4C
* PlayerMeleeWeapon enum
* Player_BButtonSwordFromAP
* GET_B_SWORD_FROM_AP
* GET_MELEE_WEAPON_FROM_AP
* PlayerBottle
* PlayerExplosive and PlayerSword
* misc fixes
* Various changes fromplayer_actor
* z64player.h stuff from player_actor
* Fixes
* skelanime stuff
* placeholders on z64item.h, save macros and ther cleanups
* <= PLAYER_AP_MINUS1
* Player_UpdateBunnyEarsKinematics
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* cleanup
* bodyPartsPos
* comment
* sizeof(u16)
* typo
* merge fixes
* fix
* fixes
* format
* fix merge
* fix merge
* func_80125D4C
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* func_80128BD0 improvement
* minor renames
* format
* whoops
* small cleanup
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* format
* _B_
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* format
* remove gap
* whoops
* clanups
* remove stuff from permuter_settings
* steal some OoT docs
* some other docs vscode didn't add to the last commit
* format
* data as infunction-static data
* OoT docs stealing
* Improvements on Player_PostLimbDrawGameplay
* More improvement
* Match Player_PostLimbDrawGameplay
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* cleanups
* Convert unk_AF0 into an union and some other cleanups
* bss
* headLimbRot and upperLimbRot
* fix naming
* cleanups
* bss
* bss
* Update src/code/z_player_lib.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* pr review
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* bss
* gesture
* namefixer
* gestureInfo
* IA_MIN and BOTTLE_EMPTY
* review
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* review
* D_801F59B0_LEN
* Remove LevelOfDetail enum
* bss
* review
* review
* gLinkDekuClosedFlowerDL gLinkDekuOpenFlowerDL
* _B_
* Player_DrawStrayFairyParticles
* fix build
---------
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18 23:01:05 -04:00
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
c1a0d0bd2b
EnOsn (Happy Mask Salesman) and object_osn Docs ( #1135 )
...
* Inital cleanup
* Object
* Docs
* Small things
* PR
2022-10-22 04:12:38 +01:00
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
a38f45b268
Document Elegy of Emptiness shell assets in gameplay_keep ( #1121 )
...
* Document Elegy of Emptiness shell assets in gameplay_keep
* Format
2022-10-15 03:52:33 +01:00
fdfe2842d9
Eff Srchball OK ( #1092 )
...
* OK
* Some docs and cleanup
* flags -> params
* Remove todo
* Small cleanup
* Description and dls
* Format
* bug tag
* Update bug comment
* Update src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Format
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-02 18:10:31 +01:00
3d5d39e74d
Document leftover pause joint tables ( #1104 )
...
* Document leftover pause joint tables
* Grab the other two joint tables
* Document the deku stick thing
* Add @bug to comment
2022-10-02 17:16:30 +01:00
84d77d5101
EnMThunder Ok with some docs ( #1082 )
...
* Match EnMThunder_Init
* Match func_808B53C0
* Match func_808B65BC
* Match func_808B6310
* Match func_808B5EEC
* Matched func_808B60D4
* Match func_808B5F68
* Match func_808B5984
* Matched func_808B58CC
* Matched EnMThunder_Destroy
* Matched EnMThunder_Update
* Matched EnMThunder_Draw
* Matched data
* Doc WIP
* Code docs
* Assets
* PR
* Rename one more function from OoT WIP docs
* Update src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* PR
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-10-02 05:00:52 +01:00
82afae675b
Replace player animation names with original names derived from OoT3D/MM3D ( #1103 )
2022-10-01 17:08:47 +01:00
00bf71460f
Item cleanup: Item drops, rupees, signs ( #1048 )
...
* item cleanup
* pr suggestions
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-09-24 16:45:53 -03:00
be121f7dd7
Document Song of Time Clock assets in gameplay_keep ( #1068 )
2022-09-24 15:34:59 -03:00
fd5ff73a35
Extract assets from link_animetion ( #1056 )
...
* Extract assets from link_animetion
* Add empty last line
2022-09-24 15:14:59 -03:00
77be902c25
Effect Bomb2 Ok ( #1039 )
...
* OK
* PR
2022-09-24 14:31:20 -03:00
b5a9189cef
Effect Deaddb OK ( #1037 )
...
* OK
* Add description
* format
* Fix EffectSsDeadDbInitParams size comment
2022-09-24 14:21:08 -03:00
71e4046415
Effect Deadds OK ( #1018 )
...
* OK
* cleanup
* Fix merge
* Small cleanups
2022-09-24 14:15:48 -03:00
f31056ef8a
Effect Dust OK ( #1016 )
...
* OK
* Some cleanup
* Description
* format
* Better name
* whoops
* Array count
* Name dust texture arrays
* Fix
* static
* Update dust tex outnames
2022-09-24 14:04:03 -03:00
f3a51c5403
General Cleanup 10 ( #990 )
...
* limbs -> limb
* Generated limbs
* Fix ENUMNAME
* goronLink fix
* actually save
* Boss011Limbs -> Boss011Limb
* keep skeletons
* remove comments
2022-08-15 20:40:41 -04:00
e44c98884b
EnRat (Real Bombchu) OK and Documented, object_rat documented 🐀 💣 ( #966 )
...
* EnRat_Init and EnRat_Destroy OK
* Tons of actionFuncs and other stuff
* EnRat_Update OK
* func_80A566E0 OK and better match for func_80A56EB8
* All draw functions OK
* EnRat OK
* Document object_rat
* Port documentation from Bom_Chu
* Document/name a few more things
* Name all funcs and struct vars
* Un-name unk_18D
* Name some more stuff
* Final round of docs before I ask for help
* Let's just PR this I suppose
* Respond to isghj5's review
* Name a variable I forgot to name
* hookedState stuff
* Clean up forward declares
* Fix after merge
* Respond to reviews
* Limbs -> Limb
* Names for these rascally Vec3f temps
* Name all the vec3fs for real this time
* world -> surface
* surfaceTangent -> forwardPos; there are many tangents, but only one is forward
* Use Elliptic's names + documentation
* worldForwardInHome -> worldPlusForwardInHome
2022-08-15 14:16:31 -04:00
0395b7bd4f
docs ( #978 )
2022-08-09 20:07:31 -04:00
b716e76d3e
Effect EnFire OK ( #977 )
...
* OK
* Gameplay keep fire
* &
* &2
* PR
* Fire textures
* Second mask
2022-08-07 19:59:23 -04:00
d0313fa766
Effect EnIce OK ( #976 )
...
* Ok
* Material/Model
* Cleanup
* format
* IceFragment Assets
* PR
2022-08-07 19:29:03 -04:00
9f6bacbb88
Effect Firetail OK ( #974 )
...
* OK
* description
* gEffFire1DL
* format
* PR
2022-08-07 19:18:54 -04:00
fba92d828a
Some minor cleanup involving stray fairies ( #949 )
...
* Some minor cleanup involving stray fairies
* Fix build
2022-07-23 14:17:35 -04:00
6dd31c00e5
ovl_Eff_Change Decompiled ( #946 )
...
* all functions matching
* progress
* ovl_Eff_Change Decompiled
* ovl_Eff_Change Decompiled
* space
* spec
2022-07-22 06:09:44 +01:00
5c7f21f6d2
Effect Gfire Ok ( #941 )
...
* OK
* description
2022-07-22 06:02:55 +01:00
64ea6665bd
Effect Gspk OK ( #939 )
...
* OK
* cleanup
* newline
2022-07-22 05:58:08 +01:00
6661b566a9
Effect Gripple ( #940 )
...
* OK
* description
* undef
* format
2022-07-19 12:32:00 -04:00
08ff2a6184
object_rotlift documented, various cleanup of Deku Flower stuff, finish documentation of ObjRotlift ( #879 )
...
* Make params-packing macro
* Move limb enum to object
* Minor deku flower cleanup
* Document object_rotlift
* Rotlift cleanup and documentation
* Respond to review
2022-07-11 23:10:24 -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
689ef2fe0b
Effect Icepiece OK ( #839 )
...
* OK
* Final cleanup
* format
* PR plus forgot to rename Matrix_RotateY
2022-06-19 23:18:54 +01:00
1a37ef95d1
Effect Icesmoke OK ( #838 )
...
* Ok
* Name DL and tex
* Matrix renames
2022-06-19 23:10:21 +01:00
5ae4ef87cd
Sob1 Objects Documented ( #814 )
...
* Start zora
* Finish zora
* BombShopkeeper with some cleanup
* Goron and don gero mask
* Small thing
* format
* PR comments
* bombshopkeeper -> bomb_shopkeeper
* gEffShockwaveDL
2022-06-19 03:33:53 +01:00
b6362cacbe
ClearTag cleanup ( #830 )
2022-06-19 02:37:31 +01:00
e1477702ca
EffectSsKirakira OK ( #801 )
...
* OK
* cleanup
* KiraKira -> Kirakira
2022-05-25 22:23:27 -04:00
c2afdf6eb0
EffectSsLightning OK ( #800 )
...
* OK
* Document and gameplay keep
* cleanup
* Rotate -> Rot
* Update description
2022-05-25 22:01:46 -04: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
f4bb821b56
EffectSsSbn OK ( #751 )
...
* Ok
* Cleanup and document
* File header description
* rename scroll related regs
* undef syms
* Cleanup for PR
* Move comment
* Add todo
2022-04-17 19:07:25 +01:00
98143afb1c
En_Test ( #756 )
...
* En_Test
* PR
* PR
* PR
* Fix
2022-03-29 21:14:29 +01:00
036a68cb3e
Effects Stick and Kakera cleanup ( #752 )
...
* cleanup
* cleanup
* idx -> index
2022-03-29 20:52:37 +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
9362fee5e8
En_kusa OK and Documented ( #640 )
...
* matched one function
* More matches
* more matches
* cleaning up some stuff
* making some progress
* two new matches, and a partial match
* meh...i'll come back to this
* fixing ctx names
* more matches
* OK and documented
* fixing data stuff
* PR suggestions
* fixing name and DL issues
* fixing pr suggestions
* PR feedback
* ....format....
* PR fix
* fixes
* dang format
* fixing name
* I'm blind
* fixing obj_grass
2022-03-26 02:10:25 +00:00
69c0e15a45
EffectSsBubble OK ( #702 )
...
* Decompile eff_ss_bubble
* Document effBubble stuff in gameplay keep
* newline
* Formatting is hard
* PR suggestions
* Amplitude -> Max
2022-03-26 01:54:05 +00:00
984a5061c2
ObjectFsn documented ( #680 )
...
* Cleanup some shopkeepers
* More cleanup
* Document animations
* General cleanup
* Animation enums
* Limb maxes
* More Cleanup
* Some more minor stuff
* fsn cutscene state
* Parens and postlimbdraw
* Ossan Limbs
* Remove ENFSN_LIMB_MAX
* SI_MAX
* Compound macro
* Document gameplayKeep textures used by shopkeepers
* Ani Limbs in Ossan
* Format
* PR suggestion
* Remove trueTmp from EnFsn
2022-03-24 23:14:14 -03:00
d5e692d0e1
En_Bom_Chu (Bombchu) OK and documented ( #679 )
...
* EnBomChu_Init OK
* EnBomChu_Destroy OK
* func_808F7868 OK
* func_808F79D4 OK
* func_808F7E74 OK
* func_808F7FA0 OK
* func_808F77E4 OK
* func_808F75D0 OK
* func_808F7944 OK
* func_808F7A84 OK
* func_808F818C OK
* func_808F8080 OK
* func_808F7FD0 OK
* EnBomChu_Update OK
* EnBomChu_Draw OK
* Drop unnecessary cast in Update
* Import data into C
* Object symbol
* Use generated reloc
* Port over OoT struct var names
* Name all statics
* Misc cleanup
* Name some of the new struct vars introduced in MM
* Port over most OoT function names
* Name movingSpeed based on in-game observation
* Name final param in EnBomChu_SpawnRipplesAndSplashes
* More cleanup and OOT port
* Some more names
* More docs
* Name last function
* Final little cleanup
* First round of review fixes
* Change the name of that one function
* More precise comment
2022-03-24 23:07:59 -03:00
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
684df37ebc
En_Door ( #571 )
...
* progress
* it matches mostly
* symbols
* done for now
* fix warnings and stuff
* formatter
* NON_EQUIVALENT
* pr fixes
* formatter and actorfixer
* fix pm
* more fixes
* PR fixes
* it actually builds again
* matching function
Co-authored-by: Louis <louist103@pop-os.localdomain>
2022-02-27 17:37:24 -05:00
249871642f
Obj_kinoko OK ( #646 )
...
* z_obj_kinoko OK
* fixing DL and changing to thisx
* naming display list
* minor fix
* fixing PR suggestions
* addressing PR
* reverting name and leaving a comment
2022-02-19 21:12:22 +00:00
d588870b7a
Document sun textures/displaylist ( #642 )
...
* Document sun textures/displaylist
* Fix gSunEvening1Tex's outname
* Add comment explaining the textures should be 64x64
2022-02-14 00:40:19 +00:00
Derek Hensley