Merge branch 'master' into unkk_020851B8

# Conflicts:
#	arm9/asm/unk_020851B8.s

1 files changed, 15 insertions, 15 deletions

diff --git a/include/main.h b/include/main.h
index 9227d9a8..ba4d7bc2 100644
--- a/include/main.h
+++ b/include/main.h
@@ -79,26 +79,26 @@ struct Main
     s32 unk28;
     u32 unk2C;
     s32 unk30;
-    u32 unk34;
-    u32 unk38;
-    u32 unk3C;
-    u32 unk40;
-    u32 unk44;
+    u32 buttonMode;
+    u32 heldKeysRaw;
+    u32 newKeysRaw;
+    u32 newAndRepeatedKeysRaw;
+    u32 heldKeys;
     u32 newKeys;
     u32 newAndRepeatedKeys;
-    s32 unk50;
-    s32 unk54;
-    s32 unk58;
-    u16 unk5C;
-    u16 unk5E;
-    u16 unk60;
-    u16 unk62;
-    u8 unk64;
+    s32 keyRepeatCounter;
+    s32 keyRepeatContinueDelay;
+    s32 keyRepeatStartDelay;
+    u16 touchX;
+    u16 touchY;
+    u16 touchNew;
+    u16 touchHeld;
+    u8 touchpadReadAuto;
     u8 unk65;
     u8 unk66;
     u8 unk67;
-    u8 unk68;
-    u8 padding_69[3];
+    u8 softResetDisabled;
+    u8 padding_69[3]; // nice
     s32 unk6C;
 };