Misc Small Retail Files Part 2 OK (#1696)

* z_draw.c OK

* more files

4 files changed, 16 insertions, 13 deletions

diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c
index 4c6ae7af6..a13ecce7e 100644
--- a/src/code/code_800430A0.c
+++ b/src/code/code_800430A0.c
@@ -36,6 +36,7 @@ void DynaPolyActor_UpdateCarriedActorPos(CollisionContext* colCtx, s32 bgId, Act
             SkinMatrix_Vec3fMtxFMultXYZ(&curTransform, &tempPos, &pos);
             carriedActor->world.pos = pos;
 
+#if OOT_DEBUG
             if (BGCHECK_XYZ_ABSMAX <= pos.x || pos.x <= -BGCHECK_XYZ_ABSMAX || BGCHECK_XYZ_ABSMAX <= pos.y ||
                 pos.y <= -BGCHECK_XYZ_ABSMAX || BGCHECK_XYZ_ABSMAX <= pos.z || pos.z <= -BGCHECK_XYZ_ABSMAX) {
 
@@ -47,6 +48,7 @@ void DynaPolyActor_UpdateCarriedActorPos(CollisionContext* colCtx, s32 bgId, Act
                     pos.x, pos.y, pos.z);
                 PRINTF(VT_RST);
             }
+#endif
         }
     }
 }
diff --git a/src/code/code_80043480.c b/src/code/code_80043480.c
index 548ff4d0b..83ca32149 100644
--- a/src/code/code_80043480.c
+++ b/src/code/code_80043480.c
@@ -6,10 +6,10 @@
  */
 void DynaPolyActor_Init(DynaPolyActor* dynaActor, s32 transformFlags) {
     dynaActor->bgId = -1;
-    dynaActor->transformFlags = transformFlags;
-    dynaActor->interactFlags = 0;
     dynaActor->unk_150 = 0.0f;
     dynaActor->unk_154 = 0.0f;
+    dynaActor->transformFlags = transformFlags;
+    dynaActor->interactFlags = 0;
 }
 
 void DynaPolyActor_UnsetAllInteractFlags(DynaPolyActor* dynaActor) {
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index 671b8d0e2..f890804eb 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -768,6 +768,8 @@ void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) {
 
     Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY);
 
+    if (1) {}
+
     Gfx_SetupDL_25Opa(play->state.gfxCtx);
     gSPMatrix(POLY_OPA_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_draw.c", 1140), G_MTX_MODELVIEW | G_MTX_LOAD);
     gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
diff --git a/src/code/z_horse.c b/src/code/z_horse.c
index 058cb439b..41fddbccf 100644
--- a/src/code/z_horse.c
+++ b/src/code/z_horse.c
@@ -130,6 +130,16 @@ typedef struct {
 } struct_8011F9B8;
 
 void func_8006D684(PlayState* play, Player* player) {
+    static struct_8011F9B8 D_8011F9B8[] = {
+        { SCENE_GERUDOS_FORTRESS, 0xFFF0, { 3600, 1413, 360 }, 0x8001, 8 },
+        { SCENE_LON_LON_RANCH, 0xFFF0, { -250, 1, -1580 }, 0x4000, 6 },
+        { SCENE_LON_LON_RANCH, 0xFFF1, { 0, 0, 0 }, 0x0000, 5 },
+        { SCENE_LON_LON_RANCH, 0xFFF5, { 0, 0, 0 }, 0x0000, 7 },
+        { SCENE_HYRULE_FIELD, 0xFFF3, { -2961, 313, 7700 }, 0x0000, 7 },
+        { SCENE_HYRULE_FIELD, 0xFFF4, { -1900, 313, 7015 }, 0x0000, 7 },
+        { SCENE_HYRULE_FIELD, 0xFFF5, { -4043, 313, 6933 }, 0x0000, 7 },
+        { SCENE_HYRULE_FIELD, 0xFFF6, { -4043, 313, 6933 }, 0x0000, 7 },
+    };
     s32 pad;
     s32 i;
     Vec3s spawnPos;
@@ -177,17 +187,6 @@ void func_8006D684(PlayState* play, Player* player) {
             player->rideActor->room = -1;
         }
     } else {
-        static struct_8011F9B8 D_8011F9B8[] = {
-            { SCENE_GERUDOS_FORTRESS, 0xFFF0, { 3600, 1413, 360 }, 0x8001, 8 },
-            { SCENE_LON_LON_RANCH, 0xFFF0, { -250, 1, -1580 }, 0x4000, 6 },
-            { SCENE_LON_LON_RANCH, 0xFFF1, { 0, 0, 0 }, 0x0000, 5 },
-            { SCENE_LON_LON_RANCH, 0xFFF5, { 0, 0, 0 }, 0x0000, 7 },
-            { SCENE_HYRULE_FIELD, 0xFFF3, { -2961, 313, 7700 }, 0x0000, 7 },
-            { SCENE_HYRULE_FIELD, 0xFFF4, { -1900, 313, 7015 }, 0x0000, 7 },
-            { SCENE_HYRULE_FIELD, 0xFFF5, { -4043, 313, 6933 }, 0x0000, 7 },
-            { SCENE_HYRULE_FIELD, 0xFFF6, { -4043, 313, 6933 }, 0x0000, 7 },
-        };
-
         for (i = 0; i < ARRAY_COUNT(D_8011F9B8); i++) {
             if ((play->sceneId == D_8011F9B8[i].sceneId) &&
                 (((void)0, gSaveContext.save.cutsceneIndex) == D_8011F9B8[i].cutsceneIndex)) {