diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2025-05-25 19:10:03 -0700 |
|---|---|---|
| committer | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-09-16 21:42:06 -0400 |
| commit | 61380e12709c12f2aed471483374dbc06d722603 (patch) | |
| tree | 33f6d3ce1c3674707d3c9a27062fd01876df4464 | |
| parent | 9d000a0c6dad70e6eb8b6805cf9df128132f4f8c (diff) | |
Misc Fixes (#1809)
* EnAn MsgScriptCallback
* Version check
* Write .extracted-assets.json to outputDir
* Fix m2ctx
* Fix boot_functions.csv
| -rw-r--r-- | mm/src/overlays/actors/ovl_En_An/z_en_an.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/src/overlays/actors/ovl_En_An/z_en_an.h b/mm/src/overlays/actors/ovl_En_An/z_en_an.h index 9273523b0..2ce8064e0 100644 --- a/mm/src/overlays/actors/ovl_En_An/z_en_an.h +++ b/mm/src/overlays/actors/ovl_En_An/z_en_an.h @@ -2,13 +2,15 @@ #define Z_EN_AN_H #include "global.h" + +#include "z64msgevent.h" + #include "assets/objects/object_an1/object_an1.h" struct EnAn; typedef void (*EnAnActionFunc)(struct EnAn*, PlayState*); typedef void (*EnAnDialogueFunc)(struct EnAn*, PlayState*); -typedef s32 (*MsgEventFunc)(Actor*, PlayState*); #define ENAN_8000 0x8000 @@ -87,7 +89,7 @@ typedef struct EnAn { /* 0x392 */ s16 mouthTexIndex; /* 0x394 */ s16 msgEventState; /* 0x396 */ s16 dialogueFuncState; - /* 0x398 */ MsgEventFunc msgScriptCallback; + /* 0x398 */ MsgScriptCallback msgScriptCallback; /* 0x39C */ s32 animIndex; // EnAnAnimation enum /* 0x3A0 */ UNK_TYPE1 unk_3A0[0x8]; /* 0x3A8 */ u32 trayTexScrollTimer1; // TwoTexScroll |