entity.spriteOrder -> entity.spriteRendering

src/archway.c

@@ -18,10 +18,10 @@ void Archway(Entity *this)
         this->spriteSettings.raw = v1 | 1;
         this->frameIndex = this->entityType.parameter;
         this->collisionLayer = 2;
-        UpdateSpriteOrderAndFlip(this);
+        UpdateSpriteForCollisionLayer(this);
         v3 = CheckIsDungeon();
     if (v3 != 0) {
-      this->ticks.b0 = (this->ticks.b0 & 0xf8) | 1;
+      this->spritePriority.b0 = (this->spritePriority.b0 & 0xf8) | 1;
     }
   }
 }

src/bell.c

@@ -11,8 +11,8 @@ void sub_08097D90(Entity* ent) {
     ent->action = 1;
     ent->spriteSettings.b.draw = 1;
     ent->collisionLayer = 1;
-    ent->ticks.b0 = 0;
-    UpdateSpriteOrderAndFlip(ent);
+    ent->spritePriority.b0 = 0;
+    UpdateSpriteForCollisionLayer(ent);
     InitAnimationForceUpdate(ent, 0);
 }
 

src/bladeBrothers.c

@@ -176,7 +176,7 @@ void sub_08068BEC(Entity* this, u32 unused) {
 
     target = CreateFx(this, 0x44, 0);
     if (target) {
-        target->ticks.b0 = 1;
+        target->spritePriority.b0 = 1;
         PositionRelative(this, target, 0, -0x100000);
         PlaySFX(0xfa);
     }

src/chestSpawner.c

@@ -29,7 +29,7 @@ void sub_08083E20(Entity *this)
 {
   this->action = 3;
   this->spriteSettings.b.draw = 1;
-  this->spriteOrder.alphaBlend = 0;
+  this->spriteRendering.alphaBlend = 0;
   sub_080842D8(this);
   sub_08078828(this);
 }

src/code_080A29BC.c

@@ -63,7 +63,7 @@ Entity * sub_080A2A64(Entity *parent)
   
   pEVar1 = CreateFx(parent, 0x20, 0);
   if (pEVar1 != NULL) {
-    pEVar1->ticks.b0 = 7;
+    pEVar1->spritePriority.b0 = 7;
   }
   return pEVar1;
 }

src/giantLeaf.c

@@ -13,8 +13,8 @@ void GiantLeaf(Entity* ent) {
     if (ent->action == 0) {
         ent->action = 1;
         ent->spriteSettings.b.draw = 1;
-        ent->spriteOrder.b3 = 3;
-        ent->ticks.b0 = 7;
+        ent->spriteRendering.b3 = 3;
+        ent->spritePriority.b0 = 7;
         ent->frameIndex = ent->entityType.form;
         sub_0808D618(ent);
     }

src/greatFairy.c

@@ -160,9 +160,9 @@ void GreatFairy_WingsCallBehavior(Entity* this) {
 
 void GreatFairy_WingsInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
-    this->ticks.b0 = 5;
+    this->spritePriority.b0 = 5;
     this->spriteSettings.b.draw = 1;
-    this->spriteOrder.alphaBlend = 1;
+    this->spriteRendering.alphaBlend = 1;
     gScreen.controls.windowOutsideControl = 3904;
     gScreen.controls.mosaicSize = 2057;
     this->nonPlanarMovement = 1024;
@@ -193,7 +193,7 @@ void GreatFairy_WakeCallBehavior(Entity* this) {
 void GreatFairy_WakeInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
-    this->ticks.b0 = 6;
+    this->spritePriority.b0 = 6;
 }
 
 void GreatFairy_WakeUpdate(Entity* this) {
@@ -252,7 +252,7 @@ void GreatFairy_MiniAffineCallBehavior(Entity* this) {
 
 void GreatFairy_MiniAffineInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
-    this->ticks.b0 = 6;
+    this->spritePriority.b0 = 6;
     this->spriteSettings.b.draw = 1;
 }
 
@@ -266,7 +266,7 @@ void GreatFairy_MiniAffineInit2(Entity* this) {
         this->action = 2;
         this->actionDelay = 90;
         this->nonPlanarMovement = 4096;
-        this->spriteOrder.b0 = 3;
+        this->spriteRendering.b0 = 3;
         sub_0805EC9C(this, 256, 256, 0);
     }
 }
@@ -295,7 +295,7 @@ void GreatFairy_DropletInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
     this->height.HALF.HI = 0;
-    this->ticks.b0 = 5;
+    this->spritePriority.b0 = 5;
     PlaySFX(320);
 }
 
@@ -314,7 +314,7 @@ void GreatFairy_RippleCallBehavior(Entity* this) {
 void GreatFairy_RippleInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
-    this->ticks.b0 = 6;
+    this->spritePriority.b0 = 6;
 }
 
 void GreatFairy_RippleUpdate(Entity* this) {
@@ -334,7 +334,7 @@ void GreatFairy_BigRippleInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->actionDelay = 120;
     this->spriteSettings.b.draw = 1;
-    this->ticks.b0 = 5;
+    this->spritePriority.b0 = 5;
     PlaySFX(249);
 }
 
@@ -362,7 +362,7 @@ void GreatFairy_EnergyCallBehavior(Entity* this) {
 void GreatFairy_EnergyInit(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
-    this->ticks.b0 = 5;
+    this->spritePriority.b0 = 5;
 }
 
 void GreatFairy_EnergyUpdate(Entity* this) {
@@ -389,8 +389,8 @@ void sub_08087150(Entity* this) {
     GreatFairy_InitializeAnimation(this);
     this->spriteSettings.b.draw = 1;
     this->spriteOrientation &= 63;
-    this->spriteOrder.b0 = 0;
-    this->ticks.b0 = 3;
+    this->spriteRendering.b0 = 0;
+    this->spritePriority.b0 = 3;
     this->nonPlanarMovement = 128;
     this->direction = 16;
     var = gUnk_0812079C[0];
@@ -474,7 +474,7 @@ void sub_08087294(Entity* this) {
 void sub_080872AC(Entity* this) {
     this->spriteSettings.b.draw = 1;
     this->spriteOrientation.flipY = 1;
-    this->spriteOrder.b0 = 0;
+    this->spriteRendering.b0 = 0;
     this->field_0x68 = (u16)(this->x).HALF.HI;
     this->field_0x6a = (u16)(this->y).HALF.HI;
     this->direction = (u8)Random() & 0x1F;

src/hangingSeed.c

@@ -32,8 +32,8 @@ void sub_08021720(Entity *this)
   this->action = 1;
   this->spriteSettings.b.draw = 1;
   this->frameIndex = (this->entityType).form;
-  this->spriteOrder.b3 = 1;
-  this->ticks.b0 = 3;
+  this->spriteRendering.b3 = 1;
+  this->spritePriority.b0 = 3;
 }
 
 void nullsub_08(Entity* this){}

src/heartContainer.c

@@ -30,7 +30,7 @@ void sub_0808E6E4(Entity* this) {
     if (CheckFlags(this->field_0x86)) {
         this->action = 2;
         this->spriteSettings.b.draw = 1;
-        this->spriteOrder.b0 = 3;
+        this->spriteRendering.b0 = 3;
         sub_0808E714(this);
     }
 }

src/item11.c

@@ -90,7 +90,7 @@ void sub_08018DE8(Entity *this)
             this->attachedEntity->previousActionFlag = 4;
             this->flags = this->flags | 0x80;
             this->action = 2;
-            this->ticks.b0 = 2;
+            this->spritePriority.b0 = 2;
             this->attachedEntity->spriteSettings.b.draw = 1;
             sub_08018FA0(this);
             break;

src/keese.c

@@ -69,14 +69,14 @@ void sub_08021DF0(Entity *this)
   
   sub_0804A720(this);
   if ((this->entityType).form != 0) {
-    this->ticks.b1 = 1;
+    this->spritePriority.b1 = 1;
     this->height.HALF.HI = -0x10;
   }
   this->direction = Random() & 0x1f;
   this->filler[0] = 1;
-  this->ticks.b0 = 3;
+  this->spritePriority.b0 = 3;
   this->collisionLayer = 3;
-  UpdateSpriteOrderAndFlip(this);
+  UpdateSpriteForCollisionLayer(this);
   sub_08021EF0(this);
 }
 

src/lakitu.c

@@ -270,7 +270,7 @@ void sub_0803CA0C(Entity *this) {
     if (sub_08003FC4(this, 0x1800) == 0 && this->animIndex <= 19) {
         InitAnimationForceUpdate(this, this->animationState + 20);
 
-        this->ticks.b1 = 0;
+        this->spritePriority.b1 = 0;
     }
 
     UpdateAnimationSingleFrame(this);
@@ -370,7 +370,7 @@ void sub_0803CBAC(Entity *this) {
     this->action = 7;
     this->spriteSettings.b.draw = 1;
 
-    this->ticks.b1 = 1;
+    this->spritePriority.b1 = 1;
 
     this->flags2 &= 0x7b;
 

src/lightableSwitch.c

@@ -38,7 +38,7 @@ void sub_0809EA34(Entity* this) {
     this->flags2 = 10;
     this->boundingBox = &gUnk_080FD150;
     sub_0809EAD8(this);
-    UpdateSpriteOrderAndFlip(this);
+    UpdateSpriteForCollisionLayer(this);
     sub_0809EABC(this);
 }
 
@@ -110,7 +110,7 @@ void sub_0809EB80(Entity* this) {
     this->flags2 = 10;
     this->boundingBox = &gUnk_080FD150;
     sub_0809EAD8(this);
-    UpdateSpriteOrderAndFlip(this);
+    UpdateSpriteForCollisionLayer(this);
     if (CheckFlags(this->cutsceneBeh.HWORD) != 0) {
         this->action = 3;
         this->frameIndex = 2;

src/mask.c

@@ -103,7 +103,7 @@ void sub_08092A94(Entity *this) {
     this->height.HALF.HI -= 0x20;
     this->y.HALF.HI += 0x20;
 
-    this->spriteOrder.b3 = 2;
+    this->spriteRendering.b3 = 2;
 }
 
 // Probably falling down

src/minishSizedEntrance.c

@@ -16,8 +16,8 @@ void MinishSizedEntrance(Entity* this)
 void sub_08090EC0(Entity *this)
 {
   this->action = 1;
-  this->spriteOrder.b3 = 3;
-  this->ticks.b0 = 7;
+  this->spriteRendering.b3 = 3;
+  this->spritePriority.b0 = 7;
   this->frameIndex = (this->entityType).parameter;
   if (CheckIsDungeon()) {
     this->frameIndex += 4;

src/object49.c

@@ -92,11 +92,11 @@ void sub_0808F1F8(Entity *this)
 {
   u8 bVar1;
   
-  this->spriteOrder.b0 = 3;
+  this->spriteRendering.b0 = 3;
   this->action++;
-  this->spriteOrder.b3 = this->parent->spriteOrder.b3;
+  this->spriteRendering.b3 = this->parent->spriteRendering.b3;
   this->spriteOrientation.flipY = this->parent->spriteOrientation.flipY;
-  this->ticks.b0 = 7;
+  this->spritePriority.b0 = 7;
   InitializeAnimation(this, 1);
   sub_0808F244(this);
 }

src/object86.c

@@ -17,8 +17,8 @@ void Object86(Entity* this) {
 
 void sub_08099DD0(Entity* this) {
     this->collisionLayer = 1;
-    this->spriteOrder.b3 = 3;
-    this->ticks.b0 = 7;
+    this->spriteRendering.b3 = 3;
+    this->spritePriority.b0 = 7;
     this->previousActionFlag = 0;
     if (GetInventoryValue(0x46)) {
         this->action = 4;

src/position.c

@@ -28,7 +28,7 @@ void PositionRelative(Entity* source, Entity* target, s32 offsetX, s32 offsetY)
 
     target->height = source->height; // ldr
     target->collisionLayer = source->collisionLayer;
-    UpdateSpriteOrderAndFlip(target);
+    UpdateSpriteForCollisionLayer(target);
 }
 
 void CopyPositionAndSpriteOffset(Entity *param_1,Entity *param_2)
@@ -47,10 +47,10 @@ void sub_0806FA90(Entity *param_1,Entity *param_2, s32 offsetX, s32 offsetY)
 
 void ResolveEntityOnTop(Entity *param_1,Entity *param_2)
 {
-    param_2->ticks.b0 = gUnk_08114F78[param_1->ticks.b0];
+    param_2->spritePriority.b0 = gUnk_08114F78[param_1->spritePriority.b0];
 }
 
 void sub_0806FAD8(Entity *param_1,Entity *param_2)
 {
-  param_2->ticks.b0 = gUnk_08114F80[param_1->ticks.b0];
+  param_2->spritePriority.b0 = gUnk_08114F80[param_1->spritePriority.b0];
 }

src/treeHidingPortal.c

@@ -29,7 +29,7 @@ void sub_0809E83C(Entity* this) {
     }
     this->action = 1;
     this->collisionLayer = 2;
-    UpdateSpriteOrderAndFlip(this);
+    UpdateSpriteForCollisionLayer(this);
 }
 
 void sub_0809E86C(Entity* this) {
@@ -76,7 +76,7 @@ void sub_0809E918(Entity* this) {
             fx->x.HALF.HI += i[0];
             fx->y.HALF.HI += i[1];
             fx->collisionLayer = 2;
-            UpdateSpriteOrderAndFlip(fx);
+            UpdateSpriteForCollisionLayer(fx);
         }
         i += sizeof(s16);
     }

src/windTribeFlag.c

@@ -13,7 +13,7 @@ void WindTribeFlag(Entity *this)
     else {
       this->spriteSettings.b.flipX = 1;
     }
-    UpdateSpriteOrderAndFlip(this);
+    UpdateSpriteForCollisionLayer(this);
     InitializeAnimation(this,0);
   }
   else {