mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-06-09 03:59:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #454 from colbyaustinbrown/master

Browse Source 
Implement shop_master_common
This commit is contained in:
Cuyler36
2024-12-27 11:32:59 -05:00
committed by GitHub
parent d30f66f766 9bfe091833
commit 94b0d3ec03
5 changed files with 3346 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_npc.h
+1
View File
@@ -18,6 +18,7 @@ extern "C" {
#define aNPC_SPNPC_BIT_CURATOR 0
#define aNPC_SPNPC_BIT_GOHOME_NPC 1
#define aNPC_SPNPC_BIT_MASK_CAT 2
#define aNPC_SPNPC_BIT_SHOP_MASTER 3
#define aNPC_SPNPC_BIT_DOZAEMON 4
#define aNPC_SPNPC_BIT_EV_SONCHO 5
include/ac_npc_shop_master.h
+326 -2
View File
@@ -3,16 +3,340 @@
#include "types.h"
#include "m_actor.h"
#include "ac_npc.h"
#include "m_mail_password_check.h"
#include "m_private.h"
#define aNSC_MAX_TICKETS 255
#define aNSC_PW_TOWN_STR_LEN 8
#define aNSC_PW_RECIP_STR_LEN 8
#define SELL_BUY_RATIO 4
#define aNSC_LOAN_MEDIUM 148000
#define aNSC_LOAN_LARGE 398000
#define aNSC_LOAN_UPPER 798000
#define aNSC_LOAN_STATUE 0
#define aNSC_LOAN_BASEMENT 49800
typedef struct npc_shop_master_s NPC_SHOP_MASTER_ACTOR;
typedef void (*aNSC_PROC)(ACTOR*, GAME*);
typedef void (*aNSC_INIT_PROC)(NPC_SHOP_MASTER_ACTOR*, GAME_PLAY*);
typedef int (*aNSC_PC_CHECK_PASSWORD_PROC)(mMpswd_password_c*);
typedef void (*aNSC_ITEM_SELL_PROC)(NPC_SHOP_MASTER_ACTOR*, mActor_name_t);
typedef void (*aNSC_ACTION_PROC)(NPC_SHOP_MASTER_ACTOR*, GAME_PLAY*);
struct npc_shop_master_s {
/* 0x000 */ NPC_ACTOR npc_class;
/* 0x994 */ int action;
/* 0x998 */ int next_action;
/* 0x99C */ aNSC_ACTION_PROC proc;
/* 0x9A0 */ u16 _9A0;
/* 0x9A2 */ u8 zone;
/* 0x9A3 */ u8 next_zone;
/* 0x9A4 */ u8 player_zone;
/* 0x9A6 */ s16 player_angle;
/* 0x9A8 */ u32 money;
/* 0x9AC */ u32 value;
/* 0x9B0 */ u32 counter;
/* 0x9B4 */ mActor_name_t sell_item;
/* 0x9B6 */ u8 ut_x;
/* 0x9B7 */ u8 ut_y;
/* 0x9B8 */ u8 is_selling;
/* 0x9B9 */ u8 _9B9;
/* 0x9BA */ mActor_name_t order_item;
/* 0x9BC */ u16 player_cloth;
/* 0x9BE */ u16 change_cloth;
/* 0x9C0 */ int _9C0;
/* 0x9C4 */ int msg_no;
/* 0x9C8 */ u8 pw_town_str[aNSC_PW_TOWN_STR_LEN];
/* 0x9D0 */ u8 pw_recip_str[aNSC_PW_RECIP_STR_LEN];
/* 0x9D8 */ u8 password_str[mMpswd_PASSWORD_STR_LEN];
/* 0x9F4 */ u16 pw_item;
/* 0x9F6 */ u16 password_flags;
/* 0x9F8 */ mMpswd_password_c password;
};
enum aNSC_action {
aNSC_ACTION_EMPTY,
aNSC_ACTION_SAY_HELLO_APPROACH,
aNSC_ACTION_SAY_HELLO_END_WAIT,
aNSC_ACTION_03_SAY_HELLO_END_WAIT,
aNSC_ACTION_CHECK_ROOF_COL_ORDER,
aNSC_ACTION_CHECK_ROOF_COL_ORDER2,
aNSC_ACTION_CHECK_COL_CHG_OR_MAKE_BASEMENT,
aNSC_ACTION_PRESENT_BALLOON_START_WAIT,
aNSC_ACTION_PRESENT_BALLOON_TRANS_MOVE,
aNSC_ACTION_PRESENT_BALLOON_TRANS_TAKEOUT,
aNSC_ACTION_PRESENT_BALLOON_TRANS_WAIT,
aNSC_ACTION_PRESENT_BALLOON_END_WAIT,
aNSC_ACTION_REQUEST_Q_START_WAIT,
aNSC_ACTION_REQUEST_Q_ANSWER_WAIT,
aNSC_ACTION_REQUEST_Q_ANSWER_WAIT2,
aNSC_ACTION_REQUEST_Q_END_WAIT,
aNSC_ACTION_ANSWER_BUY_ITEM,
aNSC_ACTION_BUY_MENU_OPEN_WAIT,
aNSC_ACTION_BUY_MENU_CLOSE_WAIT,
aNSC_ACTION_MSG_WIN_OPEN_WAIT,
aNSC_ACTION_BUY_SUM_CHECK,
aNSC_ACTION_BUY_CHECK,
aNSC_ACTION_BUY_AFTER_SERVICE,
aNSC_ACTION_BUY_CONTINUE_CHECK,
aNSC_ACTION_RECEIVE_CHECK,
aNSC_ACTION_19_ANSWER_BUY_ITEM,
aNSC_ACTION_0x1a_UNUSED,
aNSC_ACTION_0x1b_UNUSED,
aNSC_ACTION_MSG_WIN_OPEN_WAIT2,
aNSC_ACTION_ORDER_CHECK,
aNSC_ACTION_SELL_CHECK_BEFORE,
aNSC_ACTION_SELL_CHECK,
aNSC_ACTION_SELL_ANSWER0,
aNSC_ACTION_21_REQUEST_Q_END_WAIT,
aNSC_ACTION_SELL_ITEM_WITHOUT_TICKET,
aNSC_ACTION_SELL_ITEM_WITH_TICKET,
aNSC_ACTION_SELL_ITEM_POCKETS_FULL,
aNSC_ACTION_SELL_ITEM_INSUFICIENT_FUNDS,
aNSC_ACTION_SHOW_ITEM_CHECK,
aNSC_ACTION_CHG_CLOTH_START_WAIT,
aNSC_ACTION_CHG_CLOTH_END_WAIT,
aNSC_ACTION_PW_ENTRY_SEND_ADDR_START_WAIT,
aNSC_ACTION_2A_BUY_MENU_OPEN_WAIT,
aNSC_ACTION_0x2b_UNUSED,
aNSC_ACTION_PW_MSG_WIN_OPEN_WAIT,
aNSC_ACTION_PW_SEND_ADDR_CHECK,
aNSC_ACTION_PW_SEL_ITEM_START_WAIT,
aNSC_ACTION_2F_BUY_MENU_OPEN_WAIT,
aNSC_ACTION_0x30_UNUSED,
aNSC_ACTION_0x31_UNUSED,
aNSC_ACTION_PW_SEND_CHECK,
aNSC_ACTION_PW_RETRY_SEL_ITEM_CHECK,
aNSC_ACTION_PC_INPUT_PW_START_WAIT,
aNSC_ACTION_35_BUY_MENU_OPEN_WAIT,
aNSC_ACTION_0x36_UNUSED,
aNSC_ACTION_PC_MSG_WIN_OPEN_WAIT,
aNSC_ACTION_PC_RETRY_INPUT_PW_CHECK,
aNSC_ACTION_PC_PRESENT_START_WAIT,
aNSC_ACTION_PC_PRESENT_TRANS_TAKEOUT,
aNSC_ACTION_PC_PRESENT_TRANS_WAIT,
aNSC_ACTION_PC_PRESENT_END_WAIT,
aNSC_ACTION_WAIT,
aNSC_ACTION_0x3e_WAIT,
aNSC_ACTION_WALK_PL_OTHER_ZONE,
aNSC_ACTION_0x40_WAIT,
aNSC_ACTION_0x41_WALK_PL_OTHER_ZONE,
aNSC_ACTION_TURN,
aNSC_ACTION_GOODBYE_WAIT,
aNSC_ACTION_SAY_GOODBYE,
aNSC_ACTION_EXIT_WAIT,
aNSC_ACTION_NUM
};
enum aNSC_msg_no {
aNSC_MSG_WAIT = -0x1,
aNSC_MSG_REHOUSE_MEDIUM = 0x0,
aNSC_MSG_REHOUSE_MEDIUM_1,
aNSC_MSG_REHOUSE_MEDIUM_2,
aNSC_MSG_MEDIUM_BUILT,
aNSC_MSG_REHOUSE_2_OFFER,
aNSC_MSG_REHOUSE_2_LARGe,
aNSC_MSG_REHOUSE_2_BASEment,
aNSC_MSG_LARGE_BUILT,
aNSC_MSG_REHOUSE_STATUE,
aNSC_MSG_STATUE_BUILT,
aNSC_MSG_PALLET_SELECTED,
aNSC_MSG_PALLET_SELECT_1,
aNSC_MSG_PALLET_SELECT_2,
aNSC_MSG_PALLET_SELECT_3,
aNSC_MSG_PALLET_SELECT_4,
aNSC_MSG_OFFER_SELL_ALL,
aNSC_MSG_EVENT_DEPART,
aNSC_MSG_GREET_DEPART,
aNSC_MSG_SHOW_CLOTH,
aNSC_MSG_CONFIRM_CLOTH,
aNSC_MSG_CANCEL_CLOTH,
aNSC_MSG_CANCEL,
aNSC_MSG_START_CALL_NORMAL,
aNSC_MSG_INTERACT_START,
aNSC_MSG_INTERACT_CANCEl,
aNSC_MSG_KABU_INFO,
aNSC_MSG_SELL_START,
aNSC_MSG_SELL_OFFER,
aNSC_MSG_SELL_NORMAL,
aNSC_MSG_SELL_CANCEL,
aNSC_MSG_BUY_ONE_OFFER,
aNSC_MSG_BUY_CANCEL,
aNSC_MSG_THANKS,
aNSC_MSG_INSUFFICIENT_FUNDS,
aNSC_MSG_BUY_NORMAL,
aNSC_MSG_SAY_GOODBYE,
aNSC_MSG_KABU_ON_SUNDAY,
aNSC_MSG_EVENT,
aNSC_MSG_BREAK_BAG,
aNSC_MSG_POCKETS_FULL,
aNSC_MSG_SHOW_ITEM,
aNSC_MSG_SHOW_CARPET_OFFER,
aNSC_MSG_SHOW_CARPET_DECLINE,
aNSC_MSG_SHOW_CATALOGUE,
aNSC_MSG_ORDER_OFFER,
aNSC_MSG_ORDER_UNAVAILABLE,
aNSC_MSG_ORDER_CANCEL,
aNSC_MSG_ORDER_CONFIRM,
aNSC_MSG_ORDER_INSUFFICIENT_FUNDS,
aNSC_MSG_ORDER_FULL,
aNSC_MSG_ORDER_FURNITURE_ONLY,
aNSC_MSG_GIVE_TICKET,
aNSC_MSG_MAIL_TICKET,
aNSC_MSG_TICKET_1,
aNSC_MSG_TICKET_2,
aNSC_MSG_TICKET_SELL_REFUSE,
aNSC_MSG_SELL_QUEST,
aNSC_MSG_JUNK_ACCEPT,
aNSC_MSG_JUNK_CANCEL,
aNSC_MSG_SELL_SHOVEL = 0x64,
aNSC_MSG_SELL_NET,
aNSC_MSG_SELL_ROD,
aNSC_MSG_SELL_AXE,
aNSC_MSG_SELL_SIGN,
aNSC_MSG_MONEY_OVERFLOW = 0xc8,
aNSC_MSG_SELL_PAINT = 0xca,
aNSC_MSG_SELL_PAINT_CONFIRM,
aNSC_MSG_BASEMENT_BUILT,
aNSC_MSG_BASEMENT_PAID,
aNSC_MSG_REHOUSE_BASEMENT = 0xd0,
aNSC_MSG_REHOUSE_LARGE,
aNSC_MSG_REHOUSE_UPPER = 0xd4,
aNSC_MSG_UPPER_BUILT,
aNSC_MSG_BUY_MANY_OFFER,
aNSC_MSG_BUY_REFUSE_PLURAL = 0xd8,
aNSC_MSG_BALLOON = 0xda,
aNSC_MSG_BALLOON_DEPART = 0xdc,
aNSC_MSG_SELL_PAPER = 0xde,
aNSC_MSG_SELL_PAINT_FOREIGN,
aNSC_MSG_PSWD_NO_ITEM = 0x12c,
aNSC_MSG_PSWD_INFO = 0x12d,
aNSC_MSG_PSWD_SAME_NAME,
aNSC_MSG_PSWD_CONFIRM,
aNSC_MSG_PSWD_CANCEL = 0x131,
aNSC_MSG_PSWD_CHECK,
aNSC_MSG_OTHER = 0x135,
aNSC_MSG_RETURN,
aNSC_MSG_PSWD_INVENTORY_FULL,
aNSC_MSG_PSWD_SAY,
aNSC_MSG_PSWD_WRONG,
aNSC_MSG_PSWD_DECLINE,
aNSC_MSG_PSWD_GOOD_FAMICON,
aNSC_MSG_PSWD_GOOD_NPC,
aNSC_MSG_PSWD_GOOD_MAGAZINE_1,
aNSC_MSG_PSWD_CARDE,
aNSC_MSG_PSWD_GOOD_USER,
aNSC_MSG_PSWD_GOOD_CARDEM,
aNSC_MSG_PSWD_FOREIGN,
aNSC_MSG_PSWD_GOOD_MAGAZINE_2,
aNSC_MSG_GIFT_OUT,
aNSC_MSG_PSWD_BAD,
aNSC_MSG_TAKE_OFF_HANDS= 0x108a
};
enum aNSC_wait_type {
aNSC_WAIT_TYPE_REHOUSE,
aNSC_WAIT_TYPE_DONE_REHOUSE,
aNSC_WAIT_TYPE_BALLOON,
aNSC_WAIT_TYPE_3,
aNSC_WAIT_TYPE_HRATALK,
aNSC_WAIT_TYPE_NUM
};
enum aNSC_buy_outcome {
aNSC_BUY_OUTCOME_BREAK_BAG,
aNSC_BUY_OUTCOME_NORMAL,
aNSC_BUY_OUTCOME_CANCEL,
aNSC_BUY_OUTCOME_MONEY_OVERFLOW,
aNSC_BUY_OUTCOME_NUM
};
enum aNSC_check_buy {
aNSC_CHECK_BUY_NORMAL_SUB,
aNSC_CHECK_BUY_NONE_SELECTED,
aNSC_CHECK_BUY_NO_SUNDAY_TURNIPS,
aNSC_CHECK_BUY_REFUSE_QUEST_COND,
aNSC_CHECK_BUY_TAKE_OFF_HANDS,
aNSC_CHECK_BUY_OFFER_BUY_ALL,
aNSC_CHECK_BUY_PLURAL,
aNSC_CHECK_BUY_NORMAL,
aNSC_RES_NUM
};
enum aNSC_tanni_str {
aNSC_TANNI_STR_00,
aNSC_TANNI_STR_COMMOD,
aNSC_TANNI_STR_CLOTH,
aNSC_TANNI_03,
aNSC_TANNI_STR_KABU,
aNSC_TANNI_STR_FAUNA,
aNSC_TANNI_STR_SAPPLING,
aNSC_TANNI_STR_DIARY,
aNSC_TANNI_STR_08,
aNSC_TANNI_STR_09,
aNSC_TANNI_STR_NUM
};
enum check_password_result {
aNSC_PSW_RES_0,
aNSC_PSW_GOOD_FAMICON,
aNSC_PSW_GOOD_NPC,
aNSC_PSW_GOOD_MAGAZINE_1,
aNSC_PSW_CARDE = 4,
aNSC_PSW_GOOD_USER,
aNSC_PSW_GOOD_CARDEM,
aNSC_PSW_GOOD_MAGAZINE_2,
aNSC_PSW_BAD = 8,
aNSC_PSW_RES_9 = 9,
aNSC_PSW_NUM
};
enum aNSC_request_show_type {
aNSC_REQUEST_SHOW_TYPE_WALL,
aNSC_REQUEST_SHOW_TYPE_CARPET
};
enum aNSC_zone {
aNSC_ZONE_0,
aNSC_ZONE_1,
aNSC_ZONE_2,
aNSC_ZONE_3,
aNSC_ZONE_NUM
};
typedef struct aNSC_animation_data_s {
int anim;
int talk_flag;
} aNSC_animation_data;
extern ACTOR_PROFILE Npc_Shop_Master_Profile;
#define aNSC_PLAYER_DISTANCE (f32)60.0
#ifdef __cplusplus
extern "C" {
#endif
extern ACTOR_PROFILE Npc_Shop_Master_Profile;
#ifdef __cplusplus
}
#endif
static void aNSC_setupAction(NPC_SHOP_MASTER_ACTOR *shop_master, GAME_PLAY* game, int p3);
static int aNSC_check_buy_item_sub(u32 *p1, mActor_name_t itm_name);
static int aNSC_check_buy_paper(u32 *p1, mActor_name_t itm_name);
static void aNSC_init_proc(NPC_SHOP_MASTER_ACTOR *shop_master, GAME_PLAY * game, int p3);
#endif
include/m_home_h.h
+2 -1
View File
@@ -85,7 +85,8 @@ typedef struct home_size_info_s {
/* 0x05 */ u8 renew : 1; /* refresh house size & 'outlook' palette */
/* 0x05 */ u8 statue_ordered : 1; /* set when statue is ordered from Nook */
/* 0x05 */ u8 basement_ordered : 1; /* set when basement has been ordered */
/* 0x05 */ u8 pad : 5; /* unused? */
/* 0x05 */ u8 pad_1 : 1; /* unused? */
/* 0x05 */ u8 pad : 4;
} mHm_rmsz_c;
/* sizeof(Haniwa_Item_c) == 8 */
include/m_name_table.h
+1
View File
@@ -227,6 +227,7 @@ extern int mNT_check_unknown(mActor_name_t item_no);
#define PAPER2TYPE(n) ((n) % PAPER_UNIQUE_NUM)
#define PAPER2STACK(n) ((n) / PAPER_UNIQUE_NUM)
#define PAPEROFQUANT(n, q) (ITM_PAPER_START + (q - 1) * PAPER_UNIQUE_NUM + PAPER2TYPE(n))
#define ITEM_IS_FTR(n) \
(ITEM_NAME_GET_TYPE(n) == NAME_TYPE_FTR0 || ITEM_NAME_GET_TYPE(n) == NAME_TYPE_FTR1)
src/actor/npc/ac_npc_shop_master.c
+3016
View File
File diff suppressed because it is too large Load Diff