mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-06-24 15:43:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #341 from Cuyler36/m_inventory_ovl

Browse Source 
Implement & link m_inventory_ovl
This commit is contained in:
Cuyler36
2024-05-19 13:18:25 -04:00
committed by GitHub
parent 8e9cd0bb40 482afca7cf
commit b9554ef0cc
14 changed files with 2594 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_bgm.c
+1 -1
View File
@@ -2653,7 +2653,7 @@ extern void mBGM_reset() {
}
if (ps_comp->pause_state != 0) {
mBGMPsComp_pause(5);
mBGMPsComp_pause(mBGM_PAUSE_STOP);
}
mBGMDemo_ct(&bgm->demo);
src/m_catalog_ovl.c
+2 -2
View File
@@ -527,8 +527,8 @@ static void mCL_move_Move(Submenu* submenu, mSM_MenuInfo_c* menu_info) {
static void mCL_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) {
mCL_Ovl_c* catalog_ovl = submenu->overlay->catalog_ovl;
if (menu_info->_2C == FALSE) {
menu_info->_2C = TRUE;
if (menu_info->open_flag == FALSE) {
menu_info->open_flag = TRUE;
submenu->overlay->tag_ovl->chg_tag_func_proc(submenu, 14, 0, 0, 0.0f, 0.0f);
} else if (catalog_ovl->page_timer != 0) {
catalog_ovl->page_timer--;
src/m_hand_ovl.c
+6 -4
View File
@@ -310,8 +310,8 @@ static void mHD_drop_item(Submenu* submenu, mTG_tag_c* tag, mActor_name_t* item,
submenu->overlay->tag_ovl->init_tag_data_item_win_proc(submenu);
if (overlay->segment._04 == 1) {
overlay->segment._08 = 0;
if (overlay->segment.player_main_anime_idx == mIV_ANIM_CATCH) {
overlay->segment.change_player_main_anime_idx = mIV_ANIM_WALK;
}
}
@@ -515,7 +515,8 @@ static void mHD_open_end_proc_item_type3(Submenu* submenu, int idx, int table) {
int category = ITEM_NAME_GET_CAT(item);
if (item == RSV_CLOTH || ITEM_IS_CLOTH(item)) {
if (cKF_FrameControl_passCheck_now(&submenu->overlay->inventory_ovl->player_keyframe0.frame_control, 36.0f)) {
if (cKF_FrameControl_passCheck_now(&submenu->overlay->inventory_ovl->player_main_keyframe.frame_control,
36.0f)) {
cloth_p = &Now_Private->cloth;
mHD_drop_item(submenu, tag, &cloth_p->item, NULL);
@@ -768,7 +769,8 @@ static void mHD_sasu2_move(Submenu* submenu) {
int category = ITEM_NAME_GET_CAT(hand_ovl->info.item);
if (hand_ovl->info.item == RSV_CLOTH || ITEM_IS_CLOTH(hand_ovl->info.item)) {
if (cKF_FrameControl_passCheck_now(&submenu->overlay->inventory_ovl->player_keyframe0.frame_control, 36.0f)) {
if (cKF_FrameControl_passCheck_now(&submenu->overlay->inventory_ovl->player_main_keyframe.frame_control,
36.0f)) {
mPr_cloth_c* cloth_p = &Now_Private->cloth;
u16 cloth_idx;
src/m_inventory_ovl.c
+2121
View File
File diff suppressed because it is too large Load Diff
src/m_submenu_ovl.c
+2 -2
View File
@@ -2099,7 +2099,7 @@ static void mSM_set_new_start_data(Submenu* submenu) {
menu->data3 = submenu->param3;
menu->move_flag = FALSE;
if (type == mSM_OVL_INVENTORY && submenu->param0 == mSM_IV_OPEN_14) {
if (type == mSM_OVL_INVENTORY && submenu->param0 == mSM_IV_OPEN_CPMAIL) {
menu->position[0] = -300.0f;
}
@@ -2209,7 +2209,7 @@ static void mSM_return_func(Submenu* submenu, mSM_MenuInfo_c* menu_info) {
}
}
menu_info->_2C = FALSE;
menu_info->open_flag = FALSE;
menu_info->pre_menu_type = mSM_OVL_NONE;
menu_info->next_menu_type = mSM_OVL_NONE;
menu_info->proc_status = mSM_OVL_PROC_MOVE;