diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-02-01 20:28:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 20:28:25 -0800 |
| commit | dcc3ac219204e181117e366a1fb082c1ff4aabdd (patch) | |
| tree | 9354649cab3c0e3f12d5a84ac01793461fcbb2c2 /src/object | |
| parent | b455aaf0133f9bae4a08efab65d9d9f1bc5b506f (diff) | |
| parent | 5824dc8467b41e064ddc7d5118b54cf1bf08e54d (diff) | |
Merge pull request #341 from Henny022p/subtask
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/cloud.c | 2 | ||||
| -rw-r--r-- | src/object/fileScreenObjects.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/object/cloud.c b/src/object/cloud.c index 37899c33..dcf64e9b 100644 --- a/src/object/cloud.c +++ b/src/object/cloud.c @@ -33,7 +33,7 @@ void sub_0809F514(Entity* this) { this->spriteSettings.draw = 0; this->field_0x68.HALF.LO = 12; gRoomControls.camera_target = this; - gUnk_02034490[0] = 255; + gUnk_02034490.unk0 = 255; sub_0809F7BC(this); } diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index d2af86c9..f68a531d 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -219,7 +219,7 @@ void sub_0808EABC(Entity* this) { } break; case 5: - switch (gMenu.focusCoords[this->type]) { + switch (gGenericMenu.unk10.a[this->type]) { case 0: var0 = 42; var1 = 40; @@ -228,7 +228,7 @@ void sub_0808EABC(Entity* this) { case 2: var0 = 20; var1 = 144; - var1 -= (gMenu.unk16 - gMenu.focusCoords[this->type]) * 32; + var1 -= (gGenericMenu.unk16 - gGenericMenu.unk10.a[this->type]) * 32; break; } break; @@ -371,9 +371,9 @@ void sub_0808ECBC(Entity* this) { void sub_0808ED64(Entity* this) { int y = 255; - if (gUnk_02032EC0.lastState == 1 && gMenu.focusCoords[1] != 5) { - this->x.HALF.HI = gMenu.focusCoords[0] * 16 + 28; - y = gMenu.focusCoords[1] * 16 + 58; + if (gUnk_02032EC0.lastState == 1 && gGenericMenu.unk10.a[1] != 5) { + this->x.HALF.HI = gGenericMenu.unk10.a[0] * 16 + 28; + y = gGenericMenu.unk10.a[1] * 16 + 58; } this->y.HALF.HI = y; } @@ -384,7 +384,7 @@ void sub_0808ED98(Entity* this) { this->field_0x68.HWORD = 27; y = -10; } else { - u32 var0 = gMenu.unk13; + u32 var0 = gGenericMenu.unk10.a[3]; if (var0 > 5) { var0 = 5; } @@ -416,7 +416,7 @@ void sub_0808EE00(Entity* this) { } this->field_0x6a.HWORD = var2; - this->palette.b.b0 = gMenu.focusCoords[1] == 5 && var1 == gMenu.field_0x12 ? 11 : 9; + this->palette.b.b0 = gGenericMenu.unk10.a[1] == 5 && var1 == gGenericMenu.unk10.a[2] ? 11 : 9; gUnk_02019EE0.isTransitioning |= sub_0808EF6C(this); } |