diff --git a/configure.py b/configure.py
index e9eab046a42..4be8c8252d1 100755
--- a/configure.py
+++ b/configure.py
@@ -2325,7 +2325,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_tr"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_uri"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_worm"),
-    ActorRel(NonMatching, "d_a_npc_wrestler"), # regalloc; weak func order (sinShort)
+    ActorRel(Equivalent, "d_a_npc_wrestler"), # weak func order (sinShort)
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_yamid"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_yamis"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_yamit"),
diff --git a/include/d/actor/d_a_npc_wrestler.h b/include/d/actor/d_a_npc_wrestler.h
index 9a34af5e76f..2544d53c4a2 100644
--- a/include/d/actor/d_a_npc_wrestler.h
+++ b/include/d/actor/d_a_npc_wrestler.h
@@ -234,8 +234,8 @@ public:
 
 private:
     /* 0xB48 */ Z2Creature mSound;
-    /* 0xBD8 */ const daNpcWrestler_HIOParam* field_0xbd8;
-    /* 0xBDC */ const daNpcWrestler_HIOParamSub* field_0xbdc;
+    /* 0xBD8 */ daNpcWrestler_HIOParam* field_0xbd8;
+    /* 0xBDC */ daNpcWrestler_HIOParamSub* field_0xbdc;
     /* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm;
     /* 0xBE4 */ daNpcF_Lookat_c mLookAt;
     /* 0xC80 */ daNpcF_ActorMngr_c mActorMngr[2];
diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp
index fe9655e2c38..d8371e656a7 100644
--- a/src/d/actor/d_a_npc_wrestler.cpp
+++ b/src/d/actor/d_a_npc_wrestler.cpp
@@ -690,7 +690,7 @@ cPhs__Step daNpcWrestler_c::Create() {
             return cPhs_ERROR_e;
         }
 
-        field_0xbd8 = &l_HIO.m;
+        field_0xbd8 = const_cast<daNpcWrestler_HIOParam*>(&l_HIO.m);
         field_0xbdc = &field_0xbd8->mTypeParams[mType];
 #if DEBUG
         // Sumo wrestler:
@@ -2668,7 +2668,6 @@ bool daNpcWrestler_c::checkOutOfArenaW() {
 }
 
 bool daNpcWrestler_c::sumouPunchMiss(void* param_1) {
-    // NONMATCHING - regalloc
     daPy_py_c* player = daPy_getPlayerActorClass();
     int jointNo = mType == 0 ? 0x12 : 0x11;
     cXyz sp2c;
@@ -3114,7 +3113,7 @@ void daNpcWrestler_c::setStepAngle() {
         }
 
         s16 tgt_ang = cLib_targetAngleY(player->getViewerCurrentPosP(), &current.pos);
-        tgt_ang += mStepAngle * field_0xbdc->lateral_movement_time;
+        tgt_ang = tgt_ang + mStepAngle * field_0xbdc->lateral_movement_time;
         cXyz sp30(0.0f, 0.0f, field_0xbdc->grapple_distance);
         mDoMtx_stack_c::push();
         mDoMtx_stack_c::YrotM(tgt_ang);
@@ -3135,7 +3134,6 @@ void daNpcWrestler_c::setStepAngle() {
 }
 
 bool daNpcWrestler_c::sumouSideStep(void* param_1) {
-    // NONMATCHING - g_dComIfG_gameInfo weirdness
     switch (field_0xe96) {
         case 0:
             field_0xe80 = field_0xbdc->lateral_movement_time;
@@ -3285,7 +3283,6 @@ bool daNpcWrestler_c::sumouPunchShock(void* param_1) {
 }
 
 bool daNpcWrestler_c::sumouPunchChaseShock(void* param_1) {
-    // NONMATCHING - regalloc
     daPy_py_c* player = daPy_getPlayerActorClass();
 
     switch (field_0xe96) {