d_a_obj_windmill fixes

Author: elijah-thomas774

config/SOUE01/rels/d_a_obj_windmillNP/symbols.txt

@@ -79,8 +79,13 @@ lbl_374_data_178 = .data:0x00000178; // type:object size:0x18 scope:local
 lbl_374_data_190 = .data:0x00000190; // type:object size:0x198 scope:local
 __vt__29sFStateID_c<14dAcOwindmill_c> = .data:0x00000328; // type:object size:0x34
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_374_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local data:4byte
-AcOwindmill__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte
-AcOwindmill__STATE_CAMERA_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte
-AcOwindmill__STATE_MOVE = .bss:0x00000098; // type:object size:0x80 data:4byte
-AcOwindmill__STATE_COLLECT_STICK = .bss:0x00000118; // type:object size:0x30 data:4byte
+@25601 = .bss:0x00000008; // type:object size:0xC scope:local data:4byte
+StateID_Wait__14dAcOwindmill_c = .bss:0x00000018; // type:object size:0x30 data:4byte
+@25609 = .bss:0x00000048; // type:object size:0xC scope:local data:4byte
+StateID_CameraMove__14dAcOwindmill_c = .bss:0x00000058; // type:object size:0x30 data:4byte
+@25613 = .bss:0x00000088; // type:object size:0xC scope:local data:4byte
+StateID_Move__14dAcOwindmill_c = .bss:0x00000098; // type:object size:0x30 data:4byte
+@25613 = .bss:0x000000C8; // type:object size:0xC scope:local data:4byte
+StateID_Collect__14dAcOwindmill_c = .bss:0x000000D8; // type:object size:0x30 data:4byte
+@25617 = .bss:0x00000108; // type:object size:0xC scope:local data:4byte
+StateID_CollectStick__14dAcOwindmill_c = .bss:0x00000118; // type:object size:0x30 data:4byte

src/REL/d/a/obj/d_a_obj_windmill.cpp

@@ -69,8 +69,8 @@ int dAcOwindmill_c::create() {
     mWindmillRotation = mRotation.y.mVal;
     mWindmillPosition = mPosition;
 
-    mWindmillPosition.x += -95.22334f * (mRotation.y + mAng(0xc17)).sin();
-    mWindmillPosition.z += -95.22334f * (mRotation.y + mAng(0xc17)).cos();
+    mWindmillPosition.x += -95.22334f * mAng(mRotation.y + 0xc17).sin();
+    mWindmillPosition.z += -95.22334f * mAng(mRotation.y + 0xc17).cos();
     mWindmillPosition.y += -86.11143f;
 
     if (mHasPropellor || isWindmillRepaired()) {
@@ -242,7 +242,7 @@ void dAcOwindmill_c::executeState_Move() {
 void dAcOwindmill_c::finalizeState_Move() {
     field_0x63A = false;
     mAnmClr.setRate(-1.f, 0);
-    mRotation.y = mWindmillRotation + (mAng)mAng::fromDeg(mCurrentStuckPos * 0x1e);
+    mRotation.y.set(mWindmillRotation + mAng::fromDeg(mCurrentStuckPos * 30));
 }
 
 void dAcOwindmill_c::initializeState_Collect() {}