izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename SPECIAL_MAP_ID_UNK_NEG1.

Browse Source
This commit is contained in:
Antonio Castelli
2022-11-07 23:32:06 -08:00
parent d57b96d4c6
commit 0dc08eacba
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/enums.h
+1 -1
View File
@@ -14,7 +14,7 @@ typedef AssetLevelHeadersEnum MapId;
typedef enum SpecialMapId {
SPECIAL_MAP_ID_UNK_NEG10 = -10,
SPECIAL_MAP_ID_UNK_NEG2 = -2,
SPECIAL_MAP_ID_UNK_NEG1 = -1,
SPECIAL_MAP_ID_NO_LEVEL = -1,
} SpecialMapId;
typedef enum Vehicle {
src/game.c
+2 -2
View File
@@ -1273,7 +1273,7 @@ void ingame_logic_loop(s32 updateRate) {
func_8006C22C(&gPlayableMapId, &D_80123504, &i, &D_80123508);
func_8006F42C();
if (gPlayableMapId < 0) {
if (gPlayableMapId == (MapId)SPECIAL_MAP_ID_UNK_NEG1 || gPlayableMapId == (MapId)SPECIAL_MAP_ID_UNK_NEG10) {
if (gPlayableMapId == (MapId)SPECIAL_MAP_ID_NO_LEVEL || gPlayableMapId == (MapId)SPECIAL_MAP_ID_UNK_NEG10) {
if (gPlayableMapId == (MapId)SPECIAL_MAP_ID_UNK_NEG10 && is_in_two_player_adventure()) {
func_8006F398();
}
@@ -1670,7 +1670,7 @@ void load_level_for_menu(MapId levelId, s32 numberOfPlayers, s32 cutsceneId) {
gSPEndDisplayList(gCurrDisplayList++);
}
}
if (levelId != (MapId)SPECIAL_MAP_ID_UNK_NEG1) {
if (levelId != (MapId)SPECIAL_MAP_ID_NO_LEVEL) {
load_level_3(levelId, numberOfPlayers, 0, VEHICLE_PLANE, cutsceneId);
gIsLoading = FALSE;
return;
src/menu.c
+1 -1
View File
@@ -4816,7 +4816,7 @@ s32 menu_game_select_loop(s32 updateRate) {
func_80000B28();
gIsInTracksMode = TRUE;
func_8006E5BC();
load_level_for_menu((MapId)SPECIAL_MAP_ID_UNK_NEG1, -1, 0);
load_level_for_menu((MapId)SPECIAL_MAP_ID_NO_LEVEL, -1, 0);
menu_init(MENU_TRACK_SELECT);
} else {
gIsInAdventureTwo = D_800DF460;
src/unknown_05CEF0.c
+4 -4
View File
@@ -339,7 +339,7 @@ void func_8005CB68(Object_Racer *racer, s8 *arg1) {
settings->courseFlagsPtr[settings->courseId] |= 2;
if (!(settings->bosses & bossId)) {
settings->bosses |= bossId;
func_8006C1AC((MapId)SPECIAL_MAP_ID_UNK_NEG1, 0, VEHICLE_CAR, 0);
func_8006C1AC((MapId)SPECIAL_MAP_ID_NO_LEVEL, 0, VEHICLE_CAR, 0);
func_8006C1AC(miscAsset67CourseByte, 4, -1, 4);
} else if (!(settings->bosses & (bossId << 6))) {
settings->bosses |= bossId << 6;
@@ -352,15 +352,15 @@ void func_8005CB68(Object_Racer *racer, s8 *arg1) {
settings->wizpigAmulet = var_t1;
}
if (var_t1 != 0) {
func_8006C1AC((MapId)SPECIAL_MAP_ID_UNK_NEG1, 0, VEHICLE_CAR, 0);
func_8006C1AC((MapId)SPECIAL_MAP_ID_NO_LEVEL, 0, VEHICLE_CAR, 0);
func_8006C1AC(ASSET_LEVELNAME_WIZPIGAMULETSEQUENCE, 0, -1, settings->wizpigAmulet - 1);
func_8006C1AC(miscAsset67CourseByte, 6, -1, 6);
} else {
func_8006C1AC((MapId)SPECIAL_MAP_ID_UNK_NEG1, 0, VEHICLE_CAR, 0);
func_8006C1AC((MapId)SPECIAL_MAP_ID_NO_LEVEL, 0, VEHICLE_CAR, 0);
func_8006C1AC(miscAsset67CourseByte, 4, -1, 4);
}
} else {
func_8006C1AC((MapId)SPECIAL_MAP_ID_UNK_NEG1, 0, VEHICLE_CAR, 0);
func_8006C1AC((MapId)SPECIAL_MAP_ID_NO_LEVEL, 0, VEHICLE_CAR, 0);
func_8006C1AC(miscAsset67CourseByte, 4, -1, 4);
}
func_8006F140(4);