diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2026-01-24 23:36:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-24 23:36:23 -0800 |
| commit | 5867eaf68b97bfe359849aafe93af5f73313c782 (patch) | |
| tree | 09765780deff6345c89b4447a3b53b8cd9649f86 /src/d/actor/d_a_e_gm.cpp | |
| parent | e01dbc3297f000dd440410d999c4f4f32d2e25d0 (diff) | |
general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)
* typedef for cPhs_Step
* make sdk includes consistent
* d_menu_quit / d_msg_scrn_explain debug
* d_a_obj_testcube mostly done
* d_debug_pad mostly done
* jstudio tool library headers
* some JStudioCameraEditor headers
* d_jcam_editor mostly done
* try fixing some shield regressions
* d_bg_parts mostly done
* fix merge errors
* debug fix
Diffstat (limited to 'src/d/actor/d_a_e_gm.cpp')
| -rw-r--r-- | src/d/actor/d_a_e_gm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index 228779b6ea..eef5561904 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -1699,7 +1699,7 @@ static u16 const l_heapsize[4] = { 0x3120, 0x3120, 0x21E0, 0x2DE0, }; -cPhs__Step daE_GM_c::create() { +cPhs_Step daE_GM_c::create() { fopAcM_ct(this, daE_GM_c); mType = fopAcM_GetParam(this); @@ -1727,11 +1727,11 @@ cPhs__Step daE_GM_c::create() { field_0xa54 = uVar1 * 100.0f; } - cPhs__Step phase; + cPhs_Step phase; if (mType == TYPE_GOMA) { - phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_mg"); + phase = dComIfG_resLoad(&mPhase, "E_mg"); } else { - phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_gm"); + phase = dComIfG_resLoad(&mPhase, "E_gm"); } if (phase == cPhs_COMPLEATE_e) { |