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>
This commit is contained in:
Anghelo Carvajal
2022-10-15 19:12:01 -03:00
committed by GitHub
parent 638f5062cb
commit bd373940ac
139 changed files with 2323 additions and 1061 deletions
+7 -7
View File
@@ -1716,7 +1716,7 @@ asm/non_matchings/code/z_player_lib/func_801235DC.s,func_801235DC,0x801235DC,0x1
asm/non_matchings/code/z_player_lib/func_8012364C.s,func_8012364C,0x8012364C,0x71
asm/non_matchings/code/z_player_lib/func_80123810.s,func_80123810,0x80123810,0x54
asm/non_matchings/code/z_player_lib/Player_ActionToModelGroup.s,Player_ActionToModelGroup,0x80123960,0x13
asm/non_matchings/code/z_player_lib/func_801239AC.s,func_801239AC,0x801239AC,0x3E
asm/non_matchings/code/z_player_lib/Player_SetModelsForHoldingShield.s,Player_SetModelsForHoldingShield,0x801239AC,0x3E
asm/non_matchings/code/z_player_lib/Player_SetModels.s,Player_SetModels,0x80123AA4,0x4C
asm/non_matchings/code/z_player_lib/Player_SetModelGroup.s,Player_SetModelGroup,0x80123BD4,0x21
asm/non_matchings/code/z_player_lib/func_80123C58.s,func_80123C58,0x80123C58,0xE
@@ -1744,12 +1744,12 @@ asm/non_matchings/code/z_player_lib/Player_ActionToBottle.s,Player_ActionToBottl
asm/non_matchings/code/z_player_lib/Player_GetBottleHeld.s,Player_GetBottleHeld,0x8012420C,0x8
asm/non_matchings/code/z_player_lib/Player_ActionToExplosive.s,Player_ActionToExplosive,0x8012422C,0xB
asm/non_matchings/code/z_player_lib/Player_GetExplosiveHeld.s,Player_GetExplosiveHeld,0x80124258,0x8
asm/non_matchings/code/z_player_lib/func_80124278.s,func_80124278,0x80124278,0xF
asm/non_matchings/code/z_player_lib/Player_ActionToSword.s,Player_ActionToSword,0x80124278,0xF
asm/non_matchings/code/z_player_lib/func_801242B4.s,func_801242B4,0x801242B4,0xA
asm/non_matchings/code/z_player_lib/Player_GetEnvTimerType.s,Player_GetEnvTimerType,0x801242DC,0x51
asm/non_matchings/code/z_player_lib/func_80124420.s,func_80124420,0x80124420,0x7E
asm/non_matchings/code/z_player_lib/func_80124618.s,func_80124618,0x80124618,0x37
asm/non_matchings/code/z_player_lib/func_801246F4.s,func_801246F4,0x801246F4,0x5F
asm/non_matchings/code/z_player_lib/Player_DrawImpl.s,Player_DrawImpl,0x801246F4,0x5F
asm/non_matchings/code/z_player_lib/func_80124870.s,func_80124870,0x80124870,0x115
asm/non_matchings/code/z_player_lib/func_80124CC4.s,func_80124CC4,0x80124CC4,0x95
asm/non_matchings/code/z_player_lib/func_80124F18.s,func_80124F18,0x80124F18,0x36
@@ -1777,14 +1777,14 @@ asm/non_matchings/code/z_player_lib/func_801271B0.s,func_801271B0,0x801271B0,0xA
asm/non_matchings/code/z_player_lib/func_80127438.s,func_80127438,0x80127438,0x14
asm/non_matchings/code/z_player_lib/func_80127488.s,func_80127488,0x80127488,0x31
asm/non_matchings/code/z_player_lib/Player_DrawCouplesMask.s,Player_DrawCouplesMask,0x8012754C,0x12
asm/non_matchings/code/z_player_lib/func_80127594.s,func_80127594,0x80127594,0xD9
asm/non_matchings/code/z_player_lib/func_801278F8.s,func_801278F8,0x801278F8,0x5A
asm/non_matchings/code/z_player_lib/func_80127A60.s,func_80127A60,0x80127A60,0x41
asm/non_matchings/code/z_player_lib/Player_DrawCircusLeadersMask.s,Player_DrawCircusLeadersMask,0x80127594,0xD9
asm/non_matchings/code/z_player_lib/Player_DrawBlastMask.s,Player_DrawBlastMask,0x801278F8,0x5A
asm/non_matchings/code/z_player_lib/Player_DrawBunnyHood.s,Player_DrawBunnyHood,0x80127A60,0x41
asm/non_matchings/code/z_player_lib/func_80127B64.s,func_80127B64,0x80127B64,0x21
asm/non_matchings/code/z_player_lib/func_80127BE8.s,func_80127BE8,0x80127BE8,0x6F
asm/non_matchings/code/z_player_lib/func_80127DA4.s,func_80127DA4,0x80127DA4,0x179
asm/non_matchings/code/z_player_lib/func_80128388.s,func_80128388,0x80128388,0x46
asm/non_matchings/code/z_player_lib/func_801284A0.s,func_801284A0,0x801284A0,0x68
asm/non_matchings/code/z_player_lib/Player_DrawGreatFairysMask.s,Player_DrawGreatFairysMask,0x801284A0,0x68
asm/non_matchings/code/z_player_lib/func_80128640.s,func_80128640,0x80128640,0x14D
asm/non_matchings/code/z_player_lib/func_80128B74.s,func_80128B74,0x80128B74,0x17
asm/non_matchings/code/z_player_lib/func_80128BD0.s,func_80128BD0,0x80128BD0,0x4C8
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1716 asm/non_matchings/code/z_player_lib/func_8012364C.s func_8012364C 0x8012364C 0x71
1717 asm/non_matchings/code/z_player_lib/func_80123810.s func_80123810 0x80123810 0x54
1718 asm/non_matchings/code/z_player_lib/Player_ActionToModelGroup.s Player_ActionToModelGroup 0x80123960 0x13
1719 asm/non_matchings/code/z_player_lib/func_801239AC.s asm/non_matchings/code/z_player_lib/Player_SetModelsForHoldingShield.s func_801239AC Player_SetModelsForHoldingShield 0x801239AC 0x3E
1720 asm/non_matchings/code/z_player_lib/Player_SetModels.s Player_SetModels 0x80123AA4 0x4C
1721 asm/non_matchings/code/z_player_lib/Player_SetModelGroup.s Player_SetModelGroup 0x80123BD4 0x21
1722 asm/non_matchings/code/z_player_lib/func_80123C58.s func_80123C58 0x80123C58 0xE
1744 asm/non_matchings/code/z_player_lib/Player_GetBottleHeld.s Player_GetBottleHeld 0x8012420C 0x8
1745 asm/non_matchings/code/z_player_lib/Player_ActionToExplosive.s Player_ActionToExplosive 0x8012422C 0xB
1746 asm/non_matchings/code/z_player_lib/Player_GetExplosiveHeld.s Player_GetExplosiveHeld 0x80124258 0x8
1747 asm/non_matchings/code/z_player_lib/func_80124278.s asm/non_matchings/code/z_player_lib/Player_ActionToSword.s func_80124278 Player_ActionToSword 0x80124278 0xF
1748 asm/non_matchings/code/z_player_lib/func_801242B4.s func_801242B4 0x801242B4 0xA
1749 asm/non_matchings/code/z_player_lib/Player_GetEnvTimerType.s Player_GetEnvTimerType 0x801242DC 0x51
1750 asm/non_matchings/code/z_player_lib/func_80124420.s func_80124420 0x80124420 0x7E
1751 asm/non_matchings/code/z_player_lib/func_80124618.s func_80124618 0x80124618 0x37
1752 asm/non_matchings/code/z_player_lib/func_801246F4.s asm/non_matchings/code/z_player_lib/Player_DrawImpl.s func_801246F4 Player_DrawImpl 0x801246F4 0x5F
1753 asm/non_matchings/code/z_player_lib/func_80124870.s func_80124870 0x80124870 0x115
1754 asm/non_matchings/code/z_player_lib/func_80124CC4.s func_80124CC4 0x80124CC4 0x95
1755 asm/non_matchings/code/z_player_lib/func_80124F18.s func_80124F18 0x80124F18 0x36
1777 asm/non_matchings/code/z_player_lib/func_80127438.s func_80127438 0x80127438 0x14
1778 asm/non_matchings/code/z_player_lib/func_80127488.s func_80127488 0x80127488 0x31
1779 asm/non_matchings/code/z_player_lib/Player_DrawCouplesMask.s Player_DrawCouplesMask 0x8012754C 0x12
1780 asm/non_matchings/code/z_player_lib/func_80127594.s asm/non_matchings/code/z_player_lib/Player_DrawCircusLeadersMask.s func_80127594 Player_DrawCircusLeadersMask 0x80127594 0xD9
1781 asm/non_matchings/code/z_player_lib/func_801278F8.s asm/non_matchings/code/z_player_lib/Player_DrawBlastMask.s func_801278F8 Player_DrawBlastMask 0x801278F8 0x5A
1782 asm/non_matchings/code/z_player_lib/func_80127A60.s asm/non_matchings/code/z_player_lib/Player_DrawBunnyHood.s func_80127A60 Player_DrawBunnyHood 0x80127A60 0x41
1783 asm/non_matchings/code/z_player_lib/func_80127B64.s func_80127B64 0x80127B64 0x21
1784 asm/non_matchings/code/z_player_lib/func_80127BE8.s func_80127BE8 0x80127BE8 0x6F
1785 asm/non_matchings/code/z_player_lib/func_80127DA4.s func_80127DA4 0x80127DA4 0x179
1786 asm/non_matchings/code/z_player_lib/func_80128388.s func_80128388 0x80128388 0x46
1787 asm/non_matchings/code/z_player_lib/func_801284A0.s asm/non_matchings/code/z_player_lib/Player_DrawGreatFairysMask.s func_801284A0 Player_DrawGreatFairysMask 0x801284A0 0x68
1788 asm/non_matchings/code/z_player_lib/func_80128640.s func_80128640 0x80128640 0x14D
1789 asm/non_matchings/code/z_player_lib/func_80128B74.s func_80128B74 0x80128B74 0x17
1790 asm/non_matchings/code/z_player_lib/func_80128BD0.s func_80128BD0 0x80128BD0 0x4C8