diff options
| author | Henny022p <info@henny022.de> | 2022-01-24 02:16:20 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2022-01-24 02:16:20 +0100 |
| commit | 6fd53ccfa06855478a9bbdee8f859e00515fb191 (patch) | |
| tree | 4da35dd33abc305b013242a7ff0c79583497bed0 /src/object | |
| parent | 0e57341980dfc4da49b07aeef78e584003eff893 (diff) | |
started working on generic menu structs
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/fileScreenObjects.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index a59f8172..921b0b97 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.unk10.a[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.unk10.a[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.unk10.a[1] != 5) { - this->x.HALF.HI = gMenu.unk10.a[0] * 16 + 28; - y = gMenu.unk10.a[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.unk10.a[3]; + 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.unk10.a[1] == 5 && var1 == gMenu.unk10.a[2] ? 11 : 9; + this->palette.b.b0 = gGenericMenu.unk10.a[1] == 5 && var1 == gGenericMenu.unk10.a[2] ? 11 : 9; gUnk_02019EE0.isTransitioning |= sub_0808EF6C(this); } |
