Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix course naming again (#515) 

* fix course naming again

whoops that was my fault (hopefully for the last time)

* +1 course index in pause_castle_get_stars
This commit is contained in:
Isaac0-dev 2023-11-20 10:27:18 +10:00 committed by GitHub
parent f986169476
commit dd47759244
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/course_table.h
View File

@ -28,7 +28,7 @@ enum CourseNum
#undef DEFINE_BONUS_COURSE
#define COURSE_IS_MAIN_COURSE(cmd) (cmd >= COURSE_MIN && cmd <= COURSE_STAGES_MAX)
#define COURSE_IS_VALID_COURSE(cmd) (cmd >= COURSE_MIN && cmd <= COURSE_MAX)
#define COURSE_IS_VALID_COURSE(cmd) (cmd >= COURSE_MIN && cmd < COURSE_MAX)
#endif // COURSE_TABLE_H

2
src/game/ingame_menu.c
View File

@ -2884,7 +2884,7 @@ void render_pause_castle_main_strings(s16 x, s16 y) {
static u32 pause_castle_get_stars(s32 index) {
// Main courses (0-14), Secret courses (15-24)
if (COURSE_IS_VALID_COURSE(index)) {
if (COURSE_IS_VALID_COURSE(index + 1)) {
return save_file_get_star_flags(gCurrSaveFileNum - 1, index);
}

2
src/game/level_info.c
View File

@ -207,7 +207,7 @@ const char *get_level_name_ascii(s16 courseNum, s16 levelNum, s16 areaIndex, s16
}
else if (!hasCustomName) {
if (COURSE_IS_MAIN_COURSE(courseNum)) {
if (COURSE_IS_VALID_COURSE(courseNum)) {
void **courseNameTbl = get_course_name_table();
const u8 *courseName = segmented_to_virtual(courseNameTbl[courseNum - COURSE_BOB]);
convert_string_sm64_to_ascii(output, courseName + 3);