Merge branch 'master' into ac_ev_ghost

This commit is contained in:
Cuyler36
2024-01-16 06:03:22 -05:00
6 changed files with 144 additions and 0 deletions
+14
View File
@@ -8,6 +8,20 @@
extern "C" {
#endif
typedef struct actor_mikuji_s MIKUJI_ACTOR;
typedef void (*MIKUJI_PROC)(MIKUJI_ACTOR*, GAME_PLAY*);
struct actor_mikuji_s{
ACTOR actor_class;
u8 pad[0x2A0 - 0x174];
MIKUJI_PROC proc;
u8 pad2[0x2B4 - 0x2A4];
int current_action;
int next_action;
u8 pad3[0x2DC - 0x2BC];
};
extern ACTOR_PROFILE Mikuji_Profile;
#ifdef __cplusplus
+1
View File
@@ -2162,6 +2162,7 @@ extern int mNT_check_unknown(mActor_name_t item_no);
#define DUMMY_RESERVE 0xF102
#define DUMMY_SHRINE 0xF103
#define DUMMY_RADIO 0xF109
#define DUMMY_MIKUJI 0xF10D
#define DUMMY_TAMA 0xF110
#define DUMMY_DOUZOU 0xF11D
#define DUMMY_NAMEPLATE 0xF11F