falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix menu.h offsets

This commit is contained in:
theo3 2020-07-21 23:16:12 -07:00
parent 2555185721
commit 341ec8cdf6
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/menu.h
View File

@ -20,14 +20,14 @@ typedef struct {
typedef struct {
u8 field_0x0;
u16 field_0x1;
u8 field_0x2;
u8 secret;
u8 field_0x3;
u8 menuType;
u8 overlayType;
u8 storyPanelIndex;
u16 transitionTimer;
u8 field_0xa[8];
u8 field_0x12;
u8 field_0x13[22];
u8 field_0x11;
u8 field_0x12[0x16];
u32 field_0x2c;
} Menu;

2
src/code_0805436C.c
View File

@ -184,5 +184,5 @@ u32 sub_0805457C(u32 arg0, u32 arg1) {
void sub_08054870(void)
{
gUnk_080FE2A0[gMenu.secret]();
gUnk_080FE2A0[gMenu.menuType]();
}

18
src/introSetTransition.c
View File

@ -61,9 +61,9 @@ void sub_080AD3F4(void)
u32 uVar2;
iVar1 = sub_080AD84C();
if (gMenu.secret == 0) {
if (gMenu.menuType == 0) {
sub_0801DA90(1);
gMenu.secret = 1;
gMenu.menuType = 1;
gMenu.transitionTimer = 0x78;
sub_0801D7EC(0x10);
sub_0801D7EC(1);
@ -107,13 +107,13 @@ void sub_080AD474(void)
int iVar2;
u32 uVar3;
gMenu.field_0x12++;
switch (gMenu.secret) {
gMenu.field_0x11++;
switch (gMenu.menuType) {
case 0:
gMenu.secret = 1;
gMenu.menuType = 1;
gMenu.overlayType = 0;
gMenu.transitionTimer = 0x1e;
gMenu.field_0x2 = 7;
gMenu.field_0x3 = 7;
EraseAllEntities();
sub_080ADD30(sub_0801CFA8(0));
gUnk_02024490 = 1;
@ -164,7 +164,7 @@ void sub_080AD474(void)
gMenu.transitionTimer--;
if (gMenu.transitionTimer == 0) {
gMenu.transitionTimer = 0xe10;
gMenu.secret++;
gMenu.menuType++;
}
sub_080AD644();
break;
@ -187,8 +187,8 @@ void sub_080AD474(void)
sub_080ADA14(0x1ff,0);
}
}
if (gMenu.field_0x2 != ((struct_02000000*)0x2000000)->gameLanguage) {
gMenu.field_0x2 = ((struct_02000000*)0x2000000)->gameLanguage;
if (gMenu.field_0x3 != ((struct_02000000*)0x2000000)->gameLanguage) {
gMenu.field_0x3 = ((struct_02000000*)0x2000000)->gameLanguage;
sub_0801D7EC(3);
}
sub_080AD89C();

2
src/sub_080A554C.c
View File

@ -21,6 +21,6 @@ u32 sub_080A554C(u32 arg0)
void sub_080A5574(void)
{
gUnk_08128BF8[gMenu.secret]();
gUnk_08128BF8[gMenu.menuType]();
sub_080A57F4();
}