diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-11-11 21:18:48 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-11-11 21:18:48 -0800 |
| commit | fddb4abd534ef1ef623cb044bc97c45713fbcfd1 (patch) | |
| tree | 4668fa2e16aa441da3c2f06b8d9b54c9762c2523 /src/enemy | |
| parent | 313cc336f21fcf81e3e336b4fe45ca5053771f93 (diff) | |
move entity update functions
Diffstat (limited to 'src/enemy')
| -rw-r--r-- | src/enemy/waterDrop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c index 0625569c..d32ae94e 100644 --- a/src/enemy/waterDrop.c +++ b/src/enemy/waterDrop.c @@ -62,8 +62,8 @@ void sub_0802A2FC(Entity* this) { } void sub_0802A334(Entity* this) { - u32 x = (this->x.HALF.HI - gRoomControls.roomScrollX + gScreen.bg.bg1xOffset) >> 3; - u32 y = (this->y.HALF.HI - gRoomControls.roomScrollY + gScreen.bg.bg1yOffset) >> 3; + u32 x = (this->x.HALF.HI - gRoomControls.roomScrollX + gScreen.bg1.xOffset) >> 3; + u32 y = (this->y.HALF.HI - gRoomControls.roomScrollY + gScreen.bg1.yOffset) >> 3; if (gBG3Buffer[(x & 0x1fU) + (y & 0x1fU) * 0x20 + 0x400]) { this->collisionLayer = 2; } else { @@ -73,8 +73,8 @@ void sub_0802A334(Entity* this) { } void sub_0802A39C(Entity* this) { - u32 x = (gPlayerEntity.x.HALF.HI - gRoomControls.roomScrollX + gScreen.bg.bg1xOffset) >> 3; - u32 y = (gPlayerEntity.y.HALF.HI - gRoomControls.roomScrollY + gScreen.bg.bg1yOffset - 10) >> 3; + u32 x = (gPlayerEntity.x.HALF.HI - gRoomControls.roomScrollX + gScreen.bg1.xOffset) >> 3; + u32 y = (gPlayerEntity.y.HALF.HI - gRoomControls.roomScrollY + gScreen.bg1.yOffset - 10) >> 3; if (gBG3Buffer[(x & 0x1fU) + (y & 0x1fU) * 0x20 + 0x400]) { COLLISION_OFF(this); } else { |