From 265d23892bf7243bf6554d877c98c78cde960ab6 Mon Sep 17 00:00:00 2001 From: MysterD Date: Tue, 15 Feb 2022 22:03:17 -0800 Subject: [PATCH] Fixed crash in star seleciton --- src/menu/star_select.c | 14 +++++++++----- src/pc/network/discord/discord_network.c | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/menu/star_select.c b/src/menu/star_select.c index ac3d2828..a7e6f8e3 100644 --- a/src/menu/star_select.c +++ b/src/menu/star_select.c @@ -111,6 +111,8 @@ void render_100_coin_star(u8 stars) { * checks of what star should be next in sInitSelectedActNum. */ void bhv_act_selector_init(void) { + if (gCurrCourseNum == 0) { return; } + s16 i = 0; s32 selectorModelIDs[10]; u8 stars = save_file_get_star_flags(gCurrSaveFileNum - 1, gCurrCourseNum - 1); @@ -328,15 +330,17 @@ void print_act_selector_strings(void) { #endif } + if (currLevelName != NULL) { #ifdef VERSION_EU - print_generic_string(get_str_x_pos_from_center(160, currLevelName + 3, 10.0f), 33, currLevelName + 3); + print_generic_string(get_str_x_pos_from_center(160, currLevelName + 3, 10.0f), 33, currLevelName + 3); #elif defined(VERSION_SH) - lvlNameX = get_str_x_pos_from_center_scale(160, currLevelName + 3, 10.0f); - print_generic_string(lvlNameX, 33, currLevelName + 3); + lvlNameX = get_str_x_pos_from_center_scale(160, currLevelName + 3, 10.0f); + print_generic_string(lvlNameX, 33, currLevelName + 3); #else - lvlNameX = get_str_x_pos_from_center(160, currLevelName + 3, 10.0f); - print_generic_string(lvlNameX, 33, currLevelName + 3); + lvlNameX = get_str_x_pos_from_center(160, currLevelName + 3, 10.0f); + print_generic_string(lvlNameX, 33, currLevelName + 3); #endif + } gSPDisplayList(gDisplayListHead++, dl_ia_text_end); diff --git a/src/pc/network/discord/discord_network.c b/src/pc/network/discord/discord_network.c index 5f5f4bd3..eb84fb6a 100644 --- a/src/pc/network/discord/discord_network.c +++ b/src/pc/network/discord/discord_network.c @@ -47,7 +47,7 @@ s64 ns_discord_get_id(u8 localId) { char* ns_discord_get_id_str(u8 localId) { if (localId == UNKNOWN_LOCAL_INDEX) { localId = 0; } static char id_str[22] = { 0 }; - snprintf(id_str, 22, "%lld", gNetworkUserIds[localId]); + snprintf(id_str, 22, "%lld", (long long int)gNetworkUserIds[localId]); return id_str; }