From 341ec8cdf67ed646c29fe3278289abae5717a440 Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Tue, 21 Jul 2020 23:16:12 -0700
Subject: [PATCH] fix menu.h offsets

---
 include/menu.h           |  8 ++++----
 src/code_0805436C.c      |  2 +-
 src/introSetTransition.c | 18 +++++++++---------
 src/sub_080A554C.c       |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/menu.h b/include/menu.h
index e3053783..13564462 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -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;
 
diff --git a/src/code_0805436C.c b/src/code_0805436C.c
index c522c408..92175a3c 100644
--- a/src/code_0805436C.c
+++ b/src/code_0805436C.c
@@ -184,5 +184,5 @@ u32 sub_0805457C(u32 arg0, u32 arg1) {
 
 void sub_08054870(void)
 {
-  gUnk_080FE2A0[gMenu.secret]();
+  gUnk_080FE2A0[gMenu.menuType]();
 }
\ No newline at end of file
diff --git a/src/introSetTransition.c b/src/introSetTransition.c
index 3bb850e2..ea8b8a5e 100644
--- a/src/introSetTransition.c
+++ b/src/introSetTransition.c
@@ -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();
diff --git a/src/sub_080A554C.c b/src/sub_080A554C.c
index 5fb0db17..9bdd2175 100644
--- a/src/sub_080A554C.c
+++ b/src/sub_080A554C.c
@@ -21,6 +21,6 @@ u32 sub_080A554C(u32 arg0)
 
 void sub_080A5574(void)
 {
-  gUnk_08128BF8[gMenu.secret]();
+  gUnk_08128BF8[gMenu.menuType]();
   sub_080A57F4();
 }
\ No newline at end of file