mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_tag_ovl 50% matched by function count

Browse Source
This commit is contained in:
Cuyler36
2024-10-17 16:34:42 -04:00
parent 9609f2e8c9
commit 03dd18a5ab
24 changed files with 2675 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/audio_defs.h
+14 -1
View File
@@ -17,16 +17,19 @@ extern "C" {
#define SE_FLAG_15(id) ((id) | 0x8000)
// TODO: Make the rest of Sound Effects with parameters
#define SE_REGISTER MONO(0x50)
#define SE_REGISTER MONO(NA_SE_REGISTER)
typedef enum audio_sound_effects {
NA_SE_START,
NA_SE_CURSOL,
NA_SE_MENU_EXIT,
NA_SE_3 = 3,
NA_SE_ZOOMUP = 4,
NA_SE_ZOOMDOWN_SHORT,
NA_SE_A = 0xA,
NA_SE_PAGE_OKURI = 0xB,
NA_SE_SENTAKU_OPEN,
@@ -39,9 +42,13 @@ typedef enum audio_sound_effects {
NA_SE_25 = 0x25,
NA_SE_26 = 0x26,
NA_SE_2A = 0x2A,
NA_SE_MENU_PAUSE = 0x30,
NA_SE_31 = 0x31,
NA_SE_33 = 0x33,
NA_SE_DRAWER_SHUT = 0x3A,
NA_SE_ITEM_GET = 0x40,
@@ -52,6 +59,8 @@ typedef enum audio_sound_effects {
NA_SE_COIN,
NA_SE_TEMOCHI_KAZAGURUMA,
NA_SE_REGISTER = 0x50,
NA_SE_52 = 0x52,
NA_SE_ITEM_HORIDASHI = 0x57,
@@ -61,6 +70,7 @@ typedef enum audio_sound_effects {
NA_SE_AMI_HIT = 0x5C,
NA_SE_TOOL_GET,
NA_SE_5F = 0x5F,
NA_SE_60 = 0x60,
NA_SE_GASAGOSO = 0x69,
@@ -158,6 +168,9 @@ typedef enum audio_sound_effects {
NA_SE_UMBRELLA_ROTATE = 0x432,
NA_SE_435 = 0x435,
NA_SE_436 = 0x436,
NA_SE_KARABURI = 0x43A,
NA_SE_ROD_STROKE_SMALL = 0x445,
include/m_common_data.h
+13
View File
@@ -356,6 +356,19 @@ extern common_data_t common_data;
#define Get_Island() (Save_Get(island))
#define Get_Island_Villager() (Get_Island().animal)
#define GetRoomMusicBox() (Save_Get(scene_no) == SCENE_COTTAGE_MY \
? Save_Get(island).cottage.music_box \
: Save_Get(homes[mHS_get_arrange_idx(Common_Get(player_no))]).music_box)
#define ChkMusicBox(box, n) (((box)[((n) / 32) & 1] >> ((n) & 31)) & 1)
#define SetMusicBox(box, n) ((box)[((n) / 32) & 1] |= (1 << ((n) & 31)))
#define ClrMusicBox(box, n) ((box)[((n) / 32) & 1] &= ~(u32)(1 << ((n) & 31)))
#define ChkRoomMusicBox(n) ChkMusicBox(GetRoomMusicBox(), n)
#define SetRoomMusicBox(n) SetMusicBox(GetRoomMusicBox(), n)
#define ClrRoomMusicBox(n) ClrMusicBox(GetRoomMusicBox(), n)
#define CLIP(n) (Common_Get(clip).n)
#define aMR_CLIP (Common_Get(clip).my_room_clip)
extern void common_data_reinit();
extern void common_data_init();
extern void common_data_clear();
include/m_cpmail_ovl.h
+4 -1
View File
@@ -24,7 +24,10 @@ struct cpmail_ovl_s {
mCD_mail_c* card_mail;
Mail_c player_mail[mPr_INVENTORY_MAIL_COUNT];
u8 page_order[mCM_PAGE_COUNT];
u8 _BB0[0xBC4 - 0xBB0];
u32 _BB0;
u32 mark_bitfield;
int mark_flag;
u8 _BBC[0xBC4 - 0xBBC];
};
extern void mCM_cpmail_ovl_construct(Submenu* submenu);
include/m_haniwa_ovl.h
+19
View File
@@ -2,11 +2,30 @@
#define M_HANIWA_OVL_H
#include "types.h"
#include "m_haniwa_ovl_h.h"
#include "m_tag_ovl.h"
#ifdef __cplusplus
extern "C" {
#endif
#define mHW_OVL_MSG_SIZE 22
typedef void (*mHW_SET_INTERRUPT_MESSAGE_PROC)(Submenu*, mTG_tag_c*, int);
struct haniwa_ovl_s {
int msg_idx;
int msg_interrupt_idx;
int table_idx;
int sub_idx;
int msg_time;
int msg_counter;
u32 msg_price;
u32 price;
u8 msg[mHW_OVL_MSG_SIZE];
mHW_SET_INTERRUPT_MESSAGE_PROC set_interrupt_message_proc;
};
extern void mHW_haniwa_ovl_construct(Submenu* submenu);
extern void mHW_haniwa_ovl_destruct(Submenu* submenu);
extern void mHW_haniwa_ovl_set_proc(Submenu* submenu);
include/m_haniwa_ovl_h.h
+2
View File
@@ -7,6 +7,8 @@
extern "C" {
#endif
typedef struct haniwa_ovl_s mHW_Ovl_c;
#ifdef __cplusplus
}
#endif
include/m_inventory_ovl.h
+2 -2
View File
@@ -96,8 +96,8 @@ struct inventory_ovl_s {
mIV_pl_eff_c pl_eff[mIV_PLAYER_EFFECT_NUM];
mIV_SET_COLLECT_ITEMNO_PROC set_collect_itemNo_proc;
u16 item_mark_bitfield;
u16 _5E2;
s16 _5E4;
u16 mail_mark_bitfield2;
s16 mail_mark_flag;
u8 _5E6[2];
u16 mail_mark_bitfield;
u8 original_flag;
include/m_mailbox_ovl.h
+14
View File
@@ -2,11 +2,25 @@
#define M_MAILBOX_OVL_H
#include "types.h"
#include "m_mailbox_ovl_h.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef int (*mMB_GET_LAST_MAIL_IDX_PROC)(void);
struct mailbox_ovl_s {
u8 open_flag;
u8 _01;
u8 display_flag;
u8 _03;
int _04;
u16 mark_bitfield;
int mark_flag;
mMB_GET_LAST_MAIL_IDX_PROC get_last_mail_idx_proc;
};
extern void mMB_mailbox_ovl_construct(Submenu* submenu);
extern void mMB_mailbox_ovl_destruct(Submenu* submenu);
extern void mMB_mailbox_ovl_set_proc(Submenu* submenu);
include/m_mailbox_ovl_h.h
+2
View File
@@ -7,6 +7,8 @@
extern "C" {
#endif
typedef struct mailbox_ovl_s mMB_Ovl_c;
#ifdef __cplusplus
}
#endif
include/m_music_ovl.h
+6 -1
View File
@@ -9,7 +9,12 @@
extern "C" {
#endif
struct music_ovl_s;
struct music_ovl_s {
u8 title[mIN_ITEM_NAME_LEN];
s16 title_width;
mActor_name_t title_md_item;
u32 mark_flg[2];
};
extern void mMU_music_ovl_set_proc(Submenu* submenu);
extern void mMU_music_ovl_construct(Submenu* submenu);
include/m_music_ovl_h.h
+1 -1
View File
@@ -7,7 +7,7 @@
extern "C" {
#endif
typedef struct music_ovl_s mMU_Overlay_c;
typedef struct music_ovl_s mMU_Ovl_c;
#ifdef __cplusplus
}
include/m_name_table.h
+5
View File
@@ -526,6 +526,11 @@ extern int mNT_check_unknown(mActor_name_t item_no);
#define ITEM_IS_SIGNBOARD(item) ((item) >= SIGNBOARD_START && (item) <= SIGNBOARD_END)
#define ITEM_IS_FLOWER_BAG(item) ((item) >= ITM_WHITE_PANSY_BAG && (item) <= ITM_YELLOW_TULIP_BAG)
#define ITEM_IS_EXERCISE_CARD(item) ((item) >= ITM_EXCERCISE_CARD00 && (item) <= ITM_EXCERCISE_CARD12)
#define ITEM_IS_BALLOON(item) ((item) >= ITM_BALLOON_START && (item) <= ITM_BUNNY_O_BALLOON)
#define ITEM_IS_UMBRELLA(item) ((item) >= ITM_UMBRELLA_START && (item) <= ITM_UMBRELLA_END)
#define BG_CATEGORY 0
#define ENV_CATEGORY 8
include/m_needlework.h
+7
View File
@@ -42,6 +42,13 @@ enum {
mNW_PALETTE_NUM
};
enum {
mNW_TYPE_MANEKIN,
mNW_TYPE_UMBRELLA,
mNW_TYPE_NUM
};
typedef struct original_texture_s {
u8 data[mNW_DESIGN_TEX_SIZE];
} ATTRIBUTE_ALIGN(32) mNW_original_tex_c;
include/m_needlework_ovl.h
+9
View File
@@ -3,11 +3,20 @@
#include "types.h"
#include "m_submenu.h"
#include "m_needlework_ovl_h.h"
#include "m_needlework.h"
#ifdef __cplusplus
extern "C" {
#endif
struct needlework_ovl_s {
u16 mark_flg;
u16 hide_flg;
mNW_original_design_c my_org[mPr_ORIGINAL_DESIGN_COUNT];
u8 my_org_no_table[mPr_ORIGINAL_DESIGN_COUNT];
};
extern u8 mNW_get_image_no(Submenu* submenu, int slot_no);
extern u8* mNW_get_image_name(Submenu* submenu, int idx);
extern int mNW_check_hide_flg(Submenu* submenu, int idx);
include/m_needlework_ovl_h.h
+16
View File
@@ -0,0 +1,16 @@
#ifndef M_NEEDLEWORK_OVL_H_H
#define M_NEEDLEWORK_OVL_H_H
#include "types.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct needlework_ovl_s mNW_Ovl_c;
#ifdef __cplusplus
}
#endif
#endif
include/m_private.h
+6 -6
View File
@@ -291,14 +291,14 @@ extern int mPr_GetPossessionItemIdxItem1CategoryWithCond_cancel(Private_c* priv,
mActor_name_t cancel_item);
extern int mPr_GetPossessionItemIdxKindWithCond(Private_c* priv, mActor_name_t kind_start, mActor_name_t kind_end,
u32 cond);
extern int mPr_GetPossessionItemSum(Private_c* priv, mActor_name_t item);
extern int mPr_GetPossessionItemSumWithCond(Private_c* priv, mActor_name_t item, u32 cond);
extern int mPr_GetPossessionItemSumFGTypeWithCond_cancel(Private_c* priv, mActor_name_t fg_type, u32 cond,
extern u32 mPr_GetPossessionItemSum(Private_c* priv, mActor_name_t item);
extern u32 mPr_GetPossessionItemSumWithCond(Private_c* priv, mActor_name_t item, u32 cond);
extern u32 mPr_GetPossessionItemSumFGTypeWithCond_cancel(Private_c* priv, mActor_name_t fg_type, u32 cond,
mActor_name_t cancel_item);
extern int mPr_GetPossessionItemSumItemCategoryWithCond_cancel(Private_c* priv, u8 item1_type, u32 cond,
extern u32 mPr_GetPossessionItemSumItemCategoryWithCond_cancel(Private_c* priv, u8 item1_type, u32 cond,
mActor_name_t cancel_item);
extern int mPr_GetPossessionItemSumItemCategoryWithCond(Private_c* priv, u8 item1_type, u32 cond);
extern int mPr_GetPossessionItemSumKindWithCond(Private_c* priv, mActor_name_t kind_start, mActor_name_t kind_end,
extern u32 mPr_GetPossessionItemSumItemCategoryWithCond(Private_c* priv, u8 item1_type, u32 cond);
extern u32 mPr_GetPossessionItemSumKindWithCond(Private_c* priv, mActor_name_t kind_start, mActor_name_t kind_end,
u32 cond);
extern void mPr_SetItemCollectBit(mActor_name_t item);
extern mActor_name_t mPr_DummyPresentToTruePresent();
include/m_submenu_ovl.h
+7 -4
View File
@@ -31,6 +31,9 @@
#include "m_player.h"
#include "m_cpmail_ovl_h.h"
#include "m_cporiginal_ovl_h.h"
#include "m_haniwa_ovl_h.h"
#include "m_mailbox_ovl_h.h"
#include "m_needlework_ovl_h.h"
#ifdef __cplusplus
extern "C" {
@@ -175,8 +178,8 @@ struct submenu_overlay_s {
/* 0x98C */ mED_Ovl_c* editor_ovl;
/* 0x990 */ mBD_Ovl_c* board_ovl;
/* 0x994 */ mAD_Ovl_c* address_ovl;
/* 0x998 */ void* _998;
/* 0x99C */ void* _99C;
/* 0x998 */ mMB_Ovl_c* mailbox_ovl;
/* 0x99C */ mHW_Ovl_c* haniwa_ovl;
/* 0x9A0 */ mTI_Ovl_c* timeIn_ovl;
/* 0x9A4 */ mEE_Ovl_c* editEndChk_ovl;
/* 0x9A8 */ mWR_Ovl_c* warning_ovl;
@@ -189,9 +192,9 @@ struct submenu_overlay_s {
/* 0x9C4 */ void* _9C4;
/* 0x9C8 */ void* _9C8;
/* 0x9CC */ mCL_Ovl_c* catalog_ovl;
/* 0x9D0 */ mMU_Overlay_c* music_ovl;
/* 0x9D0 */ mMU_Ovl_c* music_ovl;
/* 0x9D4 */ mBN_Overlay_c* bank_ovl;
/* 0x9D8 */ void* needlework_ovl;
/* 0x9D8 */ mNW_Ovl_c* needlework_ovl;
/* 0x9DC */ mCO_Ovl_c* cporiginal_ovl;
/* 0x9E0 */ void* _9E0;
/* 0x9E4 */ void* _9E4;
include/m_tag_ovl.h
+35 -2
View File
@@ -15,6 +15,39 @@ extern "C" {
#define mTG_TAG_FLAG_EDGE_FOOT_SELECT (1 << 0)
#define mTG_MAIL_FLAG_PRESENT (1 << 0)
#define mTG_MAIL_FLAG_RECV (1 << 1)
enum {
mTG_MARK_CHK,
mTG_MARK_ON,
mTG_MARK_OFF,
mTG_MARK_RVS,
mTG_MARK_CLR,
mTG_MARK_CHK_ALL0,
mTG_MARK_NUM
};
enum {
mTG_MARK_TYPE_NONE,
mTG_MARK_TYPE_INV_FG_ITEM,
mTG_MARK_TYPE_INV_PLAYERROOM_ITEM,
mTG_MARK_TYPE_INV_OTHERROOM_ITEM,
mTG_MARK_TYPE_INV_SELL_ITEM,
mTG_MARK_TYPE_INV_FG_MAIL,
mTG_MARK_TYPE_INV_MAILBOX,
mTG_MARK_TYPE_CPMAIL_MAIL,
mTG_MARK_TYPE_MAILBOX,
mTG_MARK_TYPE_CPMAIL_CPMAIL,
mTG_MARK_TYPE_MUSIC,
mTG_MARK_TYPE_NEEDLEWORK_ORIGINAL,
mTG_MARK_TYPE_CPORIGINAL_ORIGINAL,
mTG_MARK_TYPE_NUM
};
enum {
mTG_TYPE_NONE,
mTG_TYPE_FIELD_DEFAULT,
@@ -175,8 +208,8 @@ struct tag_ovl_s {
/* 0x2F2 */ u8 _2F2[0x3C4 - 0x2F2];
};
extern int mTG_mark_main(Submenu*, mSM_MenuInfo_c*, int, int);
extern int mTG_mark_mainX(Submenu*, mSM_MenuInfo_c*, int, int, int, int);
extern int mTG_mark_main(Submenu*, mSM_MenuInfo_c*, int, int*);
extern int mTG_mark_mainX(Submenu*, mSM_MenuInfo_c*, int, int, int, int*);
extern void mTG_tag_ovl_construct(Submenu* submenu);
extern void mTG_tag_ovl_destruct(Submenu* submenu);
include/m_warning_ovl.h
+1 -1
View File
@@ -31,7 +31,7 @@ enum {
mWR_WARNING_5,
mWR_WARNING_6,
mWR_WARNING_7,
mWR_WARNING_8,
mWR_WARNING_SELL_QUEST_ITEM,
mWR_WARNING_PUT_MAX_FURNITURE,
mWR_WARNING_PUT_FURNITURE,
mWR_WARNING_PUT_ITEM,
src/ac_my_room.c
-1
View File
@@ -37,7 +37,6 @@ enum {
#define aMR_FTR_BANK_NUM 100
#define aMR_FTR_BANK_SIZE 0x800
#define aMR_CLIP (Common_Get(clip).my_room_clip)
#define aMR_BOUNDS_OK(x, z) \
((x) > (aMR_MIN_BOUND - 1) && (x) < (aMR_MAX_BOUND + 1) && (z) > (aMR_MIN_BOUND - 1) && (z) < (aMR_MAX_BOUND + 1))
src/m_hand_ovl.c
+2 -2
View File
@@ -564,8 +564,8 @@ static void mHD_open_end_proc_item_type6(Submenu* submenu, int idx, int table) {
mHD_drop_item(submenu, tag, &Save_Get(homes[menu_info->data1]).haniwa.items[idx].item, NULL);
if (flag == TRUE) {
submenu->overlay->tag_ovl->item_name_wait_time = 0;
submenu->overlay->tag_ovl->chg_tag_func_proc(submenu, tag->table, mTG_TYPE_HANIWA_PUT_ITEM, 0, tag->pos[0],
tag->pos[1]);
submenu->overlay->tag_ovl->chg_tag_func_proc(submenu, tag->table, mTG_TYPE_HANIWA_PUT_ITEM, 0, tag->base_pos[0],
tag->base_pos[1]);
}
}
src/m_inventory_ovl.c
+8 -8
View File
@@ -1274,7 +1274,7 @@ static void mIV_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) {
0.0f, 0.0f);
tag_ovl->item_name_wait_time = 0;
submenu->overlay->tag_ovl->chg_tag_func_proc(submenu, mTG_TABLE_ITEM, mTG_TYPE_QUEST_ITEM, 0,
tag_ovl->tags[0].pos[0], tag_ovl->tags[0].pos[1]);
tag_ovl->tags[0].base_pos[0], tag_ovl->tags[0].base_pos[1]);
break;
case mSM_IV_OPEN_SEND_MAIL:
submenu->overlay->tag_ovl->chg_tag_func_proc(submenu, mTG_TABLE_MAIL, mTG_TYPE_NONE, unselected_num,
@@ -1708,10 +1708,10 @@ static void mIV_set_mail(Submenu* submenu, mSM_MenuInfo_c* menu_info, GRAPH* gra
int menu_flag;
int mark_flag;
if (inv_ovl->remove_timer > 0 && (tag->table == mTG_TABLE_MAIL || inv_ovl->_5E4 == 1)) {
if (inv_ovl->_5E4 == 1) {
select_mask = inv_ovl->_5E2;
} else if (inv_ovl->_5E4 == 0) {
if (inv_ovl->remove_timer > 0 && (tag->table == mTG_TABLE_MAIL || inv_ovl->mail_mark_flag == TRUE)) {
if (inv_ovl->mail_mark_flag == TRUE) {
select_mask = inv_ovl->mail_mark_bitfield2;
} else if (inv_ovl->mail_mark_flag == FALSE) {
select_mask = 1 << tag_ovl->get_table_idx_proc(tag);
}
}
@@ -1739,7 +1739,7 @@ static void mIV_set_mail(Submenu* submenu, mSM_MenuInfo_c* menu_info, GRAPH* gra
scale = 1.0f;
}
if ((inv_ovl->_5E2 & (1 << i)) != 0 && inv_ovl->_5E4 == 0) {
if ((inv_ovl->mail_mark_bitfield2 & (1 << i)) != 0 && inv_ovl->mail_mark_flag == FALSE) {
mark_flag = TRUE;
} else {
mark_flag = FALSE;
@@ -2079,9 +2079,9 @@ static void mIV_inventory_ovl_init(Submenu* submenu, mSM_MenuInfo_c* menu_info,
inv_ovl->page_order[1] = mIV_PAGE_FISH_COLLECTION;
inv_ovl->page_order[2] = mIV_PAGE_INSECT_COLLECTION;
inv_ovl->page_move_timer = 0;
inv_ovl->_5E4 = 0;
inv_ovl->mail_mark_flag = FALSE;
inv_ovl->item_mark_bitfield = 0;
inv_ovl->_5E2 = 0;
inv_ovl->mail_mark_bitfield2 = 0;
inv_ovl->wc_flag = FALSE;
if (menu_info->data0 == mSM_IV_OPEN_MAILBOX) {
src/m_private.c
+6 -6
View File
@@ -436,7 +436,7 @@ extern int mPr_GetPossessionItemIdxKindWithCond(Private_c* priv, mActor_name_t k
return idx;
}
extern int mPr_GetPossessionItemSum(Private_c* priv, mActor_name_t item) {
extern u32 mPr_GetPossessionItemSum(Private_c* priv, mActor_name_t item) {
int sum = 0;
if (priv != NULL) {
@@ -454,7 +454,7 @@ extern int mPr_GetPossessionItemSum(Private_c* priv, mActor_name_t item) {
return sum;
}
extern int mPr_GetPossessionItemSumWithCond(Private_c* priv, mActor_name_t item, u32 cond) {
extern u32 mPr_GetPossessionItemSumWithCond(Private_c* priv, mActor_name_t item, u32 cond) {
int sum = 0;
if (priv != NULL) {
@@ -472,7 +472,7 @@ extern int mPr_GetPossessionItemSumWithCond(Private_c* priv, mActor_name_t item,
return sum;
}
extern int mPr_GetPossessionItemSumFGTypeWithCond_cancel(Private_c* priv, mActor_name_t fg_type, u32 cond,
extern u32 mPr_GetPossessionItemSumFGTypeWithCond_cancel(Private_c* priv, mActor_name_t fg_type, u32 cond,
mActor_name_t cancel_item) {
int sum = 0;
@@ -492,7 +492,7 @@ extern int mPr_GetPossessionItemSumFGTypeWithCond_cancel(Private_c* priv, mActor
return sum;
}
extern int mPr_GetPossessionItemSumItemCategoryWithCond_cancel(Private_c* priv, u8 item1_type, u32 cond,
extern u32 mPr_GetPossessionItemSumItemCategoryWithCond_cancel(Private_c* priv, u8 item1_type, u32 cond,
mActor_name_t cancel_item) {
int sum = 0;
@@ -512,7 +512,7 @@ extern int mPr_GetPossessionItemSumItemCategoryWithCond_cancel(Private_c* priv,
return sum;
}
extern int mPr_GetPossessionItemSumItemCategoryWithCond(Private_c* priv, u8 item1_type, u32 cond) {
extern u32 mPr_GetPossessionItemSumItemCategoryWithCond(Private_c* priv, u8 item1_type, u32 cond) {
int sum = 0;
if (priv != NULL) {
@@ -531,7 +531,7 @@ extern int mPr_GetPossessionItemSumItemCategoryWithCond(Private_c* priv, u8 item
return sum;
}
extern int mPr_GetPossessionItemSumKindWithCond(Private_c* priv, mActor_name_t kind_start, mActor_name_t kind_end,
extern u32 mPr_GetPossessionItemSumKindWithCond(Private_c* priv, mActor_name_t kind_start, mActor_name_t kind_end,
u32 cond) {
int sum = 0;
src/m_soncho.c
+7 -5
View File
@@ -377,7 +377,9 @@ static mActor_name_t mSC_Radio_have_taisou_card() {
Private_c* priv = Common_Get(now_private);
for (i = 0; i < 13; i++) {
if (mPr_GetPossessionItemSumWithCond(priv, ITM_EXCERCISE_CARD00 + i, mPr_ITEM_COND_NORMAL) > 0) {
int sum = mPr_GetPossessionItemSumWithCond(priv, ITM_EXCERCISE_CARD00 + i, mPr_ITEM_COND_NORMAL);
if (sum > 0) {
return ITM_EXCERCISE_CARD00 + i;
}
}
@@ -550,7 +552,7 @@ extern int mSC_Radio_Set_Talk_Proc(TAISOU_NPC0_ACTOR* taisou_actor) {
msg_no = 0x3423;
}
if ((u32)mPr_GetPossessionItemSumWithCond(Common_Get(now_private), EMPTY_NO,
if (mPr_GetPossessionItemSumWithCond(Common_Get(now_private), EMPTY_NO,
mPr_ITEM_COND_NORMAL) == 0) {
taisou_actor->talk_proc = mSCR_TALK_NEXT;
} else {
@@ -574,7 +576,7 @@ extern int mSC_Radio_Set_Talk_Proc(TAISOU_NPC0_ACTOR* taisou_actor) {
msg_no = 0x342F;
}
if ((u32)mPr_GetPossessionItemSumWithCond(Common_Get(now_private), EMPTY_NO,
if (mPr_GetPossessionItemSumWithCond(Common_Get(now_private), EMPTY_NO,
mPr_ITEM_COND_NORMAL) == 0) {
taisou_actor->talk_proc = mSCR_TALK_NEXT;
} else {
@@ -628,7 +630,7 @@ extern int mSC_Radio_Set_Talk_Proc(TAISOU_NPC0_ACTOR* taisou_actor) {
msg_no = 0x342F;
}
if ((u32)mPr_GetPossessionItemSumWithCond(Common_Get(now_private), EMPTY_NO,
if (mPr_GetPossessionItemSumWithCond(Common_Get(now_private), EMPTY_NO,
mPr_ITEM_COND_NORMAL) == 0) {
taisou_actor->talk_proc = mSCR_TALK_NEXT;
} else {
@@ -785,7 +787,7 @@ static void mSCR_talk_before_give(TAISOU_NPC0_ACTOR* taisou_actor, GAME_PLAY* pl
mMsg_Window_c* msg_win = mMsg_Get_base_window_p();
if (mMsg_Check_MainNormalContinue(msg_win)) {
if ((u32)mPr_GetPossessionItemSumWithCond(Common_Get(now_private), EMPTY_NO, mPr_ITEM_COND_NORMAL) == 0) {
if (mPr_GetPossessionItemSumWithCond(Common_Get(now_private), EMPTY_NO, mPr_ITEM_COND_NORMAL) == 0) {
mMsg_Set_continue_msg_num(msg_win, mSC_Radio_msg(taisou_actor, 2));
taisou_actor->talk_proc = mSCR_TALK_9;
} else {
src/m_tag_ovl.c
+2489 -87
View File
File diff suppressed because it is too large Load Diff