diff options
| author | jdflyer <jdflyer10@gmail.com> | 2023-01-21 16:47:18 -0700 |
|---|---|---|
| committer | jdflyer <jdflyer10@gmail.com> | 2023-01-21 16:47:18 -0700 |
| commit | 0fb9c6d98f0ffc797764edc942329baba5becc19 (patch) | |
| tree | e1eda95aa4fdd7caeba26ed4a604aa2c14a1ab37 /include | |
| parent | 2f764d277f50653b02fba34f38171473d4217ce6 (diff) | |
d_menu_map_common progress
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPane.h | 8 | ||||
| -rw-r--r-- | include/d/com/d_com_inf_game.h | 5 | ||||
| -rw-r--r-- | include/d/d_select_cursor.h | 14 |
3 files changed, 26 insertions, 1 deletions
diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index 04cbb143cd..fe6649981b 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -21,7 +21,13 @@ enum J2DRotateAxis { /* 0x7A */ ROTATE_Z = 'z' }; -enum J2DBasePosition {}; +enum J2DBasePosition { + J2DBasePosition_0, + J2DBasePosition_1, + J2DBasePosition_2, + J2DBasePosition_3, + J2DBasePosition_4, +}; struct J2DPaneHeader { /* 0x0 */ u32 mKind; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index b6187c81c0..e221e46bd9 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -345,6 +345,7 @@ public: JKRArchive* getCollectResArchive() { return mCollectResArchive; } JKRArchive* getItemIconArchive() { return mItemIconArchive; } JKRArchive* getNameResArchive() { return mNameResArchive; } + JKRArchive* getFmapResArchive() { return mFmapResArchive; } JKRAramArchive* getFieldMapArchive2() { return (JKRAramArchive*)mFieldMapArchive2; } void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; } @@ -2850,4 +2851,8 @@ inline daAlink_c* daAlink_getAlinkActorClass() { return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); } +inline JKRArchive* dComIfGp_getFmapResArchive() { + return g_dComIfG_gameInfo.play.getFmapResArchive(); +} + #endif /* D_COM_D_COM_INF_GAME_H */ diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h index e9d3f70360..fa188148e0 100644 --- a/include/d/d_select_cursor.h +++ b/include/d/d_select_cursor.h @@ -49,6 +49,18 @@ public: mPositionY = y; } + void onUpdateFlag() { + mUpdateFlag = true; + } + + void resetUpdateFlag() { + mUpdateFlag = false; + } + + bool getUpdateFlag() { + return mUpdateFlag; + } + private: /* 0x04 */ J2DScreen* mpScreen; /* 0x08 */ J2DPane* mpPane; @@ -71,6 +83,8 @@ private: /* 0xA4 */ f32 field_0xa4[4]; /* 0xB4 */ u8 field_0xb4; /* 0xB5 */ s8 mNameIdx; + /* 0xB6 */ u8 field_0xb6; + /* 0xB7 */ bool mUpdateFlag; }; #endif /* D_D_SELECT_CURSOR_H */ |
