From a7ad4afebdc464500dee3c440bf3321b2c9cc5c8 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sun, 6 Mar 2022 17:50:45 +0200 Subject: rename and retype RoomVars field_0xac --- src/object/pressurePlate.c | 2 +- src/object/pushableStatue.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/object') diff --git a/src/object/pressurePlate.c b/src/object/pressurePlate.c index 556a0344..b3231615 100644 --- a/src/object/pressurePlate.c +++ b/src/object/pressurePlate.c @@ -102,7 +102,7 @@ static u32 sub_08088938(PressurePlateEntity* this) { x = super->x.HALF.HI - 8; y = super->y.HALF.HI - 8; for (i = 0; i < 8; ++i) { - Entity* e = gRoomVars.field_0xac[i]; + Entity* e = gRoomVars.entities[i]; if (e != NULL) { if ((u16)(e->x.HALF.HI - x) < 0x11 && ((u16)(e->y.HALF_U.HI - y) < 0x11)) { e->spriteOffsetY = sSpriteOffsets[this->dir]; diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c index 824450fc..f499f565 100644 --- a/src/object/pushableStatue.c +++ b/src/object/pushableStatue.c @@ -175,8 +175,8 @@ void sub_08089454(PushableStatueEntity* this) { void sub_080894C8(PushableStatueEntity* this) { u32 index; for (index = 0; index < 8; index++) { - if (gRoomVars.field_0xac[index] == NULL) { - gRoomVars.field_0xac[index] = this; + if (gRoomVars.entities[index] == NULL) { + gRoomVars.entities[index] = super; break; } } @@ -185,8 +185,8 @@ void sub_080894C8(PushableStatueEntity* this) { void sub_080894FC(PushableStatueEntity* this) { u32 index; for (index = 0; index <= 7; index++) { - if (this == (PushableStatueEntity*)gRoomVars.field_0xac[index]) { - gRoomVars.field_0xac[index] = NULL; + if (super == gRoomVars.entities[index]) { + gRoomVars.entities[index] = NULL; break; } } -- cgit v1.2.3