mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-07 02:59:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_player_lib: Part 2 (#938)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+7 -7
View File
@@ -2202,7 +2202,7 @@
0x8012364C:("func_8012364C",),
0x80123810:("func_80123810",),
0x80123960:("Player_ActionToModelGroup",),
0x801239AC:("func_801239AC",),
0x801239AC:("Player_SetModelsForHoldingShield",),
0x80123AA4:("Player_SetModels",),
0x80123BD4:("Player_SetModelGroup",),
0x80123C58:("func_80123C58",),
@@ -2230,12 +2230,12 @@
0x8012420C:("Player_GetBottleHeld",),
0x8012422C:("Player_ActionToExplosive",),
0x80124258:("Player_GetExplosiveHeld",),
0x80124278:("func_80124278",),
0x80124278:("Player_ActionToSword",),
0x801242B4:("func_801242B4",),
0x801242DC:("Player_GetEnvTimerType",),
0x80124420:("func_80124420",),
0x80124618:("func_80124618",),
0x801246F4:("func_801246F4",),
0x801246F4:("Player_DrawImpl",),
0x80124870:("func_80124870",),
0x80124CC4:("func_80124CC4",),
0x80124F18:("func_80124F18",),
@@ -2263,14 +2263,14 @@
0x80127438:("func_80127438",),
0x80127488:("func_80127488",),
0x8012754C:("Player_DrawCouplesMask",),
0x80127594:("func_80127594",),
0x801278F8:("func_801278F8",),
0x80127A60:("func_80127A60",),
0x80127594:("Player_DrawCircusLeadersMask",),
0x801278F8:("Player_DrawBlastMask",),
0x80127A60:("Player_DrawBunnyHood",),
0x80127B64:("func_80127B64",),
0x80127BE8:("func_80127BE8",),
0x80127DA4:("func_80127DA4",),
0x80128388:("func_80128388",),
0x801284A0:("func_801284A0",),
0x801284A0:("Player_DrawGreatFairysMask",),
0x80128640:("func_80128640",),
0x80128B74:("func_80128B74",),
0x80128BD0:("func_80128BD0",),
tools/disasm/variables.txt
+34 -34
View File
@@ -1192,33 +1192,33 @@
0x801BFDA0:("sMaskObjectIds","s16","[24]",0x30),
0x801BFDD0:("D_801BFDD0","UNK_TYPE1","",0x1),
0x801BFDE8:("sMaskItemIds","UNK_TYPE1","",0x1),
0x801BFE00:("D_801BFE00","UNK_TYPE1","",0x1),
0x801BFE00:("gPlayerSkeletons","FlexSkeletonHeader*","[5]",0x14),
0x801BFE14:("D_801BFE14","UNK_TYPE1","",0x1),
0x801BFF34:("D_801BFF34","UNK_TYPE2","",0x2),
0x801BFF34:("sCItemButtons","UNK_TYPE2","",0x2),
0x801BFF3C:("sActionModelGroups","UNK_TYPE1","",0x1),
0x801BFF90:("D_801BFF90","UNK_TYPE1","",0x1),
0x801BFF98:("sPlayerStrengths","UNK_TYPE1","",0x1),
0x801BFFA0:("sEnvironmentTextTriggers","UNK_TYPE1","",0x1),
0x801BFFB0:("gPlayerModelTypes","UNK_TYPE1","",0x1),
0x801BFFFC:("D_801BFFFC","UNK_TYPE1","",0x1),
0x801C0024:("D_801C0024","UNK_TYPE1","",0x1),
0x801C0034:("D_801C0034","UNK_TYPE1","",0x1),
0x801C005C:("D_801C005C","UNK_TYPE1","",0x1),
0x801C0084:("D_801C0084","UNK_TYPE1","",0x1),
0x801C00AC:("D_801C00AC","UNK_TYPE1","",0x1),
0x801C00BC:("D_801C00BC","UNK_TYPE1","",0x1),
0x801C00D4:("D_801C00D4","UNK_TYPE1","",0x1),
0x801C00EC:("D_801C00EC","UNK_TYPE1","",0x1),
0x801C0114:("D_801C0114","UNK_TYPE1","",0x1),
0x801C013C:("D_801C013C","UNK_TYPE1","",0x1),
0x801C0164:("D_801C0164","UNK_TYPE1","",0x1),
0x801BFFFC:("gPlayerWaistDLs","UNK_TYPE1","",0x1),
0x801C0024:("gPlayerHandHoldingShields","UNK_TYPE1","",0x1),
0x801C0034:("gPlayerSheath12DLs","UNK_TYPE1","",0x1),
0x801C005C:("gPlayerSheath13DLs","UNK_TYPE1","",0x1),
0x801C0084:("gPlayerSheath14DLs","UNK_TYPE1","",0x1),
0x801C00AC:("gPlayerShields","UNK_TYPE1","",0x1),
0x801C00BC:("gPlayerSheathedSwords","UNK_TYPE1","",0x1),
0x801C00D4:("gPlayerSwordSheaths","UNK_TYPE1","",0x1),
0x801C00EC:("gPlayerLeftHandTwoHandSwordDLs","UNK_TYPE1","",0x1),
0x801C0114:("gPlayerLeftHandOpenDLs","UNK_TYPE1","",0x1),
0x801C013C:("gPlayerLeftHandClosedDLs","UNK_TYPE1","",0x1),
0x801C0164:("gPlayerLeftHandOneHandSwordDLs","UNK_TYPE1","",0x1),
0x801C018C:("D_801C018C","UNK_TYPE1","",0x1),
0x801C01A4:("D_801C01A4","UNK_TYPE1","",0x1),
0x801C01CC:("D_801C01CC","UNK_TYPE1","",0x1),
0x801C01F4:("D_801C01F4","UNK_TYPE1","",0x1),
0x801C021C:("D_801C021C","UNK_TYPE1","",0x1),
0x801C0244:("D_801C0244","UNK_TYPE1","",0x1),
0x801C026C:("D_801C026C","UNK_TYPE1","",0x1),
0x801C01A4:("gPlayerRightHandOpenDLs","UNK_TYPE1","",0x1),
0x801C01CC:("gPlayerRightHandClosedDLs","UNK_TYPE1","",0x1),
0x801C01F4:("gPlayerRightHandBowDLs","UNK_TYPE1","",0x1),
0x801C021C:("gPlayerRightHandInstrumentDLs","UNK_TYPE1","",0x1),
0x801C0244:("gPlayerRightHandHookshotDLs","UNK_TYPE1","",0x1),
0x801C026C:("gPlayerLeftHandBottleDLs","UNK_TYPE1","",0x1),
0x801C0294:("D_801C0294","UNK_TYPE1","",0x1),
0x801C02A8:("D_801C02A8","UNK_TYPE1","",0x1),
0x801C02BC:("D_801C02BC","UNK_TYPE1","",0x1),
@@ -1260,11 +1260,11 @@
0x801C07F0:("D_801C07F0","UNK_TYPE1","",0x1),
0x801C0820:("D_801C0820","UNK_TYPE1","",0x1),
0x801C0838:("D_801C0838","UNK_TYPE1","",0x1),
0x801C0850:("D_801C0850","UNK_TYPE1","",0x1),
0x801C0860:("D_801C0860","UNK_TYPE1","",0x1),
0x801C0870:("D_801C0870","UNK_PTR","",0x4),
0x801C0890:("D_801C0890","UNK_TYPE1","",0x1),
0x801C08A0:("D_801C08A0","UNK_TYPE1","",0x20),
0x801C0850:("gCullBackDList","UNK_TYPE1","",0x1),
0x801C0860:("gCullFrontDList","UNK_TYPE1","",0x1),
0x801C0870:("sPlayerEyesTextures","UNK_PTR","",0x4),
0x801C0890:("sPlayerMouthTextures","UNK_TYPE1","",0x1),
0x801C08A0:("sPlayerFaces","UNK_TYPE1","",0x20),
0x801C08C0:("D_801C08C0","UNK_TYPE1","",0x1),
0x801C08FC:("D_801C08FC","UNK_TYPE1","",0x1),
0x801C0910:("D_801C0910","UNK_TYPE1","",0x1),
@@ -4003,17 +4003,17 @@
0x801F5834:("D_801F5834","UNK_TYPE1","",0x1),
0x801F5840:("gNMIBuffer","s32*","",0x4),
0x801F5850:("sPostmanTimerInput","UNK_TYPE1","",0x1),
0x801F58B0:("D_801F58B0","UNK_TYPE1","",0x1),
0x801F58B0:("D_801F58B0","struct_801F58B0","[3][3]",0xFC),
0x801F59AC:("D_801F59AC","UNK_TYPE1","",0x1),
0x801F59B0:("D_801F59B0","UNK_TYPE1","",0x1),
0x801F59C8:("D_801F59C8","UNK_TYPE1","",0x1),
0x801F59D0:("D_801F59D0","UNK_TYPE1","",0x1),
0x801F59DC:("D_801F59DC","UNK_TYPE1","",0x1),
0x801F59E0:("D_801F59E0","UNK_TYPE1","",0x1),
0x801F59E4:("D_801F59E4","UNK_TYPE1","",0x1),
0x801F59B0:("D_801F59B0","Vec3f","[2]",0x18),
0x801F59C8:("D_801F59C8","s32","[2]",0x8),
0x801F59D0:("D_801F59D0","struct_801F59D0","",0x0A),
0x801F59DC:("D_801F59DC","Vec3f*","",0x4),
0x801F59E0:("D_801F59E0","s32","",0x4),
0x801F59E4:("D_801F59E4","s32","",0x4),
0x801F59E8:("D_801F59E8","Vec3f","",0xC),
0x801F59F4:("D_801F59F4","UNK_TYPE1","",0x1),
0x801F59F8:("D_801F59F8","UNK_TYPE1","",0x1),
0x801F59F4:("D_801F59F4","s32","",0x4),
0x801F59F8:("D_801F59F8","s32","",0x4),
0x801F5A00:("sQuakeRequest","QuakeRequest","[4]",0x90),
0x801F5A90:("sDistortionRequest","DistortionRequest","",0xc),
0x801F5AA0:("sMatAnimStep","s32","",0x4),