summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-03-06 17:50:45 +0200
committerTal Hayon <talhayon1@gmail.com>2022-03-06 17:50:45 +0200
commita7ad4afebdc464500dee3c440bf3321b2c9cc5c8 (patch)
treea48b938664d021472fe71ae5b63e192145386b48 /src/object
parent1724325cb05424bcc15e7d7dd893671d55a26860 (diff)
rename and retype RoomVars field_0xac
Diffstat (limited to 'src/object')
-rw-r--r--src/object/pressurePlate.c2
-rw-r--r--src/object/pushableStatue.c8
2 files changed, 5 insertions, 5 deletions
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;
}
}