summaryrefslogtreecommitdiff
path: root/src/d/d_s_room.cpp
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2025-06-27 03:14:58 -0700
committerGitHub <noreply@github.com>2025-06-27 13:14:58 +0300
commit79c56b254885b006f0fdec184b0ba06fbd3746a3 (patch)
tree3b10ab9144abba0e644d026bcc12c0cf5d3efcb3 /src/d/d_s_room.cpp
parent028c07d47d41b10ba8fbef0ef4240751db74776f (diff)
add wii usa rev0 support (#2505)
* wii usa rev0 dol building ok * wii dol cleanup * some wii tests * most rels building
Diffstat (limited to 'src/d/d_s_room.cpp')
-rw-r--r--src/d/d_s_room.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp
index d5ed6d27cd..f043cdc88f 100644
--- a/src/d/d_s_room.cpp
+++ b/src/d/d_s_room.cpp
@@ -193,7 +193,11 @@ static bool objectSetCheck(room_of_scene_class* i_this) {
if (*dStage_roomControl_c::getDemoArcName() != '\0') {
int phase = dComIfG_syncObjectRes(dStage_roomControl_c::getDemoArcName());
- if (phase >= 0 && phase > 0) {
+ if (phase < 0) {
+ #if VERSION == VERSION_WII_USA_R0
+ dStage_escapeRestart();
+ #endif
+ } else if (phase > 0) {
return 0;
}
}
@@ -342,6 +346,9 @@ static int phase_1(room_of_scene_class* i_this) {
}
if (!dComIfG_setStageRes(arcName, heap)) {
+ #if VERSION == VERSION_WII_USA_R0
+ dStage_escapeRestart();
+ #endif
return cPhs_ERROR_e;
}
}
@@ -355,6 +362,9 @@ static int phase_2(room_of_scene_class* i_this) {
int phase = dComIfG_syncStageRes(arcName);
if (phase < 0) {
+ #if VERSION == VERSION_WII_USA_R0
+ dStage_escapeRestart();
+ #endif
return cPhs_ERROR_e;
}