1 files changed, 17 insertions, 7 deletions
diff --git a/src/engine/objects/Flagpole.cpp b/src/engine/objects/Flagpole.cpp
index acd74ba2b..58581e3c9 100644
--- a/src/engine/objects/Flagpole.cpp
+++ b/src/engine/objects/Flagpole.cpp
@@ -15,16 +15,24 @@ extern "C" {
 
 size_t OFlagpole::_count = 0;
 
-OFlagpole::OFlagpole(const FVector& pos, s16 direction) {
+OFlagpole::OFlagpole(const SpawnParams& params) : OObject(params) {
     Name = "Flagpole";
+    ResourceName = "mk:flagpole";
     _idx = _count;
-    _pos = pos;
-    _direction = direction;
 
     find_unused_obj_index(&_objectIndex);
-
     init_object(_objectIndex, 0);
 
+    SpawnPos = params.Location.value_or(FVector(0, 0, 0));
+    gObjectList[_objectIndex].pos[0] = SpawnPos.x;
+    gObjectList[_objectIndex].pos[1] = SpawnPos.y;
+    gObjectList[_objectIndex].pos[2] = SpawnPos.z;
+
+    SpawnRot = params.Rotation.value_or(IRotator(0, 0, 0));
+    gObjectList[_objectIndex].orientation[0] = SpawnRot.pitch;
+    gObjectList[_objectIndex].orientation[1] = SpawnRot.yaw;
+    gObjectList[_objectIndex].orientation[2] = SpawnRot.roll;
+
     _count++;
 }
 
@@ -49,7 +57,7 @@ void OFlagpole::Draw(s32 cameraId) { // func_80055228
 void OFlagpole::func_80055164(s32 objectIndex) { // func_80055164
     if (gObjectList[objectIndex].state >= 2) {
         gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D0077A0);
-        rsp_set_matrix_transformation(gObjectList[objectIndex].pos, gObjectList[objectIndex].direction_angle,
+        rsp_set_matrix_transformation(gObjectList[objectIndex].pos, gObjectList[objectIndex].orientation,
                                       gObjectList[objectIndex].sizeScaling);
         if (gIsGamePaused == 0) {
             gObjectList[objectIndex].unk_0A2 = render_animated_model((Armature*) gObjectList[objectIndex].model,
@@ -67,9 +75,11 @@ void OFlagpole::func_80082F1C(s32 objectIndex) {
     gObjectList[objectIndex].vertex = (Vtx*) d_course_yoshi_valley_unk4;
     gObjectList[objectIndex].sizeScaling = 0.027f;
     object_next_state(objectIndex);
-    set_obj_origin_pos(objectIndex, _pos.x * xOrientation, _pos.y, _pos.z);
+    FVector pos = SpawnPos;
+    set_obj_origin_pos(objectIndex, pos.x * xOrientation, pos.y, pos.z);
     set_obj_origin_offset(objectIndex, 0.0f, 0.0f, 0.0f);
-    set_obj_direction_angle(objectIndex, 0U, _direction, 0U);
+    IRotator rot = SpawnRot;
+    set_obj_orientation(objectIndex, rot.pitch, rot.yaw, rot.roll); // changed from directional_angle to orientation for editor support
 }
 
 void OFlagpole::func_80083018(s32 objectIndex) {