falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dStage_SetErrorRoom OK

This commit is contained in:
Pheenoh 2021-01-10 02:33:36 -05:00
parent adf65faa28
commit fb341652cc
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -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);

12
src/d/d_stage.cpp
View File

@ -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) {