mirror of
https://github.com/zeldaret/mm.git
synced 2026-08-19 05:22:32 -04:00
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:
+8
-7
@@ -297,6 +297,7 @@ wordReplace = {
|
||||
"func_800B86C8": "Actor_ChangeFocus",
|
||||
"func_800B90F4": "Actor_DeactivateLens",
|
||||
"func_800BC770": "Actor_AddQuake",
|
||||
"func_800DF840": "Camera_ChangeMode",
|
||||
"zelda_malloc": "ZeldaArena_Malloc",
|
||||
"zelda_mallocR": "ZeldaArena_MallocR",
|
||||
"zelda_realloc": "ZeldaArena_Realloc",
|
||||
@@ -606,6 +607,7 @@ wordReplace = {
|
||||
"EffectSsKiraKira_SpawnSmall": "EffectSsKirakira_SpawnSmall",
|
||||
"EffectSsKiraKira_SpawnDispersed": "EffectSsKirakira_SpawnDispersed",
|
||||
"EffectSsKiraKira_SpawnFocused": "EffectSsKirakira_SpawnFocused",
|
||||
"Effect_Getplay": "Effect_GetPlayState",
|
||||
"Effect_GetGlobalCtx": "Effect_GetPlayState",
|
||||
"EffectSsHitMark_Spawn": "EffectSsHitmark_Spawn",
|
||||
"EffectSsHitMark_SpawnFixedScale": "EffectSsHitmark_SpawnFixedScale",
|
||||
@@ -699,6 +701,7 @@ wordReplace = {
|
||||
"gSaveContext.equips": "gSaveContext.save.equips",
|
||||
"gSaveContext.unk_1016": "gSaveContext.jinxTimer",
|
||||
"gSaveContext.unk_3F58": "gSaveContext.sunsSongState",
|
||||
"gSaveContext.equips.buttonItems": "gSaveContext.save.equips.buttonItems",
|
||||
"gSaveContext.unk_48C8": "gSaveContext.dungeonIndex",
|
||||
"gSaveContext.save.playerData.magicAcquired": "gSaveContext.save.playerData.isMagicAcquired",
|
||||
"gSaveContext.save.playerDatadoubleMagic": "gSaveContext.save.playerData.isDoubleMagicAcquired",
|
||||
@@ -723,6 +726,7 @@ wordReplace = {
|
||||
"player->swordAnimation": "player->meleeWeaponAnimation",
|
||||
"player->swordState": "player->meleeWeaponState",
|
||||
"player->swordInfo": "player->meleeWeaponInfo",
|
||||
|
||||
"csCtx.npcActions": "csCtx.actorActions",
|
||||
"csCtx->npcActions": "csCtx->actorActions",
|
||||
"csCtx.unk_12": "csCtx.currentCsIndex",
|
||||
@@ -768,13 +772,10 @@ wordReplace = {
|
||||
"gSaveContext.fadeDuration": "gSaveContext.transFadeDuration",
|
||||
"gSaveContext.fadeSpeed": "gSaveContext.transWipeSpeed",
|
||||
|
||||
"D_801D15B0" : "gZeroVec3f",
|
||||
"D_801D15BC" : "gZeroVec3s",
|
||||
"D_801D1DE0" : "gIdentityMtx",
|
||||
"D_801D1E20" : "gIdentityMtxF",
|
||||
"D_04020658" : "gameplay_keep_Anim_020658",
|
||||
"D_04022B28" : "gDoorSkel",
|
||||
"D_04023100" : "gDoorCol",
|
||||
"D_801D15B0": "gZeroVec3f",
|
||||
"D_801D15BC": "gZeroVec3s",
|
||||
"D_801D1DE0": "gIdentityMtx",
|
||||
"D_801D1E20": "gIdentityMtxF",
|
||||
|
||||
# Macros
|
||||
"CUR_EQUIP_VALUE_VOID": "GET_CUR_EQUIP_VALUE",
|
||||
|
||||
Reference in New Issue
Block a user