summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
Diffstat (limited to 'src/object')
-rw-r--r--src/object/itemOnGround.c2
-rw-r--r--src/object/pressurePlate.c2
-rw-r--r--src/object/pushableStatue.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index 8aff156f..5c46e2dd 100644
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -96,7 +96,7 @@ void ItemOnGround(ItemOnGroundEntity* this) {
}
if (super->type == 0x5C) {
- gRoomVars.field_0x4++;
+ gRoomVars.numKinstoneDrops++;
}
sub_08080CB4(super);
diff --git a/src/object/pressurePlate.c b/src/object/pressurePlate.c
index a10818eb..ebb5d3a2 100644
--- a/src/object/pressurePlate.c
+++ b/src/object/pressurePlate.c
@@ -105,7 +105,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.entities[i];
+ Entity* e = gRoomVars.puzzleEntities[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 ed3de97f..c5c57579 100644
--- a/src/object/pushableStatue.c
+++ b/src/object/pushableStatue.c
@@ -173,8 +173,8 @@ void sub_08089454(PushableStatueEntity* this) {
void sub_080894C8(PushableStatueEntity* this) {
u32 index;
for (index = 0; index < 8; index++) {
- if (gRoomVars.entities[index] == NULL) {
- gRoomVars.entities[index] = super;
+ if (gRoomVars.puzzleEntities[index] == NULL) {
+ gRoomVars.puzzleEntities[index] = super;
break;
}
}
@@ -183,8 +183,8 @@ void sub_080894C8(PushableStatueEntity* this) {
void sub_080894FC(PushableStatueEntity* this) {
u32 index;
for (index = 0; index <= 7; index++) {
- if (super == gRoomVars.entities[index]) {
- gRoomVars.entities[index] = NULL;
+ if (super == gRoomVars.puzzleEntities[index]) {
+ gRoomVars.puzzleEntities[index] = NULL;
break;
}
}