mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-09 14:55:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve LayerStruct

Browse Source
This commit is contained in:
octorock
2022-03-05 11:43:58 +01:00
parent d18fed1fb9
commit d6bbbf2db6
67 changed files with 720 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menu/figurine_menu.c
+2 -2
View File
@@ -78,7 +78,7 @@ void Subtask_FigurineMenu(void) {
};
#if !(defined(DEMO_USA) || defined(DEMO_JP))
FlushSprites();
if (gUnk_02032EC0.field_0x3 == 0xff) {
if (gUI.field_0x3 == 0xff) {
figurineMenu0_Types[gMenu.menuType]();
} else {
figurineMenu1_Types[gMenu.menuType]();
@@ -113,7 +113,7 @@ void FigurineMenu_080A4608(void) {
{
int r0, r1, r2;
r1 = gUnk_02032EC0.field_0x3;
r1 = gUI.field_0x3;
r0 = gSave.unk6;
r2 = 0x88;
if (r0 == 0) {
src/menu/kinstone_menu.c
+10 -10
View File
@@ -345,7 +345,7 @@ typedef struct {
u8 unk_01;
u8 unk_02[2];
} struct_02019EE0;
extern struct_02019EE0 gUnk_02019EE0[16];
extern struct_02019EE0 gMapDataBottomSpecial[16];
void KinstoneMenu_080A4054(void) {
u32 uVar2;
@@ -353,8 +353,8 @@ void KinstoneMenu_080A4054(void) {
KinstoneMenu_080A414C();
KinstoneMenu_080A4080();
for (uVar2 = 0; uVar2 < 0x10; uVar2++) {
if (gUnk_02019EE0[uVar2].unk_01 != 0) {
gUnk_02019EE0[uVar2].unk_01 -= 1;
if (gMapDataBottomSpecial[uVar2].unk_01 != 0) {
gMapDataBottomSpecial[uVar2].unk_01 -= 1;
}
}
}
@@ -505,8 +505,8 @@ void sub_080A42E0(u32 param_1, u32 param_2) {
iVar4 = sub_080A43A8(uVar1);
if ((param_2 != 0) && (param_2 != 0xff)) {
int index = iVar4 * 4;
if (param_2 != gUnk_02019EE0[iVar4].unk_02[0]) {
gUnk_02019EE0[iVar4].unk_02[0] = param_2;
if (param_2 != gMapDataBottomSpecial[iVar4].unk_02[0]) {
gMapDataBottomSpecial[iVar4].unk_02[0] = param_2;
sub_0801C2F0(iVar4 * 2 + 0x2e0, param_2);
}
gOamCmd._8 = (s16)(iVar4 * 2) + 0x3ae0;
@@ -535,7 +535,7 @@ void sub_080A42E0(u32 param_1, u32 param_2) {
}
void sub_080A4398(void) {
MemClear(&gUnk_02019EE0, sizeof(gUnk_02019EE0));
MemClear(&gMapDataBottomSpecial, sizeof(gMapDataBottomSpecial));
}
u32 sub_080A43A8(u32 param_1) {
@@ -547,20 +547,20 @@ u32 sub_080A43A8(u32 param_1) {
sub_080A4418(param_1, uVar1 * 0x10 + 0x300);
}
{ int index = uVar1 * 4; }
gUnk_02019EE0[uVar1].unk_00[0] = param_1;
gUnk_02019EE0[uVar1].unk_01 = 2;
gMapDataBottomSpecial[uVar1].unk_00[0] = param_1;
gMapDataBottomSpecial[uVar1].unk_01 = 2;
return uVar1;
}
u32 sub_080A43DC(u32 unk1) {
u32 i;
for (i = 0; i < 16; i++) {
if (unk1 == gUnk_02019EE0[i].unk_00[0]) {
if (unk1 == gMapDataBottomSpecial[i].unk_00[0]) {
return i;
}
}
for (i = 0; i < 16; i++) {
if (gUnk_02019EE0[i].unk_01 == 0) {
if (gMapDataBottomSpecial[i].unk_01 == 0) {
return i + 0x10;
}
}