diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-05-23 03:09:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-23 12:09:59 +0200 |
| commit | e915df66c806bdff65aa243649f7abfe6cc19227 (patch) | |
| tree | 226e708c0546c45f65420446382ba597ad773651 /include/d/com | |
| parent | 462d71cbef02ef119fc2aa480b98cfeedde46441 (diff) | |
move d_a_alink and some related stuff (#130)
* clean up d_a_player
* move some of daalink
* more daalink / daplayer
* setup some daalink members
* rest of daalink members setup
* remove comment
* few more matches
* remove asm
* more matches
* more matches + move e_wb_class
* fix some d_save classes
Co-authored-by: lepelog <lepelog@users.noreply.github.com>
Diffstat (limited to 'include/d/com')
| -rw-r--r-- | include/d/com/d_com_inf_game.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index ad3186d54c..d002419509 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1,6 +1,7 @@ #ifndef D_COM_D_COM_INF_GAME_H #define D_COM_D_COM_INF_GAME_H +#include "d/a/d_a_alink.h" #include "d/bg/d_bg_s.h" #include "d/cc/d_cc_s.h" #include "d/d_attention.h" @@ -13,16 +14,6 @@ #include "d/save/d_save.h" #include "dolphin/types.h" -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - -struct daAlink_c { - /* 800BDE48 */ void setLastSceneMode(u32*); -}; - -struct daHorse_c {}; - struct dTimer_c { /* 8025D524 */ void deleteCheck(); /* 8025D618 */ void start(int, s16); @@ -392,23 +383,17 @@ public: u8 setWorldDark() { return mWorldDark; } dSv_player_c& getPlayer() { return info.getPlayer(); } - dSv_save_c& getSaveFile() { return info.getSaveFile(); } + dSv_save_c& getSaveFile() { return info.getSavedata(); } u32 getNowVibration() { return play.getNowVibration(); } dDlst_peekZ_c& getdlstPeekZ() { return draw_list_list.dlstPeekZ; } dComIfG_play_c& getPlay() { return play; } dSv_memory_c& getMemory() { return info.getMemory(); } - dSv_event_c& getEvent() { return info.getEvent(); } + dSv_event_c& getEvent() { return info.getTmp(); } dSv_info_c& getInfo() { return info; } inline dDlst_list_c& getDrawlist() { return draw_list_list; } private: /* 0x00000 */ dSv_info_c info; - /* 0x00EEC */ u8 field_0xeec[0x38]; - /* 0x00F24 */ u32 saveTotalTime; - /* 0x00F28 */ u32 saveStartTime; - /* 0x00F2C */ u32 field_0xf2c; - /* 0x00F30 */ u32 field_0xf30; - /* 0x00F34 */ u32 field_0xf34; /* 0x00F38 */ dComIfG_play_c play; /* 0x05F64 */ dDlst_list_c draw_list_list; /* 0x1C110 */ u8 field_0x1C114[0x1E8]; |