From 0dc08eacba3746d56d675ae46ae05338105d457e Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Mon, 7 Nov 2022 23:32:06 -0800 Subject: [PATCH] Rename SPECIAL_MAP_ID_UNK_NEG1. --- include/enums.h | 2 +- src/game.c | 4 ++-- src/menu.c | 2 +- src/unknown_05CEF0.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/enums.h b/include/enums.h index ad9d44ec..a5b1529c 100644 --- a/include/enums.h +++ b/include/enums.h @@ -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 { diff --git a/src/game.c b/src/game.c index 3aab5c21..66fe83ff 100644 --- a/src/game.c +++ b/src/game.c @@ -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; diff --git a/src/menu.c b/src/menu.c index d605d8f8..8291260f 100644 --- a/src/menu.c +++ b/src/menu.c @@ -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; diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index 96daa488..ad482e9e 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -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);