diff options
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/d_com_inf_game.h | 10 | ||||
| -rw-r--r-- | include/d/d_file_select.h | 2 | ||||
| -rw-r--r-- | include/d/d_menu_option.h | 8 | ||||
| -rw-r--r-- | include/d/d_msg_class.h | 8 | ||||
| -rw-r--r-- | include/d/d_save.h | 4 | ||||
| -rw-r--r-- | include/d/d_timer.h | 3 |
6 files changed, 34 insertions, 1 deletions
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index f4c4a2a91f..13b49095bd 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -1392,6 +1392,11 @@ inline u8 dComIfGs_getSelectItemIndex(int i_no) { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(i_no); } +//TODO: actual name is unknown +inline u8 dComIfGs_getOptUnk0() { + return g_dComIfG_gameInfo.info.getPlayer().getConfig().getUnk0(); +} + inline u8 dComIfGs_getOptVibration() { return g_dComIfG_gameInfo.info.getPlayer().getConfig().getVibration(); } @@ -1951,6 +1956,11 @@ inline void dComIfGs_setLastWarpAcceptStage(s8 param_0) { g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpAcceptStage(param_0); } +//TODO: actual name is unknown +inline void dComIfGs_setOptUnk0(u8 i_unk0) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setUnk0(i_unk0); +} + inline void dComIfGs_setOptSound(u8 i_mode) { g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(i_mode); } diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h index 52db7307da..38808c21a5 100644 --- a/include/d/d_file_select.h +++ b/include/d/d_file_select.h @@ -13,7 +13,7 @@ class dFile_info_c; class dDlst_FileSel_c : public dDlst_base_c { public: /* 8018DEBC */ void draw(); - /* 8019135C */ ~dDlst_FileSel_c() { + /* 8019135C */ virtual ~dDlst_FileSel_c() { delete Scr; delete mpMessageString; } diff --git a/include/d/d_menu_option.h b/include/d/d_menu_option.h index 81d7ff4a86..4599aa65e5 100644 --- a/include/d/d_menu_option.h +++ b/include/d/d_menu_option.h @@ -31,6 +31,10 @@ public: /* 801E3DE0 */ bool _close(); /* 801E3F6C */ void atten_init(); /* 801E3FC4 */ void atten_move(); +#if VERSION == VERSION_GCN_JPN + void ruby_init(); + void ruby_move(); +#endif /* 801E41A0 */ void vib_init(); /* 801E41F8 */ void vib_move(); /* 801E4488 */ void sound_init(); @@ -61,6 +65,7 @@ public: /* 801E5678 */ void screenSet(); /* 801E6FBC */ void setSoundMode(u32); /* 801E7004 */ void setAttenString(); + /* 801E70E8 */ void setRubyString(); /* 801E70E8 */ void setVibString(); /* 801E71CC */ void setSoundString(); /* 801E7314 */ void setCursorPos(u8); @@ -179,6 +184,9 @@ private: /* 0x3E2 */ u8 field_0x3e2; /* 0x3E3 */ u8 field_0x3e3; /* 0x3E4 */ u8 field_0x3e4; +#if VERSION == VERSION_GCN_JPN + /* 0x3E5 */ u8 field_0x3e5_JPN; +#endif /* 0x3E5 */ u8 field_0x3e5; /* 0x3E6 */ u8 field_0x3e6; /* 0x3E7 */ u8 field_0x3e7; diff --git a/include/d/d_msg_class.h b/include/d/d_msg_class.h index d143da0538..c8b65625b5 100644 --- a/include/d/d_msg_class.h +++ b/include/d/d_msg_class.h @@ -578,8 +578,13 @@ struct jmessage_string_tReference : public JMessage::TReference { /* 0x0C */ J2DTextBox* mRubyPanePtr; /* 0x10 */ COutFont_c* mOutFontPtr; /* 0x14 */ JUTFont* mpFont; +#if VERSION == VERSION_GCN_JPN + /* 0x18 */ f32 mLineLength[9]; + /* 0x3C */ f32 mOutfontLength[9]; +#else /* 0x18 */ f32 mLineLength[12]; /* 0x48 */ f32 mOutfontLength[12]; +#endif /* 0x78 */ u32 mCCColor; /* 0x7C */ u32 mGCColor; /* 0x80 */ s16 mLineCount; @@ -659,6 +664,9 @@ struct jmessage_string_tRenderingProcessor : public JMessage::TRenderingProcesso /* 0x550 */ s16 field_0x550; /* 0x552 */ s16 field_0x552; /* 0x554 */ u8 field_0x554; +#if VERSION == VERSION_GCN_JPN + /* 0x558 */ u8 field_0x558[0x578 - 0x558]; +#endif }; #define MSGTAG_GROUP(g) (g << 16) diff --git a/include/d/d_save.h b/include/d/d_save.h index 733ee3fcef..56fb73e6a1 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -504,6 +504,10 @@ public: void setVibration(u8 i_status); u8 getPalLanguage() const; + //TODO: placeholder name, actual name is not known + u8 getUnk0() { return unk0; } + void setUnk0(u8 i_unk0) { unk0 = i_unk0; } + u8 getAttentionType() { return mAttentionType; } void setAttentionType(u8 i_mAttentionType) { mAttentionType = i_mAttentionType; } u16 getCalibrateDist() { return mCalibrateDist; } diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 20c9e0a559..e50bb790fd 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -52,6 +52,9 @@ public: /* 80260574 */ s32 createStart(u16); /* 80260AA8 */ bool checkStartAnimeEnd(); /* 80260AD4 */ void playBckAnimation(f32); +#if VERSION == VERSION_GCN_JPN + bool isLeadByte(int); +#endif /* 80260B54 */ void drawPikari(int); /* 80260690 */ virtual void draw(); |
