diff options
| author | Pheenoh <pheenoh@gmail.com> | 2021-01-10 02:33:36 -0500 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2021-01-10 02:33:36 -0500 |
| commit | fb341652cc8737075a9664f808ef6a1bcaf7e85d (patch) | |
| tree | 86e0d39124c6faf163362676305873fd91eee94d /src/d/d_stage.cpp | |
| parent | adf65faa28a15a597d384b66f94bbb6538ee213c (diff) | |
dStage_SetErrorRoom OK
Diffstat (limited to 'src/d/d_stage.cpp')
| -rw-r--r-- | src/d/d_stage.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index ded9fd4027..d4d861c872 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -11,11 +11,12 @@ #ifdef NONMATCHING void dStage_nextStage_c::set(const char* param_1, s8 param_2, s16 param_3, s8 param_4, s8 param_5, u8 param_6) { + if (!enabled) { enabled = 1; wipe = param_5; wipe_speed = param_6; - set__19dStage_startStage_cFPCcScsSc(param_1, param_2, param_3, param_4); + dStage_startStage_c::set(param_1, param_2, param_3, param_4); if (!strcmp(param_1, lbl_80378A50)) { m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x0 = 1; } @@ -29,14 +30,11 @@ asm void dStage_nextStage_c::set(const char* param_1, s8 param_2, s16 param_3, s } #endif -extern "C" { -// dStage_SetErrorRoom__Fv -// dStage_SetErrorRoom(void) -asm void dStage_SetErrorRoom(void) { - nofralloc -#include "d/d_stage/asm/func_80023E94.s" +void dStage_SetErrorRoom(void) { + OSReport_Error(lbl_80378A50+8); } +extern "C" { // dStage_SetErrorStage__Fv // dStage_SetErrorStage(void) asm void dStage_SetErrorStage(void) { |