Tom Overton
|
9d043f0197
|
Add original asset names to all `object_l*` and `object_m*` files (#1403)
|
2023-10-03 17:26:50 +11:00 |
|
Anghelo Carvajal
|
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 |
|
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 |
|
Derek Hensley
|
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 |
|
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 |
|
Anghelo Carvajal
|
e7940e3bed
|
Add autogenerated limb enum info in the object's XMLs (#633)
* first pass
* Fix limb enums for objects with more than one skeleton
* Manually fix object_cne
|
2022-03-05 13:06:02 -03:00 |
|
Tharo
|
d62fb2b689
|
Initial object file xmls (#312)
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "3c00dcb3"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "3c00dcb3"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Object xmls
* Fix bss reordering
* Setup has warnings now
* Fix object_gi_reserve01 dlist names
* rm xml -> c make rule
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "ba947126"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "ba947126"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* SPBranchList related warnings gone
* Remove some mis-detected animations
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "405fc13e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "405fc13e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* scene related setup warning gone
* Fix
* Newlines
|
2021-12-18 14:37:05 -05:00 |