diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-06-30 16:20:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 16:20:26 -0700 |
| commit | 7d2e4e81dc2e1e598b41fc41a859faa8668514e8 (patch) | |
| tree | 7ceebcfd86a24530ea395c146ac1759683bd585b /src/d/menu/d_menu_save.cpp | |
| parent | 046d178003035ea87d3042a61917c2d482c68c74 (diff) | |
| parent | a2e21275cb2722aed941cd5290b57b29732ce6d7 (diff) | |
Merge pull request #202 from lepelog/inline-stuff
move inlines
Diffstat (limited to 'src/d/menu/d_menu_save.cpp')
| -rw-r--r-- | src/d/menu/d_menu_save.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index f190801985..dbef5a0e60 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -265,15 +265,6 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // -inline u8 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { - return param_0->field_0x09 >> 1 & 0x1f; -} - -inline void mDoAud_seStartLevel(u32 sfx_id, const Vec* param_1, u32 param_2, s8 param_3) { - Z2AudioMgr::getInterface()->mSeMgr.seStartLevel(sfx_id, param_1, param_2, param_3, 1.0f, 1.0f, - -1.0f, -1.0f, 0); -} - /* ############################################################################################## */ /* 803BDF78-803BDF84 01B098 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -1675,7 +1666,7 @@ asm void dMenu_save_c::memCardDataLoadWait() { /* 801F2840-801F28E4 1ED180 00A4+00 2/2 0/0 0/0 .text dataWrite__12dMenu_save_cFv */ void dMenu_save_c::dataWrite() { - int stageNo = dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()); + int stageNo = i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()); dComIfGs_putSave(stageNo); dComIfGs_setMemoryToCard(mSaveBuffer, field_0x54); @@ -1701,7 +1692,7 @@ SECTION_DEAD static char const* const stringBase_80397A06 = "save cmdState %d\n" // matches with literals #ifdef NONMATCHING void dMenu_save_c::memCardDataSaveWait() { - mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); + i_mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); if (mWaitTimer != 0) { mWaitTimer--; |