summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/69CB30.h4
-rw-r--r--include/6B3DC0.h7
-rw-r--r--include/m_flashrom.h2
-rw-r--r--linker_scripts/jp/symbol_addrs_code.txt2
-rw-r--r--src/code/m_start_data_init.c2
-rw-r--r--src/overlays/gamestates/ovl_save_menu/save_menu.c253
-rw-r--r--src/overlays/gamestates/ovl_save_menu/save_menu.h29
-rw-r--r--yamls/jp/overlays.yaml6
8 files changed, 289 insertions, 16 deletions
diff --git a/include/69CB30.h b/include/69CB30.h
index 74d3b3e..dc18253 100644
--- a/include/69CB30.h
+++ b/include/69CB30.h
@@ -6,7 +6,7 @@
struct Animal_c;
struct PrivateInfo;
-s32 func_80078E90_jp(void* arg0, s32 arg1);
+s32 mCPk_PakOpen(void* arg0, s32 arg1);
// void func_80078EB4_jp();
// void func_80078EE0_jp();
// void func_80078F08_jp();
@@ -20,7 +20,7 @@ s32 func_80078E90_jp(void* arg0, s32 arg1);
// void func_800792FC_jp();
// void func_80079378_jp();
// void func_800793A8_jp();
-// void mCPk_SavePak();
+s32 mCPk_SavePak(struct PrivateInfo*, struct Animal_c*, void*);
s32 func_8007942C_jp(struct PrivateInfo*, struct Animal_c*, void*);
// void func_800794E4_jp();
// void func_8007967C_jp();
diff --git a/include/6B3DC0.h b/include/6B3DC0.h
index 37e5715..b9f1d91 100644
--- a/include/6B3DC0.h
+++ b/include/6B3DC0.h
@@ -4,6 +4,7 @@
#include "ultra64.h"
struct GraphicsContext;
+struct Game;
// void func_80090120_jp();
// void func_80090130_jp();
@@ -27,10 +28,10 @@ struct GraphicsContext;
// void func_80090848_jp();
// void func_8009087C_jp();
// void func_80090CC0_jp();
-// void mFont_SetLineStrings_AndSpace();
+f32 mFont_SetLineStrings_AndSpace(struct Game*, char*, s32, f32 x, f32 y, s32 , s32 , s32 , s32 , s32, s32, s32, f32, f32, s32);
// void func_80090E98_jp();
-// void mFont_SetMatrix();
-// void mFont_UnSetMatrix();
+void mFont_SetMatrix(struct GraphicsContext* gfxCtx, s32 type);
+void mFont_UnSetMatrix(struct GraphicsContext* gfxCtx, s32 type);
void func_80091074_jp(struct GraphicsContext* gfxCtx);
// void func_80091094_jp();
// void func_80091104_jp();
diff --git a/include/m_flashrom.h b/include/m_flashrom.h
index 0fdf0ca..b29eaf2 100644
--- a/include/m_flashrom.h
+++ b/include/m_flashrom.h
@@ -30,7 +30,7 @@ void mFRm_ClearSaveCheckData(struct CommonData* common_data);
// void func_8008F5FC_jp();
// void func_8008F648_jp();
// void func_8008F768_jp();
-// void func_8008F7C8_jp();
+s32 func_8008F7C8_jp(void);
// void func_8008F8A0_jp();
// void func_8008F938_jp();
// void func_8008F968_jp();
diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index 1beb3d4..3395c6a 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -931,7 +931,7 @@ chkTrigger = 0x80078DAC; // type:func
getTrigger = 0x80078DF4; // type:func
getJoystick_X = 0x80078E28; // type:func
getJoystick_Y = 0x80078E5C; // type:func
-func_80078E90_jp = 0x80078E90; // type:func
+mCPk_PakOpen = 0x80078E90; // type:func
func_80078EB4_jp = 0x80078EB4; // type:func
func_80078EE0_jp = 0x80078EE0; // type:func
func_80078F08_jp = 0x80078F08; // type:func
diff --git a/src/code/m_start_data_init.c b/src/code/m_start_data_init.c
index 9709b55..cb6aa61 100644
--- a/src/code/m_start_data_init.c
+++ b/src/code/m_start_data_init.c
@@ -363,7 +363,7 @@ s32 mSDI_StartInitPak(Game* game2, s32 playerNumber, s32 mallocFlag) {
if (mFRm_CheckSaveData() == TRUE) {
sp1C = mCPk_get_pkinfo();
- if ((func_80078E90_jp(sp1C, 0) == TRUE) && (mPr_LoadPak_and_SetPrivateInfo2(playerNumber, sp1C) == TRUE)) {
+ if ((mCPk_PakOpen(sp1C, 0) == TRUE) && (mPr_LoadPak_and_SetPrivateInfo2(playerNumber, sp1C) == TRUE)) {
mFM_SetBlockKindLoadCombi(game);
mEv_init_force(&game_play->event);
mHsRm_GetHuusuiRoom(game, playerNumber);
diff --git a/src/overlays/gamestates/ovl_save_menu/save_menu.c b/src/overlays/gamestates/ovl_save_menu/save_menu.c
new file mode 100644
index 0000000..5593b55
--- /dev/null
+++ b/src/overlays/gamestates/ovl_save_menu/save_menu.c
@@ -0,0 +1,253 @@
+#include "save_menu.h"
+#include "overlays/gamestates/ovl_trademark/m_trademark.h"
+#include "gfx.h"
+#include "m_view.h"
+#include "m_common_data.h"
+#include "macros.h"
+#include "m_flashrom.h"
+#include "69CB30.h"
+#include "6B3DC0.h"
+#include "m_rcp.h"
+#include "sys_matrix.h"
+
+void save_menu_set_cursor_col(Game_SaveMenu* saveMenu) {
+ s32 cursor_col[10][3] = {
+ { 192, 120, 120 }, { 224, 130, 130 }, { 240, 150, 150 }, { 255, 180, 180 }, { 240, 150, 150 },
+ { 224, 130, 130 }, { 192, 120, 120 }, { 128, 80, 80 }, { 64, 64, 64 }, { 128, 80, 80 },
+ };
+ s32 dstIndex;
+ s32* dst;
+ u32 colorIndex;
+ s32 i;
+
+ dstIndex = saveMenu->mode;
+ dst = saveMenu->cursorColumn[dstIndex];
+ colorIndex = saveMenu->frame / 4;
+
+ for (i = 0; i < 3; i++) {
+ dst[i] = cursor_col[colorIndex][i];
+ }
+}
+
+void save_menu_reset_cursor_col(s32 (*color)[3]) {
+ s32 default_color[3] = { 40, 40, 40 };
+ s32 i;
+
+ for (i = 0; i < 3; i++) {
+ (*color)[i] = default_color[i];
+ }
+}
+
+typedef void (*SaveMenuProc)(Game_SaveMenu*);
+
+void save_menu_data_save_from(Game_SaveMenu* saveMenu) {
+ u8 playerNo = common_data.playerNumber;
+ if ((playerNo) != 4) {
+ common_data.privateInfo->exists = TRUE;
+ if (func_8008F7C8_jp() != -1) {
+ saveMenu->error = SAVE_ERROR_EXIT; // OK
+ } else {
+ saveMenu->error = SAVE_ERROR_FLASHROM;
+ }
+ } else {
+ saveMenu->error = SAVE_ERROR_FLASHROM; // Player is foriegner
+ }
+}
+
+void save_menu_data_save_pak(Game_SaveMenu* saveMenu) {
+ PrivateInfo* private = common_data.privateInfo;
+ AnmPersonalID_c* foreignId;
+ u8 playerNo = common_data.playerNumber;
+ if (playerNo == 4) {
+ foreignId = mNpc_GetOtherAnimalPersonalID(NULL, 0);
+ if (foreignId != NULL) {
+ mNpc_CopyAnimalPersonalID(&private->storedAnmId, foreignId);
+ }
+ }
+
+ mCPk_PakOpen(mCPk_get_pkinfo(), 0);
+ if (mCPk_SavePak(common_data.saveFilePrivateInfo, common_data.animals, mCPk_get_pkinfo()) == TRUE) {
+ if (mLd_PlayerManKindCheck() == FALSE) {
+ common_data.privateInfo->exists = FALSE;
+ }
+ if (func_8008F7C8_jp() != -1) {
+ saveMenu->error = SAVE_ERROR_EXIT; // OK
+ } else {
+ saveMenu->error = SAVE_ERROR_FLASHROM;
+ { UNUSED s32 scopedTemp; }
+ }
+ } else {
+ saveMenu->error = SAVE_ERROR_CPAK; // Failed to save to CPak
+ }
+}
+void save_menu_move_do_save(Game_SaveMenu* saveMenu) {
+ static SaveMenuProc save_proc[2] = { &save_menu_data_save_from, &save_menu_data_save_pak };
+
+ s32 mode = saveMenu->mode;
+
+ if (chkTrigger(A_BUTTON)) {
+ save_proc[mode](saveMenu);
+ }
+
+ if (chkTrigger(R_TRIG) || chkTrigger(U_JPAD) || chkTrigger(D_JPAD)) {
+ saveMenu->frame = 0;
+ save_menu_reset_cursor_col(saveMenu->cursorColumn + mode);
+ saveMenu->mode++;
+
+ if (saveMenu->mode >= 2) {
+ saveMenu->mode = 0;
+ }
+ }
+
+ if (chkTrigger(B_BUTTON)) {
+ saveMenu->error = SAVE_ERROR_EXIT; // OK
+ }
+}
+
+void save_menu_move_finish(Game_SaveMenu* save) {
+ STOP_GAMESTATE((Game*)save);
+ SET_NEXT_GAMESTATE((Game*)save, trademark_init, sizeof(Game_Trademark));
+}
+
+void save_menu_move_err(Game_SaveMenu* saveMenu) {
+ saveMenu->error = SAVE_ERROR_NONE; // cleared
+}
+
+void save_menu_move_main(Game_SaveMenu* saveMenu) {
+ static SaveMenuProc sub_proc[] = { &save_menu_move_do_save, &save_menu_move_err, &save_menu_move_err,
+ &save_menu_move_finish };
+
+ s32 error = saveMenu->error;
+
+ if (error >= SAVE_ERROR_NONE && error < SAVE_ERROR_MAX) {
+ sub_proc[error](saveMenu);
+ }
+
+ save_menu_set_cursor_col(saveMenu);
+ saveMenu->frame++;
+
+ if (saveMenu->frame == 40) {
+ saveMenu->frame = 0;
+ }
+}
+
+void save_menu_draw_title(Game_SaveMenu* saveMenu) {
+ UNUSED s32 pad;
+ char title[] = { 0x9E, 0x90, 0xDF, 0x20, 0xB2, 0xA6, 0x8D, 0x90 };
+
+ mFont_SetMatrix(saveMenu->game.gfxCtx, 1);
+ mFont_SetLineStrings_AndSpace((Game*)saveMenu, title, ARRAY_COUNT(title) * sizeof(char), 110.0f, 30.0f, 200, 50, 50,
+ 255, FALSE, TRUE, FALSE, 1.1f, 1.1f, 1);
+ mFont_UnSetMatrix(saveMenu->game.gfxCtx, 1);
+}
+
+void save_menu_draw_push_a(Game_SaveMenu* saveMenu) {
+ UNUSED s32 pad;
+ char push_a[] = { 0x50, 0x75, 0x73, 0x68, 0x20, 0x41, 0x20, 0x42, 0x75, 0x74, 0x74, 0x6F, 0x6E };
+
+ mFont_SetMatrix(saveMenu->game.gfxCtx, 1);
+ mFont_SetLineStrings_AndSpace((Game*)saveMenu, push_a, ARRAY_COUNT(push_a) * sizeof(char), 95.0f, 175.0f, 200, 200,
+ 200, 255, FALSE, TRUE, FALSE, 0.8f, 0.8f, 1);
+ mFont_UnSetMatrix(saveMenu->game.gfxCtx, 1);
+}
+
+void save_menu_draw_select_r(Game_SaveMenu* saveMenu) {
+ UNUSED s32 pad;
+ char select_r[0xF] = { 0x53, 0x65, 0x6C, 0x65, 0x63, 0x74, 0x20, 0x52, 0x20, 0x42, 0x75, 0x74, 0x74, 0x6F, 0x6E };
+
+ mFont_SetMatrix(saveMenu->game.gfxCtx, 1);
+ mFont_SetLineStrings_AndSpace((Game*)saveMenu, select_r, ARRAY_COUNT(select_r), 76.0f, 185.0f, 200, 200, 200, 255,
+ FALSE, TRUE, FALSE, 0.8f, 0.8f, 1);
+ mFont_UnSetMatrix(saveMenu->game.gfxCtx, 1);
+}
+
+void save_menu_draw_push_b(Game_SaveMenu* saveMenu) {
+ UNUSED s32 pad;
+ char push_b[] = { 0x50, 0x75, 0x73, 0x68, 0x20, 0x42, 0x20, 0x42, 0x75, 0x74, 0x74,
+ 0x6F, 0x6E, 0x20, 0x74, 0x6F, 0x20, 0x45, 0x58, 0x49, 0x54 };
+
+ mFont_SetMatrix(saveMenu->game.gfxCtx, 1);
+ mFont_SetLineStrings_AndSpace((Game*)saveMenu, push_b, ARRAY_COUNT(push_b) * sizeof(char), 50.0f, 210.0f, 200, 200,
+ 200, 255, FALSE, TRUE, FALSE, 0.8f, 0.8f, 1);
+ mFont_UnSetMatrix(saveMenu->game.gfxCtx, 1);
+}
+
+void save_menu_draw_select_mode(Game_SaveMenu* saveMenu) {
+ UNUSED s32 pad;
+ char select_mode[2][13] = {
+ { 0x46, 0x6C, 0x61, 0x73, 0x68, 0x52, 0x6F, 0x6D, 0x20, 0x15, 0x9E, 0x90, 0xDF },
+ { 0xE2, 0x8F, 0x98, 0x20, 0x15, 0x9E, 0x90, 0xDF, 0x20, 0x20, 0x20, 0x20, 0x20 },
+ };
+
+ mFont_SetMatrix(saveMenu->game.gfxCtx, 1);
+ mFont_SetLineStrings_AndSpace(
+ (Game*)saveMenu, select_mode[SAVE_MODE_FLASHROM], ARRAY_COUNT(select_mode[SAVE_MODE_FLASHROM]) * sizeof(char),
+ 60.0f, 85.0f, saveMenu->cursorColumn[SAVE_MODE_FLASHROM][0], saveMenu->cursorColumn[SAVE_MODE_FLASHROM][1],
+ saveMenu->cursorColumn[SAVE_MODE_FLASHROM][2], 255, FALSE, TRUE, FALSE, 1.2f, 1.2f, 1);
+ mFont_UnSetMatrix(saveMenu->game.gfxCtx, 1);
+
+ mFont_SetMatrix(saveMenu->game.gfxCtx, 1);
+ mFont_SetLineStrings_AndSpace((Game*)saveMenu, select_mode[SAVE_MODE_CPAK],
+ ARRAY_COUNT(select_mode[SAVE_MODE_CPAK]), 100.0f, 125.0f,
+ saveMenu->cursorColumn[SAVE_MODE_CPAK][0], saveMenu->cursorColumn[SAVE_MODE_CPAK][1],
+ saveMenu->cursorColumn[SAVE_MODE_CPAK][2], 255, FALSE, TRUE, FALSE, 1.2f, 1.2f, 1);
+ mFont_UnSetMatrix(saveMenu->game.gfxCtx, 1);
+}
+
+void save_menu_draw_main(Game_SaveMenu* saveMenu) {
+ GraphicsContext* g = saveMenu->game.gfxCtx;
+
+ OPEN_DISPS(g);
+
+ gSPSegment(POLY_OPA_DISP++, G_MWO_SEGMENT_0, 0);
+ DisplayList_initialize(g, 0, 0, 0, NULL);
+ gDPPipeSync(POLY_OPA_DISP++);
+
+ CLOSE_DISPS(g);
+
+ showView(&saveMenu->view, 15);
+ save_menu_draw_title(saveMenu);
+ save_menu_draw_push_a(saveMenu);
+ save_menu_draw_select_r(saveMenu);
+ save_menu_draw_push_b(saveMenu);
+ save_menu_draw_select_mode(saveMenu);
+}
+
+void save_menu_main(Game* game) {
+ Game_SaveMenu* saveMenu = (Game_SaveMenu*)game;
+ GraphicsContext* g;
+
+ save_menu_move_main(saveMenu);
+ save_menu_draw_main(saveMenu);
+
+ g = game->gfxCtx;
+ game_debug_draw_last(game, g);
+ game_draw_last(g);
+}
+
+void save_menu_cleanup(UNUSED Game* game) {
+}
+
+void save_menu_init(Game* game) {
+ GraphicsContext* g = game->gfxCtx;
+ View* view;
+ Game_SaveMenu* saveMenu = (Game_SaveMenu*)game;
+ int i;
+
+ game->main = &save_menu_main;
+ game->destroy = &save_menu_cleanup;
+
+ view = &saveMenu->view;
+ initView(view, g);
+ view->flag = 8;
+ new_Matrix(game);
+ SetGameFrame(1);
+
+ saveMenu->frame = 0;
+ saveMenu->mode = SAVE_MODE_START;
+ saveMenu->error = SAVE_ERROR_NONE;
+
+ for (i = 0; i < SAVE_MODE_MAX; i++) {
+ save_menu_reset_cursor_col(saveMenu->cursorColumn + i);
+ }
+}
diff --git a/src/overlays/gamestates/ovl_save_menu/save_menu.h b/src/overlays/gamestates/ovl_save_menu/save_menu.h
index 4be98dd..e4a18d7 100644
--- a/src/overlays/gamestates/ovl_save_menu/save_menu.h
+++ b/src/overlays/gamestates/ovl_save_menu/save_menu.h
@@ -1,14 +1,33 @@
#ifndef SAVE_MENU_H
#define SAVE_MENU_H
-#include "ultra64.h"
#include "game.h"
-#include "unk.h"
+#include "m_view.h"
typedef struct Game_SaveMenu {
- /* 0x00 */ Game state;
- /* 0xE0 */ UNK_TYPE1 unk_00[0x230-0xE0];
-} Game_SaveMenu; // size = 0x230
+ /* 0x0000 */ Game game;
+ /* 0x00E0 */ View view;
+ /* 0x0200 */ u32 frame;
+ /* 0x0204 */ s32 mode;
+ /* 0x0208 */ s32 error;
+ /* 0x020C */ s32 cursorColumn[2][3];
+} Game_SaveMenu; // size = 0x224
+
+typedef enum SaveMenuSaveError {
+ /* 0 */ SAVE_ERROR_NONE,
+ /* 1 */ SAVE_ERROR_FLASHROM,
+ /* 2 */ SAVE_ERROR_CPAK,
+ /* 3 */ SAVE_ERROR_EXIT,
+ /* 4 */ SAVE_ERROR_MAX
+} SaveMenuSaveError;
+
+typedef enum SaveMenuSaveMode {
+ /* 0 */ SAVE_MODE_START,
+ /* 0 */ SAVE_MODE_FLASHROM = SAVE_MODE_START,
+ /* 1 */ SAVE_MODE_CPAK,
+ /* 2 */ SAVE_MODE_MAX
+}SaveMenuSaveMode;
+
void save_menu_init(Game *thisx);
void save_menu_cleanup(Game *thisx);
diff --git a/yamls/jp/overlays.yaml b/yamls/jp/overlays.yaml
index 4130cc1..a3fd58b 100644
--- a/yamls/jp/overlays.yaml
+++ b/yamls/jp/overlays.yaml
@@ -142,9 +142,9 @@
compress: True
bss_size: 0x0
subsegments:
- - [0x7486E0, asm, overlays/gamestates/ovl_save_menu/save_menu]
- - [0x7490E0, data, overlays/gamestates/ovl_save_menu/save_menu]
- - [0x7491E0, rodata, overlays/gamestates/ovl_save_menu/save_menu]
+ - [0x7486E0, c, overlays/gamestates/ovl_save_menu/save_menu]
+ - [0x7490E0, .data, overlays/gamestates/ovl_save_menu/save_menu]
+ - [0x7491E0, .rodata, overlays/gamestates/ovl_save_menu/save_menu]
- name: ovl_save_menu_reloc
type: code
start: 0x749200
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 04:44:06 +0000