diff --git a/include/functions.h b/include/functions.h index ebc837f57ac..150d9721f1e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -6177,7 +6177,7 @@ void dStage_KeepDoorInfoInit(void); void dStage_KeepDoorInfoProc(void); void dStage_KeepDoorInfo_NS_dtor(void); void dStage_RoomKeepDoorInfoProc(void); -void dStage_SetErrorRoom(void); +//void dStage_SetErrorRoom(void); void dStage_SetErrorStage(void); void dStage_actorCreate(void); void dStage_actorInit(void); diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index ded9fd40276..d4d861c8723 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) {