Clean up collision et al in enhancements

5 files changed, 14 insertions, 14 deletions

diff --git a/mm/2s2h/Enhancements/Graphics/EnemyHealthBars.cpp b/mm/2s2h/Enhancements/Graphics/EnemyHealthBars.cpp
index 8a454ea0e..b44a811b7 100644
--- a/mm/2s2h/Enhancements/Graphics/EnemyHealthBars.cpp
+++ b/mm/2s2h/Enhancements/Graphics/EnemyHealthBars.cpp
@@ -200,7 +200,7 @@ static RegisterShipInitFunc initFunc(
 
                 // The remains in the Majora fight get their health set after init for the first time fighting,
                 // so we set the expected value now
-                if (actor->id == ACTOR_BOSS_07 && actor->params >= MAJORAS_REMAINS) {
+                if (actor->id == ACTOR_BOSS_07 && actor->params >= MAJORA_TYPE_REMAINS) {
                     *maxHealth = 5;
                 }
             });
diff --git a/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp b/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp
index 1de36eee7..ba208b5ec 100644
--- a/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp
+++ b/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp
@@ -143,7 +143,7 @@ void RegisterFierceDeityAnywhere() {
      */
     COND_VB_SHOULD(VB_CHECK_BUMPER_COLLISION, CVAR, {
         ColliderElement* toucher = va_arg(args, ColliderElement*);
-        if (toucher->toucher.dmgFlags & DMG_SWORD_BEAM) {
+        if (toucher->atDmgInfo.dmgFlags & DMG_SWORD_BEAM) {
             *should = false;
         }
     });
@@ -164,7 +164,7 @@ void RegisterFierceDeityAnywhere() {
          */
         if (at->actor->id == ACTOR_EN_M_THUNDER && ((EnMThunder*)at->actor)->subtype > 1 &&
             ac->actor->category != ACTORCAT_ENEMY && ac->actor->category != ACTORCAT_BOSS &&
-            !(acInfo->bumper.dmgFlags & DMG_SWORD_BEAM)) {
+            !(acInfo->acDmgInfo.dmgFlags & DMG_SWORD_BEAM)) {
             *should = false;
         }
     });
@@ -176,14 +176,14 @@ void RegisterFierceDeityAnywhere() {
     COND_ID_HOOK(ShouldActorUpdate, ACTOR_EN_BIGOKUTA, CVAR, [](Actor* actor, bool* result) {
         EnBigokuta* enBigOkuta = (EnBigokuta*)actor;
         if (enBigOkuta->bodyCollider.base.acFlags & AC_HIT &&
-            enBigOkuta->bodyCollider.info.acHitElem->toucher.dmgFlags & DMG_SWORD_BEAM) {
+            enBigOkuta->bodyCollider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_SWORD_BEAM) {
             enBigOkuta->drawDmgEffType = ACTOR_DRAW_DMGEFF_BLUE_LIGHT_ORBS;
             enBigOkuta->drawDmgEffScale = 1.2f;
             enBigOkuta->drawDmgEffAlpha = 4.0f;
-            Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_CLEAR_TAG,
-                        enBigOkuta->bodyCollider.info.bumper.hitPos.x, enBigOkuta->bodyCollider.info.bumper.hitPos.y,
-                        enBigOkuta->bodyCollider.info.bumper.hitPos.z, 0, 0, 3,
-                        CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS));
+            Actor_Spawn(
+                &gPlayState->actorCtx, gPlayState, ACTOR_EN_CLEAR_TAG, enBigOkuta->bodyCollider.elem.acDmgInfo.hitPos.x,
+                enBigOkuta->bodyCollider.elem.acDmgInfo.hitPos.y, enBigOkuta->bodyCollider.elem.acDmgInfo.hitPos.z, 0,
+                0, 3, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS));
         }
     });
 
diff --git a/mm/2s2h/Enhancements/Modes/PlayAsKafei.cpp b/mm/2s2h/Enhancements/Modes/PlayAsKafei.cpp
index 791b36512..e01d18fed 100644
--- a/mm/2s2h/Enhancements/Modes/PlayAsKafei.cpp
+++ b/mm/2s2h/Enhancements/Modes/PlayAsKafei.cpp
@@ -41,9 +41,9 @@ void UpdatePlayAsKafei() {
         sPlayerEyesTextures[PLAYER_FORM_HUMAN][7] = (TexturePtr)gKafeiEyesWincingTex;
 
         sPlayerMouthTextures[PLAYER_FORM_HUMAN][0] = (TexturePtr)gKafeiMouthClosedTex;
-        sPlayerMouthTextures[PLAYER_FORM_HUMAN][1] = (TexturePtr)gKafeiMouthTeethTex;
-        sPlayerMouthTextures[PLAYER_FORM_HUMAN][2] = (TexturePtr)gKafeiMouthAngryTex;
-        sPlayerMouthTextures[PLAYER_FORM_HUMAN][3] = (TexturePtr)gKafeiMouthHappyTex;
+        sPlayerMouthTextures[PLAYER_FORM_HUMAN][1] = (TexturePtr)gKafeiMouthHalfTex;
+        sPlayerMouthTextures[PLAYER_FORM_HUMAN][2] = (TexturePtr)gKafeiMouthOpenTex;
+        sPlayerMouthTextures[PLAYER_FORM_HUMAN][3] = (TexturePtr)gKafeiMouthSmileTex;
     } else {
         auto gLinkHumanSkelResource = Ship::Context::GetInstance()->GetResourceManager()->LoadResource(gLinkHumanSkel);
         SkeletonHeader* gLinkHumanSkelPtr = (SkeletonHeader*)gLinkHumanSkelResource->GetRawPointer();
diff --git a/mm/2s2h/Enhancements/Player/ManualJump.cpp b/mm/2s2h/Enhancements/Player/ManualJump.cpp
index 0fa599c98..5bd4aec4b 100644
--- a/mm/2s2h/Enhancements/Player/ManualJump.cpp
+++ b/mm/2s2h/Enhancements/Player/ManualJump.cpp
@@ -17,7 +17,7 @@ void func_808395F0(PlayState* play, Player* player, PlayerMeleeWeaponAnimation m
 void RegisterManualJump() {
     COND_VB_SHOULD(VB_START_JUMPSLASH, CVAR, {
         Player* player = GET_PLAYER(gPlayState);
-        s32 temp_a2 = player->unk_AE3[player->unk_ADE];
+        s32 temp_a2 = player->controlStickDirections[player->controlStickDataIndex];
 
         *should = false;
 
diff --git a/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp b/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp
index 6be29b8f7..18757275e 100644
--- a/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp
+++ b/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp
@@ -10,8 +10,8 @@ void RegisterPowerCrouchStab() {
 
     COND_ID_HOOK(OnActorInit, ACTOR_PLAYER, CVAR == 2, [](Actor* actor) {
         Player* player = (Player*)actor;
-        player->meleeWeaponQuads[0].info.toucher.dmgFlags = 512; // Kokiri Sword
-        player->meleeWeaponQuads[1].info.toucher.dmgFlags = 512; // Kokiri Sword
+        player->meleeWeaponQuads[0].elem.atDmgInfo.dmgFlags = 512; // Kokiri Sword
+        player->meleeWeaponQuads[1].elem.atDmgInfo.dmgFlags = 512; // Kokiri Sword
     });
 }