mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-07 12:07:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

started working on generic menu structs

Browse Source
This commit is contained in:
Henny022p
2022-01-24 02:16:20 +01:00
parent 0e57341980
commit 6fd53ccfa0
6 changed files with 119 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/fileScreenObjects.c
+7 -7
View File
@@ -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);
}