izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

name more flags

Browse Source
This commit is contained in:
angie
2023-10-17 14:26:55 -03:00
parent 79fdae13c8
commit 49c2c608ea
3 changed files with 242 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_An/z_en_an.c
+236 -95
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_An/z_en_an.h
+5 -5
View File
@@ -14,13 +14,13 @@ typedef s32 (*MsgEventFunc)(Actor*, PlayState*);
#define ENAN_8000 0x8000
//#define ENAN_GET_8000(thisx) (((thisx)->params & 0x8000) >> 0xF)
#define ENAN_STATE_8 (1 << 3)
#define ENAN_STATE_8 (1 << 3) // path related
#define ENAN_STATE_REACHED_PATH_END (1 << 4)
#define ENAN_STATE_20 (1 << 5) // rotate head?
#define ENAN_STATE_ENGAGED (1 << 5)
#define ENAN_STATE_IGNORE_GRAVITY (1 << 6)
#define ENAN_STATE_80 (1 << 7)
#define ENAN_STATE_FACE_TARGET (1 << 7)
#define ENAN_STATE_UPDATE_EYES (1 << 8)
#define ENAN_STATE_200 (1 << 9)
#define ENAN_STATE_LOST_ATTENTION (1 << 9)
#define ENAN_STATE_TALKING (1 << 10)
#define ENAN_STATE_DRAW_TRAY (1 << 11)
#define ENAN_STATE_DRAW_UMBRELLA (1 << 12)
@@ -78,7 +78,7 @@ typedef struct EnAn {
/* 0x380 */ UNK_TYPE1 unk_380[0x4];
/* 0x384 */ s16 timePathTimeSpeed;
/* 0x386 */ s16 unk_386; // timer
/* 0x388 */ s16 unk_388; // timer
/* 0x388 */ s16 loseAttentionTimer;
/* 0x38A */ s16 savedFaceIndex; // EnAnFace enum
/* 0x38C */ s16 faceIndex; // EnAnFace enum
/* 0x38E */ s16 eyeTimer;
tools/disasm/functions.txt
+1 -1
View File
@@ -14029,7 +14029,7 @@
0x80B55180:("EnAn_CheckTalk",),
0x80B552E4:("EnAn_IsCouplesMaskCsPlaying",),
0x80B553AC:("EnAn_UpdateHeadRot",),
0x80B554E8:("func_80B554E8",),
0x80B554E8:("EnAn_UpdateAttention",),
0x80B555C8:("EnAn_ChooseAnimAfterTalking",),
0x80B556F8:("EnAn_DialogueFunc_80B556F8",),
0x80B557AC:("EnAn_DialogueFunc_80B557AC",),