From e16779cc338c53b91387a28e3e97cd6f5f036a66 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Thu, 23 Jun 2022 14:34:26 -0700 Subject: Rename game states (#1294) * `TitleSetup` -> `Setup` * `Title` -> `ConsoleLogo` * `Opening` -> `TitleSetup` * `FileChoose` -> `FileSelect` * `Select` -> `MapSelect` * prenmi/sample `Context` -> `State` * Revert filename changes * . * setupstate cleanup * Oops, `GameState` -> `SetupState` --- src/code/graph.c | 14 ++-- src/code/title_setup.c | 16 ++-- src/code/z_game_dlftbls.c | 10 +-- src/code/z_play.c | 4 +- src/code/z_prenmi.c | 10 +-- src/code/z_sample.c | 12 +-- src/code/z_sram.c | 189 +++++++++++++++++++++------------------------- 7 files changed, 122 insertions(+), 133 deletions(-) (limited to 'src/code') diff --git a/src/code/graph.c b/src/code/graph.c index 481808cee..948dc127d 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -102,22 +102,22 @@ void Graph_InitTHGA(GraphicsContext* gfxCtx) { GameStateOverlay* Graph_GetNextGameState(GameState* gameState) { void* gameStateInitFunc = GameState_GetInit(gameState); - if (gameStateInitFunc == TitleSetup_Init) { + if (gameStateInitFunc == Setup_Init) { return &gGameStateOverlayTable[0]; } - if (gameStateInitFunc == Select_Init) { + if (gameStateInitFunc == MapSelect_Init) { return &gGameStateOverlayTable[1]; } - if (gameStateInitFunc == Title_Init) { + if (gameStateInitFunc == ConsoleLogo_Init) { return &gGameStateOverlayTable[2]; } if (gameStateInitFunc == Play_Init) { return &gGameStateOverlayTable[3]; } - if (gameStateInitFunc == Opening_Init) { + if (gameStateInitFunc == TitleSetup_Init) { return &gGameStateOverlayTable[4]; } - if (gameStateInitFunc == FileChoose_Init) { + if (gameStateInitFunc == FileSelect_Init) { return &gGameStateOverlayTable[5]; } @@ -385,14 +385,14 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { if (gIsCtrlr2Valid && CHECK_BTN_ALL(gameState->input[0].press.button, BTN_Z) && CHECK_BTN_ALL(gameState->input[0].cur.button, BTN_L | BTN_R)) { gSaveContext.gameMode = 0; - SET_NEXT_GAMESTATE(gameState, Select_Init, SelectContext); + SET_NEXT_GAMESTATE(gameState, MapSelect_Init, MapSelectState); gameState->running = false; } if (gIsCtrlr2Valid && PreNmiBuff_IsResetting(gAppNmiBufferPtr) && !gameState->unk_A0) { // "To reset mode" osSyncPrintf(VT_COL(YELLOW, BLACK) "PRE-NMIによりリセットモードに移行します\n" VT_RST); - SET_NEXT_GAMESTATE(gameState, PreNMI_Init, PreNMIContext); + SET_NEXT_GAMESTATE(gameState, PreNMI_Init, PreNMIState); gameState->running = false; } } diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 1e709dc12..2dcee7ce9 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -1,16 +1,18 @@ #include "global.h" -void TitleSetup_InitImpl(GameState* gameState) { +void Setup_InitImpl(SetupState* this) { osSyncPrintf("ゼルダ共通データ初期化\n"); // "Zelda common data initalization" SaveContext_Init(); - gameState->running = false; - SET_NEXT_GAMESTATE(gameState, Title_Init, TitleContext); + this->state.running = false; + SET_NEXT_GAMESTATE(&this->state, ConsoleLogo_Init, ConsoleLogoState); } -void TitleSetup_Destroy(GameState* gameState) { +void Setup_Destroy(GameState* thisx) { } -void TitleSetup_Init(GameState* gameState) { - gameState->destroy = TitleSetup_Destroy; - TitleSetup_InitImpl(gameState); +void Setup_Init(GameState* thisx) { + SetupState* this = (SetupState*)thisx; + + this->state.destroy = Setup_Destroy; + Setup_InitImpl(this); } diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c index 354967e28..55da621a7 100644 --- a/src/code/z_game_dlftbls.c +++ b/src/code/z_game_dlftbls.c @@ -9,10 +9,10 @@ { NULL, 0, 0, NULL, NULL, NULL, init, destroy, NULL, NULL, 0, size } GameStateOverlay gGameStateOverlayTable[] = { - GAMESTATE_OVERLAY_INTERNAL(TitleSetup_Init, TitleSetup_Destroy, sizeof(GameState)), - GAMESTATE_OVERLAY(select, Select_Init, Select_Destroy, sizeof(SelectContext)), - GAMESTATE_OVERLAY(title, Title_Init, Title_Destroy, sizeof(TitleContext)), + GAMESTATE_OVERLAY_INTERNAL(Setup_Init, Setup_Destroy, sizeof(SetupState)), + GAMESTATE_OVERLAY(select, MapSelect_Init, MapSelect_Destroy, sizeof(MapSelectState)), + GAMESTATE_OVERLAY(title, ConsoleLogo_Init, ConsoleLogo_Destroy, sizeof(ConsoleLogoState)), GAMESTATE_OVERLAY_INTERNAL(Play_Init, Play_Destroy, sizeof(PlayState)), - GAMESTATE_OVERLAY(opening, Opening_Init, Opening_Destroy, sizeof(OpeningContext)), - GAMESTATE_OVERLAY(file_choose, FileChoose_Init, FileChoose_Destroy, sizeof(FileChooseContext)), + GAMESTATE_OVERLAY(opening, TitleSetup_Init, TitleSetup_Destroy, sizeof(TitleSetupState)), + GAMESTATE_OVERLAY(file_choose, FileSelect_Init, FileSelect_Destroy, sizeof(FileSelectState)), }; diff --git a/src/code/z_play.c b/src/code/z_play.c index b84725942..bb18e1ad1 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -228,7 +228,7 @@ void Play_Init(GameState* thisx) { if (gSaveContext.entranceIndex == ENTR_LOAD_OPENING) { gSaveContext.entranceIndex = 0; this->state.running = false; - SET_NEXT_GAMESTATE(&this->state, Opening_Init, OpeningContext); + SET_NEXT_GAMESTATE(&this->state, TitleSetup_Init, TitleSetupState); return; } @@ -635,7 +635,7 @@ void Play_Update(PlayState* this) { gSaveContext.minigameState = 3; } } else { - SET_NEXT_GAMESTATE(&this->state, FileChoose_Init, FileChooseContext); + SET_NEXT_GAMESTATE(&this->state, FileSelect_Init, FileSelectState); } } else { this->transitionCtx.destroy(&this->transitionCtx.instanceData); diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index e4deb9a02..1c7869ffa 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -1,13 +1,13 @@ #include "global.h" #include "vt.h" -void func_80092320(PreNMIContext* this) { +void func_80092320(PreNMIState* this) { this->state.running = false; this->state.init = NULL; this->state.size = 0; } -void PreNMI_Update(PreNMIContext* this) { +void PreNMI_Update(PreNMIState* this) { osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_move\n" VT_RST); // Strings existing only in rodata @@ -25,7 +25,7 @@ void PreNMI_Update(PreNMIContext* this) { this->timer--; } -void PreNMI_Draw(PreNMIContext* this) { +void PreNMI_Draw(PreNMIState* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST); @@ -42,7 +42,7 @@ void PreNMI_Draw(PreNMIContext* this) { } void PreNMI_Main(GameState* thisx) { - PreNMIContext* this = (PreNMIContext*)thisx; + PreNMIState* this = (PreNMIState*)thisx; PreNMI_Update(this); PreNMI_Draw(this); @@ -54,7 +54,7 @@ void PreNMI_Destroy(GameState* thisx) { } void PreNMI_Init(GameState* thisx) { - PreNMIContext* this = (PreNMIContext*)thisx; + PreNMIState* this = (PreNMIState*)thisx; this->state.main = PreNMI_Main; this->state.destroy = PreNMI_Destroy; diff --git a/src/code/z_sample.c b/src/code/z_sample.c index ebfb1ab03..e0863c96e 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -1,13 +1,13 @@ #include "global.h" -void Sample_HandleStateChange(SampleContext* this) { +void Sample_HandleStateChange(SampleState* this) { if (CHECK_BTN_ALL(this->state.input[0].press.button, BTN_START)) { SET_NEXT_GAMESTATE(&this->state, Play_Init, PlayState); this->state.running = false; } } -void Sample_Draw(SampleContext* this) { +void Sample_Draw(SampleState* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; View* view = &this->view; @@ -40,7 +40,7 @@ void Sample_Draw(SampleContext* this) { } void Sample_Main(GameState* thisx) { - SampleContext* this = (SampleContext*)thisx; + SampleState* this = (SampleState*)thisx; Sample_Draw(this); Sample_HandleStateChange(this); @@ -49,7 +49,7 @@ void Sample_Main(GameState* thisx) { void Sample_Destroy(GameState* thisx) { } -void Sample_SetupView(SampleContext* this) { +void Sample_SetupView(SampleState* this) { View* view = &this->view; GraphicsContext* gfxCtx = this->state.gfxCtx; @@ -76,7 +76,7 @@ void Sample_SetupView(SampleContext* this) { } } -void Sample_LoadTitleStatic(SampleContext* this) { +void Sample_LoadTitleStatic(SampleState* this) { u32 size = _title_staticSegmentRomEnd - _title_staticSegmentRomStart; this->staticSegment = GameState_Alloc(&this->state, size, "../z_sample.c", 163); @@ -84,7 +84,7 @@ void Sample_LoadTitleStatic(SampleContext* this) { } void Sample_Init(GameState* thisx) { - SampleContext* this = (SampleContext*)thisx; + SampleState* this = (SampleState*)thisx; this->state.main = Sample_Main; this->state.destroy = Sample_Destroy; diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 6041503d6..4afaff306 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -528,7 +528,7 @@ void Sram_WriteSave(SramContext* sramCtx) { * * After verifying all 3 saves, pass relevant data to File Select to be displayed. */ -void Sram_VerifyAndLoadAllSaves(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { +void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCtx) { u16 i; u16 newChecksum; u16 slotNum; @@ -645,60 +645,50 @@ void Sram_VerifyAndLoadAllSaves(FileChooseContext* fileChooseCtx, SramContext* s osSyncPrintf("SAVECT=%x, NAME=%x, LIFE=%x, ITEM=%x, 64DD=%x, HEART=%x\n", DEATHS, NAME, HEALTH_CAP, QUEST, N64DD, DEFENSE); - MemCpy(&fileChooseCtx->deaths[0], sramCtx->readBuff + SLOT_OFFSET(0) + DEATHS, sizeof(fileChooseCtx->deaths[0])); - MemCpy(&fileChooseCtx->deaths[1], sramCtx->readBuff + SLOT_OFFSET(1) + DEATHS, sizeof(fileChooseCtx->deaths[0])); - MemCpy(&fileChooseCtx->deaths[2], sramCtx->readBuff + SLOT_OFFSET(2) + DEATHS, sizeof(fileChooseCtx->deaths[0])); - - MemCpy(&fileChooseCtx->fileNames[0], sramCtx->readBuff + SLOT_OFFSET(0) + NAME, - sizeof(fileChooseCtx->fileNames[0])); - MemCpy(&fileChooseCtx->fileNames[1], sramCtx->readBuff + SLOT_OFFSET(1) + NAME, - sizeof(fileChooseCtx->fileNames[0])); - MemCpy(&fileChooseCtx->fileNames[2], sramCtx->readBuff + SLOT_OFFSET(2) + NAME, - sizeof(fileChooseCtx->fileNames[0])); - - MemCpy(&fileChooseCtx->healthCapacities[0], sramCtx->readBuff + SLOT_OFFSET(0) + HEALTH_CAP, - sizeof(fileChooseCtx->healthCapacities[0])); - MemCpy(&fileChooseCtx->healthCapacities[1], sramCtx->readBuff + SLOT_OFFSET(1) + HEALTH_CAP, - sizeof(fileChooseCtx->healthCapacities[0])); - MemCpy(&fileChooseCtx->healthCapacities[2], sramCtx->readBuff + SLOT_OFFSET(2) + HEALTH_CAP, - sizeof(fileChooseCtx->healthCapacities[0])); - - MemCpy(&fileChooseCtx->questItems[0], sramCtx->readBuff + SLOT_OFFSET(0) + QUEST, - sizeof(fileChooseCtx->questItems[0])); - MemCpy(&fileChooseCtx->questItems[1], sramCtx->readBuff + SLOT_OFFSET(1) + QUEST, - sizeof(fileChooseCtx->questItems[0])); - MemCpy(&fileChooseCtx->questItems[2], sramCtx->readBuff + SLOT_OFFSET(2) + QUEST, - sizeof(fileChooseCtx->questItems[0])); - - MemCpy(&fileChooseCtx->n64ddFlags[0], sramCtx->readBuff + SLOT_OFFSET(0) + N64DD, - sizeof(fileChooseCtx->n64ddFlags[0])); - MemCpy(&fileChooseCtx->n64ddFlags[1], sramCtx->readBuff + SLOT_OFFSET(1) + N64DD, - sizeof(fileChooseCtx->n64ddFlags[0])); - MemCpy(&fileChooseCtx->n64ddFlags[2], sramCtx->readBuff + SLOT_OFFSET(2) + N64DD, - sizeof(fileChooseCtx->n64ddFlags[0])); - - MemCpy(&fileChooseCtx->defense[0], sramCtx->readBuff + SLOT_OFFSET(0) + DEFENSE, sizeof(fileChooseCtx->defense[0])); - MemCpy(&fileChooseCtx->defense[1], sramCtx->readBuff + SLOT_OFFSET(1) + DEFENSE, sizeof(fileChooseCtx->defense[0])); - MemCpy(&fileChooseCtx->defense[2], sramCtx->readBuff + SLOT_OFFSET(2) + DEFENSE, sizeof(fileChooseCtx->defense[0])); - - MemCpy(&fileChooseCtx->health[0], sramCtx->readBuff + SLOT_OFFSET(0) + HEALTH, sizeof(fileChooseCtx->health[0])); - MemCpy(&fileChooseCtx->health[1], sramCtx->readBuff + SLOT_OFFSET(1) + HEALTH, sizeof(fileChooseCtx->health[0])); - MemCpy(&fileChooseCtx->health[2], sramCtx->readBuff + SLOT_OFFSET(2) + HEALTH, sizeof(fileChooseCtx->health[0])); - - osSyncPrintf("f_64dd=%d, %d, %d\n", fileChooseCtx->n64ddFlags[0], fileChooseCtx->n64ddFlags[1], - fileChooseCtx->n64ddFlags[2]); - osSyncPrintf("heart_status=%d, %d, %d\n", fileChooseCtx->defense[0], fileChooseCtx->defense[1], - fileChooseCtx->defense[2]); - osSyncPrintf("now_life=%d, %d, %d\n", fileChooseCtx->health[0], fileChooseCtx->health[1], fileChooseCtx->health[2]); + MemCpy(&fileSelect->deaths[0], sramCtx->readBuff + SLOT_OFFSET(0) + DEATHS, sizeof(fileSelect->deaths[0])); + MemCpy(&fileSelect->deaths[1], sramCtx->readBuff + SLOT_OFFSET(1) + DEATHS, sizeof(fileSelect->deaths[0])); + MemCpy(&fileSelect->deaths[2], sramCtx->readBuff + SLOT_OFFSET(2) + DEATHS, sizeof(fileSelect->deaths[0])); + + MemCpy(&fileSelect->fileNames[0], sramCtx->readBuff + SLOT_OFFSET(0) + NAME, sizeof(fileSelect->fileNames[0])); + MemCpy(&fileSelect->fileNames[1], sramCtx->readBuff + SLOT_OFFSET(1) + NAME, sizeof(fileSelect->fileNames[0])); + MemCpy(&fileSelect->fileNames[2], sramCtx->readBuff + SLOT_OFFSET(2) + NAME, sizeof(fileSelect->fileNames[0])); + + MemCpy(&fileSelect->healthCapacities[0], sramCtx->readBuff + SLOT_OFFSET(0) + HEALTH_CAP, + sizeof(fileSelect->healthCapacities[0])); + MemCpy(&fileSelect->healthCapacities[1], sramCtx->readBuff + SLOT_OFFSET(1) + HEALTH_CAP, + sizeof(fileSelect->healthCapacities[0])); + MemCpy(&fileSelect->healthCapacities[2], sramCtx->readBuff + SLOT_OFFSET(2) + HEALTH_CAP, + sizeof(fileSelect->healthCapacities[0])); + + MemCpy(&fileSelect->questItems[0], sramCtx->readBuff + SLOT_OFFSET(0) + QUEST, sizeof(fileSelect->questItems[0])); + MemCpy(&fileSelect->questItems[1], sramCtx->readBuff + SLOT_OFFSET(1) + QUEST, sizeof(fileSelect->questItems[0])); + MemCpy(&fileSelect->questItems[2], sramCtx->readBuff + SLOT_OFFSET(2) + QUEST, sizeof(fileSelect->questItems[0])); + + MemCpy(&fileSelect->n64ddFlags[0], sramCtx->readBuff + SLOT_OFFSET(0) + N64DD, sizeof(fileSelect->n64ddFlags[0])); + MemCpy(&fileSelect->n64ddFlags[1], sramCtx->readBuff + SLOT_OFFSET(1) + N64DD, sizeof(fileSelect->n64ddFlags[0])); + MemCpy(&fileSelect->n64ddFlags[2], sramCtx->readBuff + SLOT_OFFSET(2) + N64DD, sizeof(fileSelect->n64ddFlags[0])); + + MemCpy(&fileSelect->defense[0], sramCtx->readBuff + SLOT_OFFSET(0) + DEFENSE, sizeof(fileSelect->defense[0])); + MemCpy(&fileSelect->defense[1], sramCtx->readBuff + SLOT_OFFSET(1) + DEFENSE, sizeof(fileSelect->defense[0])); + MemCpy(&fileSelect->defense[2], sramCtx->readBuff + SLOT_OFFSET(2) + DEFENSE, sizeof(fileSelect->defense[0])); + + MemCpy(&fileSelect->health[0], sramCtx->readBuff + SLOT_OFFSET(0) + HEALTH, sizeof(fileSelect->health[0])); + MemCpy(&fileSelect->health[1], sramCtx->readBuff + SLOT_OFFSET(1) + HEALTH, sizeof(fileSelect->health[0])); + MemCpy(&fileSelect->health[2], sramCtx->readBuff + SLOT_OFFSET(2) + HEALTH, sizeof(fileSelect->health[0])); + + osSyncPrintf("f_64dd=%d, %d, %d\n", fileSelect->n64ddFlags[0], fileSelect->n64ddFlags[1], + fileSelect->n64ddFlags[2]); + osSyncPrintf("heart_status=%d, %d, %d\n", fileSelect->defense[0], fileSelect->defense[1], fileSelect->defense[2]); + osSyncPrintf("now_life=%d, %d, %d\n", fileSelect->health[0], fileSelect->health[1], fileSelect->health[2]); } -void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { +void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx) { u16 offset; u16 j; u16* ptr; u16 checksum; - if (fileChooseCtx->buttonIndex != 0) { + if (fileSelect->buttonIndex != 0) { Sram_InitNewSave(); } else { Sram_InitDebugSave(); @@ -709,12 +699,12 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { gSaveContext.dayTime = CLOCK_TIME(10, 0); gSaveContext.cutsceneIndex = 0xFFF1; - if (fileChooseCtx->buttonIndex == 0) { + if (fileSelect->buttonIndex == 0) { gSaveContext.cutsceneIndex = 0; } for (offset = 0; offset < 8; offset++) { - gSaveContext.playerName[offset] = fileChooseCtx->fileNames[fileChooseCtx->buttonIndex][offset]; + gSaveContext.playerName[offset] = fileSelect->fileNames[fileSelect->buttonIndex][offset]; } gSaveContext.newf[0] = 'Z'; @@ -724,8 +714,8 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { gSaveContext.newf[4] = 'A'; gSaveContext.newf[5] = 'Z'; - gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag; - osSyncPrintf("６４ＤＤフラグ=%d\n", fileChooseCtx->n64ddFlag); + gSaveContext.n64ddFlag = fileSelect->n64ddFlag; + osSyncPrintf("６４ＤＤフラグ=%d\n", fileSelect->n64ddFlag); osSyncPrintf("newf=%x,%x,%x,%x,%x,%x\n", gSaveContext.newf[0], gSaveContext.newf[1], gSaveContext.newf[2], gSaveContext.newf[3], gSaveContext.newf[4], gSaveContext.newf[5]); osSyncPrintf("\n$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n"); @@ -762,82 +752,79 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { j = gSramSlotOffsets[gSaveContext.fileNum]; - MemCpy(&fileChooseCtx->deaths[gSaveContext.fileNum], sramCtx->readBuff + j + DEATHS, - sizeof(fileChooseCtx->deaths[0])); - MemCpy(&fileChooseCtx->fileNames[gSaveContext.fileNum], sramCtx->readBuff + j + NAME, - sizeof(fileChooseCtx->fileNames[0])); - MemCpy(&fileChooseCtx->healthCapacities[gSaveContext.fileNum], sramCtx->readBuff + j + HEALTH_CAP, - sizeof(fileChooseCtx->healthCapacities[0])); - MemCpy(&fileChooseCtx->questItems[gSaveContext.fileNum], sramCtx->readBuff + j + QUEST, - sizeof(fileChooseCtx->questItems[0])); - MemCpy(&fileChooseCtx->n64ddFlags[gSaveContext.fileNum], sramCtx->readBuff + j + N64DD, - sizeof(fileChooseCtx->n64ddFlags[0])); - MemCpy(&fileChooseCtx->defense[gSaveContext.fileNum], sramCtx->readBuff + j + DEFENSE, - sizeof(fileChooseCtx->defense[0])); - MemCpy(&fileChooseCtx->health[gSaveContext.fileNum], sramCtx->readBuff + j + HEALTH, - sizeof(fileChooseCtx->health[0])); - - osSyncPrintf("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileChooseCtx->n64ddFlags[gSaveContext.fileNum]); - osSyncPrintf("heart_status[%d]=%d\n", gSaveContext.fileNum, fileChooseCtx->defense[gSaveContext.fileNum]); - osSyncPrintf("now_life[%d]=%d\n", gSaveContext.fileNum, fileChooseCtx->health[gSaveContext.fileNum]); + MemCpy(&fileSelect->deaths[gSaveContext.fileNum], sramCtx->readBuff + j + DEATHS, sizeof(fileSelect->deaths[0])); + MemCpy(&fileSelect->fileNames[gSaveContext.fileNum], sramCtx->readBuff + j + NAME, + sizeof(fileSelect->fileNames[0])); + MemCpy(&fileSelect->healthCapacities[gSaveContext.fileNum], sramCtx->readBuff + j + HEALTH_CAP, + sizeof(fileSelect->healthCapacities[0])); + MemCpy(&fileSelect->questItems[gSaveContext.fileNum], sramCtx->readBuff + j + QUEST, + sizeof(fileSelect->questItems[0])); + MemCpy(&fileSelect->n64ddFlags[gSaveContext.fileNum], sramCtx->readBuff + j + N64DD, + sizeof(fileSelect->n64ddFlags[0])); + MemCpy(&fileSelect->defense[gSaveContext.fileNum], sramCtx->readBuff + j + DEFENSE, sizeof(fileSelect->defense[0])); + MemCpy(&fileSelect->health[gSaveContext.fileNum], sramCtx->readBuff + j + HEALTH, sizeof(fileSelect->health[0])); + + osSyncPrintf("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileSelect->n64ddFlags[gSaveContext.fileNum]); + osSyncPrintf("heart_status[%d]=%d\n", gSaveContext.fileNum, fileSelect->defense[gSaveContext.fileNum]); + osSyncPrintf("now_life[%d]=%d\n", gSaveContext.fileNum, fileSelect->health[gSaveContext.fileNum]); } -void Sram_EraseSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { +void Sram_EraseSave(FileSelectState* fileSelect, SramContext* sramCtx) { s32 offset; Sram_InitNewSave(); - offset = gSramSlotOffsets[fileChooseCtx->selectedFileIndex]; + offset = gSramSlotOffsets[fileSelect->selectedFileIndex]; MemCpy(sramCtx->readBuff + offset, &gSaveContext, sizeof(Save)); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000) + offset, &gSaveContext, SLOT_SIZE, OS_WRITE); - MemCpy(&fileChooseCtx->n64ddFlags[fileChooseCtx->selectedFileIndex], sramCtx->readBuff + offset + N64DD, - sizeof(fileChooseCtx->n64ddFlags[0])); + MemCpy(&fileSelect->n64ddFlags[fileSelect->selectedFileIndex], sramCtx->readBuff + offset + N64DD, + sizeof(fileSelect->n64ddFlags[0])); - offset = gSramSlotOffsets[fileChooseCtx->selectedFileIndex + 3]; + offset = gSramSlotOffsets[fileSelect->selectedFileIndex + 3]; MemCpy(sramCtx->readBuff + offset, &gSaveContext, sizeof(Save)); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000) + offset, &gSaveContext, SLOT_SIZE, OS_WRITE); osSyncPrintf("ＣＬＥＡＲ終了\n"); } -void Sram_CopySave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { +void Sram_CopySave(FileSelectState* fileSelect, SramContext* sramCtx) { s32 offset; - osSyncPrintf("ＲＥＡＤ=%d(%x) ＣＯＰＹ=%d(%x)\n", fileChooseCtx->selectedFileIndex, - gSramSlotOffsets[fileChooseCtx->selectedFileIndex], fileChooseCtx->copyDestFileIndex, - gSramSlotOffsets[fileChooseCtx->copyDestFileIndex]); + osSyncPrintf("ＲＥＡＤ=%d(%x) ＣＯＰＹ=%d(%x)\n", fileSelect->selectedFileIndex, + gSramSlotOffsets[fileSelect->selectedFileIndex], fileSelect->copyDestFileIndex, + gSramSlotOffsets[fileSelect->copyDestFileIndex]); - offset = gSramSlotOffsets[fileChooseCtx->selectedFileIndex]; + offset = gSramSlotOffsets[fileSelect->selectedFileIndex]; MemCpy(&gSaveContext, sramCtx->readBuff + offset, sizeof(Save)); - offset = gSramSlotOffsets[fileChooseCtx->copyDestFileIndex]; + offset = gSramSlotOffsets[fileSelect->copyDestFileIndex]; MemCpy(sramCtx->readBuff + offset, &gSaveContext, sizeof(Save)); - offset = gSramSlotOffsets[fileChooseCtx->copyDestFileIndex + 3]; + offset = gSramSlotOffsets[fileSelect->copyDestFileIndex + 3]; MemCpy(sramCtx->readBuff + offset, &gSaveContext, sizeof(Save)); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_WRITE); - offset = gSramSlotOffsets[fileChooseCtx->copyDestFileIndex]; - - MemCpy(&fileChooseCtx->deaths[fileChooseCtx->copyDestFileIndex], sramCtx->readBuff + offset + DEATHS, - sizeof(fileChooseCtx->deaths[0])); - MemCpy(&fileChooseCtx->fileNames[fileChooseCtx->copyDestFileIndex], sramCtx->readBuff + offset + NAME, - sizeof(fileChooseCtx->fileNames[0])); - MemCpy(&fileChooseCtx->healthCapacities[fileChooseCtx->copyDestFileIndex], sramCtx->readBuff + offset + HEALTH_CAP, - sizeof(fileChooseCtx->healthCapacities[0])); - MemCpy(&fileChooseCtx->questItems[fileChooseCtx->copyDestFileIndex], sramCtx->readBuff + offset + QUEST, - sizeof(fileChooseCtx->questItems[0])); - MemCpy(&fileChooseCtx->n64ddFlags[fileChooseCtx->copyDestFileIndex], sramCtx->readBuff + offset + N64DD, - sizeof(fileChooseCtx->n64ddFlags[0])); - MemCpy(&fileChooseCtx->defense[fileChooseCtx->copyDestFileIndex], sramCtx->readBuff + offset + DEFENSE, - sizeof(fileChooseCtx->defense[0])); - MemCpy(&fileChooseCtx->health[fileChooseCtx->copyDestFileIndex], (sramCtx->readBuff + offset) + HEALTH, - sizeof(fileChooseCtx->health[0])); - - osSyncPrintf("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileChooseCtx->n64ddFlags[gSaveContext.fileNum]); - osSyncPrintf("heart_status[%d]=%d\n", gSaveContext.fileNum, fileChooseCtx->defense[gSaveContext.fileNum]); + offset = gSramSlotOffsets[fileSelect->copyDestFileIndex]; + + MemCpy(&fileSelect->deaths[fileSelect->copyDestFileIndex], sramCtx->readBuff + offset + DEATHS, + sizeof(fileSelect->deaths[0])); + MemCpy(&fileSelect->fileNames[fileSelect->copyDestFileIndex], sramCtx->readBuff + offset + NAME, + sizeof(fileSelect->fileNames[0])); + MemCpy(&fileSelect->healthCapacities[fileSelect->copyDestFileIndex], sramCtx->readBuff + offset + HEALTH_CAP, + sizeof(fileSelect->healthCapacities[0])); + MemCpy(&fileSelect->questItems[fileSelect->copyDestFileIndex], sramCtx->readBuff + offset + QUEST, + sizeof(fileSelect->questItems[0])); + MemCpy(&fileSelect->n64ddFlags[fileSelect->copyDestFileIndex], sramCtx->readBuff + offset + N64DD, + sizeof(fileSelect->n64ddFlags[0])); + MemCpy(&fileSelect->defense[fileSelect->copyDestFileIndex], sramCtx->readBuff + offset + DEFENSE, + sizeof(fileSelect->defense[0])); + MemCpy(&fileSelect->health[fileSelect->copyDestFileIndex], (sramCtx->readBuff + offset) + HEALTH, + sizeof(fileSelect->health[0])); + + osSyncPrintf("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileSelect->n64ddFlags[gSaveContext.fileNum]); + osSyncPrintf("heart_status[%d]=%d\n", gSaveContext.fileNum, fileSelect->defense[gSaveContext.fileNum]); osSyncPrintf("ＣＯＰＹ終了\n"); // "Copy end" } -- cgit v1.2.3