diff --git a/data/dynos_level.cpp b/data/dynos_level.cpp index a2aea408e..9c58f47cc 100644 --- a/data/dynos_level.cpp +++ b/data/dynos_level.cpp @@ -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 */ { "FIRST FLOOR", "SECOND FLOOR", "BASEMENT", "NOT AVAILABLE" }, /* Castle inside */ { "MAIN AREA", "NOT AVAILABLE", "NOT AVAILABLE", "NOT AVAILABLE" }, /* Castle courtyard */ + { "ENDING", "NOT AVAILABLE", "NOT AVAILABLE", "NOT AVAILABLE" }, /* Ending */ }; static u8 sBuffer[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: 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_ENDING: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[31][MIN(MAX(aArea - 1, 0), 3)]); break; default: SetConvertedTextToBuffer(sBuffer, sAreaNamesPerLevel[0][MIN(MAX(aArea - 1, 0), 3)]); break; } diff --git a/data/dynos_mgr_builtin.cpp b/data/dynos_mgr_builtin.cpp index c0c1af43d..d57cb3db5 100644 --- a/data/dynos_mgr_builtin.cpp +++ b/data/dynos_mgr_builtin.cpp @@ -61,6 +61,7 @@ extern "C" { #include "levels/ccm/header.h" #include "levels/cotmc/header.h" #include "levels/ddd/header.h" +#include "levels/ending/header.h" #include "levels/hmc/header.h" #include "levels/jrb/header.h" #include "levels/lll/header.h" @@ -157,6 +158,7 @@ static const void* sDynosBuiltinScriptPtrs[] = { define_builtin(level_ccm_entry), define_builtin(level_cotmc_entry), define_builtin(level_ddd_entry), + define_builtin(level_ending_entry), define_builtin(level_hmc_entry), define_builtin(level_jrb_entry), define_builtin(level_lll_entry), diff --git a/src/engine/surface_collision.c b/src/engine/surface_collision.c index 744e8d7cc..1f7447845 100644 --- a/src/engine/surface_collision.c +++ b/src/engine/surface_collision.c @@ -11,7 +11,6 @@ #include "game/game_init.h" #include "pc/utils/misc.h" #include "pc/network/network.h" -#include "src/game/debug.h" // DO NOT COMMIT Vec3f gFindWallDirection = { 0 }; u8 gFindWallDirectionActive = false;