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

many placeholder names

Browse Source
This commit is contained in:
angie
2023-10-11 13:22:30 -03:00
parent a8b877c7f0
commit 327c3040cd
4 changed files with 213 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_An/z_en_an.c
+182 -175
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_An/z_en_an.h
+1 -1
View File
@@ -80,7 +80,7 @@ typedef struct EnAn {
/* 0x38E */ s16 eyeTimer;
/* 0x390 */ s16 eyeTexIndex;
/* 0x392 */ s16 mouthTexIndex;
/* 0x394 */ s16 unk_394;
/* 0x394 */ s16 msgEventState;
/* 0x396 */ s16 dialogueFuncState;
/* 0x398 */ MsgEventFunc msgEventFunc;
/* 0x39C */ s32 animIndex; // EnAnAnimation enum
tools/disasm/functions.txt
+9 -9
View File
@@ -14016,15 +14016,15 @@
0x80B53ED4:("EnAn_UpdateCollider",),
0x80B53F84:("EnAn_UpdateFace",),
0x80B54124:("EnAn_DrawAccessory",),
0x80B54678:("func_80B54678",),
0x80B546F4:("func_80B546F4",),
0x80B54750:("func_80B54750",),
0x80B547C8:("func_80B547C8",),
0x80B5492C:("func_80B5492C",),
0x80B54A94:("func_80B54A94",),
0x80B54BC4:("func_80B54BC4",),
0x80B54C5C:("func_80B54C5C",),
0x80B54D18:("func_80B54D18",),
0x80B54678:("EnAn_ChangeCutscene",),
0x80B546F4:("EnAn_GetCsId",),
0x80B54750:("EnAn_GetChildCsId",),
0x80B547C8:("EnAn_MsgEvent_10",),
0x80B5492C:("EnAn_MsgEvent_11",),
0x80B54A94:("EnAn_MsgEvent_15",),
0x80B54BC4:("EnAn_MsgEvent_17",),
0x80B54C5C:("EnAn_MsgEvent_E",),
0x80B54D18:("EnAn_MsgEvent_LaundryPool",),
0x80B54DF4:("EnAn_GetMsgEventScript",),
0x80B55180:("EnAn_CheckTalk",),
0x80B552E4:("func_80B552E4",),
tools/disasm/variables.txt
+21 -21
View File
@@ -14445,32 +14445,32 @@
0x80B534AC:("D_80B534AC","f32","",0x4),
0x80B581D0:("sScheduleScript","UNK_TYPE1","",0x1),
0x80B58618:("sSearchTimePathLimit","UNK_TYPE1","",0x1),
0x80B58718:("D_80B58718","UNK_TYPE1","",0x1),
0x80B58784:("D_80B58784","UNK_TYPE1","",0x1),
0x80B58808:("D_80B58808","UNK_TYPE1","",0x1),
0x80B5885C:("D_80B5885C","UNK_TYPE1","",0x1),
0x80B58938:("D_80B58938","UNK_TYPE1","",0x1),
0x80B58944:("D_80B58944","UNK_TYPE1","",0x1),
0x80B5894C:("D_80B5894C","UNK_TYPE1","",0x1),
0x80B58954:("D_80B58954","UNK_TYPE1","",0x1),
0x80B58718:("sAnjuMsgScript_Sch10","UNK_TYPE1","",0x1),
0x80B58784:("sAnjuMsgScript_Sch11","UNK_TYPE1","",0x1),
0x80B58808:("sAnjuMsgScript_Sch15","UNK_TYPE1","",0x1),
0x80B5885C:("sAnjuMsgScript_Sch12_B","UNK_TYPE1","",0x1),
0x80B58938:("sAnjuMsgScript_Sch13_Sch2F","UNK_TYPE1","",0x1),
0x80B58944:("sAnjuMsgScript_Sch30","UNK_TYPE1","",0x1),
0x80B5894C:("sAnjuMsgScript_Sch28","UNK_TYPE1","",0x1),
0x80B58954:("sAnjuMsgScript_SchE","UNK_TYPE1","",0x1),
0x80B58980:("D_80B58980","UNK_TYPE1","",0x1),
0x80B58988:("D_80B58988","UNK_TYPE1","",0x1),
0x80B58994:("D_80B58994","UNK_TYPE1","",0x1),
0x80B5899C:("D_80B5899C","UNK_TYPE1","",0x1),
0x80B589AC:("D_80B589AC","UNK_TYPE1","",0x1),
0x80B589FC:("D_80B589FC","UNK_TYPE1","",0x1),
0x80B58A04:("D_80B58A04","UNK_TYPE1","",0x1),
0x80B58A24:("D_80B58A24","UNK_TYPE1","",0x1),
0x80B58A3C:("D_80B58A3C","UNK_TYPE1","",0x1),
0x80B58988:("sAnjuMsgScript_Sch16","UNK_TYPE1","",0x1),
0x80B58994:("sAnjuMsgScript_Sch34_Sch35","UNK_TYPE1","",0x1),
0x80B5899C:("sAnjuMsgScript_SchRanch","UNK_TYPE1","",0x1),
0x80B589AC:("sAnjuMsgScript_Sch17_A","UNK_TYPE1","",0x1),
0x80B589FC:("sAnjuMsgScript_Sch17_B","UNK_TYPE1","",0x1),
0x80B58A04:("sAnjuMsgScript_DekuDefault","UNK_TYPE1","",0x1),
0x80B58A24:("sAnjuMsgScript_SchLaundryPoolDeku","UNK_TYPE1","",0x1),
0x80B58A3C:("sAnjuMsgScript_Sch12_A","UNK_TYPE1","",0x1),
0x80B58A44:("D_80B58A44","UNK_TYPE1","",0x1),
0x80B58ABC:("D_80B58ABC","UNK_TYPE1","",0x1),
0x80B58AC4:("D_80B58AC4","UNK_TYPE1","",0x1),
0x80B58AE8:("D_80B58AE8","UNK_TYPE1","",0x1),
0x80B58AF4:("D_80B58AF4","UNK_TYPE1","",0x1),
0x80B58B3C:("D_80B58B3C","UNK_TYPE1","",0x1),
0x80B58AE8:("sAnjuMsgScript_Sch1","UNK_TYPE1","",0x1),
0x80B58AF4:("sAnjuMsgScript_SchLaundryPoolDefault","UNK_TYPE1","",0x1),
0x80B58B3C:("sAnjuMsgScript_SchLaundryPoolKafeiMask","UNK_TYPE1","",0x1),
0x80B58B7C:("D_80B58B7C","UNK_TYPE1","",0x1),
0x80B58B88:("D_80B58B88","UNK_TYPE1","",0x1),
0x80B58B90:("D_80B58B90","UNK_TYPE1","",0x1),
0x80B58B88:("sAnjuMsgScript_Sch31","UNK_TYPE1","",0x1),
0x80B58B90:("sAnjuMsgScript_Sch19","UNK_TYPE1","",0x1),
0x80B58B9C:("En_An_InitVars","UNK_TYPE1","",0x1),
0x80B58BBC:("sCylinderInit","UNK_TYPE1","",0x1),
0x80B58BE8:("sColChkInfoInit","UNK_TYPE1","",0x1),