diff options
| author | theo3 <arisstephenson2@gmail.com> | 2022-01-03 23:58:02 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2022-01-03 23:58:02 -0800 |
| commit | 52db70bb9d63a801f76b2fe6b359bd402a2c5b2a (patch) | |
| tree | a38de84a806c50f765d0370a2668a695038eb894 /src/object/button.c | |
| parent | f26b2e286a7f462947b395da259e185fc8ecfa7f (diff) | |
naming work
Diffstat (limited to 'src/object/button.c')
| -rw-r--r-- | src/object/button.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/button.c b/src/object/button.c index 5f36262d..1d1c88d9 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -16,8 +16,8 @@ void sub_08081AE0(Entity* this) { if (this->cutsceneBeh.HWORD != 0) { this->collisionLayer = this->cutsceneBeh.HWORD; } - this->field_0x74.HWORD = (((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3F) | - ((((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3F) << 6); + this->field_0x74.HWORD = (((this->x.HALF.HI - gRoomControls.origin_x) >> 4) & 0x3F) | + ((((this->y.HALF.HI - gRoomControls.origin_y) >> 4) & 0x3F) << 6); this->field_0x70.HALF.HI = GetTileType(this->field_0x74.HWORD, this->collisionLayer); if (this->type == 0 && CheckFlags(this->field_0x86.HWORD)) { this->action = 5; |