mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-23 06:54:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc Fixes (#1809)

Browse Source 
* EnAn MsgScriptCallback

* Version check

* Write .extracted-assets.json to outputDir

* Fix m2ctx

* Fix boot_functions.csv
This commit is contained in:
Derek Hensley
2025-05-25 19:10:03 -07:00
committed by GitHub
parent c99e2328ef
commit 13d92a413b
6 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_An/z_en_an.h
+4 -2
View File
@@ -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