Implement & link m_editEndChk_ovl.c

This commit is contained in:
Cuyler36
2023-11-19 00:32:29 -05:00
parent a447d23d7b
commit 4b166bc649
5 changed files with 407 additions and 1 deletions
+5
View File
@@ -562,6 +562,11 @@ m_bank_ovl.c:
.rodata: [0x8064AE58, 0x8064AE90]
.data: [0x806C7B90, 0x806C7BE0]
.bss: [0x8133E0A8, 0x8133E0C0]
m_editEndChk_ovl.c:
.text: [0x805D7A64, 0x805D8498]
.rodata: [0x8064B2C0, 0x8064B300]
.data: [0x806CC8B8, 0x806CC9D8]
.bss: [0x8133F5C0, 0x8133F5C8]
m_editor_ovl.c:
.text: [0x805D8498, 0x805DC3CC]
.rodata: [0x8064B300, 0x8064B368]
+39
View File
@@ -0,0 +1,39 @@
#ifndef M_ENDEDITCHK_H
#define M_ENDEDITCHK_H
#include "types.h"
#include "m_editEndChk_h.h"
#include "m_submenu_ovl.h"
#ifdef __cplusplus
extern "C" {
#endif
/* TODO: verify these */
enum {
mEE_TYPE_DIARY,
mEE_TYPE_NOTICE,
mEE_TYPE_MSCORE,
mEE_TYPE_CPORIGINAL,
mEE_TYPE_ORIGINAL_DESIGN,
mEE_TYPE_NUM
};
struct end_edit_chk_s {
u8 moving_in;
u8 selected_answer;
u8 question_alpha_step;
u8 question_alpha;
f32 scale;
};
extern void mEE_editEndChk_ovl_set_proc(Submenu* submenu);
extern void mEE_editEndChk_ovl_construct(Submenu* submenu);
extern void mEE_editEndChk_ovl_destruct(Submenu* submenu);
#ifdef __cplusplus
}
#endif
#endif
+16
View File
@@ -0,0 +1,16 @@
#ifndef M_ENDEDITCHK_H_H
#define M_ENDEDITCHK_H_H
#include "types.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct end_edit_chk_s mEE_Ovl_c;
#ifdef __cplusplus
}
#endif
#endif
+3 -1
View File
@@ -18,6 +18,7 @@
#include "m_board_ovl_h.h"
#include "m_diary_ovl_h.h"
#include "m_address_ovl_h.h"
#include "m_editEndChk_h.h"
#ifdef __cplusplus
extern "C" {
@@ -119,7 +120,8 @@ struct submenu_overlay_s {
/* 0x98C */ mED_Ovl_c* editor_ovl;
/* 0x990 */ mBD_Ovl_c* board_ovl;
/* 0x994 */ mAD_Ovl_c* address_ovl;
/* 0x998 */ u8 _998[0x9A8 - 0x998];
/* 0x998 */ u8 _998[0x9A4 - 0x998];
/* 0x9A4 */ mEE_Ovl_c* editEndChk_ovl;
/* 0x9A8 */ mWR_Ovl_c* warning_ovl;
/* 0x9AC */ void* _9AC;
/* 0x9B0 */ void* _9B0;
+344
View File
@@ -0,0 +1,344 @@
#include "m_editEndChk.h"
#include "audio.h"
#include "m_font.h"
#include "sys_matrix.h"
typedef struct editEndChk_win_data_s {
int answer_num;
Gfx* win_model;
Gfx* char_model;
f32 char_x;
f32 char_y;
f32 answer_x;
f32 answer_y;
f32 question_x;
f32 question_y;
} mEE_win_data_c;
extern Gfx lat_sentaku2_winT_model[];
extern Gfx lat_sentaku2_c_model[];
extern Gfx lat_sentaku_winT_model[];
extern Gfx lat_sentaku_c_model[];
static mEE_win_data_c win_data[] = {
{
2,
lat_sentaku2_winT_model,
lat_sentaku2_c_model,
-45.0f, 43.0f,
65.0f, -74.0f,
0.0f, 0.0f
},
{
3,
lat_sentaku_winT_model,
lat_sentaku_c_model,
-81.0f, 58.0f,
60.0f, -71.0f,
1.0f, -4.0f
},
{
3,
lat_sentaku_winT_model,
lat_sentaku_c_model,
-81.0f, 58.0f,
42.0f, -55.0f,
1.0f, 15.0f
},
{
3,
lat_sentaku_winT_model,
lat_sentaku_c_model,
-81.0f, 58.0f,
60.0f, -71.0f,
0.0f, 0.0f
},
{
3,
lat_sentaku_winT_model,
lat_sentaku_c_model,
-81.0f, 58.0f,
60.0f, -71.0f,
1.0f, -4.0f
},
};
static u8 mEE_str_table[11] = "Is this OK?";
static u8 mEE_str_data0[3] = "Yes";
static u8 mEE_str_data1[7] = "Rewrite";
static u8 mEE_str_data2[12] = "Throw it out";
static void mEE_move_Move(Submenu* submenu, mSM_MenuInfo_c* menu_info) {
(*submenu->overlay->move_Move_proc)(submenu, menu_info);
}
static void mEE_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) {
mEE_win_data_c* data = &win_data[menu_info->data0];
mEE_Ovl_c* editEndChk_ovl = submenu->overlay->editEndChk_ovl;
u32 trigger = submenu->overlay->menu_control.trigger;
int max_answer_no = data->answer_num - 1;
if ((trigger & BUTTON_B)) {
sAdo_SysTrgStart(0x1003);
menu_info->proc_status = mSM_OVL_PROC_MOVE;
menu_info->move_drt = mSM_MOVE_OUT_BOTTOM;
menu_info->next_proc_status = mSM_OVL_PROC_END;
menu_info->data1 = 1;
}
else if ((trigger & (BUTTON_A | BUTTON_START))) {
if (editEndChk_ovl->moving_in == FALSE) {
editEndChk_ovl->moving_in = TRUE;
editEndChk_ovl->scale = 0.0f;
}
else {
menu_info->proc_status = mSM_OVL_PROC_MOVE;
menu_info->move_drt = mSM_MOVE_OUT_BOTTOM;
menu_info->next_proc_status = mSM_OVL_PROC_END;
menu_info->data1 = editEndChk_ovl->selected_answer;
}
if (menu_info->data1 == 2) {
sAdo_SysTrgStart(0x1003);
}
else {
sAdo_SysTrgStart(0x2);
}
}
else if (editEndChk_ovl->moving_in == TRUE) {
if (editEndChk_ovl->scale < 1.0f) {
editEndChk_ovl->scale += 0.2f;
}
else {
editEndChk_ovl->scale = 1.0f;
if ((trigger & BUTTON_CUP)) {
if (editEndChk_ovl->selected_answer != 0) {
editEndChk_ovl->selected_answer--;
sAdo_SysTrgStart(0x1);
}
}
else if ((trigger & BUTTON_CDOWN)) {
if (editEndChk_ovl->selected_answer < max_answer_no) {
editEndChk_ovl->selected_answer++;
sAdo_SysTrgStart(0x1);
}
}
}
editEndChk_ovl->question_alpha_step = 0;
editEndChk_ovl->question_alpha = 0;
}
else {
int step = (editEndChk_ovl->question_alpha_step + 1) % 30;
editEndChk_ovl->question_alpha_step = step;
if (step < 15) {
editEndChk_ovl->question_alpha = ((f32)step * 255.0f) / 15.0f;
}
else {
editEndChk_ovl->question_alpha = ((f32)(30 - step) * 255.0f) / 15.0f;
}
}
}
static void mEE_move_End(Submenu* submenu, mSM_MenuInfo_c* menu_info) {
(*submenu->overlay->move_End_proc)(submenu, menu_info);
}
typedef void (*mEE_OVL_MOVE_PROC)(Submenu*, mSM_MenuInfo_c*);
static void mEE_editEndChk_ovl_move(Submenu* submenu) {
static mEE_OVL_MOVE_PROC ovl_move_proc[mSM_OVL_PROC_NUM] = {
&mEE_move_Move,
&mEE_move_Play,
(mEE_OVL_MOVE_PROC)&none_proc1,
(mEE_OVL_MOVE_PROC)&none_proc1,
mEE_move_End
};
Submenu_Overlay_c* overlay = submenu->overlay;
mSM_MenuInfo_c* menu_info = &overlay->menu_info[mSM_OVL_EDITENDCHK];
(*menu_info->pre_move_func)(submenu);
(*ovl_move_proc[menu_info->proc_status])(submenu, menu_info);
}
extern Gfx lat_kakunin_DL_mode[];
extern Gfx lat_kakunin_wakuT_model[];
extern Gfx lat_kakunin_c_model[];
static void mEE_set_question_field(Submenu* submenu, GRAPH* graph, f32 x, f32 y) {
Gfx* gfx;
Matrix_scale(16.0f, 16.0f, 1.0f, 0);
Matrix_translate(x, y, 140.0f, 1);
OPEN_DISP(graph);
gfx = NOW_POLY_OPA_DISP;
gSPMatrix(gfx++, _Matrix_to_Mtx_new(graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, lat_kakunin_DL_mode);
gSPDisplayList(gfx++, lat_kakunin_wakuT_model);
gDPPipeSync(gfx++);
gDPSetPrimColor(gfx++, 0, 255, 0, 0, 255, submenu->overlay->editEndChk_ovl->question_alpha);
gSPDisplayList(gfx++, lat_kakunin_c_model);
SET_POLY_OPA_DISP(gfx);
CLOSE_DISP(graph);
}
static void mEE_set_answer_field(Submenu* submenu, GRAPH* graph, mEE_win_data_c* data, f32 x, f32 y) {
f32 scale = submenu->overlay->editEndChk_ovl->scale;
Gfx* gfx;
Matrix_scale(16.0f, 16.0f, 1.0f, 0);
Matrix_translate(x, y, 140.0f, 1);
Matrix_scale(scale, scale, 1.0f, 1);
OPEN_DISP(graph);
gfx = NOW_POLY_OPA_DISP;
gSPMatrix(gfx++, _Matrix_to_Mtx_new(graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, lat_kakunin_DL_mode);
gSPDisplayList(gfx++, data->win_model);
if (scale == 1.0f) {
Matrix_scale(16.0f, 16.0f, 1.0f, 0);
Matrix_translate(x, y - ((f32)submenu->overlay->editEndChk_ovl->selected_answer * 16.0f), 140.0f, 1);
gSPMatrix(gfx++, _Matrix_to_Mtx_new(graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, data->char_model);
}
SET_POLY_OPA_DISP(gfx);
CLOSE_DISP(graph);
}
static void mEE_set_question_character(Submenu* submenu, GRAPH* graph, GAME* game, f32 x, f32 y) {
(*submenu->overlay->set_char_matrix_proc)(graph);
mFont_SetLineStrings(
game,
mEE_str_table, sizeof(mEE_str_table),
107.0f + x, 194.0f - y,
80, 80, 230, 255,
FALSE,
TRUE,
1.0f, 1.0f,
mFont_MODE_POLY
);
}
typedef struct editEndChk_str_s {
u8* str;
int len;
} mEE_str_c;
static void mEE_set_answer_character(Submenu* submenu, GRAPH* graph, GAME* game, mEE_win_data_c* data, f32 x, f32 y) {
static mEE_str_c str_table[] = {
{ mEE_str_data0, sizeof(mEE_str_data0) },
{ mEE_str_data1, sizeof(mEE_str_data1) },
{ mEE_str_data2, sizeof(mEE_str_data2) },
};
static int col_table[2][3] = {
{ 165, 185, 185 },
{ 100, 130, 245 }
};
mEE_Ovl_c* editEndChk_ovl = submenu->overlay->editEndChk_ovl;
mEE_str_c* str_p = str_table;
f32 scale = editEndChk_ovl->scale;
int max = data->answer_num;
int i;
(*submenu->overlay->set_char_matrix_proc)(graph);
x = (160.0f + x) + (data->char_x * scale);
y = (120.0f - y) - (data->char_y * scale);
for (i = 0; i < max; i++, str_p++) {
int idx = i == editEndChk_ovl->selected_answer ? 1 : 0;
int* col = col_table[idx];
mFont_SetLineStrings(
game,
str_p->str, str_p->len,
x, y,
col[0], col[1], col[2], 255,
FALSE,
TRUE,
scale, scale,
mFont_MODE_POLY
);
y += scale * 16.0f;
}
}
static void mEE_set_dl(Submenu* submenu, GAME* game, mSM_MenuInfo_c* menu_info) {
mEE_win_data_c* data = &win_data[menu_info->data0];
GRAPH* graph = game->graph;
f32 x;
f32 y;
x = menu_info->position[0] + data->question_x;
y = menu_info->position[1] + data->question_y;
mEE_set_question_field(submenu, graph, x, y);
mEE_set_question_character(submenu, graph, game, x, y);
if (submenu->overlay->editEndChk_ovl->moving_in == TRUE) {
x = menu_info->position[0] + data->answer_x;
y = menu_info->position[1] + data->answer_y;
mEE_set_answer_field(submenu, graph, data, x, y);
mEE_set_answer_character(submenu, graph, game, data, x, y);
}
}
static void mEE_editEndChk_ovl_draw(Submenu* submenu, GAME* game) {
Submenu_Overlay_c* overlay = submenu->overlay;
mSM_MenuInfo_c* menu_info = &overlay->menu_info[mSM_OVL_EDITENDCHK];
(*menu_info->pre_draw_func)(submenu, game);
mEE_set_dl(submenu, game, menu_info);
}
extern void mEE_editEndChk_ovl_set_proc(Submenu* submenu) {
Submenu_Overlay_c* overlay = submenu->overlay;
overlay->menu_control.menu_move_func = &mEE_editEndChk_ovl_move;
overlay->menu_control.menu_draw_func = &mEE_editEndChk_ovl_draw;
}
static void mEE_editEndChk_ovl_init(Submenu* submenu) {
Submenu_Overlay_c* overlay = submenu->overlay;
mSM_MenuInfo_c* menu_info = &overlay->menu_info[mSM_OVL_EDITENDCHK];
overlay->menu_control.animation_flag = FALSE;
menu_info->proc_status = mSM_OVL_PROC_MOVE;
menu_info->move_drt = mSM_MOVE_IN_BOTTOM;
menu_info->next_proc_status = mSM_OVL_PROC_PLAY;
}
static mEE_Ovl_c ee_ovl_data;
extern void mEE_editEndChk_ovl_construct(Submenu* submenu) {
if (submenu->overlay->editEndChk_ovl == NULL) {
submenu->overlay->editEndChk_ovl = &ee_ovl_data;
}
ee_ovl_data.moving_in = FALSE;
ee_ovl_data.selected_answer = 0;
ee_ovl_data.question_alpha_step = 0;
ee_ovl_data.question_alpha = 0;
mEE_editEndChk_ovl_init(submenu);
mEE_editEndChk_ovl_set_proc(submenu);
}
extern void mEE_editEndChk_ovl_destruct(Submenu* submenu) {
Submenu_Overlay_c* overlay = submenu->overlay;
overlay->editEndChk_ovl = NULL;
}