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/npc | |
| parent | a818f1b7041898d7eee28b5c1c455ba3225e063f (diff) | |
| parent | 3c0c1ba5a0653e0acb1c433c3619cda0e3223ddd (diff) | |
Merge branch 'master' into enemies
Diffstat (limited to 'src/npc')
| -rw-r--r-- | src/npc/rem.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/npc/rem.c b/src/npc/rem.c index dba2b8dd..d921f196 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -434,18 +434,18 @@ void sub_0806AA50(Entity* this, ScriptExecutionContext* context) { MessageNoOverlap(messageIndex, this); switch (context->intVariable) { case 0: - gRoomVars.entities[0] = this; + gRoomVars.puzzleEntities[0] = this; PrependEntityToList(this, NPC); this->zVelocity = Q_16_16(1.5); break; case 1: - pEnt = FindNextDuplicateID(gRoomVars.entities[0], NPC); - gRoomVars.entities[1] = pEnt; + pEnt = FindNextDuplicateID(gRoomVars.puzzleEntities[0], NPC); + gRoomVars.puzzleEntities[1] = pEnt; pEnt->zVelocity = Q_16_16(1.5); break; case 2: - pEnt = FindNextDuplicateID(gRoomVars.entities[1], NPC); - gRoomVars.entities[2] = pEnt; + pEnt = FindNextDuplicateID(gRoomVars.puzzleEntities[1], NPC); + gRoomVars.puzzleEntities[2] = pEnt; pEnt->zVelocity = Q_16_16(1.5); break; } @@ -456,7 +456,7 @@ void sub_0806AA50(Entity* this, ScriptExecutionContext* context) { context->unk_18 = 1; break; case 1: - pEnt = gRoomVars.entities[context->intVariable]; + pEnt = gRoomVars.puzzleEntities[context->intVariable]; if (pEnt->z.HALF.HI < 0) { break; } @@ -474,7 +474,7 @@ void sub_0806AA50(Entity* this, ScriptExecutionContext* context) { } void sub_0806AB74(Entity* this) { - gRoomVars.field_0x3 = 1; + gRoomVars.remFlagUnused = TRUE; if ((s32)(this->y.HALF.HI - (u32)gRoomControls.origin_y) < 0xa8) { this->y.HALF.HI = gRoomControls.origin_y + 0xa8; } |