mirror of https://github.com/zeldaret/mm.git
`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>
This commit is contained in:
Anghelo Carvajal
GitHub
parent
f9c638117c
commit
543c38ae06
|
|
@ -787,7 +787,7 @@
|
|||
<PlayerAnimation Name="gPlayerAnim_Link_muku" Offset="0xE4E0" />
|
||||
<PlayerAnimation Name="gPlayerAnim_Link_otituku_w" Offset="0xE4E8" />
|
||||
<PlayerAnimation Name="gPlayerAnim_Link_ue_wait" Offset="0xE4F0" />
|
||||
|
||||
|
||||
<DList Name="gameplay_keep_DL_00E5C0" Offset="0xE5C0" />
|
||||
|
||||
<!-- Deku Flower -->
|
||||
|
|
@ -1145,8 +1145,8 @@
|
|||
<Texture Name="gElegyShellGoronNecklaceTex" OutName="elegy_shell_goron_necklace" Format="i8" Width="32" Height="32" Offset="0x4DDA0" />
|
||||
<Texture Name="gElegyShellGoronPlatformTex" OutName="elegy_shell_goron_platform" Format="ci8" Width="8" Height="16" Offset="0x4E1A0" />
|
||||
|
||||
<Texture Name="gameplay_keep_Tex_04E220" OutName="tex_04E220" Format="i8" Width="64" Height="64" Offset="0x4E220" />
|
||||
<DList Name="gameplay_keep_DL_04F250" Offset="0x4F250" />
|
||||
<Texture Name="gHookshotReticleTex" OutName="tex_04E220" Format="i8" Width="64" Height="64" Offset="0x4E220" />
|
||||
<DList Name="gHookshotReticleDL" Offset="0x4F250" />
|
||||
<Texture Name="gameplay_keep_Tex_04F2C0" OutName="tex_04F2C0" Format="ia16" Width="32" Height="64" Offset="0x4F2C0" />
|
||||
<DList Name="gEffIceFragment1DL" Offset="0x50550" />
|
||||
<DList Name="gEffIceFragment2MaterialDL" Offset="0x50648" />
|
||||
|
|
@ -1223,7 +1223,9 @@
|
|||
<DList Name="gameplay_keep_DL_054C90" Offset="0x54C90" />
|
||||
<Texture Name="gameplay_keep_Tex_054D90" OutName="tex_054D90" Format="i4" Width="16" Height="16" Offset="0x54D90" />
|
||||
<Texture Name="gameplay_keep_Tex_054E10" OutName="tex_054E10" Format="i8" Width="16" Height="16" Offset="0x54E10" />
|
||||
|
||||
<TextureAnimation Name="gameplay_keep_Matanimheader_054F18" Offset="0x54F18" />
|
||||
|
||||
<Texture Name="gameplay_keep_Tex_054F20" OutName="tex_054F20" Format="i8" Width="32" Height="32" Offset="0x54F20" />
|
||||
<DList Name="gameplay_keep_DL_055360" Offset="0x55360" />
|
||||
<DList Name="gameplay_keep_DL_055620" Offset="0x55620" />
|
||||
|
|
@ -1477,7 +1479,7 @@
|
|||
<Texture Name="gElegyShellZoraPlatformTex" OutName="elegy_shell_zora_platform" Format="rgba16" Width="8" Height="16" Offset="0x8D2E0" />
|
||||
|
||||
<Texture Name="gameplay_keep_Tex_08D3E0" OutName="tex_08D3E0" Format="i8" Width="64" Height="32" Offset="0x8D3E0" />
|
||||
|
||||
|
||||
<!-- Dust Textures -->
|
||||
<Texture Name="gEffDust1Tex" OutName="eff_dust_1" Format="i8" Width="32" Height="32" Offset="0x8DBE0" />
|
||||
<Texture Name="gEffDust2Tex" OutName="eff_dust_2" Format="i8" Width="32" Height="32" Offset="0x8DFE0" />
|
||||
|
|
@ -1487,7 +1489,7 @@
|
|||
<Texture Name="gEffDust6Tex" OutName="eff_dust_6" Format="i8" Width="32" Height="32" Offset="0x8EFE0" />
|
||||
<Texture Name="gEffDust7Tex" OutName="eff_dust_7" Format="i8" Width="32" Height="32" Offset="0x8F3E0" />
|
||||
<Texture Name="gEffDust8Tex" OutName="eff_dust_8" Format="i8" Width="32" Height="32" Offset="0x8F7E0" />
|
||||
|
||||
|
||||
<Texture Name="gameplay_keep_Tex_08FBE0" OutName="tex_08FBE0" Format="i8" Width="32" Height="64" Offset="0x8FBE0" />
|
||||
<Texture Name="gameplay_keep_Tex_0903E0" OutName="tex_0903E0" Format="i8" Width="32" Height="64" Offset="0x903E0" />
|
||||
<Texture Name="gameplay_keep_Tex_090BE0" OutName="tex_090BE0" Format="i8" Width="32" Height="64" Offset="0x90BE0" />
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@
|
|||
<DList Name="object_link_child_DL_017270" Offset="0x17270" />
|
||||
<DList Name="gLinkHumanGildedSwordBladeDL" Offset="0x17310" />
|
||||
<DList Name="gLinkHumanRazorSwordSheathDL" Offset="0x17338" />
|
||||
<DList Name="gLinkHumanHylianShieldDL" Offset="0x17458" />
|
||||
<DList Name="gLinkHumanHerosShieldDL" Offset="0x17458" />
|
||||
<DList Name="gLinkHumanKokiriSwordSheathDL" Offset="0x17700" />
|
||||
<DList Name="object_link_child_DL_017818" Offset="0x17818" />
|
||||
<DList Name="gLinkHumanHookshotDL" Offset="0x17858" />
|
||||
|
|
@ -110,17 +110,17 @@
|
|||
<DList Name="object_link_child_DL_018490" Offset="0x18490" />
|
||||
|
||||
<Texture Name="object_link_child_TLUT_018A40" OutName="tlut_018A40" Format="rgba16" Width="16" Height="16" Offset="0x18A40" />
|
||||
<Texture Name="gLinkHumanHylianShieldFrontTLUT" OutName="hylian_shield_front_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18C40" />
|
||||
<Texture Name="gLinkHumanHylianShieldBackTLUT" OutName="hylian_shield_back_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18E40" />
|
||||
<Texture Name="gLinkHumanHerosShieldFrontTLUT" OutName="hylian_shield_front_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18C40" />
|
||||
<Texture Name="gLinkHumanHerosShieldBackTLUT" OutName="hylian_shield_back_tlut" Format="rgba16" Width="16" Height="16" Offset="0x18E40" />
|
||||
<Texture Name="gLinkHumanShieldHandleTLUT" OutName="shield_handle_tlut" Format="rgba16" Width="16" Height="16" Offset="0x19040" />
|
||||
<Texture Name="object_link_child_Tex_019240" OutName="tex_019240" Format="ci8" Width="8" Height="8" Offset="0x19240" />
|
||||
<Texture Name="gLinkHumanHylianShieldFrontUpperTex" OutName="hylian_shield_front_upper" Format="ci8" Width="64" Height="32" Offset="0x19280" TlutOffset="0x18C40" />
|
||||
<Texture Name="gLinkHumanHerosShieldFrontUpperTex" OutName="hylian_shield_front_upper" Format="ci8" Width="64" Height="32" Offset="0x19280" TlutOffset="0x18C40" />
|
||||
<Texture Name="object_link_child_Tex_019A80" OutName="tex_019A80" Format="ci8" Width="32" Height="64" Offset="0x19A80" />
|
||||
<Texture Name="object_link_child_Tex_01A280" OutName="tex_01A280" Format="ci8" Width="16" Height="16" Offset="0x1A280" />
|
||||
<Texture Name="object_link_child_Tex_01A380" OutName="tex_01A380" Format="rgba16" Width="64" Height="32" Offset="0x1A380" />
|
||||
<Texture Name="object_link_child_Tex_01B380" OutName="tex_01B380" Format="ci8" Width="16" Height="16" Offset="0x1B380" />
|
||||
<Texture Name="gLinkHumanHylianShieldFrontLowerTex" OutName="hylian_shield_front_lower" Format="ci8" Width="64" Height="32" Offset="0x1B480" TlutOffset="0x18C40" />
|
||||
<Texture Name="gLinkHumanHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0x1BC80" TlutOffset="0x18E40" />
|
||||
<Texture Name="gLinkHumanHerosShieldFrontLowerTex" OutName="hylian_shield_front_lower" Format="ci8" Width="64" Height="32" Offset="0x1B480" TlutOffset="0x18C40" />
|
||||
<Texture Name="gLinkHumanHerosShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0x1BC80" TlutOffset="0x18E40" />
|
||||
<Texture Name="gLinkHumanShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0x1BE80" TlutOffset="0x19040" />
|
||||
<Texture Name="object_link_child_Tex_01BF00" OutName="tex_01BF00" Format="rgba16" Width="8" Height="8" Offset="0x1BF00" />
|
||||
<Texture Name="object_link_child_Tex_01BF80" OutName="tex_01BF80" Format="rgba16" Width="16" Height="16" Offset="0x1BF80" />
|
||||
|
|
@ -143,12 +143,12 @@
|
|||
<Mtx Name="gLinkHumanSheathedRazorSwordMtx" Offset="0x1DB00" />
|
||||
<DList Name="gLinkHumanSheathedRazorSwordDL" Offset="0x1DB40" />
|
||||
<DList Name="gLinkHumanSheathedGildedSwordDL" Offset="0x1DB60" />
|
||||
<Mtx Name="gLinkHumanHylianShieldMtx" Offset="0x1DB88" />
|
||||
<DList Name="gLinkHumanHylianShieldWithMtxDL" Offset="0x1DBC8" />
|
||||
<Mtx Name="gLinkHumanHerosShieldMtx" Offset="0x1DB88" />
|
||||
<DList Name="gLinkHumanHerosShieldWithMtxDL" Offset="0x1DBC8" />
|
||||
<Mtx Name="gLinkHumanMirrorShieldMtx" Offset="0x1DBD8" />
|
||||
<DList Name="gLinkHumanMirrorShieldWithMtxDL" Offset="0x1DC18" />
|
||||
|
||||
<DList Name="gLinkHumanRightHandHoldingHylianShieldDL" Offset="0x1DC28" />
|
||||
<DList Name="gLinkHumanRightHandHoldingHerosShieldDL" Offset="0x1DC28" />
|
||||
<DList Name="object_link_child_DL_01DC38" Offset="0x1DC38" />
|
||||
<DList Name="gLinkHumanRightHandHoldingMirrorShieldDL" Offset="0x1DC48" />
|
||||
<DList Name="object_link_child_DL_01DC58" Offset="0x1DC58" />
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
<Limb Name="gLinkGoronShieldingArmsAndLegsLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_ARMS_AND_LEGS" Offset="0x1779C" />
|
||||
<Skeleton Name="gLinkGoronShieldingSkel" Type="Flex" LimbType="Standard" LimbNone="LINK_GORON_SHIELDING_LIMB_NONE" LimbMax="LINK_GORON_SHIELDING_LIMB_MAX" EnumName="LinkGoronShieldingLimb" Offset="0x177B8" />
|
||||
|
||||
<!-- <Blob Name="object_link_goron_Blob_0178D0" Size="0x10" Offset="0x178D0" /> -->
|
||||
<Animation Name="gLinkGoronShieldingAnim" Offset="0x178D0" />
|
||||
|
||||
<Limb Name="gLinkGoronRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_ROOT" Offset="0x178E0" />
|
||||
<Limb Name="gLinkGoronWaistLimb" Type="LOD" EnumName="LINK_GORON_LIMB_WAIST" Offset="0x178F0" />
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@
|
|||
<DList Name="object_link_nuts_DL_008860" Offset="0x8860" />
|
||||
<DList Name="object_link_nuts_DL_008908" Offset="0x8908" />
|
||||
<DList Name="object_link_nuts_DL_0089F0" Offset="0x89F0" />
|
||||
<DList Name="object_link_nuts_DL_008AA0" Offset="0x8AA0" />
|
||||
<DList Name="gLinkDekuClosedFlowerDL" Offset="0x8AA0" />
|
||||
<DList Name="object_link_nuts_DL_008AB8" Offset="0x8AB8" />
|
||||
<DList Name="object_link_nuts_DL_008BA0" Offset="0x8BA0" />
|
||||
<DList Name="object_link_nuts_DL_008C50" Offset="0x8C50" />
|
||||
<DList Name="gLinkDekuOpenFlowerDL" Offset="0x8C50" />
|
||||
<Texture Name="object_link_nuts_Tex_008C68" OutName="tex_008C68" Format="rgba16" Width="16" Height="16" Offset="0x8C68" />
|
||||
<Texture Name="object_link_nuts_Tex_008E68" OutName="tex_008E68" Format="rgba16" Width="16" Height="16" Offset="0x8E68" />
|
||||
<Texture Name="object_link_nuts_Tex_009068" OutName="tex_009068" Format="rgba16" Width="8" Height="8" Offset="0x9068" />
|
||||
|
|
|
|||
|
|
@ -1616,34 +1616,34 @@ s32 Player_HasMirrorShieldEquipped(PlayState* play);
|
|||
s32 Player_IsHoldingMirrorShield(PlayState* play);
|
||||
s32 Player_IsHoldingHookshot(Player* player);
|
||||
s32 func_801240DC(Player* player);
|
||||
s32 func_80124110(Player* player, PlayerItemAction itemAction);
|
||||
s32 func_80124148(Player* player);
|
||||
s32 Player_ActionToMeleeWeapon(PlayerItemAction itemAction);
|
||||
s32 Player_GetMeleeWeaponHeld(Player* player);
|
||||
PlayerBButtonSword Player_BButtonSwordFromIA(Player* player, PlayerItemAction itemAction);
|
||||
PlayerBButtonSword Player_GetHeldBButtonSword(Player* player);
|
||||
PlayerMeleeWeapon Player_MeleeWeaponFromIA(PlayerItemAction itemAction);
|
||||
PlayerMeleeWeapon Player_GetMeleeWeaponHeld(Player* player);
|
||||
s32 Player_IsHoldingTwoHandedWeapon(Player* player);
|
||||
s32 Player_ActionToBottle(Player* player, PlayerItemAction itemAction);
|
||||
s32 Player_GetBottleHeld(Player* Player);
|
||||
s32 Player_ActionToExplosive(Player* player, PlayerItemAction itemAction);
|
||||
s32 Player_GetExplosiveHeld(Player* player);
|
||||
s32 Player_ActionToSword(Actor* actor, PlayerItemAction itemAction);
|
||||
PlayerBottle Player_BottleFromIA(Player* player, PlayerItemAction itemAction);
|
||||
PlayerBottle Player_GetBottleHeld(Player* Player);
|
||||
PlayerExplosive Player_ExplosiveFromIA(Player* player, PlayerItemAction itemAction);
|
||||
PlayerExplosive Player_GetExplosiveHeld(Player* player);
|
||||
PlayerSword Player_SwordFromIA(Player* player, PlayerItemAction itemAction);
|
||||
s32 func_801242B4(Player* player);
|
||||
s32 Player_GetEnvironmentalHazard(PlayState* play);
|
||||
void func_80124420(Player* player);
|
||||
void Player_UpdateBunnyEars(Player* player);
|
||||
void func_80124618(struct_80124618 arg0[], f32 curFrame, Vec3f* arg2);
|
||||
void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, PlayerTransformation playerForm, s32 boots, s32 face, OverrideLimbDrawFlex overrideLimbDraw, PostLimbDrawFlex postLimbDraw, Actor* actor);
|
||||
void func_80125318(Vec3f* arg0, Vec3s* arg1);
|
||||
void Player_DrawZoraShield(PlayState* play, Player* player);
|
||||
void func_80125500(PlayState* play, Player* player, s32 limbIndex, Vec3f* pos, Vec3s* rot);
|
||||
s32 func_80125D4C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor);
|
||||
s32 func_801262C8(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor);
|
||||
s32 func_801263FC(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
|
||||
s32 func_80126440(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* arg3, Vec3f* arg4);
|
||||
s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor);
|
||||
s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor);
|
||||
s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
|
||||
s32 func_80126440(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip, Vec3f* newBase);
|
||||
void Player_DrawGetItem(PlayState* play, Player* player);
|
||||
void func_80126B8C(PlayState* play, Player* player);
|
||||
s32 func_80127438(PlayState* play, Player* player, s32 currentMask);
|
||||
s32 func_80128640(PlayState* play, Player* player, Gfx* dlist);
|
||||
void func_80128B74(PlayState* play, Player* player, s32 limbIndex);
|
||||
void func_80128BD0(PlayState* play, s32 limbIndex, Gfx** dList1, Gfx** dList2, Vec3s* rot, Actor* actor);
|
||||
void Player_SetFeetPos(PlayState* play, Player* player, s32 limbIndex);
|
||||
void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, Gfx** dList2, Vec3s* rot, Actor* actor);
|
||||
|
||||
Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f);
|
||||
Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef _ULTRA64_MESSAGE_H_
|
||||
#define _ULTRA64_MESSAGE_H_
|
||||
#ifndef ULTRA64_MESSAGE_H
|
||||
#define ULTRA64_MESSAGE_H
|
||||
|
||||
#include "ultra64/thread.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -646,14 +646,14 @@ typedef struct PlayState {
|
|||
/* 0x1878C */ void (*unk_1878C)(struct PlayState* play);
|
||||
/* 0x18790 */ void (*unk_18790)(struct PlayState* play, s16 arg1);
|
||||
/* 0x18794 */ PlayerItemAction (*unk_18794)(struct PlayState* play, Player* player, ItemId itemId);
|
||||
/* 0x18798 */ s32 (*setPlayerTalkAnim)(struct PlayState* play, PlayerAnimationHeader* talkAnim, s32 animMode);
|
||||
/* 0x18798 */ s32 (*setPlayerTalkAnim)(struct PlayState* play, PlayerAnimationHeader* talkAnim, AnimationMode animMode);
|
||||
/* 0x1879C */ s16 playerActorCsIds[10];
|
||||
/* 0x187B0 */ MtxF viewProjectionMtxF;
|
||||
/* 0x187F0 */ Vec3f projectionMtxFDiagonal;
|
||||
/* 0x187FC */ MtxF billboardMtxF;
|
||||
/* 0x1883C */ Mtx* billboardMtx;
|
||||
/* 0x18840 */ u32 gameplayFrames;
|
||||
/* 0x18844 */ u8 unk_18844;
|
||||
/* 0x18844 */ u8 unk_18844; // bool
|
||||
/* 0x18845 */ u8 haltAllActors;
|
||||
/* 0x18846 */ s16 numSetupActors;
|
||||
/* 0x18848 */ u8 numRooms;
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@ typedef enum AnimationMode {
|
|||
/* 5 */ ANIMMODE_LOOP_PARTIAL_INTERP
|
||||
} AnimationMode;
|
||||
|
||||
typedef enum {
|
||||
typedef enum {
|
||||
/* -1 */ ANIMTAPER_DECEL = -1,
|
||||
/* 0 */ ANIMTAPER_NONE,
|
||||
/* 0 */ ANIMTAPER_NONE,
|
||||
/* 1 */ ANIMTAPER_ACCEL
|
||||
} AnimationTapers;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ typedef enum PlayerBoots {
|
|||
/* 4 */ PLAYER_BOOTS_ZORA_LAND,
|
||||
/* 5 */ PLAYER_BOOTS_ZORA_UNDERWATER,
|
||||
/* 6 */ PLAYER_BOOTS_GORON,
|
||||
/* 7 */ PLAYER_BOOTS_MAX
|
||||
/* 7 */ PLAYER_BOOTS_7,
|
||||
/* 8 */ PLAYER_BOOTS_MAX
|
||||
} PlayerBoots;
|
||||
|
||||
typedef enum PlayerStrength {
|
||||
|
|
@ -84,7 +85,8 @@ typedef enum PlayerItemAction {
|
|||
/* 0x00 */ PLAYER_IA_NONE,
|
||||
/* 0x01 */ PLAYER_IA_LAST_USED,
|
||||
/* 0x02 */ PLAYER_IA_FISHING_ROD,
|
||||
/* 0x03 */ PLAYER_IA_SWORD_KOKIRI,
|
||||
/* 0x03 */ PLAYER_IA_SWORD_MIN,
|
||||
/* 0x03 */ PLAYER_IA_SWORD_KOKIRI = PLAYER_IA_SWORD_MIN,
|
||||
/* 0x04 */ PLAYER_IA_SWORD_RAZOR,
|
||||
/* 0x05 */ PLAYER_IA_SWORD_GILDED,
|
||||
/* 0x06 */ PLAYER_IA_SWORD_GREAT_FAIRY,
|
||||
|
|
@ -95,14 +97,16 @@ typedef enum PlayerItemAction {
|
|||
/* 0x0B */ PLAYER_IA_BOW_ICE,
|
||||
/* 0x0C */ PLAYER_IA_BOW_LIGHT,
|
||||
/* 0x0D */ PLAYER_IA_HOOKSHOT,
|
||||
/* 0x0E */ PLAYER_IA_BOMB,
|
||||
/* 0x0E */ PLAYER_IA_EXPLOSIVE_MIN,
|
||||
/* 0x0E */ PLAYER_IA_BOMB = PLAYER_IA_EXPLOSIVE_MIN,
|
||||
/* 0x0F */ PLAYER_IA_POWDER_KEG,
|
||||
/* 0x10 */ PLAYER_IA_BOMBCHU,
|
||||
/* 0x11 */ PLAYER_IA_11,
|
||||
/* 0x12 */ PLAYER_IA_NUT,
|
||||
/* 0x13 */ PLAYER_IA_PICTO_BOX,
|
||||
/* 0x14 */ PLAYER_IA_OCARINA,
|
||||
/* 0x15 */ PLAYER_IA_BOTTLE,
|
||||
/* 0x15 */ PLAYER_IA_BOTTLE_MIN,
|
||||
/* 0x15 */ PLAYER_IA_BOTTLE_EMPTY = PLAYER_IA_BOTTLE_MIN,
|
||||
/* 0x16 */ PLAYER_IA_BOTTLE_FISH,
|
||||
/* 0x17 */ PLAYER_IA_BOTTLE_SPRING_WATER,
|
||||
/* 0x18 */ PLAYER_IA_BOTTLE_HOT_SPRING_WATER,
|
||||
|
|
@ -167,6 +171,83 @@ typedef enum PlayerItemAction {
|
|||
/* 0x53 */ PLAYER_IA_MAX
|
||||
} PlayerItemAction;
|
||||
|
||||
// Relies on B swords related item actions to be contiguous
|
||||
#define GET_B_SWORD_FROM_IA(itemAction) ((itemAction) - PLAYER_IA_SWORD_MIN + 1)
|
||||
|
||||
typedef enum PlayerBButtonSword {
|
||||
/* 0 */ PLAYER_B_SWORD_NONE,
|
||||
/* 1 */ PLAYER_B_SWORD_KOKIRI = GET_B_SWORD_FROM_IA(PLAYER_IA_SWORD_KOKIRI),
|
||||
/* 2 */ PLAYER_B_SWORD_RAZOR = GET_B_SWORD_FROM_IA(PLAYER_IA_SWORD_RAZOR),
|
||||
/* 3 */ PLAYER_B_SWORD_GILDED = GET_B_SWORD_FROM_IA(PLAYER_IA_SWORD_GILDED),
|
||||
/* 4 */ PLAYER_B_SWORD_MAX
|
||||
} PlayerBButtonSword;
|
||||
|
||||
// Relies on melee weapon related item actions to be contiguous
|
||||
#define GET_MELEE_WEAPON_FROM_IA(itemAction) ((itemAction) - PLAYER_IA_SWORD_MIN + 1)
|
||||
|
||||
typedef enum PlayerMeleeWeapon {
|
||||
/* 0 */ PLAYER_MELEEWEAPON_NONE,
|
||||
/* 1 */ PLAYER_MELEEWEAPON_SWORD_KOKIRI = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_KOKIRI),
|
||||
/* 2 */ PLAYER_MELEEWEAPON_SWORD_RAZOR = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_RAZOR),
|
||||
/* 3 */ PLAYER_MELEEWEAPON_SWORD_GILDED = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_GILDED),
|
||||
/* 4 */ PLAYER_MELEEWEAPON_SWORD_GREAT_FAIRY = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_GREAT_FAIRY),
|
||||
/* 5 */ PLAYER_MELEEWEAPON_STICK = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_STICK),
|
||||
/* 6 */ PLAYER_MELEEWEAPON_ZORA_FINS = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_ZORA_FINS),
|
||||
/* 7 */ PLAYER_MELEEWEAPON_MAX
|
||||
} PlayerMeleeWeapon;
|
||||
|
||||
// Relies on bottle-related item actions to be contiguous
|
||||
#define GET_BOTTLE_FROM_IA(itemAction) ((itemAction) - PLAYER_IA_BOTTLE_MIN)
|
||||
|
||||
typedef enum PlayerBottle {
|
||||
/* -1 */ PLAYER_BOTTLE_NONE = -1,
|
||||
/* 0 */ PLAYER_BOTTLE_EMPTY = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_EMPTY),
|
||||
/* 1 */ PLAYER_BOTTLE_FISH = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_FISH),
|
||||
/* 2 */ PLAYER_BOTTLE_SPRING_WATER = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_SPRING_WATER),
|
||||
/* 3 */ PLAYER_BOTTLE_HOT_SPRING_WATER = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_HOT_SPRING_WATER),
|
||||
/* 4 */ PLAYER_BOTTLE_ZORA_EGG = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_ZORA_EGG),
|
||||
/* 5 */ PLAYER_BOTTLE_DEKU_PRINCESS = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_DEKU_PRINCESS),
|
||||
/* 6 */ PLAYER_BOTTLE_GOLD_DUST = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_GOLD_DUST),
|
||||
/* 7 */ PLAYER_BOTTLE_1C = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_1C),
|
||||
/* 8 */ PLAYER_BOTTLE_SEAHORSE = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_SEAHORSE),
|
||||
/* 9 */ PLAYER_BOTTLE_MUSHROOM = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_MUSHROOM),
|
||||
/* 10 */ PLAYER_BOTTLE_HYLIAN_LOACH = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_HYLIAN_LOACH),
|
||||
/* 11 */ PLAYER_BOTTLE_BUG = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_BUG),
|
||||
/* 12 */ PLAYER_BOTTLE_POE = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_POE),
|
||||
/* 13 */ PLAYER_BOTTLE_BIG_POE = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_BIG_POE),
|
||||
/* 14 */ PLAYER_BOTTLE_POTION_RED = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_POTION_RED),
|
||||
/* 15 */ PLAYER_BOTTLE_POTION_BLUE = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_POTION_BLUE),
|
||||
/* 16 */ PLAYER_BOTTLE_POTION_GREEN = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_POTION_GREEN),
|
||||
/* 17 */ PLAYER_BOTTLE_MILK = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_MILK),
|
||||
/* 18 */ PLAYER_BOTTLE_MILK_HALF = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_MILK_HALF),
|
||||
/* 19 */ PLAYER_BOTTLE_CHATEAU = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_CHATEAU),
|
||||
/* 20 */ PLAYER_BOTTLE_FAIRY = GET_BOTTLE_FROM_IA(PLAYER_IA_BOTTLE_FAIRY),
|
||||
/* 21 */ PLAYER_BOTTLE_MAX
|
||||
} PlayerBottle;
|
||||
|
||||
// Relies on explosive-related item actions to be contiguous
|
||||
#define GET_EXPLOSIVE_FROM_IA(itemAction) ((itemAction) - PLAYER_IA_EXPLOSIVE_MIN)
|
||||
|
||||
typedef enum PlayerExplosive {
|
||||
/* -1 */ PLAYER_EXPLOSIVE_NONE = -1,
|
||||
/* 0 */ PLAYER_EXPLOSIVE_BOMB = GET_EXPLOSIVE_FROM_IA(PLAYER_IA_BOMB),
|
||||
/* 1 */ PLAYER_EXPLOSIVE_POWDER_KEG = GET_EXPLOSIVE_FROM_IA(PLAYER_IA_POWDER_KEG),
|
||||
/* 2 */ PLAYER_EXPLOSIVE_BOMBCHU = GET_EXPLOSIVE_FROM_IA(PLAYER_IA_BOMBCHU),
|
||||
/* 3 */ PLAYER_EXPLOSIVE_MAX
|
||||
} PlayerExplosive;
|
||||
|
||||
// Relies on sword item actions to be contiguous
|
||||
#define GET_SWORD_FROM_IA(itemAction) ((itemAction) - PLAYER_IA_SWORD_MIN)
|
||||
|
||||
typedef enum PlayerSword {
|
||||
/* -1 */ PLAYER_SWORD_NONE = -1,
|
||||
/* 0 */ PLAYER_SWORD_KOKIRI = GET_SWORD_FROM_IA(PLAYER_IA_SWORD_KOKIRI),
|
||||
/* 1 */ PLAYER_SWORD_RAZOR = GET_SWORD_FROM_IA(PLAYER_IA_SWORD_RAZOR),
|
||||
/* 2 */ PLAYER_SWORD_GILDED = GET_SWORD_FROM_IA(PLAYER_IA_SWORD_GILDED),
|
||||
/* 3 */ PLAYER_SWORD_GREAT_FAIRY = GET_SWORD_FROM_IA(PLAYER_IA_SWORD_GREAT_FAIRY),
|
||||
/* 4 */ PLAYER_SWORD_MAX
|
||||
} PlayerSword;
|
||||
|
||||
typedef enum PlayerMeleeWeaponAnimation {
|
||||
/* 0 */ PLAYER_MWA_FORWARD_SLASH_1H, // Vertical one-handed slash
|
||||
/* 1 */ PLAYER_MWA_FORWARD_SLASH_2H, // Vertical two-handed slash
|
||||
|
|
@ -217,10 +298,10 @@ typedef enum PlayerDoorType {
|
|||
} PlayerDoorType;
|
||||
|
||||
typedef enum PlayerAnimType {
|
||||
/* 0 */ PLAYER_ANIMTYPE_0,
|
||||
/* 0 */ PLAYER_ANIMTYPE_DEFAULT, // DEFAULT
|
||||
/* 1 */ PLAYER_ANIMTYPE_1,
|
||||
/* 2 */ PLAYER_ANIMTYPE_2,
|
||||
/* 3 */ PLAYER_ANIMTYPE_3,
|
||||
/* 3 */ PLAYER_ANIMTYPE_3, // Two hand weapon
|
||||
/* 4 */ PLAYER_ANIMTYPE_4,
|
||||
/* 5 */ PLAYER_ANIMTYPE_5,
|
||||
/* 6 */ PLAYER_ANIMTYPE_MAX
|
||||
|
|
@ -228,28 +309,29 @@ typedef enum PlayerAnimType {
|
|||
|
||||
typedef enum PlayerModelType {
|
||||
// left hand
|
||||
/* 0 */ PLAYER_MODELTYPE_LH_OPEN,
|
||||
/* 1 */ PLAYER_MODELTYPE_LH_CLOSED,
|
||||
/* 2 */ PLAYER_MODELTYPE_LH_ONE_HAND_SWORD,
|
||||
/* 3 */ PLAYER_MODELTYPE_LH_TWO_HAND_SWORD,
|
||||
/* 4 */ PLAYER_MODELTYPE_LH_4,
|
||||
/* 5 */ PLAYER_MODELTYPE_LH_BOTTLE,
|
||||
/* 0 */ PLAYER_MODELTYPE_LH_OPEN,
|
||||
/* 1 */ PLAYER_MODELTYPE_LH_CLOSED,
|
||||
/* 2 */ PLAYER_MODELTYPE_LH_ONE_HAND_SWORD,
|
||||
/* 3 */ PLAYER_MODELTYPE_LH_TWO_HAND_SWORD,
|
||||
/* 4 */ PLAYER_MODELTYPE_LH_4,
|
||||
/* 5 */ PLAYER_MODELTYPE_LH_BOTTLE,
|
||||
// right hand
|
||||
/* 6 */ PLAYER_MODELTYPE_RH_OPEN,
|
||||
/* 7 */ PLAYER_MODELTYPE_RH_CLOSED,
|
||||
/* 8 */ PLAYER_MODELTYPE_RH_SHIELD,
|
||||
/* 9 */ PLAYER_MODELTYPE_RH_BOW,
|
||||
/* 10 */ PLAYER_MODELTYPE_RH_INSTRUMENT,
|
||||
/* 11 */ PLAYER_MODELTYPE_RH_HOOKSHOT,
|
||||
/* 6 */ PLAYER_MODELTYPE_RH_OPEN,
|
||||
/* 7 */ PLAYER_MODELTYPE_RH_CLOSED,
|
||||
/* 8 */ PLAYER_MODELTYPE_RH_SHIELD,
|
||||
/* 9 */ PLAYER_MODELTYPE_RH_BOW,
|
||||
/* 10 */ PLAYER_MODELTYPE_RH_INSTRUMENT,
|
||||
/* 11 */ PLAYER_MODELTYPE_RH_HOOKSHOT,
|
||||
// sheath
|
||||
/* 12 */ PLAYER_MODELTYPE_SHEATH_12,
|
||||
/* 13 */ PLAYER_MODELTYPE_SHEATH_13,
|
||||
/* 14 */ PLAYER_MODELTYPE_SHEATH_14,
|
||||
/* 15 */ PLAYER_MODELTYPE_SHEATH_15,
|
||||
/* 12 */ PLAYER_MODELTYPE_SHEATH_12,
|
||||
/* 13 */ PLAYER_MODELTYPE_SHEATH_13,
|
||||
/* 14 */ PLAYER_MODELTYPE_SHEATH_14,
|
||||
/* 15 */ PLAYER_MODELTYPE_SHEATH_15,
|
||||
// waist
|
||||
/* 16 */ PLAYER_MODELTYPE_WAIST,
|
||||
/* 17 */ PLAYER_MODELTYPE_17, // NULL?
|
||||
/* 18 */ PLAYER_MODELTYPE_MAX
|
||||
/* 16 */ PLAYER_MODELTYPE_WAIST,
|
||||
/* 17 */ PLAYER_MODELTYPE_17, // NULL?
|
||||
/* 18 */ PLAYER_MODELTYPE_MAX,
|
||||
/* 255 */ PLAYER_MODELTYPE_RH_FF = 0xFF // disable shield collider, cutscene-specific
|
||||
} PlayerModelType;
|
||||
|
||||
typedef struct PlayerModelIndices {
|
||||
|
|
@ -368,25 +450,33 @@ typedef enum PlayerBodyPart {
|
|||
|
||||
typedef struct PlayerAnimationFrame {
|
||||
/* 0x000 */ Vec3s frameTable[PLAYER_LIMB_MAX];
|
||||
/* 0x108 */ s16 faceInfo;
|
||||
/* 0x108 */ s16 appearanceInfo; // bitpack containing the face and hands info
|
||||
} PlayerAnimationFrame; // size = 0x10A
|
||||
|
||||
#define PLAYER_LIMB_BUF_SIZE (ALIGN16(sizeof(PlayerAnimationFrame)) + 0xF)
|
||||
|
||||
#define GET_APPEARANCE_FROM_JOINT_TABLE(jointTable) (((PlayerAnimationFrame *)(jointTable))->appearanceInfo)
|
||||
#define GET_EYE_INDEX_FROM_JOINT_TABLE(jointTable) ((GET_APPEARANCE_FROM_JOINT_TABLE(jointTable) & 0xF) - 1)
|
||||
#define GET_MOUTH_INDEX_FROM_JOINT_TABLE(jointTable) (((GET_APPEARANCE_FROM_JOINT_TABLE(jointTable) >> 4) & 0xF) - 1)
|
||||
|
||||
// Note the returned value from this macro needs to be shifted
|
||||
#define GET_LEFT_HAND_INDEX_FROM_JOINT_TABLE(jointTable) (GET_APPEARANCE_FROM_JOINT_TABLE(jointTable) & 0xF000)
|
||||
#define GET_RIGHT_HAND_INDEX_FROM_JOINT_TABLE(jointTable) (GET_APPEARANCE_FROM_JOINT_TABLE(jointTable) & 0x0F00)
|
||||
|
||||
typedef struct PlayerAgeProperties {
|
||||
/* 0x00 */ f32 unk_00; // ceilingCheckHeight?
|
||||
/* 0x04 */ f32 shadowScale;
|
||||
/* 0x08 */ f32 unk_08;
|
||||
/* 0x0C */ f32 unk_0C;
|
||||
/* 0x10 */ f32 unk_10;
|
||||
/* 0x14 */ f32 unk_14;
|
||||
/* 0x18 */ f32 unk_18;
|
||||
/* 0x1C */ f32 unk_1C;
|
||||
/* 0x20 */ f32 unk_20;
|
||||
/* 0x24 */ f32 unk_24;
|
||||
/* 0x28 */ f32 unk_28;
|
||||
/* 0x2C */ f32 unk_2C;
|
||||
/* 0x30 */ f32 unk_30;
|
||||
/* 0x14 */ f32 unk_14; // compared to wallHeight
|
||||
/* 0x18 */ f32 unk_18; // compared to wallHeight
|
||||
/* 0x1C */ f32 unk_1C; // compared to wallHeight
|
||||
/* 0x20 */ f32 unk_20; // unused?
|
||||
/* 0x24 */ f32 unk_24; // water stuff // depthInWater
|
||||
/* 0x28 */ f32 unk_28; // water stuff // depthInWater
|
||||
/* 0x2C */ f32 unk_2C; // water stuff // depthInWater
|
||||
/* 0x30 */ f32 unk_30; // water stuff // depthInWater
|
||||
/* 0x34 */ f32 unk_34;
|
||||
/* 0x38 */ f32 unk_38; // wallCheckHeight?
|
||||
/* 0x3C */ f32 unk_3C;
|
||||
|
|
@ -942,8 +1032,8 @@ typedef struct Player {
|
|||
/* 0xAA6 */ u16 unk_AA6; // flags of some kind
|
||||
/* 0xAA8 */ s16 unk_AA8;
|
||||
/* 0xAAA */ s16 unk_AAA;
|
||||
/* 0xAAC */ Vec3s unk_AAC;
|
||||
/* 0xAB2 */ Vec3s unk_AB2;
|
||||
/* 0xAAC */ Vec3s headLimbRot;
|
||||
/* 0xAB2 */ Vec3s upperLimbRot;
|
||||
/* 0xAB8 */ f32 unk_AB8;
|
||||
/* 0xABC */ f32 unk_ABC;
|
||||
/* 0xAC0 */ f32 unk_AC0;
|
||||
|
|
@ -966,11 +1056,14 @@ typedef struct Player {
|
|||
/* 0xAE7 */ s8 unk_AE7; // a timer
|
||||
/* 0xAE8 */ s16 unk_AE8; // multipurpose timer
|
||||
/* 0xAEC */ f32 unk_AEC;
|
||||
/* 0xAF0 */ Vec3f unk_AF0[2];
|
||||
/* 0xAF0 */ union { // TODO: this may be an union of two structs
|
||||
Vec3f unk_AF0[2];
|
||||
f32 arr_AF0[6];
|
||||
};
|
||||
/* 0xB08 */ f32 unk_B08[2]; // TODO: Investigate if this member actually is an array
|
||||
/* 0xB10 */ f32 unk_B10[6];
|
||||
/* 0xB28 */ s16 unk_B28; //Burning stick timer?
|
||||
/* 0xB2A */ s8 getItemDrawId;
|
||||
/* 0xB2A */ s8 getItemDrawIdPlusOne;
|
||||
/* 0xB2B */ s8 unk_B2B;
|
||||
/* 0xB2C */ f32 windSpeed;
|
||||
/* 0xB30 */ s16 windAngleX;
|
||||
|
|
@ -1022,7 +1115,7 @@ typedef struct Player {
|
|||
/* 0xCC4 */ MtxF mf_CC4;
|
||||
/* 0xD04 */ MtxF shieldMf;
|
||||
/* 0xD44 */ u8 isBurning;
|
||||
/* 0xD45 */ u8 flameTimers[PLAYER_BODYPART_MAX];
|
||||
/* 0xD45 */ u8 flameTimers[PLAYER_BODYPART_MAX]; // one flame per body part
|
||||
/* 0xD57 */ u8 unk_D57;
|
||||
/* 0xD58 */ PlayerFuncD58 unk_D58;
|
||||
/* 0xD5C */ s8 invincibilityTimer; // prevents damage when nonzero (positive = visible, counts towards zero each frame)
|
||||
|
|
|
|||
|
|
@ -472,7 +472,7 @@ u16 gSceneIdsPerRegion[REGION_MAX][27] = {
|
|||
};
|
||||
|
||||
s32 Inventory_GetBtnBItem(PlayState* play) {
|
||||
if (gSaveContext.buttonStatus[0] == BTN_DISABLED) {
|
||||
if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) {
|
||||
return ITEM_NONE;
|
||||
} else if (gSaveContext.bButtonStatus == BTN_DISABLED) {
|
||||
return ITEM_NONE;
|
||||
|
|
|
|||
|
|
@ -2032,7 +2032,7 @@ s32 Actor_OfferGetItem(Actor* actor, PlayState* play, GetItemId getItemId, f32 x
|
|||
if (!(player->stateFlags1 &
|
||||
(PLAYER_STATE1_80 | PLAYER_STATE1_1000 | PLAYER_STATE1_2000 | PLAYER_STATE1_4000 | PLAYER_STATE1_40000 |
|
||||
PLAYER_STATE1_80000 | PLAYER_STATE1_100000 | PLAYER_STATE1_200000)) &&
|
||||
Player_GetExplosiveHeld(player) < 0) {
|
||||
(Player_GetExplosiveHeld(player) <= PLAYER_EXPLOSIVE_NONE)) {
|
||||
if ((actor->xzDistToPlayer <= xzRange) && (fabsf(actor->playerHeightRel) <= fabsf(yRange))) {
|
||||
if ((getItemId == GI_MASK_CIRCUS_LEADER || getItemId == GI_PENDANT_OF_MEMORIES ||
|
||||
getItemId == GI_DEED_LAND ||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f
|
|||
u32 spA0;
|
||||
Vec3s* vtxList = colCtx->colHeader->vtxList;
|
||||
|
||||
if ((bgId != 50) || (this->numElements >= (ARRAY_COUNT(this->elements) - 1)) || (colPoly == NULL)) {
|
||||
if ((bgId != BGCHECK_SCENE) || (this->numElements >= (ARRAY_COUNT(this->elements) - 1)) || (colPoly == NULL)) {
|
||||
func_800AEF44(this);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1266,7 +1266,7 @@ void Play_DrawMain(PlayState* this) {
|
|||
goto PostWorldDraw;
|
||||
}
|
||||
|
||||
if (this->unk_18844 == 0) {
|
||||
if (!this->unk_18844) {
|
||||
if (1) {
|
||||
if ((this->skyboxId != SKYBOX_NONE) && !this->envCtx.skyboxDisabled) {
|
||||
if ((this->skyboxId == SKYBOX_NORMAL_SKY) || (this->skyboxId == SKYBOX_3)) {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1226,7 +1226,7 @@ void SkelAnime_InitPlayer(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHea
|
|||
allocSize = sizeof(Vec3s) * limbCount;
|
||||
|
||||
if (flags & 8) {
|
||||
allocSize += 2;
|
||||
allocSize += sizeof(u16);
|
||||
}
|
||||
|
||||
if (jointTableBuffer == NULL) {
|
||||
|
|
|
|||
|
|
@ -48,6 +48,8 @@
|
|||
* - Effect Update/Draw
|
||||
* - Seaweed
|
||||
*/
|
||||
|
||||
#include "prevent_bss_reordering.h"
|
||||
#include "z_boss_03.h"
|
||||
#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
|
||||
#include "overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h"
|
||||
|
|
|
|||
|
|
@ -997,7 +997,7 @@ void EnFsn_GiveItem(EnFsn* this, PlayState* play) {
|
|||
}
|
||||
this->actor.parent = NULL;
|
||||
if (ENFSN_IS_SHOP(&this->actor) && !this->isSelling) {
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE);
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE_EMPTY);
|
||||
}
|
||||
this->actionFunc = EnFsn_SetupResumeInteraction;
|
||||
} else if (this->isSelling == true) {
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ s32 func_80B26F6C(EnKendoJs* this, PlayState* play) {
|
|||
|
||||
switch (this->unk_288) {
|
||||
case 0x271D:
|
||||
if (Player_GetMeleeWeaponHeld(player) != 0) {
|
||||
if (Player_GetMeleeWeaponHeld(player) != PLAYER_MELEEWEAPON_NONE) {
|
||||
Message_StartTextbox(play, 0x272A, &this->actor);
|
||||
this->unk_288 = 0x272A;
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -743,7 +743,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) {
|
|||
|
||||
case 0xC46:
|
||||
case 0xC55:
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE);
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE_EMPTY);
|
||||
player->exchangeItemId = PLAYER_IA_NONE;
|
||||
this->unk_29C &= ~0x8;
|
||||
play->msgCtx.msgLength = 0;
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@ void EnMinifrog_NextFrogReturned(EnMinifrog* this, PlayState* play) {
|
|||
this->actionFunc = EnMinifrog_ContinueChoirCutscene;
|
||||
this->flags &= ~(0x2 << MINIFROG_YELLOW | 0x2 << MINIFROG_CYAN | 0x2 << MINIFROG_PINK | 0x2 << MINIFROG_BLUE |
|
||||
0x2 << MINIFROG_WHITE);
|
||||
play->setPlayerTalkAnim(play, &gPlayerAnim_link_normal_talk_free_wait, 0);
|
||||
play->setPlayerTalkAnim(play, &gPlayerAnim_link_normal_talk_free_wait, ANIMMODE_LOOP);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -431,7 +431,7 @@ void EnMinifrog_SetupNextFrogChoir(EnMinifrog* this, PlayState* play) {
|
|||
this->flags &= ~0x100;
|
||||
this->flags &= ~(0x2 << MINIFROG_YELLOW | 0x2 << MINIFROG_CYAN | 0x2 << MINIFROG_PINK | 0x2 << MINIFROG_BLUE |
|
||||
0x2 << MINIFROG_WHITE);
|
||||
play->setPlayerTalkAnim(play, &gPlayerAnim_link_normal_talk_free_wait, 0);
|
||||
play->setPlayerTalkAnim(play, &gPlayerAnim_link_normal_talk_free_wait, ANIMMODE_LOOP);
|
||||
} else if (this->timer <= 0) {
|
||||
this->actionFunc = EnMinifrog_NextFrogReturned;
|
||||
this->timer = 30;
|
||||
|
|
@ -451,7 +451,7 @@ void EnMinifrog_BeginChoirCutscene(EnMinifrog* this, PlayState* play) {
|
|||
this->timer = 5;
|
||||
func_801A1F00(3, NA_BGM_FROG_SONG);
|
||||
this->flags |= 0x100;
|
||||
play->setPlayerTalkAnim(play, &gPlayerAnim_pn_gakkiplay, 0);
|
||||
play->setPlayerTalkAnim(play, &gPlayerAnim_pn_gakkiplay, ANIMMODE_LOOP);
|
||||
} else {
|
||||
ActorCutscene_SetIntentToPlay(this->actor.cutscene);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ void EnStoneheishi_DrinkBottleProcess(EnStoneheishi* this, PlayState* play) {
|
|||
if ((this->timer < 10) && (this->bottleDisplay != EN_STONE_BOTTLE_EMPTY)) {
|
||||
this->bottleDisplay = EN_STONE_BOTTLE_EMPTY;
|
||||
Actor_PlaySfx(&this->actor, NA_SE_VO_NP_DRINK);
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE);
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE_EMPTY);
|
||||
}
|
||||
} else {
|
||||
this->drinkBottleState++;
|
||||
|
|
|
|||
|
|
@ -323,9 +323,9 @@ s32 func_80BE0D60(EnTab* this, PlayState* play) {
|
|||
|
||||
this->unk_320++;
|
||||
if (this->unk_320 == 1) {
|
||||
play->setPlayerTalkAnim(play, &gPlayerAnim_link_demo_bikkuri, 2);
|
||||
play->setPlayerTalkAnim(play, &gPlayerAnim_link_demo_bikkuri, ANIMMODE_ONCE);
|
||||
} else if (this->unk_320 > 20) {
|
||||
play->setPlayerTalkAnim(play, NULL, 0);
|
||||
play->setPlayerTalkAnim(play, NULL, ANIMMODE_LOOP);
|
||||
this->unk_320 = 0;
|
||||
ret = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -824,7 +824,7 @@ void EnTalkGibud_Talk(EnTalkGibud* this, PlayState* play) {
|
|||
if (!requestedItem->isBottledItem) {
|
||||
Inventory_ChangeAmmo(requestedItem->item, -requestedItem->amount);
|
||||
} else {
|
||||
Player_UpdateBottleHeld(play, player, ITEM_BOTTLE, PLAYER_IA_BOTTLE);
|
||||
Player_UpdateBottleHeld(play, player, ITEM_BOTTLE, PLAYER_IA_BOTTLE_EMPTY);
|
||||
}
|
||||
player->stateFlags1 |= PLAYER_STATE1_20;
|
||||
player->stateFlags1 |= PLAYER_STATE1_20000000;
|
||||
|
|
|
|||
|
|
@ -1123,9 +1123,9 @@ s32 EnTest3_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
|
|||
*dList = NULL;
|
||||
}
|
||||
if (limbIndex == OBJECT_TEST3_LIMB_0B) {
|
||||
rot->x += this->player.unk_AAC.z;
|
||||
rot->y -= this->player.unk_AAC.y;
|
||||
rot->z += this->player.unk_AAC.x;
|
||||
rot->x += this->player.headLimbRot.z;
|
||||
rot->y -= this->player.headLimbRot.y;
|
||||
rot->z += this->player.headLimbRot.x;
|
||||
} else if (limbIndex == OBJECT_TEST3_LIMB_0A) {
|
||||
s32 requiredScopeTemp;
|
||||
|
||||
|
|
@ -1133,12 +1133,12 @@ s32 EnTest3_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
|
|||
Matrix_RotateZS(0x44C, MTXMODE_APPLY);
|
||||
Matrix_RotateYS(this->player.unk_AA8, MTXMODE_APPLY);
|
||||
}
|
||||
if (this->player.unk_AB2.y != 0) {
|
||||
Matrix_RotateYS(this->player.unk_AB2.y, MTXMODE_APPLY);
|
||||
if (this->player.upperLimbRot.y != 0) {
|
||||
Matrix_RotateYS(this->player.upperLimbRot.y, MTXMODE_APPLY);
|
||||
}
|
||||
Matrix_RotateXS(this->player.unk_AB2.x, MTXMODE_APPLY);
|
||||
if (this->player.unk_AB2.z != 0) {
|
||||
Matrix_RotateZS(this->player.unk_AB2.z, MTXMODE_APPLY);
|
||||
Matrix_RotateXS(this->player.upperLimbRot.x, MTXMODE_APPLY);
|
||||
if (this->player.upperLimbRot.z != 0) {
|
||||
Matrix_RotateZS(this->player.upperLimbRot.z, MTXMODE_APPLY);
|
||||
}
|
||||
} else {
|
||||
func_80125500(play, &this->player, limbIndex, pos, rot);
|
||||
|
|
@ -1214,7 +1214,7 @@ void EnTest3_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList1, Gfx** dL
|
|||
} else if (limbIndex == OBJECT_TEST3_LIMB_15) {
|
||||
if (D_80A41D60 || CHECK_WEEKEVENTREG(WEEKEVENTREG_50_80) ||
|
||||
(INV_CONTENT(ITEM_PENDANT_OF_MEMORIES) == ITEM_PENDANT_OF_MEMORIES) ||
|
||||
(this->player.getItemDrawId - 1 == GID_PENDANT_OF_MEMORIES)) {
|
||||
(this->player.getItemDrawIdPlusOne - 1 == GID_PENDANT_OF_MEMORIES)) {
|
||||
D_80A41D60 = true;
|
||||
} else {
|
||||
OPEN_DISPS(play->state.gfxCtx);
|
||||
|
|
@ -1222,7 +1222,7 @@ void EnTest3_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList1, Gfx** dL
|
|||
CLOSE_DISPS(play->state.gfxCtx);
|
||||
}
|
||||
} else {
|
||||
func_80128B74(play, &this->player, limbIndex);
|
||||
Player_SetFeetPos(play, &this->player, limbIndex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1295,7 +1295,7 @@ void EnTest3_Draw(Actor* thisx, PlayState* play2) {
|
|||
if (this->player.invincibilityTimer > 0) {
|
||||
POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP);
|
||||
}
|
||||
if ((this->player.getItemDrawId - 1) != GID_NONE) {
|
||||
if ((this->player.getItemDrawIdPlusOne - 1) != GID_NONE) {
|
||||
Player_DrawGetItem(play, &this->player);
|
||||
}
|
||||
CLOSE_DISPS(play->state.gfxCtx);
|
||||
|
|
|
|||
|
|
@ -349,7 +349,7 @@ void EnTrt_GetMushroom(EnTrt* this, PlayState* play) {
|
|||
this->textId = 0x884;
|
||||
Message_StartTextbox(play, this->textId, &this->actor);
|
||||
SET_WEEKEVENTREG(WEEKEVENTREG_53_08);
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE);
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE_EMPTY);
|
||||
break;
|
||||
case 0x888:
|
||||
this->textId = 0x889;
|
||||
|
|
@ -375,7 +375,7 @@ void EnTrt_GetMushroom(EnTrt* this, PlayState* play) {
|
|||
void EnTrt_PayForMushroom(EnTrt* this, PlayState* play) {
|
||||
if (Actor_HasParent(&this->actor, play)) {
|
||||
this->actor.parent = NULL;
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE);
|
||||
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE_EMPTY);
|
||||
this->actionFunc = EnTrt_SetupItemGiven;
|
||||
} else {
|
||||
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_RED, 300.0f, 300.0f);
|
||||
|
|
|
|||
|
|
@ -913,7 +913,7 @@ s32 func_80A87880(Actor* thisx, PlayState* play) {
|
|||
Animation_OnFrame(&this->skelAnime, 52.0f)) {
|
||||
if (Animation_OnFrame(&this->skelAnime, 52.0f)) {
|
||||
this->unk_34E &= ~0x400;
|
||||
Player_UpdateBottleHeld(play, player, ITEM_BOTTLE, PLAYER_IA_BOTTLE);
|
||||
Player_UpdateBottleHeld(play, player, ITEM_BOTTLE, PLAYER_IA_BOTTLE_EMPTY);
|
||||
}
|
||||
Actor_PlaySfx(&this->actor, NA_SE_EN_KOUME_DRINK);
|
||||
} else if (Animation_OnFrame(&this->skelAnime, 90.0f)) {
|
||||
|
|
|
|||
|
|
@ -620,13 +620,13 @@ void func_80B78EBC(ObjUm* this, PlayState* play) {
|
|||
player->actor.focus.rot.z = 0;
|
||||
player->actor.focus.rot.y = player->actor.shape.rot.y;
|
||||
|
||||
player->unk_AAC.x = 0;
|
||||
player->unk_AAC.y = 0;
|
||||
player->unk_AAC.z = 0;
|
||||
player->headLimbRot.x = 0;
|
||||
player->headLimbRot.y = 0;
|
||||
player->headLimbRot.z = 0;
|
||||
|
||||
player->unk_AB2.x = 0;
|
||||
player->unk_AB2.y = 0;
|
||||
player->unk_AB2.z = 0;
|
||||
player->upperLimbRot.x = 0;
|
||||
player->upperLimbRot.y = 0;
|
||||
player->upperLimbRot.z = 0;
|
||||
|
||||
player->currentYaw = player->actor.focus.rot.y;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2221,23 +2221,23 @@
|
|||
0x80124088:("Player_IsHoldingMirrorShield",),
|
||||
0x801240C8:("Player_IsHoldingHookshot",),
|
||||
0x801240DC:("func_801240DC",),
|
||||
0x80124110:("func_80124110",),
|
||||
0x80124148:("func_80124148",),
|
||||
0x80124168:("Player_ActionToMeleeWeapon",),
|
||||
0x80124110:("Player_BButtonSwordFromIA",),
|
||||
0x80124148:("Player_GetHeldBButtonSword",),
|
||||
0x80124168:("Player_MeleeWeaponFromIA",),
|
||||
0x80124190:("Player_GetMeleeWeaponHeld",),
|
||||
0x801241B4:("Player_IsHoldingTwoHandedWeapon",),
|
||||
0x801241E0:("Player_ActionToBottle",),
|
||||
0x801241E0:("Player_BottleFromIA",),
|
||||
0x8012420C:("Player_GetBottleHeld",),
|
||||
0x8012422C:("Player_ActionToExplosive",),
|
||||
0x8012422C:("Player_ExplosiveFromIA",),
|
||||
0x80124258:("Player_GetExplosiveHeld",),
|
||||
0x80124278:("Player_ActionToSword",),
|
||||
0x80124278:("Player_SwordFromIA",),
|
||||
0x801242B4:("func_801242B4",),
|
||||
0x801242DC:("Player_GetEnvironmentalHazard",),
|
||||
0x80124420:("func_80124420",),
|
||||
0x80124420:("Player_UpdateBunnyEars",),
|
||||
0x80124618:("func_80124618",),
|
||||
0x801246F4:("Player_DrawImpl",),
|
||||
0x80124870:("func_80124870",),
|
||||
0x80124CC4:("func_80124CC4",),
|
||||
0x80124870:("Player_AdjustSingleLeg",),
|
||||
0x80124CC4:("Player_DrawHookshotReticle",),
|
||||
0x80124F18:("func_80124F18",),
|
||||
0x80124FF0:("func_80124FF0",),
|
||||
0x801251C4:("func_801251C4",),
|
||||
|
|
@ -2246,13 +2246,13 @@
|
|||
0x8012536C:("func_8012536C",),
|
||||
0x801253A4:("Player_DrawZoraShield",),
|
||||
0x80125500:("func_80125500",),
|
||||
0x80125580:("func_80125580",),
|
||||
0x80125580:("Player_OverrideLimbDrawGameplayCommon",),
|
||||
0x80125CE0:("func_80125CE0",),
|
||||
0x80125D4C:("func_80125D4C",),
|
||||
0x801262C8:("func_801262C8",),
|
||||
0x801263FC:("func_801263FC",),
|
||||
0x80125D4C:("Player_OverrideLimbDrawGameplayDefault",),
|
||||
0x801262C8:("Player_OverrideLimbDrawGameplayFirstPerson",),
|
||||
0x801263FC:("Player_OverrideLimbDrawGameplayCrawling",),
|
||||
0x80126440:("func_80126440",),
|
||||
0x801265C8:("func_801265C8",),
|
||||
0x801265C8:("Player_UpdateShieldCollider",),
|
||||
0x8012669C:("func_8012669C",),
|
||||
0x80126808:("Player_DrawGetItemImpl",),
|
||||
0x8012697C:("Player_DrawGetItem",),
|
||||
|
|
@ -2267,13 +2267,13 @@
|
|||
0x801278F8:("Player_DrawBlastMask",),
|
||||
0x80127A60:("Player_DrawBunnyHood",),
|
||||
0x80127B64:("func_80127B64",),
|
||||
0x80127BE8:("func_80127BE8",),
|
||||
0x80127BE8:("Player_DrawStrayFairyParticles",),
|
||||
0x80127DA4:("func_80127DA4",),
|
||||
0x80128388:("func_80128388",),
|
||||
0x801284A0:("Player_DrawGreatFairysMask",),
|
||||
0x80128640:("func_80128640",),
|
||||
0x80128B74:("func_80128B74",),
|
||||
0x80128BD0:("func_80128BD0",),
|
||||
0x80128B74:("Player_SetFeetPos",),
|
||||
0x80128BD0:("Player_PostLimbDrawGameplay",),
|
||||
0x80129EF0:("PreNMI_Stop",),
|
||||
0x80129F04:("PreNMI_Update",),
|
||||
0x80129F4C:("PreNMI_Draw",),
|
||||
|
|
|
|||
|
|
@ -1210,9 +1210,9 @@
|
|||
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),
|
||||
0x801C00AC:("gPlayerShields","Gfx*","",0x10),
|
||||
0x801C00BC:("gPlayerSheathedSwords","Gfx*","",0x18),
|
||||
0x801C00D4:("gPlayerSwordSheaths","Gfx*","",0x18),
|
||||
0x801C00EC:("gPlayerLeftHandTwoHandSwordDLs","UNK_TYPE1","",0x1),
|
||||
0x801C0114:("gPlayerLeftHandOpenDLs","UNK_TYPE1","",0x1),
|
||||
0x801C013C:("gPlayerLeftHandClosedDLs","UNK_TYPE1","",0x1),
|
||||
|
|
@ -1224,11 +1224,11 @@
|
|||
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),
|
||||
0x801C02D0:("D_801C02D0","UNK_TYPE1","",0x1),
|
||||
0x801C02E4:("D_801C02E4","UNK_TYPE1","",0x1),
|
||||
0x801C0294:("sPlayerFirstPersonLeftForearmDLs","UNK_TYPE1","",0x1),
|
||||
0x801C02A8:("sPlayerFirstPersonLeftHandDLs","UNK_TYPE1","",0x1),
|
||||
0x801C02BC:("sPlayerFirstPersonRightShoulderDLs","UNK_TYPE1","",0x1),
|
||||
0x801C02D0:("sPlayerFirstPersonRightHandDLs","UNK_TYPE1","",0x1),
|
||||
0x801C02E4:("sPlayerFirstPersonRightHandHookshotDLs","UNK_TYPE1","",0x1),
|
||||
0x801C02F8:("sPlayerDListGroups","UNK_PTR","",0x4),
|
||||
0x801C0340:("D_801C0340","UNK_TYPE1","",0x1),
|
||||
0x801C0368:("D_801C0368","UNK_TYPE1","",0x1),
|
||||
|
|
@ -1279,7 +1279,7 @@
|
|||
0x801C0958:("D_801C0958","UNK_TYPE4","",0x4),
|
||||
0x801C095C:("D_801C095C","UNK_PTR","",0x4),
|
||||
0x801C0964:("D_801C0964","UNK_TYPE1","",0x1),
|
||||
0x801C096C:("D_801C096C","UNK_TYPE1","",0x1),
|
||||
0x801C096C:("sPlayerShieldCollisionTypes","UNK_TYPE1","",0x1),
|
||||
0x801C0970:("D_801C0970","UNK_TYPE1","",0x1),
|
||||
0x801C0994:("D_801C0994","UNK_TYPE4","",0x4),
|
||||
0x801C09B8:("D_801C09B8","UNK_TYPE1","",0x1),
|
||||
|
|
@ -1313,28 +1313,27 @@
|
|||
0x801C0C0C:("D_801C0C0C","UNK_TYPE4","",0x4),
|
||||
0x801C0C30:("D_801C0C30","UNK_TYPE1","",0x1),
|
||||
0x801C0C54:("D_801C0C54","struct_80128388_arg1","",0x54),
|
||||
0x801C0CA8:("D_801C0CA8","UNK_TYPE1","",0x1),
|
||||
0x801C0CA8:("sPlayerBottleColors","UNK_TYPE1","",0x1),
|
||||
0x801C0CE8:("D_801C0CE8","UNK_TYPE4","",0x4),
|
||||
0x801C0D24:("D_801C0D24","UNK_TYPE1","",0x1),
|
||||
0x801C0D24:("sPlayerFootPos","UNK_TYPE1","",0x1),
|
||||
0x801C0D60:("D_801C0D60","UNK_TYPE1","",0x1),
|
||||
0x801C0D6C:("D_801C0D6C","UNK_TYPE1","",0x1),
|
||||
0x801C0D78:("D_801C0D78","UNK_TYPE1","",0x1),
|
||||
0x801C0D78:("sMeleeWeaponLengths","f32","[7]",0x1C),
|
||||
0x801C0D94:("D_801C0D94","UNK_TYPE4","",0x4),
|
||||
0x801C0D98:("D_801C0D98","UNK_TYPE4","",0x4),
|
||||
0x801C0D9C:("D_801C0D9C","UNK_TYPE4","",0x4),
|
||||
0x801C0DA0:("D_801C0DA0","UNK_TYPE4","",0x4),
|
||||
0x801C0DA8:("D_801C0DA8","UNK_TYPE1","",0x1),
|
||||
0x801C0D98:("D_801C0D98","Vec3f","",0xC),
|
||||
0x801C0DA4:("D_801C0DA4","UNK_TYPE4","",0x4),
|
||||
0x801C0DA8:("sRightHandLimbModelShieldQuadVertices","Vec3f","[4]",0x30),
|
||||
0x801C0DD8:("D_801C0DD8","UNK_TYPE1","",0x1),
|
||||
0x801C0DE4:("D_801C0DE4","UNK_TYPE1","",0x1),
|
||||
0x801C0DF0:("D_801C0DF0","UNK_TYPE4","",0x4),
|
||||
0x801C0E04:("D_801C0E04","UNK_TYPE1","",0x1),
|
||||
0x801C0E2C:("D_801C0E2C","UNK_TYPE4","",0x4),
|
||||
0x801C0E40:("D_801C0E40","UNK_TYPE4","",0x4),
|
||||
0x801C0E7C:("D_801C0E7C","UNK_TYPE1","",0x1),
|
||||
0x801C0E7C:("sPlayerFocusHeadLimbModelPos","Vec3f","",0xC),
|
||||
0x801C0E94:("D_801C0E94","UNK_TYPE1","",0x1),
|
||||
0x801C0EA0:("D_801C0EA0","UNK_TYPE1","",0x1),
|
||||
0x801C0EAC:("D_801C0EAC","UNK_TYPE1","",0x1),
|
||||
0x801C0EB8:("D_801C0EB8","UNK_TYPE1","",0x1),
|
||||
0x801C0EAC:("sSheathLimbModelShieldOnBackPos","Vec3f","",0xC),
|
||||
0x801C0EB8:("sSheathLimbModelShieldOnBackZyxRot","Vec3s","",0x6),
|
||||
0x801C0EC0:("sIsQuakeInitialized","UNK_TYPE2","",0x2),
|
||||
0x801C0EC4:("sQuakeRequestCount","s16","",0x2),
|
||||
0x801C0EC8:("sQuakeCallbacks","quake_callback_func","[7]",0x1c),
|
||||
|
|
@ -4009,13 +4008,13 @@
|
|||
0x801F59AC:("D_801F59AC","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),
|
||||
0x801F59D0:("sBunnyEarKinematics","struct_801F59D0","",0x0A),
|
||||
0x801F59DC:("sPlayerCurBodyPartPos","Vec3f*","",0x4),
|
||||
0x801F59E0:("D_801F59E0","s32","",0x4),
|
||||
0x801F59E4:("D_801F59E4","s32","",0x4),
|
||||
0x801F59E8:("D_801F59E8","Vec3f","",0xC),
|
||||
0x801F59F4:("D_801F59F4","s32","",0x4),
|
||||
0x801F59F8:("D_801F59F8","s32","",0x4),
|
||||
0x801F59E4:("sPlayerLod","s32","",0x4),
|
||||
0x801F59E8:("sPlayerGetItemRefPos","Vec3f","",0xC),
|
||||
0x801F59F4:("sPlayerLeftHandType","s32","",0x4),
|
||||
0x801F59F8:("sPlayerRightHandType","s32","",0x4),
|
||||
0x801F5A00:("sQuakeRequest","QuakeRequest","[4]",0x90),
|
||||
0x801F5A90:("sDistortionRequest","DistortionRequest","",0xc),
|
||||
0x801F5AA0:("sMatAnimStep","s32","",0x4),
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ simpleReplace = {
|
|||
wordReplace = {
|
||||
# Functions
|
||||
"Actor_GetSwitchFlag": "Flags_GetSwitch",
|
||||
"Math_FAtan2F(": "Math_Atan2S_XY(",
|
||||
"Math_FAtan2F": "Math_Atan2S_XY",
|
||||
"Math_Acot2F": "Math_Atan2F_XY",
|
||||
"atan_flip": "Math_Atan2F_XY",
|
||||
"atans": "Math_Atan2S",
|
||||
|
|
@ -839,13 +839,19 @@ wordReplace = {
|
|||
"player->heldItemActionParam": "player->itemAction",
|
||||
"player->unk_A9C": "player->secretRumbleCharge",
|
||||
"player->unk_AA0": "player->closestSecretDistSq",
|
||||
"player->unk_AAC": "player->headLimbRot",
|
||||
"player->unk_AB2": "player->upperLimbRot",
|
||||
"player->unk_B2A": "player->getItemDrawIdPlusOne",
|
||||
"player->getItemDrawId": "player->getItemDrawIdPlusOne",
|
||||
"player->unk_B68": "player->fallStartHeight",
|
||||
"player->unk_B6A": "player->fallDistance",
|
||||
"player->targetActor": "player->talkActor",
|
||||
"player->targetActorDistance": "player->talkActorDistance",
|
||||
"player->unk_730": "player->targetedActor",
|
||||
"player->ageProperties->unk_92": "player->ageProperties->voiceSfxIdOffset",
|
||||
"player->ageProperties->unk_94": "player->ageProperties->surfaceSfxIdOffset",
|
||||
|
||||
"ageProperties->unk_04": "ageProperties->shadowScale",
|
||||
"ageProperties->unk_92": "ageProperties->voiceSfxOffset",
|
||||
"ageProperties->unk_94": "ageProperties->surfaceSfxOffset",
|
||||
|
||||
"csCtx.npcActions": "csCtx.actorActions",
|
||||
"csCtx->npcActions": "csCtx->actorActions",
|
||||
|
|
@ -943,6 +949,7 @@ wordReplace = {
|
|||
"EXCH_ITEM_LETTER_MAMA": "PLAYER_IA_LETTER_MAMA",
|
||||
"ITEM_FISHING_POLE": "ITEM_FISHING_ROD",
|
||||
"PLAYER_AP_FISHING_POLE": "PLAYER_IA_FISHING_ROD",
|
||||
"PLAYER_IA_BOTTLE": "PLAYER_IA_BOTTLE_EMPTY",
|
||||
|
||||
# Enums
|
||||
"TRANS_TYPE_00": "TRANS_TYPE_WIPE",
|
||||
|
|
|
|||
|
|
@ -1735,23 +1735,23 @@ asm/non_matchings/code/z_player_lib/Player_HasMirrorShieldEquipped.s,Player_HasM
|
|||
asm/non_matchings/code/z_player_lib/Player_IsHoldingMirrorShield.s,Player_IsHoldingMirrorShield,0x80124088,0x10
|
||||
asm/non_matchings/code/z_player_lib/Player_IsHoldingHookshot.s,Player_IsHoldingHookshot,0x801240C8,0x5
|
||||
asm/non_matchings/code/z_player_lib/func_801240DC.s,func_801240DC,0x801240DC,0xD
|
||||
asm/non_matchings/code/z_player_lib/func_80124110.s,func_80124110,0x80124110,0xE
|
||||
asm/non_matchings/code/z_player_lib/func_80124148.s,func_80124148,0x80124148,0x8
|
||||
asm/non_matchings/code/z_player_lib/Player_ActionToMeleeWeapon.s,Player_ActionToMeleeWeapon,0x80124168,0xA
|
||||
asm/non_matchings/code/z_player_lib/Player_BButtonSwordFromIA.s,Player_BButtonSwordFromIA,0x80124110,0xE
|
||||
asm/non_matchings/code/z_player_lib/Player_GetHeldBButtonSword.s,Player_GetHeldBButtonSword,0x80124148,0x8
|
||||
asm/non_matchings/code/z_player_lib/Player_MeleeWeaponFromIA.s,Player_MeleeWeaponFromIA,0x80124168,0xA
|
||||
asm/non_matchings/code/z_player_lib/Player_GetMeleeWeaponHeld.s,Player_GetMeleeWeaponHeld,0x80124190,0x9
|
||||
asm/non_matchings/code/z_player_lib/Player_IsHoldingTwoHandedWeapon.s,Player_IsHoldingTwoHandedWeapon,0x801241B4,0xB
|
||||
asm/non_matchings/code/z_player_lib/Player_ActionToBottle.s,Player_ActionToBottle,0x801241E0,0xB
|
||||
asm/non_matchings/code/z_player_lib/Player_BottleFromIA.s,Player_BottleFromIA,0x801241E0,0xB
|
||||
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_ExplosiveFromIA.s,Player_ExplosiveFromIA,0x8012422C,0xB
|
||||
asm/non_matchings/code/z_player_lib/Player_GetExplosiveHeld.s,Player_GetExplosiveHeld,0x80124258,0x8
|
||||
asm/non_matchings/code/z_player_lib/Player_ActionToSword.s,Player_ActionToSword,0x80124278,0xF
|
||||
asm/non_matchings/code/z_player_lib/Player_SwordFromIA.s,Player_SwordFromIA,0x80124278,0xF
|
||||
asm/non_matchings/code/z_player_lib/func_801242B4.s,func_801242B4,0x801242B4,0xA
|
||||
asm/non_matchings/code/z_player_lib/Player_GetEnvironmentalHazard.s,Player_GetEnvironmentalHazard,0x801242DC,0x51
|
||||
asm/non_matchings/code/z_player_lib/func_80124420.s,func_80124420,0x80124420,0x7E
|
||||
asm/non_matchings/code/z_player_lib/Player_UpdateBunnyEars.s,Player_UpdateBunnyEars,0x80124420,0x7E
|
||||
asm/non_matchings/code/z_player_lib/func_80124618.s,func_80124618,0x80124618,0x37
|
||||
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/Player_AdjustSingleLeg.s,Player_AdjustSingleLeg,0x80124870,0x115
|
||||
asm/non_matchings/code/z_player_lib/Player_DrawHookshotReticle.s,Player_DrawHookshotReticle,0x80124CC4,0x95
|
||||
asm/non_matchings/code/z_player_lib/func_80124F18.s,func_80124F18,0x80124F18,0x36
|
||||
asm/non_matchings/code/z_player_lib/func_80124FF0.s,func_80124FF0,0x80124FF0,0x75
|
||||
asm/non_matchings/code/z_player_lib/func_801251C4.s,func_801251C4,0x801251C4,0x55
|
||||
|
|
@ -1760,13 +1760,13 @@ asm/non_matchings/code/z_player_lib/func_80125340.s,func_80125340,0x80125340,0xB
|
|||
asm/non_matchings/code/z_player_lib/func_8012536C.s,func_8012536C,0x8012536C,0xE
|
||||
asm/non_matchings/code/z_player_lib/Player_DrawZoraShield.s,Player_DrawZoraShield,0x801253A4,0x57
|
||||
asm/non_matchings/code/z_player_lib/func_80125500.s,func_80125500,0x80125500,0x20
|
||||
asm/non_matchings/code/z_player_lib/func_80125580.s,func_80125580,0x80125580,0x1D8
|
||||
asm/non_matchings/code/z_player_lib/Player_OverrideLimbDrawGameplayCommon.s,Player_OverrideLimbDrawGameplayCommon,0x80125580,0x1D8
|
||||
asm/non_matchings/code/z_player_lib/func_80125CE0.s,func_80125CE0,0x80125CE0,0x1B
|
||||
asm/non_matchings/code/z_player_lib/func_80125D4C.s,func_80125D4C,0x80125D4C,0x15F
|
||||
asm/non_matchings/code/z_player_lib/func_801262C8.s,func_801262C8,0x801262C8,0x4D
|
||||
asm/non_matchings/code/z_player_lib/func_801263FC.s,func_801263FC,0x801263FC,0x11
|
||||
asm/non_matchings/code/z_player_lib/Player_OverrideLimbDrawGameplayDefault.s,Player_OverrideLimbDrawGameplayDefault,0x80125D4C,0x15F
|
||||
asm/non_matchings/code/z_player_lib/Player_OverrideLimbDrawGameplayFirstPerson.s,Player_OverrideLimbDrawGameplayFirstPerson,0x801262C8,0x4D
|
||||
asm/non_matchings/code/z_player_lib/Player_OverrideLimbDrawGameplayCrawling.s,Player_OverrideLimbDrawGameplayCrawling,0x801263FC,0x11
|
||||
asm/non_matchings/code/z_player_lib/func_80126440.s,func_80126440,0x80126440,0x62
|
||||
asm/non_matchings/code/z_player_lib/func_801265C8.s,func_801265C8,0x801265C8,0x35
|
||||
asm/non_matchings/code/z_player_lib/Player_UpdateShieldCollider.s,Player_UpdateShieldCollider,0x801265C8,0x35
|
||||
asm/non_matchings/code/z_player_lib/func_8012669C.s,func_8012669C,0x8012669C,0x5B
|
||||
asm/non_matchings/code/z_player_lib/Player_DrawGetItemImpl.s,Player_DrawGetItemImpl,0x80126808,0x5D
|
||||
asm/non_matchings/code/z_player_lib/Player_DrawGetItem.s,Player_DrawGetItem,0x8012697C,0x4E
|
||||
|
|
@ -1781,13 +1781,13 @@ asm/non_matchings/code/z_player_lib/Player_DrawCircusLeadersMask.s,Player_DrawCi
|
|||
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/Player_DrawStrayFairyParticles.s,Player_DrawStrayFairyParticles,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/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
|
||||
asm/non_matchings/code/z_player_lib/Player_SetFeetPos.s,Player_SetFeetPos,0x80128B74,0x17
|
||||
asm/non_matchings/code/z_player_lib/Player_PostLimbDrawGameplay.s,Player_PostLimbDrawGameplay,0x80128BD0,0x4C8
|
||||
asm/non_matchings/code/z_prenmi/PreNMI_Stop.s,PreNMI_Stop,0x80129EF0,0x5
|
||||
asm/non_matchings/code/z_prenmi/PreNMI_Update.s,PreNMI_Update,0x80129F04,0x12
|
||||
asm/non_matchings/code/z_prenmi/PreNMI_Draw.s,PreNMI_Draw,0x80129F4C,0x2B
|
||||
|
|
|
|||
|
Loading…
Reference in New Issue