entity changes, textbox changes

9 files changed, 17 insertions, 17 deletions

diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c
index d2f4f45e..fc6d3305 100644
--- a/src/projectile/arrowProjectile.c
+++ b/src/projectile/arrowProjectile.c
@@ -48,7 +48,7 @@ void ArrowProjectile_Init(Entity* this) {
     this->flags &= 0x7f;
     this->actionDelay = 0x6a;
     this->field_0xf = 0;
-    this->field_0x20 = 0xa00;
+    this->hVelocity = 0xa00;
     sub_080A94C0(this, this->type);
 }
 
@@ -106,7 +106,7 @@ void sub_080A9488(Entity* this) {
     this->action = 4;
     this->flags &= 0x7f;
     this->actionDelay = 2;
-    this->field_0x20 = 0x18000;
+    this->hVelocity = 0x18000;
     this->animationState = (this->knockbackDirection & 0x18) >> 3;
     EnqueueSFX(SFX_METAL_CLINK);
     sub_080A94C0(this, this->animationState);
diff --git a/src/projectile/boneProjectile.c b/src/projectile/boneProjectile.c
index 61f60863..cfa5f3ed 100644
--- a/src/projectile/boneProjectile.c
+++ b/src/projectile/boneProjectile.c
@@ -59,7 +59,7 @@ void BoneProjectile_Action2(Entity* this) {
         this->action = 3;
         this->flags = this->flags & 0x7f;
         this->speed = 0xe0;
-        this->field_0x20 = 0xe000;
+        this->hVelocity = 0xe000;
     }
 }
 
@@ -83,7 +83,7 @@ void BoneProjectile_Action4(Entity* this) {
 void sub_080A82D8(Entity* this) {
     this->action = 4;
     this->flags &= 0x7f;
-    this->field_0x20 = 0x10000;
+    this->hVelocity = 0x10000;
     this->direction ^= 0x10;
     this->speed = 0x80;
 }
diff --git a/src/projectile/cannonballProjectile.c b/src/projectile/cannonballProjectile.c
index 150d5fe3..2f4c8339 100644
--- a/src/projectile/cannonballProjectile.c
+++ b/src/projectile/cannonballProjectile.c
@@ -78,7 +78,7 @@ bool32 sub_080AB5F4(Entity* this) {
 }
 
 bool32 sub_080AB634(Entity* this) {
-    Entity** entities = ((Entity**)&this->parent->field_0x20);
+    Entity** entities = ((Entity**)&this->parent->hVelocity);
     u32 i;
     for (i = 0; i <= 3; ++i) {
         if (entities[i] != NULL && (sub_080177A0(this, entities[i]) != 0)) {
diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c
index 371473da..fd5909b8 100644
--- a/src/projectile/dirtBallProjectile.c
+++ b/src/projectile/dirtBallProjectile.c
@@ -48,7 +48,7 @@ void DirtBallProjectile_Init(Entity* this) {
     this->action = 1;
     this->subAction = 0;
     this->spriteSettings.b.shadow = 1;
-    this->field_0x20 = 0x8000;
+    this->hVelocity = 0x8000;
     this->hitbox = (Hitbox*)&gUnk_08129764;
     this->field_0x3c |= 0x10;
     switch (this->type) {
diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c
index d8eeff71..d48820b0 100644
--- a/src/projectile/gleerokProjectile.c
+++ b/src/projectile/gleerokProjectile.c
@@ -36,7 +36,7 @@ void GleerokProjectile_Init(Entity* this) {
     s32 iVar2;
 
     this->action = 1;
-    this->field_0x20 = -0x10000;
+    this->hVelocity = -0x10000;
     if (this->type != 3) {
         CopyPosition(this->parent, this);
         sub_0806F5BC(this, 0x1000, this->direction);
@@ -63,11 +63,11 @@ void GleerokProjectile_Init(Entity* this) {
             } else if (0x400 < iVar2) {
                 iVar2 = 0x400;
             }
-            this->field_0x20 = this->height.WORD / (iVar2 << 8) << 0xd;
+            this->hVelocity = this->height.WORD / (iVar2 << 8) << 0xd;
             this->field_0xf = 0x1e;
             break;
         case 2:
-            this->field_0x20 = (this->height.WORD / 0x18000) << 0xc;
+            this->hVelocity = (this->height.WORD / 0x18000) << 0xc;
             break;
         case 3:
             this->height.WORD = 0xff600000;
diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c
index 6f677525..5b1f8e44 100644
--- a/src/projectile/octorokBossProjectile.c
+++ b/src/projectile/octorokBossProjectile.c
@@ -40,7 +40,7 @@ void OctorokBossProjectile_Init(Entity* this) {
             this->spriteRendering.b3 = 3;
             this->spritePriority.b0 = 6;
             this->speed = (Random() & 0x1ff) + 0x200;
-            this->field_0x20 = (Random() & 0x1fff) + 0x18000;
+            this->hVelocity = (Random() & 0x1fff) + 0x18000;
             uVar1 = (((u8)Random() & 7) - 4);
             this->direction -= uVar1;
             *(u32*)&this->field_0x78 = 600;
diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c
index 265a1e5b..72d34a73 100644
--- a/src/projectile/rockProjectile.c
+++ b/src/projectile/rockProjectile.c
@@ -31,7 +31,7 @@ void sub_080A8064(Entity* this) {
 void RockProjectile_Init(Entity* this) {
     this->action = 1;
     this->actionDelay = 0x30;
-    this->field_0x20 = 0xa000;
+    this->hVelocity = 0xa000;
     InitializeAnimation(this, 0);
 }
 
@@ -86,7 +86,7 @@ void sub_080A8178(Entity* this) {
     this->action = 2;
     this->flags &= 0x7f;
     this->speed = 0x40;
-    this->field_0x20 = 0x14000;
+    this->hVelocity = 0x14000;
 }
 
 void (*const RockProjectile_Functions[])(Entity*) = {
diff --git a/src/projectile/stalfosProjectile.c b/src/projectile/stalfosProjectile.c
index 0c48006f..fb75691e 100644
--- a/src/projectile/stalfosProjectile.c
+++ b/src/projectile/stalfosProjectile.c
@@ -33,7 +33,7 @@ void sub_080A9A34(Entity* this) {
     if (this->bitfield == 0x9d) {
         this->action = 3;
         this->flags &= 0x7f;
-        this->field_0x20 = 0x2a000;
+        this->hVelocity = 0x2a000;
         this->spritePriority.b1 = 1;
     }
 }
@@ -77,7 +77,7 @@ void StalfosProjectile_Init(Entity* this) {
             break;
         case 2:
             this->action = 3;
-            this->field_0x20 = 0x2a000;
+            this->hVelocity = 0x2a000;
             this->spritePriority.b1 = 1;
             break;
         default:
@@ -117,7 +117,7 @@ void StalfosProjectile_Action2(Entity* this) {
 }
 
 void StalfosProjectile_Action3(Entity* this) {
-    if (this->field_0x20 < 0) {
+    if (this->hVelocity < 0) {
         this->spriteSettings.b.flipY = 1;
     }
     if (sub_08003FC4(this, 0x2000) == 0) {
diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c
index cad6d879..00dff22b 100644
--- a/src/projectile/v1FireProjectile.c
+++ b/src/projectile/v1FireProjectile.c
@@ -42,7 +42,7 @@ void V1FireProjectile_Init(Entity* this) {
     s8* data;
 
     this->action = 1;
-    this->field_0x20 = -0x10000;
+    this->hVelocity = -0x10000;
     this->field_0x76.HWORD = TILE(this->x.HALF.HI, this->y.HALF.HI);
     CopyPosition(this->parent, this);
     sub_0806F5BC(this, 0x1000, this->direction);
@@ -68,7 +68,7 @@ void V1FireProjectile_Init(Entity* this) {
             iVar2 = 0x20;
         }
     }
-    this->field_0x20 = (this->height.WORD / (iVar2 << 8)) << 0xd;
+    this->hVelocity = (this->height.WORD / (iVar2 << 8)) << 0xd;
 
     this->direction = sub_080045B4(this, x, y);
 }