diff options
| author | theo3 <arisstephenson2@gmail.com> | 2020-11-23 22:18:34 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2020-11-23 22:18:34 -0800 |
| commit | edbf03101a64b05e9d20cdf53ec2ca4888a2effa (patch) | |
| tree | db67f687b238abf2961b819dd0f121fffbb341c2 /src/enemy | |
| parent | 0b52f80e4d01ce7c9104eeb9b474bc1cf77b94ed (diff) | |
done
Diffstat (limited to 'src/enemy')
| -rw-r--r-- | src/enemy/waterDrop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c index b95535df..3a1e347b 100644 --- a/src/enemy/waterDrop.c +++ b/src/enemy/waterDrop.c @@ -6,7 +6,7 @@ void sub_0802A39C(Entity*); void sub_0802A334(Entity*); -extern u16 gUnk_02001A40[]; +extern u16 gBG3Buffer[]; extern void (*const gUnk_080CD030[])(Entity*); extern const u8 gUnk_080CD03C[]; @@ -63,7 +63,7 @@ void sub_0802A2FC(Entity* this) { void sub_0802A334(Entity* this) { u32 x = (this->x.HALF.HI - gRoomControls.roomScrollX + gScreen.bg.bg1yOffset) >> 3; u32 y = (this->y.HALF.HI - gRoomControls.roomScrollY + gScreen.bg.bg2xOffset) >> 3; - if (gUnk_02001A40[(x & 0x1fU) + (y & 0x1fU) * 0x20 + 0x400]) { + if (gBG3Buffer[(x & 0x1fU) + (y & 0x1fU) * 0x20 + 0x400]) { this->collisionLayer = 2; } else { this->collisionLayer = 1; @@ -74,7 +74,7 @@ void sub_0802A334(Entity* this) { void sub_0802A39C(Entity* this) { u32 x = (gPlayerEntity.x.HALF.HI - gRoomControls.roomScrollX + gScreen.bg.bg1yOffset) >> 3; u32 y = (gPlayerEntity.y.HALF.HI - gRoomControls.roomScrollY + gScreen.bg.bg2xOffset - 10) >> 3; - if (gUnk_02001A40[(x & 0x1fU) + (y & 0x1fU) * 0x20 + 0x400]) { + if (gBG3Buffer[(x & 0x1fU) + (y & 0x1fU) * 0x20 + 0x400]) { this->flags &= ~0x80; } else { this->flags |= 0x80; |