mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-07 20:11:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SamuraiOndo/ac-decomp

Browse Source
This commit is contained in:
Vi
2025-05-19 01:58:06 -05:00
parent ac8c73be0b db38839b7b
commit eda891186e
8 changed files with 687 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Famicom/famicom.h
+1 -1
View File
@@ -187,7 +187,7 @@ extern u8 ics_bad;
extern FamicomCommon famicomCommon;
typedef s32 (*FAMICOM_GETSAVECHAN_PROC)(int* player_no, s32* slot_card_result);
typedef int (*FAMICOM_GETSAVECHAN_PROC)(int* player_no, s32* slot_card_result);
extern int famicom_getErrorChan();
extern void famicom_setCallback_getSaveChan(FAMICOM_GETSAVECHAN_PROC proc);
include/ac_halloween_npc.h
+38 -23
View File
@@ -9,38 +9,54 @@
extern "C" {
#endif
typedef struct halloween_npc_s NPC_HALLOWEEN_ACTOR;
typedef struct halloween_npc_s HALLOWEEN_NPC_ACTOR;
typedef void (*aHWN_TALK_PROC)(HALLOWEEN_NPC_ACTOR*, GAME_PLAY*);
typedef void (*aHWN_THINK_PROC)(HALLOWEEN_NPC_ACTOR*, GAME_PLAY*);
typedef void (*aHWN_TALK_PROC)(NPC_HALLOWEEN_ACTOR*, GAME_PLAY*);
// has to be _P because a function is already defined as aHWN_think_proc
typedef void (*aHWN_THINK_PROC_P)(NPC_ACTOR*, GAME_PLAY*);
/* sizeof(halloween_npc_s) == 0x9AC*/
struct halloween_npc_s {
/* 0x000 */ NPC_ACTOR npc_class;
/* 0x994 */ int dt_tbl_idx;
/* 0x998 */ aHWN_THINK_PROC_P think_proc;
/* 0x998 */ aHWN_THINK_PROC think_proc;
/* 0x99C */ int _99C;
/* 0x9A0 */ aHWN_TALK_PROC talk_proc;
/* 0x9A4 */ mActor_name_t item;
/* 0x9A8 */ BOOL _9A0;
};
enum {
aHWN_TALK_FIRST_CALL_TALK_PROC, // 0
aHWN_TALK_TRICK_OR_TREAT_TALK_PROC, // 1
aHWN_TALK_MENU_OPEN_WAIT_TALK_PROC, // 2
aHWN_TALK_MENU_CLOSE_WAIT_TALK_PROC, // 3
aHWN_TALK_GET_OTHER_ITEM_WAIT_TALK_PROC, // 4
aHWN_TALK_RECEIVE_TOOL_ITEM_START_WAIT_TALK_PROC, // 5
aHWN_TALK_RECEIVE_TOOL_ITEM_END_WAIT_TALK_PROC, // 6
aHWN_TALK_TRICK_TIMING_WAIT_TALK_PROC, // 7
aHWN_TALK_TRICK_CHG_CLOTH_TALK_PROC, // 8
aHWN_TALK_TRICK_CHG_CLOTH_END_WAIT_TALK_PROC, // 9
aHWN_TALK_GET_AME_WAIT_TALK_PROC, // 10
aHWN_TALK_GET_AME_TALK_PROC, // 11
aHWN_TALK_PL_DEMO_CODE_END_WAIT_TALK_PROC, // 12
aHWN_TALK_NONE_PROC1, // 13
/* 0x9A8 */ BOOL wait_think_done;
};
enum {
aHWN_TALK_FIRST_CALL_TALK, // 0
aHWN_TALK_TRICK_OR_TREAT_TALK, // 1
aHWN_TALK_MENU_OPEN_WAIT_TALK, // 2
aHWN_TALK_MENU_CLOSE_WAIT_TALK, // 3
aHWN_TALK_GET_OTHER_ITEM_WAIT_TALK, // 4
aHWN_TALK_RECEIVE_TOOL_ITEM_START_WAIT_TALK, // 5
aHWN_TALK_RECEIVE_TOOL_ITEM_END_WAIT_TALK, // 6
aHWN_TALK_TRICK_TIMING_WAIT_TALK, // 7
aHWN_TALK_TRICK_CHG_CLOTH_TALK, // 8
aHWN_TALK_TRICK_CHG_CLOTH_END_WAIT_TALK, // 9
aHWN_TALK_GET_AME_WAIT_TALK, // 10
aHWN_TALK_GET_AME_TALK, // 11
aHWN_TALK_PL_DEMO_CODE_END_WAIT_TALK, // 12
aHWN_TALK_END_WAIT, // 13
aHWN_TALK_NUM
};
enum {
aHWN_THINK_APPROACH,
aHWN_THINK_APPROACH_WAIT,
aHWN_THINK_NUM
};
enum {
aHWN_TRICK_TYPE_CHG_CLOTH,
aHWN_TRICK_TYPE_CHG_ITEM,
aHWN_TRICK_TYPE_NUM
};
extern ACTOR_PROFILE Halloween_Npc_Profile;
@@ -49,4 +65,3 @@ extern ACTOR_PROFILE Halloween_Npc_Profile;
#endif
#endif
include/m_card.h
+2 -2
View File
@@ -269,12 +269,12 @@ enum {
#define OTHERS_SIZE ALIGN_NEXT(sizeof(mCD_others_c), mCD_MEMCARD_SECTORSIZE)
extern s32 mCD_GetThisLandSlotNo_code(int* player_no, s32* slot_card_results);
extern int mCD_GetThisLandSlotNo_code(int* player_no, s32* slot_card_results);
extern int mCD_GetThisLandSlotNo(void);
extern void mCD_save_data_aram_malloc(void);
extern void mCD_set_aram_save_data();
extern void mCD_init_card();
extern s32 mCD_InitGameStart_bg(int player_no, int card_private_idx, int start_cond, s32* mounted_chan);
extern int mCD_InitGameStart_bg(int player_no, int card_private_idx, int start_cond, s32* mounted_chan);
extern int mCD_GetCardPrivateNameCopy(u8* name, int idx);
extern int mCD_CheckCardPlayerNative(int idx);
extern int mCD_CheckPassportFile(void);