diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/main.h | 46 | ||||
| -rw-r--r-- | include/menu.h | 2 |
2 files changed, 24 insertions, 24 deletions
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; diff --git a/include/menu.h b/include/menu.h index 7b3525461..05c675097 100644 --- a/include/menu.h +++ b/include/menu.h @@ -9,7 +9,7 @@ struct MenuAction u8 (*func)(); }; -void sub_8071C20(void); +void CloseMenu(void); void AppendToList(u8 *list, u8 *pindex, u32 value); void InitMenuWindow(const struct WindowConfig *); void MultistepInitMenuWindowBegin(const struct WindowConfig *); |