diff options
author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-17 01:14:19 +0100 |
---|---|---|
committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-17 01:14:19 +0100 |
commit | 9e3e6173760ebdbe58eda2986b9f21d31f774f16 (patch) | |
tree | 7cd8e0730639da41d63040bacf738a764f4322ed /src/fieldmap.c | |
parent | 09b8f4c09e69a2359cdf5e4497b97aca3746b8b1 (diff) |
Begin synchronising with pokeemerald
Diffstat (limited to 'src/fieldmap.c')
-rw-r--r-- | src/fieldmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index abb46fd35..4b5149878 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -715,7 +715,7 @@ bool8 CameraMove(int x, int y) unsigned int direction; struct MapConnection *connection; int old_x, old_y; - gCamera.field_0 = FALSE; + gCamera.active = FALSE; direction = GetPostCameraMoveMapBorderId(x, y); if (direction + 1 <= 1) { @@ -730,14 +730,14 @@ bool8 CameraMove(int x, int y) connection = sub_8056A64(direction, gSaveBlock1.pos.x, gSaveBlock1.pos.y); sub_8056918(connection, direction, x, y); sub_80538F0(connection->mapGroup, connection->mapNum); - gCamera.field_0 = TRUE; + gCamera.active = TRUE; gCamera.x = old_x - gSaveBlock1.pos.x; gCamera.y = old_y - gSaveBlock1.pos.y; gSaveBlock1.pos.x += x; gSaveBlock1.pos.y += y; sub_80566F0(direction); } - return gCamera.field_0; + return gCamera.active; } struct MapConnection *sub_8056A64(u8 direction, int x, int y) |