Rename scale and rotate fields in Entity (Xeeynamo#2630)

FLAG_DRAW_ROTX => FLAG_DRAW_SCALEX
FLAG_DRAW_ROTY => FLAG_DRAW_SCALEY
FLAG_DRAW_ROTZ => FLAG_DRAW_ROTATE
rotX => scaleX
rotY => scaleY
rotZ => rotate

Author: Xeeynamo

include/entity.h

@@ -785,7 +785,7 @@ typedef struct ET_CastleDoor {
     /* 0x7C */ struct Primitive* prim;
     /* 0x80 */ s16 timer;
     /* 0x82 */ char pad_82[0x2];
-    /* 0x84 */ s16 rotZ;
+    /* 0x84 */ s16 rotate;
 } ET_CastleDoor;
 
 typedef struct {
@@ -849,7 +849,7 @@ typedef struct {
     /* 0x8D */ u8 unk8D;
     /* 0x8E */ u8 unk8E;
     /* 0x8E */ char pad_8E[13];
-    /* 0x9C */ s16 rotZ;
+    /* 0x9C */ s16 rotate;
     /* 0x9E */ s16 unk9E;
     /* 0xA0 */ struct Entity* parent;
     /* 0xA4 */ s16 unkA4;

include/game.h

@@ -303,9 +303,9 @@ typedef enum {
 // Flags for entity->drawFlags
 typedef enum {
     FLAG_DRAW_DEFAULT = 0x00,
-    FLAG_DRAW_ROTX = 0x01,
-    FLAG_DRAW_ROTY = 0x02,
-    FLAG_DRAW_ROTZ = 0x04,
+    FLAG_DRAW_SCALEX = 0x01,
+    FLAG_DRAW_SCALEY = 0x02,
+    FLAG_DRAW_ROTATE = 0x04,
     FLAG_DRAW_OPACITY = 0x08,
     FLAG_DRAW_UNK10 = 0x10,
     FLAG_DRAW_UNK20 = 0x20,
@@ -817,9 +817,9 @@ typedef struct Entity {
     /* 0x16 */ u16 palette;
     /* 0x18 */ u8 drawMode;
     /* 0x19 */ u8 drawFlags;
-    /* 0x1A */ s16 rotX;
-    /* 0x1C */ s16 rotY;
-    /* 0x1E */ s16 rotZ;
+    /* 0x1A */ s16 scaleX; // 0x100 = 1.0
+    /* 0x1C */ s16 scaleY; // 0x100 = 1.0
+    /* 0x1E */ s16 rotate; // 0x1000 = 360 degrees
     /* 0x20 */ s16 rotPivotX;
     /* 0x22 */ s16 rotPivotY;
     /* 0x24 */ u16 zPriority;

src/boss/bo4/doors.c

@@ -191,19 +191,19 @@ void func_us_801B5040(Entity* self) {
     switch (self->step) {
     case 0:
         InitializeEntity(D_us_80180458);
-        self->drawFlags |= FLAG_DRAW_OPACITY | FLAG_DRAW_ROTZ | FLAG_DRAW_ROTY |
-                           FLAG_DRAW_ROTX;
+        self->drawFlags |= FLAG_DRAW_OPACITY | FLAG_DRAW_ROTATE |
+                           FLAG_DRAW_SCALEY | FLAG_DRAW_SCALEX;
         if ((self->params & 0xF) > 1) {
             self->opacity = 0x20;
         } else {
             self->opacity = 0x80;
         }
-        self->rotX = D_us_801805C0[self->params & 0xF];
-        self->rotY = self->rotX;
+        self->scaleX = D_us_801805C0[self->params & 0xF];
+        self->scaleY = self->scaleX;
         if ((self->params & 0xF) % 2) {
-            self->rotZ = -0x400;
+            self->rotate = -0x400;
         } else {
-            self->rotZ = 0;
+            self->rotate = 0;
         }
         self->zPriority = (0x40 - self->params) & 0xF;
         if (self->params & 0x100) {
@@ -271,8 +271,8 @@ void func_us_801B5040(Entity* self) {
 
     case 4:
         magnitude = self->ext.et_801BDA0C.unk80 / FIX(1);
-        xOffset = (rcos(self->rotZ - 0x400) * magnitude) >> 0xC;
-        yOffset = (rsin(self->rotZ - 0x400) * magnitude) >> 0xC;
+        xOffset = (rcos(self->rotate - 0x400) * magnitude) >> 0xC;
+        yOffset = (rsin(self->rotate - 0x400) * magnitude) >> 0xC;
         prim = self->ext.et_801BDA0C.unk7C;
         self->posX.i.hi = prim->x0 + xOffset;
         self->posY.i.hi = prim->y0 + yOffset;
@@ -309,8 +309,8 @@ void func_us_801B5040(Entity* self) {
             tempEntity->opacity += 2;
         }
         magnitude = self->ext.et_801BDA0C.unk80 / 0x10000;
-        xOffset = (rcos(self->rotZ - 0x400) * magnitude) >> 0xC;
-        yOffset = (rsin(self->rotZ - 0x400) * magnitude) >> 0xC;
+        xOffset = (rcos(self->rotate - 0x400) * magnitude) >> 0xC;
+        yOffset = (rsin(self->rotate - 0x400) * magnitude) >> 0xC;
         prim = self->ext.et_801BDA0C.unk7C;
         self->posX.i.hi = prim->x0 + xOffset;
         self->posY.i.hi = prim->y0 + yOffset;
@@ -319,7 +319,7 @@ void func_us_801B5040(Entity* self) {
         } else {
             AnimateEntity(D_us_801805DC, self);
         }
-        self->rotZ += D_us_801805B4[self->params & 0xF];
+        self->rotate += D_us_801805B4[self->params & 0xF];
         if (self->params & 0x100) {
             self->ext.et_801BDA0C.unk88 -= D_us_801805A8[self->params & 0xF];
         } else {
@@ -339,8 +339,8 @@ void func_us_801B55DC(Entity* self) {
     switch (self->step) {
     case 0:
         InitializeEntity(D_us_80180458);
-        self->drawFlags |= FLAG_DRAW_ROTZ;
-        self->rotZ = -0x400;
+        self->drawFlags |= FLAG_DRAW_ROTATE;
+        self->rotate = -0x400;
         if (self->params & 1) {
             self->animCurFrame = 0x64;
             self->velocityX = FIX(-0.5);

src/boss/bo4/doppleganger.c

@@ -27,8 +27,8 @@ void func_us_801C1A38(void) {
     }
 
     DOPPLEGANGER.palette = PAL_OVL(0x200);
-    DOPPLEGANGER.rotX = 0x100;
-    DOPPLEGANGER.rotY = 0x100;
+    DOPPLEGANGER.scaleX = 0x100;
+    DOPPLEGANGER.scaleY = 0x100;
     DOPPLEGANGER.drawMode = DRAW_DEFAULT;
     DOPPLEGANGER.flags =
         FLAG_UNK_10000000 | FLAG_POS_CAMERA_LOCKED | FLAG_UNK_400000;
@@ -241,8 +241,8 @@ void EntityDoppleganger10(void) {
                     D_us_801D4A1C = 12;
                 }
                 g_api.PlaySfx(SFX_TRANSFORM_LOW);
-                if (DOPPLEGANGER.rotZ == FIX(1.0 / 32.0)) {
-                    DOPPLEGANGER.rotZ = 0;
+                if (DOPPLEGANGER.rotate == FIX(1.0 / 32.0)) {
+                    DOPPLEGANGER.rotate = 0;
                     DOPPLEGANGER.animCurFrame = 0x9D;
                     DOPPLEGANGER.facingLeft++;
                     DOPPLEGANGER.facingLeft &= 1;
@@ -258,8 +258,8 @@ void EntityDoppleganger10(void) {
                  DOPPLEGANGER.step == Dop_Jump ||
                  DOPPLEGANGER.step == Dop_HighJump ||
                  DOPPLEGANGER.step == Dop_MorphBat)) {
-                if (DOPPLEGANGER.rotZ == FIX(1.0 / 32.0)) {
-                    DOPPLEGANGER.rotZ = 0;
+                if (DOPPLEGANGER.rotate == FIX(1.0 / 32.0)) {
+                    DOPPLEGANGER.rotate = 0;
                     DOPPLEGANGER.animCurFrame = 0x9D;
                     DOPPLEGANGER.facingLeft++;
                     DOPPLEGANGER.facingLeft &= 1;

src/boss/bo4/st_debug.c

@@ -5,7 +5,7 @@ extern ObjInit2 OVL_EXPORT(BackgroundBlockInit)[];
 extern u16 g_EInitCommon[];
 
 // params: Index of ObjInit to use
-//         (== 1) Use a different hardcoded rotY and rotX value
+//         (== 1) Use a different hardcoded scaleY and scaleX value
 void OVL_EXPORT(EntityBackgroundBlock)(Entity* self) {
     ObjInit2* objInit = &OVL_EXPORT(BackgroundBlockInit)[self->params];
     if (!self->step) {