diff options
Diffstat (limited to 'src/npc')
| -rw-r--r-- | src/npc/npc5.c | 10 | ||||
| -rw-r--r-- | src/npc/townMinish.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/npc/npc5.c b/src/npc/npc5.c index 3cc244e9..6e71501e 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -530,11 +530,11 @@ u32 CalcJumpDirection(Entity* this) { }; static const u8 sTable[] = { - // vvv, animationState - VVV_43, DirectionSouth, VVV_42, DirectionNorth, VVV_45, DirectionEast, VVV_44, DirectionWest, 0x0, + // actTile, animationState + ACT_TILE_43, DirectionSouth, ACT_TILE_42, DirectionNorth, ACT_TILE_45, DirectionEast, ACT_TILE_44, DirectionWest, 0x0, }; - u32 vvv; + u32 actTile; u32 x; s32 x_offset; s32 y_offset; @@ -544,11 +544,11 @@ u32 CalcJumpDirection(Entity* this) { ptr = (s8*)sOffsets; x_offset = ptr[x]; y_offset = ptr[x + 1]; - vvv = GetVvvRelativeToEntity(this, x_offset, y_offset); + actTile = GetActTileRelativeToEntity(this, x_offset, y_offset); ptr2 = sTable; do { - if (*ptr2 != vvv || this->animationState != (ptr2[1] >> 2)) { + if (*ptr2 != actTile || this->animationState != (ptr2[1] >> 2)) { continue; } diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index 118b2587..b0f3fc68 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -811,8 +811,8 @@ void sub_0806B0E0(Entity* this, ScriptExecutionContext* context) { int idx = 0; // Checks if the dust is gone at these four tiles. - if (GetVvvAtRoomCoords(56, 184, 1) == VVV_87 && GetVvvAtRoomCoords(72, 184, 1) == VVV_87 && - GetVvvAtRoomCoords(56, 200, 1) == VVV_87 && GetVvvAtRoomCoords(72, 200, 1) == VVV_87) { + if (GetActTileAtRoomCoords(56, 184, 1) == ACT_TILE_87 && GetActTileAtRoomCoords(72, 184, 1) == ACT_TILE_87 && + GetActTileAtRoomCoords(56, 200, 1) == ACT_TILE_87 && GetActTileAtRoomCoords(72, 200, 1) == ACT_TILE_87) { idx = 1; } |