Rename SpriteBase::spriteX -> meX

Author: JaceCear

include/game/entity.h

@@ -205,7 +205,7 @@ typedef struct {
 
 #define ENEMY_DESTROY_IF_OUT_OF_CAM_RANGE(_enemy, _mapEntity, _sprite)                                                                     \
     if (IS_OUT_OF_CAM_RANGE(_sprite->x, _sprite->y)) {                                                                                     \
-        SET_MAP_ENTITY_NOT_INITIALIZED(_mapEntity, _enemy->base.meX);                                                                  \
+        SET_MAP_ENTITY_NOT_INITIALIZED(_mapEntity, _enemy->base.meX);                                                                      \
         TaskDestroy(gCurTask);                                                                                                             \
         return;                                                                                                                            \
     }

src/game/enemies/balloon.c

@@ -35,7 +35,7 @@ void CreateEntity_Balloon(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u
         balloon->base.regionX = spriteRegionX;
         balloon->base.regionY = spriteRegionY;
         balloon->base.me = me;
-        balloon->base.spriteX = me->x;
+        balloon->base.meX = me->x;
         balloon->base.id = spriteY;
 
         ENEMY_SET_SPAWN_POS_FLYING(balloon, me);

src/game/enemies/bell.c

@@ -34,7 +34,7 @@ void CreateEntity_Bell(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 s
     bell->base.regionX = spriteRegionX;
     bell->base.regionY = spriteRegionY;
     bell->base.me = me;
-    bell->base.spriteX = me->x;
+    bell->base.meX = me->x;
     bell->base.id = spriteY;
 
     bell->spawnX = Q(TO_WORLD_POS(me->x, spriteRegionX));
@@ -60,7 +60,7 @@ static void Task_BellMain(void)
     ENEMY_DESTROY_IF_PLAYER_HIT_2(s, pos);
 
     if (IS_OUT_OF_CAM_RANGE(s->x, s->y)) {
-        SET_MAP_ENTITY_NOT_INITIALIZED(me, bell->base.spriteX);
+        SET_MAP_ENTITY_NOT_INITIALIZED(me, bell->base.meX);
         TaskDestroy(gCurTask);
         return;
     }
@@ -96,7 +96,7 @@ void sub_8054D20(void)
     Coll_Player_Projectile(s, pos.x, pos.y);
 
     if (IS_OUT_OF_CAM_RANGE(s->x, s->y)) {
-        SET_MAP_ENTITY_NOT_INITIALIZED(me, bell->base.spriteX);
+        SET_MAP_ENTITY_NOT_INITIALIZED(me, bell->base.meX);
         TaskDestroy(gCurTask);
         return;
     }

src/game/enemies/bullet_buzzer.c

@@ -38,7 +38,7 @@ void CreateEntity_BulletBuzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegio
     bbuzzer->base.regionX = spriteRegionX;
     bbuzzer->base.regionY = spriteRegionY;
     bbuzzer->base.me = me;
-    bbuzzer->base.spriteX = me->x;
+    bbuzzer->base.meX = me->x;
     bbuzzer->base.id = spriteY;
 
     ENEMY_SET_SPAWN_POS_FLYING(bbuzzer, me);

src/game/enemies/buzzer.c

@@ -41,7 +41,7 @@ void CreateEntity_Buzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
         buzzer->base.regionX = spriteRegionX;
         buzzer->base.regionY = spriteRegionY;
         buzzer->base.me = me;
-        buzzer->base.spriteX = me->x;
+        buzzer->base.meX = me->x;
         buzzer->base.id = spriteY;
 
         ENEMY_SET_SPAWN_POS_FLYING(buzzer, me);

src/game/enemies/circus.c

@@ -34,7 +34,7 @@ void CreateEntity_Circus(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
     circus->base.regionX = spriteRegionX;
     circus->base.regionY = spriteRegionY;
     circus->base.me = me;
-    circus->base.spriteX = me->x;
+    circus->base.meX = me->x;
     circus->base.id = spriteY;
 
     if (me->d.sData[1] != 0) {

src/game/enemies/flickey.c

@@ -52,7 +52,7 @@ void CreateEntity_Flickey(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u
         flickey->base.regionX = spriteRegionX;
         flickey->base.regionY = spriteRegionY;
         flickey->base.me = me;
-        flickey->base.spriteX = me->x;
+        flickey->base.meX = me->x;
         flickey->base.id = spriteY;
 
         ENEMY_SET_SPAWN_POS_FLYING(flickey, me);

src/game/enemies/geji_geji.c

@@ -46,7 +46,7 @@ void CreateEntity_GejiGeji(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
     gg->base.regionX = spriteRegionX;
     gg->base.regionY = spriteRegionY;
     gg->base.me = me;
-    gg->base.spriteX = me->x;
+    gg->base.meX = me->x;
     gg->base.id = spriteY;
 
     gg->spawnX = Q(TO_WORLD_POS(me->x, spriteRegionX));

src/game/enemies/gohla.c

@@ -45,7 +45,7 @@ void CreateEntity_Gohla(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
         gohla->base.regionX = spriteRegionX;
         gohla->base.regionY = spriteRegionY;
         gohla->base.me = me;
-        gohla->base.spriteX = me->x;
+        gohla->base.meX = me->x;
         gohla->base.id = spriteY;
 
         if (me->d.sData[1]) {

src/game/enemies/hammerhead.c

@@ -33,7 +33,7 @@ void CreateEntity_Hammerhead(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY
     hammerhead->base.regionX = spriteRegionX;
     hammerhead->base.regionY = spriteRegionY;
     hammerhead->base.me = me;
-    hammerhead->base.spriteX = me->x;
+    hammerhead->base.meX = me->x;
     hammerhead->base.id = spriteY;
 
     hammerhead->unk48 = 0;
@@ -76,7 +76,7 @@ static void Task_Hammerhead(void)
     hammerhead->unk48 = (sin * 15) >> 3;
     ip = hammerhead->unk48 - prevUnk48;
 
-    posX = TO_WORLD_POS(hammerhead->base.spriteX, hammerhead->base.regionX);
+    posX = TO_WORLD_POS(hammerhead->base.meX, hammerhead->base.regionX);
     posY = TO_WORLD_POS(me->y, hammerhead->base.regionY);
 
     s->x = posX - gCamera.x;
@@ -107,7 +107,7 @@ static void Task_Hammerhead(void)
 
         if (IS_OUT_OF_RANGE_3(s->x, s->y, (CAM_REGION_WIDTH / 2), CAM_REGION_WIDTH)
             && IS_OUT_OF_RANGE_3(posX, posY, (CAM_REGION_WIDTH / 2), CAM_REGION_WIDTH)) {
-            SET_MAP_ENTITY_NOT_INITIALIZED(me, hammerhead->base.spriteX);
+            SET_MAP_ENTITY_NOT_INITIALIZED(me, hammerhead->base.meX);
             TaskDestroy(gCurTask);
         } else {
             Player_UpdateHomingPosition(posX << 8, (posY << 8) + hammerhead->unk48);