kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Some var renaming

Browse Source
This commit is contained in:
MaikelChan
2023-08-09 16:08:13 +02:00
parent 1c8579c6b5
commit bf45573eec
14 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/enums.h
View File

@@ -29,7 +29,7 @@ enum file_progress_e{
FILEPROG_10_HAS_TOUCHED_SAND_EEL_SAND,
FILEPROG_11_HAS_MET_MUMBO,
FILEPROG_12_HAS_TRANSFORMED_BEFORE,
FILEPROG_13, //something with xmas tree jiggy progress
FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME,
FILEPROG_14_HAS_TOUCHED_FP_ICY_WATER,
FILEPROG_15_ENTER_MMM_TEXT,
FILEPROG_16_STOOD_ON_JIGSAW_PODIUM,
@@ -193,7 +193,7 @@ enum file_progress_e{
// {index=0xDB, unknown},
FILEPROG_DB_SKIPPED_TUTORIAL = 0xDB,
FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE,
FILEPROG_DD_HAS_TOUCHED_ICY_WATER,
FILEPROG_DD_HAS_TOUCHED_CCW_ICY_WATER,
FILEPROG_DE_USED_ALL_YOUR_PUZZLE_PIECES,
FILEPROG_DF_CAN_REMOVE_ALL_PUZZLE_PIECES,
FILEPROG_E0_CAN_PLACE_ALL_PUZZLE_PIECES,

6
include/save.h
View File

@@ -1,7 +1,7 @@
#ifndef __SAVE_H__
#define __SAVE_H__
typedef struct {
typedef struct {
u8 unk0[0x4];
u8 unk4[0x14];
u8 pad28[0x5C];
@@ -9,8 +9,8 @@ typedef struct {
}SaveFile;
typedef struct{
u8 unk0;
u8 unk1;
u8 magic;
u8 slotIndex;
u8 pad2[0x76];
}SaveData;

6
src/FP/ch/twinklybox.c
View File

@@ -26,7 +26,7 @@ ActorInfo D_803920E8 = { 0x204, 0x336, 0x442,
/* .code */
Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
if( func_8038BFA0() || fileProgressFlag_get(FILEPROG_13) ){
if( func_8038BFA0() || fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME) ){
if(0.0f == this->velocity[1])
return this;
}
@@ -240,7 +240,7 @@ void func_8038D51C(ActorMarker *marker){
Actor *this = marker_getActor(marker);
item_set(ITEM_6_HOURGLASS, FALSE);
fileProgressFlag_set(FILEPROG_13, TRUE);
fileProgressFlag_set(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME, TRUE);
FUNC_8030E624(SFX_416, 0.8f, 32000);
func_8028F8F8(7, 0);
this->unk1C[1] = 1.0f;
@@ -281,7 +281,7 @@ void func_8038D6C8(Actor *this){
sp24 = time_getDelta();
mapSpecificFlags_set(0xd, (this->state != 1 && this->state != 2) ? TRUE : FALSE);
if(func_8038BFA0() || fileProgressFlag_get(FILEPROG_13)){
if(func_8038BFA0() || fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOff(this);
func_8028F8F8(7, FALSE);

2
src/FP/ch/twinklymuncher.c
View File

@@ -124,7 +124,7 @@ void func_8038E094(Actor *this){
if(this->unk100){
sp38 = marker_getActor(this->unk100);
if(sp38->unk1C[1] == 1.0f){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_13)){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
if(this->state != 6 && this->state != 7 && 0.0f == this->velocity[0]){
timed_setStaticCameraToNode(0.5f, 0xd);
func_80311480(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);

2
src/FP/ch/xmastreeswitch.c
View File

@@ -88,7 +88,7 @@ void func_8038E940(Actor *this){
switch(this->state){
case 1: //L8038EA98
if(fileProgressFlag_get(FILEPROG_13) && !mapSpecificFlags_get(2))
if(fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME) && !mapSpecificFlags_get(2))
func_8038E774(this);
break;
case 2: //L8038EAC8

10
src/core2/bs/swim.c
View File

@@ -72,11 +72,11 @@ void func_802B55DC(void) {
func_80297970(ml_interpolate_f(sp1C, bsSwimHorzVelocityMin, bsSwimHorzVelocityMax));
}
void func_802B563C(void) {
void entered_water(void) {
if (level_get() == LEVEL_9_RUSTY_BUCKET_BAY) {
func_8035644C(FILEPROG_AB_SWIM_OILY_WATER);
} else if (map_get() == MAP_46_CCW_WINTER) {
func_8035644C(FILEPROG_DD_HAS_TOUCHED_ICY_WATER);
func_8035644C(FILEPROG_DD_HAS_TOUCHED_CCW_ICY_WATER);
}
gravity_set(100.0f);
func_80297BF8(133.33f);
@@ -141,7 +141,7 @@ void func_802B5774(void) {
func_8029C7F4(1, 3, 3, 2);
yaw_setVelocityBounded(500.0f, 5.0f);
func_80297970(0.0f);
func_802B563C();
entered_water();
bsSwimCurrentAnimation = 0;
}
@@ -283,7 +283,7 @@ void func_802B5E8C(void) {
func_8029C7F4(1, 3, 3, 2);
yaw_setVelocityBounded(500.0f, 5.0f);
func_80297970(0.0f);
func_802B563C();
entered_water();
func_802B5E30();
}
@@ -303,7 +303,7 @@ void func_802B5F38(void){
}
void func_802B5F58(void){
func_802B563C();
entered_water();
bsdrone_init();
}

6
src/core2/code_98CB0.c
View File

@@ -145,9 +145,9 @@ void fileProgressFlag_setN(s32 startIndex, s32 set, s32 length) {
func_8031FEC0();
}
void func_8032008C(s32 *arg0, u8 **arg1) {
*arg0 = 0x25;
*arg1 = D_803831A0.unk8;
void progressflags_getSizeAndPtr(s32 *size, u8 **addr) {
*size = 0x25;
*addr = D_803831A0.unk8;
}
// Returns a single bit from a byte array

2
src/core2/code_9A320.c
View File

@@ -76,7 +76,7 @@ s32 honeycombscore_get_total(void){
return total;
}
void honeycombscore_get_size_and_ptr(s32 *size, u8 **addr){
void honeycombscore_getSizeAndPtr(s32 *size, u8 **addr){
*size = HONEYCOMBSCORE_SIZE;
*addr = sHoneycombScore;
}

2
src/core2/code_9A580.c
View File

@@ -53,7 +53,7 @@ s32 mumboscore_get_total(void){
return cnt;
}
void mumboscore_get_size_and_ptr(s32 *size, u8 **addr){
void mumboscore_getSizeAndPtr(s32 *size, u8 **addr){
*size = MUMBOSCORE_SIZE;
*addr = sMumboTokenScore;
}

262
src/core2/code_B5040.c
View File

@@ -55,16 +55,16 @@ Struct_B5040 D_80370A20[] = {
};
/* .bss */
s32 D_80383CF0;
s32 D_80383CF4; //jiggy_offset
s32 D_80383CF8; //honeycomb_offset
s32 D_80383CFC; //mumbotoken_offset
s32 D_80383D00; //notescores_offset
s32 D_80383D04; //timescores_offset
s32 D_80383D08; //savedata_jiggy_offset
s32 D_80383D0C; //saved_item_offset
s32 D_80383D10; //abilities_offset
s32 D_80383D14; //end_offset
s32 base_offset;
s32 jiggy_offset;
s32 honeycomb_offset;
s32 mumbotoken_offset;
s32 notescores_offset;
s32 timescores_offset;
s32 progressflags_offset;
s32 saved_item_offset;
s32 abilities_offset;
s32 end_offset;
u8 D_80383D18[8];
/* .code */
@@ -91,226 +91,226 @@ int _savedata_verify(SaveData *savedata, s32 size){
}
void savedata_init(void){ //savedata_init
s32 sp54;
s32 sp50;
s32 sp4C;
s32 sp48 = 0;
s32 sp44 = 0;
s32 sp40;
s32 sp3C;
s32 sp38;
u8 *sp34;
u8 *sp30;
u8 *sp2C;
u8 *sp28;
u8 *sp24;
u8 *sp20;
u8 *sp1C;
u8 *sp18;
s32 jiggy_size;
s32 honeycomb_size;
s32 mumbotoken_size;
s32 notescores_size = 0;
s32 timescores_size = 0;
s32 progressflags_size;
s32 saved_item_size;
s32 abilities_size;
u8 *jiggy_addr;
u8 *honeycomb_addr;
u8 *mumbotoken_addr;
u8 *progressflags_addr;
u8 *notescores_addr;
u8 *timescores_addr;
u8 *saved_item_addr;
u8 *abilities_addr;
jiggyscore_info(&sp54, &sp34);
honeycombscore_get_size_and_ptr(&sp50, &sp30);
mumboscore_get_size_and_ptr(&sp4C, &sp2C);
func_8032008C(&sp40, &sp28);
func_80346F44(&sp48, &sp24);
itemscore_timeScores_getSizeAndPtr(&sp44, &sp20);
func_80347630(&sp3C, &sp1C);
ability_getSizeAndPtr(&sp38, &sp18);
D_80383CF0 = 0;
D_80383CF4 = D_80383CF0 + 2;
D_80383CF8 = D_80383CF4 + sp54;
D_80383CFC = D_80383CF8 + sp50;
D_80383D00 = D_80383CFC + sp4C;
D_80383D04 = D_80383D00 + sp48;
D_80383D08 = D_80383D04 + sp44;
D_80383D0C = D_80383D08 + sp40;
D_80383D10 = D_80383D0C + sp3C;
D_80383D14 = D_80383D10 + sp38;
jiggyscore_getSizeAndPtr(&jiggy_size, &jiggy_addr);
honeycombscore_getSizeAndPtr(&honeycomb_size, &honeycomb_addr);
mumboscore_getSizeAndPtr(&mumbotoken_size, &mumbotoken_addr);
progressflags_getSizeAndPtr(&progressflags_size, &progressflags_addr);
notescore_getSizeAndPtr(&notescores_size, &notescores_addr);
timeScores_getSizeAndPtr(&timescores_size, &timescores_addr);
saveditem_getSizeAndPtr(&saved_item_size, &saved_item_addr);
ability_getSizeAndPtr(&abilities_size, &abilities_addr);
base_offset = 0;
jiggy_offset = base_offset + 2;
honeycomb_offset = jiggy_offset + jiggy_size;
mumbotoken_offset = honeycomb_offset + honeycomb_size;
notescores_offset = mumbotoken_offset + mumbotoken_size;
timescores_offset = notescores_offset + notescores_size;
progressflags_offset = timescores_offset + timescores_size;
saved_item_offset = progressflags_offset + progressflags_size;
abilities_offset = saved_item_offset + saved_item_size;
end_offset = abilities_offset + abilities_size;
}
void __savedata_load_jiggyScore(u8 *savedata){
s32 sp2C;
u8 *sp28;
s32 jiggy_size;
u8 *jiggy_addr;
int i;
jiggyscore_info(&sp2C, &sp28);
for(i = D_80383CF4; i < D_80383CF4 + sp2C; i++){
sp28[i - D_80383CF4] = savedata[i];
jiggyscore_getSizeAndPtr(&jiggy_size, &jiggy_addr);
for(i = jiggy_offset; i < jiggy_offset + jiggy_size; i++){
jiggy_addr[i - jiggy_offset] = savedata[i];
}
func_8034798C();
}
void __savedata_load_honeycombScore(u8 *savedata){ //savedata_save_honeycomb
s32 sp2C;
u8 *sp28;
s32 honeycomb_size;
u8 *honeycomb_addr;
int i;
honeycombscore_get_size_and_ptr(&sp2C, &sp28);
for(i = D_80383CF8; i < D_80383CF8 + sp2C; i++){
sp28[i - D_80383CF8] = savedata[i];
honeycombscore_getSizeAndPtr(&honeycomb_size, &honeycomb_addr);
for(i = honeycomb_offset; i < honeycomb_offset + honeycomb_size; i++){
honeycomb_addr[i - honeycomb_offset] = savedata[i];
}
func_80347958();
}
void __savedata_load_mumboScore(u8 *savedata){
s32 sp2C;
u8 *sp28;
s32 mumbotoken_size;
u8 *mumbotoken_addr;
int i;
mumboscore_get_size_and_ptr(&sp2C, &sp28);
for(i = D_80383CFC; i < D_80383CFC + sp2C; i++){
sp28[i - D_80383CFC] = savedata[i];
mumboscore_getSizeAndPtr(&mumbotoken_size, &mumbotoken_addr);
for(i = mumbotoken_offset; i < mumbotoken_offset + mumbotoken_size; i++){
mumbotoken_addr[i - mumbotoken_offset] = savedata[i];
}
func_80347984();
}
void __savedata_load_highNoteScores(u8 *savedata){
s32 sp2C;
u8 *sp28;
s32 notescores_size;
u8 *notescores_addr;
int i;
func_80346F44(&sp2C, &sp28);
for(i = D_80383D00; i < D_80383D00 + sp2C; i++){
sp28[i - D_80383D00] = savedata[i];
notescore_getSizeAndPtr(&notescores_size, &notescores_addr);
for(i = notescores_offset; i < notescores_offset + notescores_size; i++){
notescores_addr[i - notescores_offset] = savedata[i];
}
itemscore_highNoteScores_fromSaveData(sp28);
itemscore_highNoteScores_fromSaveData(notescores_addr);
}
void __savedata_load_timeScores(u8 *savedata){
s32 sp2C;
u8 *sp28;
s32 timescores_size;
u8 *timescores_addr;
int i;
itemscore_timeScores_getSizeAndPtr(&sp2C, &sp28);
for(i = D_80383D04; i < D_80383D04 + sp2C; i++){
sp28[i - D_80383D04] = savedata[i];
timeScores_getSizeAndPtr(&timescores_size, &timescores_addr);
for(i = timescores_offset; i < timescores_offset + timescores_size; i++){
timescores_addr[i - timescores_offset] = savedata[i];
}
itemscore_timeScores_fromSaveData(sp28);
itemscore_timeScores_fromSaveData(timescores_addr);
}
void func_8033C460(u8 *savedata){ //global_progress
s32 sp2C;
u8 *sp28;
s32 progressflags_size;
u8 *progressflags_addr;
int i;
func_8032008C(&sp2C, &sp28);
for(i = D_80383D08; i < D_80383D08 + sp2C; i++){
sp28[i - D_80383D08] = savedata[i];
progressflags_getSizeAndPtr(&progressflags_size, &progressflags_addr);
for(i = progressflags_offset; i < progressflags_offset + progressflags_size; i++){
progressflags_addr[i - progressflags_offset] = savedata[i];
}
}
void func_8033C4E4(u8 *savedata){ //saveddata_load_collectibles
s32 sp2C;
u8 *sp28;
s32 saved_item_size;
u8 *saved_item_addr;
int i;
func_80347630(&sp2C, &sp28);
for(i = D_80383D0C; i < D_80383D0C + sp2C; i++){
sp28[i - D_80383D0C] = savedata[i];
saveditem_getSizeAndPtr(&saved_item_size, &saved_item_addr);
for(i = saved_item_offset; i < saved_item_offset + saved_item_size; i++){
saved_item_addr[i - saved_item_offset] = savedata[i];
}
func_803479C0(sp28);
func_803479C0(saved_item_addr);
}
void __savedata_load_abilities(u8 *savedata){ //savedata_load_abilities
s32 sp2C;
u8 *sp28;
s32 abilities_size;
u8 *abilities_addr;
int i;
ability_getSizeAndPtr(&sp2C, &sp28);
for(i = D_80383D10; i < D_80383D10 + sp2C; i++){
sp28[i - D_80383D10] = savedata[i];
ability_getSizeAndPtr(&abilities_size, &abilities_addr);
for(i = abilities_offset; i < abilities_offset + abilities_size; i++){
abilities_addr[i - abilities_offset] = savedata[i];
}
}
void func_8033C5F4(u8 *savedata){
savedata[D_80383CF0] = 0x11;
void __savedata_save_magic(u8 *savedata){
savedata[base_offset] = 0x11;
}
void __savedata_save_jiggyScore(u8 *savedata){ //savedata_save_jiggies
s32 sp2C;
u8 *sp28;
s32 jiggy_size;
u8 *jiggy_addr;
int i;
jiggyscore_info(&sp2C, &sp28);
for(i = D_80383CF4; i < D_80383CF4 + sp2C; i++){
savedata[i] = sp28[i - D_80383CF4];
jiggyscore_getSizeAndPtr(&jiggy_size, &jiggy_addr);
for(i = jiggy_offset; i < jiggy_offset + jiggy_size; i++){
savedata[i] = jiggy_addr[i - jiggy_offset];
}
}
void __savedata_save_honeycombScore(u8 *savedata){ //savedata_save_honeycomb
s32 sp2C;
u8 *sp28;
s32 honeycomb_size;
u8 *honeycomb_addr;
int i;
honeycombscore_get_size_and_ptr(&sp2C, &sp28);
for(i = D_80383CF8; i < D_80383CF8 + sp2C; i++){
savedata[i] = sp28[i - D_80383CF8];
honeycombscore_getSizeAndPtr(&honeycomb_size, &honeycomb_addr);
for(i = honeycomb_offset; i < honeycomb_offset + honeycomb_size; i++){
savedata[i] = honeycomb_addr[i - honeycomb_offset];
}
}
void __savedata_save_mumboScore(u8 *savedata){
s32 sp2C;
u8 *sp28;
s32 mumbotoken_size;
u8 *mumbotoken_addr;
int i;
mumboscore_get_size_and_ptr(&sp2C, &sp28);
for(i = D_80383CFC; i < D_80383CFC + sp2C; i++){
savedata[i] = sp28[i - D_80383CFC];
mumboscore_getSizeAndPtr(&mumbotoken_size, &mumbotoken_addr);
for(i = mumbotoken_offset; i < mumbotoken_offset + mumbotoken_size; i++){
savedata[i] = mumbotoken_addr[i - mumbotoken_offset];
}
}
void __savedata_save_highNoteScores(u8 *savedata){
s32 sp2C;
u8 *sp28;
s32 notescores_size;
u8 *notescores_addr;
int i;
func_80346F44(&sp2C, &sp28);
for(i = D_80383D00; i < D_80383D00 + sp2C; i++){
savedata[i] = sp28[i - D_80383D00];
notescore_getSizeAndPtr(&notescores_size, &notescores_addr);
for(i = notescores_offset; i < notescores_offset + notescores_size; i++){
savedata[i] = notescores_addr[i - notescores_offset];
}
}
void __savedata_save_timeScores(u8 *savedata){
s32 sp2C;
u8 *sp28;
s32 timescores_size;
u8 *timescores_addr;
int i;
itemscore_timeScores_getSizeAndPtr(&sp2C, &sp28);
for(i = D_80383D04; i < D_80383D04 + sp2C; i++){
savedata[i] = sp28[i - D_80383D04];
timeScores_getSizeAndPtr(&timescores_size, &timescores_addr);
for(i = timescores_offset; i < timescores_offset + timescores_size; i++){
savedata[i] = timescores_addr[i - timescores_offset];
}
}
void __savedata_8033C8A0(u8 *savedata){ //global_progress
s32 sp2C;
u8 *sp28;
s32 progressflags_size;
u8 *progressflags_addr;
int i;
func_8032008C(&sp2C, &sp28);
for(i = D_80383D08; i < D_80383D08 + sp2C; i++){
savedata[i] = sp28[i - D_80383D08];
progressflags_getSizeAndPtr(&progressflags_size, &progressflags_addr);
for(i = progressflags_offset; i < progressflags_offset + progressflags_size; i++){
savedata[i] = progressflags_addr[i - progressflags_offset];
}
}
void __savedata_8033CA2C(u8 *savedata){ //saveddata_save_collectibles
s32 sp2C;
u8 *sp28;
s32 saved_item_size;
u8 *saved_item_addr;
int i;
func_80347630(&sp2C, &sp28);
for(i = D_80383D0C; i < D_80383D0C + sp2C; i++){
savedata[i] = sp28[i - D_80383D0C];
saveditem_getSizeAndPtr(&saved_item_size, &saved_item_addr);
for(i = saved_item_offset; i < saved_item_offset + saved_item_size; i++){
savedata[i] = saved_item_addr[i - saved_item_offset];
}
}
void __savedata_save_abilities(u8 *savedata){ //savedata_save_abilities
s32 sp2C;
u8 *sp28;
s32 abilities_size;
u8 *abilities_addr;
int i;
ability_getSizeAndPtr(&sp2C, &sp28);
for(i = D_80383D10; i < D_80383D10 + sp2C; i++){
savedata[i] = sp28[i - D_80383D10];
ability_getSizeAndPtr(&abilities_size, &abilities_addr);
for(i = abilities_offset; i < abilities_offset + abilities_size; i++){
savedata[i] = abilities_addr[i - abilities_offset];
}
}
@@ -320,7 +320,7 @@ s32 savedata_8033CA2C(s32 filenum, SaveData *save_data){
sp1C = load_file_blocks(filenum, 0, save_data, 0xF);
if( sp1C
|| savedata_verify(0x78, save_data)
|| ((u8*)save_data)[D_80383CF0] != 0x11
|| ((u8*)save_data)[base_offset] != 0x11
){
sp1C = 2;
}
@@ -369,7 +369,7 @@ void saveData_create(SaveData *savedata){
fileProgressFlag_set(D_80370A20[i].unk2, func_803203FC(D_80370A20[i].unk0));
}
savedata_clear(savedata);
func_8033C5F4(savedata);
__savedata_save_magic(savedata);
__savedata_save_jiggyScore(savedata);
__savedata_save_honeycombScore(savedata);
__savedata_save_mumboScore(savedata);

16
src/core2/code_B5E00.c
View File

@@ -47,8 +47,8 @@ void gameFile_8033CE40(void) {
}
}
for(var_s0 = 0; var_s0 < 4; var_s0++){
if( (__gameFile_8033CD90(var_s0) == 0) && (gameFile_GameIdToFileIdMap[gameFile_saveData[var_s0].unk1 - 1] == -1)) {
gameFile_GameIdToFileIdMap[gameFile_saveData[var_s0].unk1 - 1] = var_s0;
if( (__gameFile_8033CD90(var_s0) == 0) && (gameFile_GameIdToFileIdMap[gameFile_saveData[var_s0].slotIndex - 1] == -1)) {
gameFile_GameIdToFileIdMap[gameFile_saveData[var_s0].slotIndex - 1] = var_s0;
sp48[var_s0] = 1;
} else {
D_80383F04 = var_s0;
@@ -70,18 +70,18 @@ s32 gameFile_8033CFD4(s32 gamenum){
s32 filenum;
u32 i = 3;
s32 eeprom_error;
SaveData *var_a1;
SaveData *saveData;
filenum = D_80383F04;
next = gameFile_GameIdToFileIdMap[gamenum];
gameFile_GameIdToFileIdMap[gamenum] = D_80383F04;
bcopy(&gameFile_saveData[next], &gameFile_saveData[filenum], 0xF*8);
var_a1 = gameFile_saveData + filenum;
var_a1->unk1 = gamenum + 1;
savedata_update_crc(var_a1, sizeof(SaveData));
saveData = gameFile_saveData + filenum;
saveData->slotIndex = gamenum + 1;
savedata_update_crc(saveData, sizeof(SaveData));
for(eeprom_error = 1; eeprom_error && i > 0; i--){//L8033D070
eeprom_error = savedata_8033CC98(filenum, var_a1);
eeprom_error = savedata_8033CC98(filenum, saveData);
if(!eeprom_error){
__gameFile_8033CE14(gamenum);
}
@@ -119,7 +119,7 @@ void gameFile_save(s32 gamenum){
bool gameFile_isNotEmpty(s32 gamenum){
s32 filenum = gameFile_GameIdToFileIdMap[gamenum];
return gameFile_saveData[filenum].unk0 != 0;
return gameFile_saveData[filenum].magic != 0;
}
bool gameFile_anyNonEmpty(void){

6
src/core2/code_BEF20.c
View File

@@ -418,7 +418,7 @@ s32 itemscore_noteScores_get(enum level_e lvl_id){
return D_80385FF0[lvl_id];
}
void func_80346F44(s32 *size, void **ptr) {
void notescore_getSizeAndPtr(s32 *size, void **ptr) {
static u64 D_80386040;
s32 var_s0;
@@ -463,7 +463,7 @@ u16 itemscore_timeScores_get(enum level_e level_id) {
return (u16) D_80386000[level_id];
}
void itemscore_timeScores_getSizeAndPtr(s32 *size, void **ptr) {
void timeScores_getSizeAndPtr(s32 *size, void **ptr) {
static u16 D_80386048[0xB]; //timescores_truncated
s32 i;
@@ -476,7 +476,7 @@ void itemscore_timeScores_getSizeAndPtr(s32 *size, void **ptr) {
}
//itemscore_getSavedItemArray
void func_80347630(s32 *size, u8 **buffer){
void saveditem_getSizeAndPtr(s32 *size, u8 **buffer){
static u8 D_80386060[5]; //saved item array
D_80386060[0] = item_getCount(ITEM_1C_MUMBO_TOKEN);

2
src/core2/code_CF3E0.c
View File

@@ -14,7 +14,7 @@ unkD_80372730 D_80372730[] = {
{ FILEPROG_14_HAS_TOUCHED_FP_ICY_WATER, 0xC11},
{ FILEPROG_F_HAS_TOUCHED_PIRAHANA_WATER, 0xC85},
{ FILEPROG_86_HAS_TOUCHED_MMM_THORN_HEDGE, 0xAE1},
{ FILEPROG_DD_HAS_TOUCHED_ICY_WATER, 0xCE7},
{ FILEPROG_DD_HAS_TOUCHED_CCW_ICY_WATER, 0xCE7},
{ FILEPROG_3_MUSIC_NOTE_TEXT, 0xD9C},
{ FILEPROG_4_MUMBO_TOKEN_TEXT, 0xD9D},
{ FILEPROG_5_BLUE_EGG_TEXT, 0xD9E},

2
src/core2/jiggyscore.c
View File

@@ -104,7 +104,7 @@ s32 jiggyscore_total(void) {
return cnt;
}
void jiggyscore_info(s32 *size, u8 **addr){
void jiggyscore_getSizeAndPtr(s32 *size, u8 **addr){
*size = 0x0D;
*addr = jiggyscore.D_803832C0;
}