Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowed LEVEL_ENDING to be overridden by DynOS

This commit is contained in:
MysterD 2022-06-02 22:06:33 -07:00
parent a8c11109ad
commit c95de7fe87
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/dynos_level.cpp
View File

@ -377,6 +377,7 @@ const u8 *DynOS_Level_GetAreaName(s32 aLevel, s32 aArea, bool aDecaps) {
{ "MAIN AREA", "NOT AVAILABLE", "NOT AVAILABLE", "NOT AVAILABLE" }, /* Castle grounds */ { "MAIN AREA", "NOT AVAILABLE", "NOT AVAILABLE", "NOT AVAILABLE" }, /* Castle grounds */
{ "FIRST FLOOR", "SECOND FLOOR", "BASEMENT", "NOT AVAILABLE" }, /* Castle inside */ { "FIRST FLOOR", "SECOND FLOOR", "BASEMENT", "NOT AVAILABLE" }, /* Castle inside */
{ "MAIN AREA", "NOT AVAILABLE", "NOT AVAILABLE", "NOT AVAILABLE" }, /* Castle courtyard */ { "MAIN AREA", "NOT AVAILABLE", "NOT AVAILABLE", "NOT AVAILABLE" }, /* Castle courtyard */
{ "ENDING", "NOT AVAILABLE", "NOT AVAILABLE", "NOT AVAILABLE" }, /* Ending */
}; };
static u8 sBuffer[256]; static u8 sBuffer[256];
memset(sBuffer, 0xFF, 256); memset(sBuffer, 0xFF, 256);
@ -413,6 +414,7 @@ const u8 *DynOS_Level_GetAreaName(s32 aLevel, s32 aArea, bool aDecaps) {
case LEVEL_CASTLE_GROUNDS: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[28][MIN(MAX(aArea - 1, 0), 3)]); break; case LEVEL_CASTLE_GROUNDS: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[28][MIN(MAX(aArea - 1, 0), 3)]); break;
case LEVEL_CASTLE: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[29][MIN(MAX(aArea - 1, 0), 3)]); break; case LEVEL_CASTLE: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[29][MIN(MAX(aArea - 1, 0), 3)]); break;
case LEVEL_CASTLE_COURTYARD: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[30][MIN(MAX(aArea - 1, 0), 3)]); break; case LEVEL_CASTLE_COURTYARD: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[30][MIN(MAX(aArea - 1, 0), 3)]); break;
case LEVEL_ENDING: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[31][MIN(MAX(aArea - 1, 0), 3)]); break;
default: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[0][MIN(MAX(aArea - 1, 0), 3)]); break; default: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[0][MIN(MAX(aArea - 1, 0), 3)]); break;
} }

2
data/dynos_mgr_builtin.cpp
View File

@ -61,6 +61,7 @@ extern "C" {
#include "levels/ccm/header.h" #include "levels/ccm/header.h"
#include "levels/cotmc/header.h" #include "levels/cotmc/header.h"
#include "levels/ddd/header.h" #include "levels/ddd/header.h"
#include "levels/ending/header.h"
#include "levels/hmc/header.h" #include "levels/hmc/header.h"
#include "levels/jrb/header.h" #include "levels/jrb/header.h"
#include "levels/lll/header.h" #include "levels/lll/header.h"
@ -157,6 +158,7 @@ static const void* sDynosBuiltinScriptPtrs[] = {
define_builtin(level_ccm_entry), define_builtin(level_ccm_entry),
define_builtin(level_cotmc_entry), define_builtin(level_cotmc_entry),
define_builtin(level_ddd_entry), define_builtin(level_ddd_entry),
define_builtin(level_ending_entry),
define_builtin(level_hmc_entry), define_builtin(level_hmc_entry),
define_builtin(level_jrb_entry), define_builtin(level_jrb_entry),
define_builtin(level_lll_entry), define_builtin(level_lll_entry),

1
src/engine/surface_collision.c
View File

@ -11,7 +11,6 @@
#include "game/game_init.h" #include "game/game_init.h"
#include "pc/utils/misc.h" #include "pc/utils/misc.h"
#include "pc/network/network.h" #include "pc/network/network.h"
#include "src/game/debug.h" // DO NOT COMMIT
Vec3f gFindWallDirection = { 0 }; Vec3f gFindWallDirection = { 0 };
u8 gFindWallDirectionActive = false; u8 gFindWallDirectionActive = false;