summaryrefslogtreecommitdiff
path: root/src/manager/manager2.c
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2022-01-03 23:58:02 -0800
committertheo3 <arisstephenson2@gmail.com>2022-01-03 23:58:02 -0800
commit52db70bb9d63a801f76b2fe6b359bd402a2c5b2a (patch)
treea38de84a806c50f765d0370a2668a695038eb894 /src/manager/manager2.c
parentf26b2e286a7f462947b395da259e185fc8ecfa7f (diff)
naming work
Diffstat (limited to 'src/manager/manager2.c')
-rw-r--r--src/manager/manager2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/manager/manager2.c b/src/manager/manager2.c
index 0294a65f..a9404c10 100644
--- a/src/manager/manager2.c
+++ b/src/manager/manager2.c
@@ -29,7 +29,7 @@ void Manager2_Main(Manager2* this) {
void sub_0805754C(Manager2* this) {
s32 bgOffset;
- bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
+ bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
bgOffset += bgOffset >> 3;
gScreen.bg3.yOffset = bgOffset & 0x3f;
gScreen.bg3.tilemap = gMapDataTopSpecial + (bgOffset / 0x40) * 0x200;
@@ -37,7 +37,7 @@ void sub_0805754C(Manager2* this) {
this->field_0x38 = gScreen.bg3.tilemap;
gScreen.bg3.updated = 1;
}
- bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
+ bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
bgOffset += bgOffset >> 2;
gScreen.bg1.yOffset = bgOffset & 0x3f;
gScreen.bg1.tilemap = gMapDataTopSpecial + 0x2000 + (bgOffset / 0x40) * 0x200;
@@ -55,7 +55,7 @@ void sub_080575C8(u32 param) {
LoadGfxGroup(param);
gRoomVars.unk_10[0] = param;
- bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
+ bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
bgOffset += bgOffset >> 3;
gScreen.bg3.yOffset = bgOffset & 0x3f;
gScreen.bg3.xOffset = 0;
@@ -63,7 +63,7 @@ void sub_080575C8(u32 param) {
gScreen.bg3.control = BGCNT_SCREENBASE(29) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(2) | BGCNT_MOSAIC;
gScreen.bg3.updated = 1;
- bgOffset = (gRoomControls.roomScrollY - gRoomControls.roomOriginY);
+ bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y);
bgOffset += bgOffset >> 2;
gScreen.bg1.yOffset = bgOffset & 0x3f;
gScreen.bg1.xOffset = 0;