sm64-mirrors/sm64ex
1
0
Fork 0
mirror of https://github.com/sm64pc/sm64ex.git synced 2025-01-22 15:43:04 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #421 from ineedhelpbad/Text-save-cannon-fix

Browse source 
BUGFIX:  Text Saves aren't saving cannon flags. #397
This commit is contained in:
fgsfds 2020-09-29 19:28:50 +03:00 committed by GitHub
commit 5b66d3faff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/save_file.c
View file

@ -615,6 +615,12 @@ u32 save_file_get_star_flags(s32 fileIndex, s32 courseIndex) {
return starFlags; return starFlags;
} }
u32 save_file_get_cannon_flags(s32 fileIndex, s32 courseIndex) {
if (gSaveBuffer.files[fileIndex][0].courseStars[courseIndex+1] & 0x80){return 1;}
return 0;
}
/** /**
* Add to the bitset of obtained stars in the specified course. * Add to the bitset of obtained stars in the specified course.

1
src/game/save_file.h
View file

@ -135,6 +135,7 @@ void save_file_set_flags(u32 flags);
void save_file_clear_flags(u32 flags); void save_file_clear_flags(u32 flags);
u32 save_file_get_flags(void); u32 save_file_get_flags(void);
u32 save_file_get_star_flags(s32 fileIndex, s32 courseIndex); u32 save_file_get_star_flags(s32 fileIndex, s32 courseIndex);
u32 save_file_get_cannon_flags(s32 fileIndex, s32 courseIndex);
void save_file_set_star_flags(s32 fileIndex, s32 courseIndex, u32 starFlags); void save_file_set_star_flags(s32 fileIndex, s32 courseIndex, u32 starFlags);
s32 save_file_get_course_coin_score(s32 fileIndex, s32 courseIndex); s32 save_file_get_course_coin_score(s32 fileIndex, s32 courseIndex);
s32 save_file_is_cannon_unlocked(void); s32 save_file_is_cannon_unlocked(void);

12
src/game/text_save.inc.h
View file

@ -81,7 +81,7 @@ static s32 write_text_save(s32 fileIndex) {
struct MainMenuSaveData *menudata; struct MainMenuSaveData *menudata;
char filename[SYS_MAX_PATH] = { 0 }; char filename[SYS_MAX_PATH] = { 0 };
char value[64]; char value[64];
u32 i, bit, flags, coins, stars, starFlags; u32 i, bit, flags, coins, stars, starFlags, cannonFlag;
if (snprintf(filename, sizeof(filename), FILENAME_FORMAT, fs_writepath, fileIndex) < 0) if (snprintf(filename, sizeof(filename), FILENAME_FORMAT, fs_writepath, fileIndex) < 0)
return -1; return -1;
@ -133,9 +133,10 @@ static s32 write_text_save(s32 fileIndex) {
for (i = 0; i < NUM_COURSES; i++) { for (i = 0; i < NUM_COURSES; i++) {
stars = save_file_get_star_flags(fileIndex, i); stars = save_file_get_star_flags(fileIndex, i);
coins = save_file_get_course_coin_score(fileIndex, i); coins = save_file_get_course_coin_score(fileIndex, i);
cannonFlag = save_file_get_cannon_flags(fileIndex, i);
starFlags = int_to_bin(stars); // 63 -> 111111 starFlags = int_to_bin(stars); // 63 -> 111111
fprintf(file, "%s = \"%d, %07d\"\n", sav_courses[i], coins, starFlags); fprintf(file, "%s = \"%d, %07d, %d\"\n", sav_courses[i], coins, starFlags,cannonFlag);
} }
fprintf(file, "\n[bonus]\n"); fprintf(file, "\n[bonus]\n");
@ -208,7 +209,7 @@ static s32 read_text_save(s32 fileIndex) {
const char *value; const char *value;
ini_t *savedata; ini_t *savedata;
u32 i, flag, coins, stars, starFlags; u32 i, flag, coins, stars, starFlags, cannonFlag;
u32 capArea; u32 capArea;
if (snprintf(filename, sizeof(filename), FILENAME_FORMAT, fs_writepath, fileIndex) < 0) if (snprintf(filename, sizeof(filename), FILENAME_FORMAT, fs_writepath, fileIndex) < 0)
@ -255,9 +256,10 @@ static s32 read_text_save(s32 fileIndex) {
for (i = 0; i < NUM_COURSES; i++) { for (i = 0; i < NUM_COURSES; i++) {
value = ini_get(savedata, "courses", sav_courses[i]); value = ini_get(savedata, "courses", sav_courses[i]);
if (value) { if (value) {
sscanf(value, "%d, %d", &coins, &stars); sscanf(value, "%d, %d, %d", &coins, &stars, &cannonFlag);
starFlags = bin_to_int(stars); // 111111 -> 63 starFlags = bin_to_int(stars); // 111111 -> 63
cannonFlag <<= 7; //Shifts the bit to the most significant bit.
save_file_set_star_flags(fileIndex, i+1, cannonFlag); //
save_file_set_star_flags(fileIndex, i, starFlags); save_file_set_star_flags(fileIndex, i, starFlags);
gSaveBuffer.files[fileIndex][0].courseCoinScores[i] = coins; gSaveBuffer.files[fileIndex][0].courseCoinScores[i] = coins;
} }