From 5c1c941182ddaa52e40fdc662371c7d0a2ed1498 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 30 Dec 2016 14:11:34 -0800 Subject: begin decompiling pokemon_3 --- include/main.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/main.h') diff --git a/include/main.h b/include/main.h index 054bba901..5d8f8b68a 100644 --- a/include/main.h +++ b/include/main.h @@ -40,6 +40,7 @@ struct Main u8 state; u8 oamLoadDisabled:1; + u8 inBattle:1; }; extern u8 gUnknown_3001764; -- cgit v1.2.3 From 370c7f78539698902907f262721fe60e606c774d Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 4 Jan 2017 17:31:44 -0500 Subject: more labels (#159) * labels for tv.c and tv.s * match function prologue a little bit better * whoops * label and document lottery_corner.c * gSoftResetDisabled * add labels for main_menu.c * labels for metatile_behavior.c --- include/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/main.h') diff --git a/include/main.h b/include/main.h index 5d8f8b68a..bed3a5749 100644 --- a/include/main.h +++ b/include/main.h @@ -45,7 +45,7 @@ struct Main extern u8 gUnknown_3001764; extern struct Main gMain; -extern u8 gUnknown_3001BB4; +extern bool8 gSoftResetDisabled; extern bool8 gLinkVSyncDisabled; extern const u8 gGameVersion; -- cgit v1.2.3 From 41d2b112ebdf91da3d85b4495ceb95e69d69ef0a Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 4 Jan 2017 16:32:45 -0600 Subject: almost finish decompiling matsuda_debug_menu.c (#158) * almost finish decompiling matsuda_debug_menu.c * rename sub_8071C20 to CloseMenu --- include/main.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'include/main.h') diff --git a/include/main.h b/include/main.h index bed3a5749..eca0e7f96 100644 --- a/include/main.h +++ b/include/main.h @@ -9,38 +9,38 @@ typedef void (*IntrFunc)(void); struct Main { - MainCallback callback1; - MainCallback callback2; + /*0x000*/ MainCallback callback1; + /*0x004*/ MainCallback callback2; - MainCallback field_8; + /*0x008*/ MainCallback field_8; - IntrCallback vblankCallback; - IntrCallback hblankCallback; - IntrCallback vcountCallback; - IntrCallback serialCallback; + /*0x00C*/ IntrCallback vblankCallback; + /*0x010*/ IntrCallback hblankCallback; + /*0x014*/ IntrCallback vcountCallback; + /*0x018*/ IntrCallback serialCallback; - vu16 intrCheck; + /*0x01C*/ vu16 intrCheck; - u32 vblankCounter1; - u32 vblankCounter2; + /*0x020*/ u32 vblankCounter1; + /*0x024*/ u32 vblankCounter2; - u16 heldKeysRaw; // held keys without L=A remapping - u16 newKeysRaw; // newly pressed keys without L=A remapping - u16 heldKeys; // held keys with L=A remapping - u16 newKeys; // newly pressed keys with L=A remapping - u16 newAndRepeatedKeys; // newly pressed keys plus key repeat - u16 keyRepeatCounter; // counts down to 0, triggering key repeat - bool16 watchedKeysPressed; // whether one of the watched keys was pressed - u16 watchedKeysMask; // bit mask for watched keys + /*0x028*/ u16 heldKeysRaw; // held keys without L=A remapping + /*0x02A*/ u16 newKeysRaw; // newly pressed keys without L=A remapping + /*0x02C*/ u16 heldKeys; // held keys with L=A remapping + /*0x02E*/ u16 newKeys; // newly pressed keys with L=A remapping + /*0x030*/ u16 newAndRepeatedKeys; // newly pressed keys plus key repeat + /*0x032*/ u16 keyRepeatCounter; // counts down to 0, triggering key repeat + /*0x034*/ bool16 watchedKeysPressed; // whether one of the watched keys was pressed + /*0x036*/ u16 watchedKeysMask; // bit mask for watched keys - u8 objCount; + /*0x038*/ u8 objCount; - struct OamData oamBuffer[128]; + /*0x03C*/ struct OamData oamBuffer[128]; - u8 state; + /*0x43C*/ u8 state; - u8 oamLoadDisabled:1; - u8 inBattle:1; + /*0x43D*/ u8 oamLoadDisabled:1; + /*0x43D*/ u8 inBattle:1; }; extern u8 gUnknown_3001764; -- cgit v1.2.3 From 3dc2f8992446b2fffa0f7da16351e1445856f190 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 5 Jan 2017 02:53:34 -0800 Subject: field_8 -> savedCallback --- include/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/main.h') diff --git a/include/main.h b/include/main.h index eca0e7f96..aef55a182 100644 --- a/include/main.h +++ b/include/main.h @@ -12,7 +12,7 @@ struct Main /*0x000*/ MainCallback callback1; /*0x004*/ MainCallback callback2; - /*0x008*/ MainCallback field_8; + /*0x008*/ MainCallback savedCallback; /*0x00C*/ IntrCallback vblankCallback; /*0x010*/ IntrCallback hblankCallback; -- cgit v1.2.3 From 1aeef4e4c3e6a6d844a712bad5f6fe88c57e5f9b Mon Sep 17 00:00:00 2001 From: NieDzejkob Date: Sun, 21 May 2017 22:17:31 +0200 Subject: Identify gUnknown_3001764 --- include/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/main.h') diff --git a/include/main.h b/include/main.h index aef55a182..e0cb09370 100644 --- a/include/main.h +++ b/include/main.h @@ -43,7 +43,7 @@ struct Main /*0x43D*/ u8 inBattle:1; }; -extern u8 gUnknown_3001764; +extern u8 gLinkTransferringData; extern struct Main gMain; extern bool8 gSoftResetDisabled; extern bool8 gLinkVSyncDisabled; -- cgit v1.2.3