diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-30 22:18:38 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-30 22:18:38 +0100 |
| commit | 917ca10ba5f397e3e897afd3a3f9b8324de5bdb4 (patch) | |
| tree | b7eec587ce4c35fc5fe6d0dc29cac220b4ce9f6e /src/object | |
| parent | a818f1b7041898d7eee28b5c1c455ba3225e063f (diff) | |
| parent | 3c0c1ba5a0653e0acb1c433c3619cda0e3223ddd (diff) | |
Merge branch 'master' into enemies
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/itemOnGround.c | 2 | ||||
| -rw-r--r-- | src/object/pressurePlate.c | 2 | ||||
| -rw-r--r-- | src/object/pushableStatue.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index edb631a2..3a755c87 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -95,7 +95,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 be8a7ff6..df373091 100644 --- a/src/object/pressurePlate.c +++ b/src/object/pressurePlate.c @@ -104,7 +104,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 386cb3e0..90ba2fc2 100644 --- a/src/object/pushableStatue.c +++ b/src/object/pushableStatue.c @@ -172,8 +172,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; } } @@ -182,8 +182,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; } } |