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

more naming

Browse Source
This commit is contained in:
Angie
2023-10-12 21:03:53 -03:00
parent 81e6058268
commit 3ce8e6f6b3
3 changed files with 338 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_An/z_en_an.c
+323 -318
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_An/z_en_an.h
+8 -4
View File
@@ -51,10 +51,10 @@ typedef struct EnAn {
/* 0x210 */ s32 msgScriptResumePos;
/* 0x214 */ s8 roomNum;
/* 0x215 */ s8 doorOpenTimer;
/* 0x218 */ Actor* lookAtActor;
/* 0x218 */ Actor* lookAtActor; // interactActor
/* 0x21C */ UNK_TYPE1 unk_21C[0xC];
/* 0x228 */ Vec3f unk_228;
/* 0x234 */ Vec3f unk_234;
/* 0x228 */ Vec3f doorEntrancePos; // Position of the point just before entering the door
/* 0x234 */ Vec3f doorExitPos; // Position of the point just after passing through the door
/* 0x240 */ Vec3f headComputedPos;
/* 0x24C */ UNK_TYPE1 unk_24C[0xC];
/* 0x258 */ Vec3s headComputedRot;
@@ -68,7 +68,11 @@ typedef struct EnAn {
/* 0x36C */ UNK_TYPE1 unk_36C[0x8];
/* 0x374 */ f32 unk_374;
/* 0x378 */ s16 unk_378; // schedule time diff
/* 0x37A */ s16 unk_37A; // schedule time diff
/* 0x37A */ union {
s16 unk_37A; // schedule time diff
s16 laundryPoolState;
s16 followScheduleState; // unused
} var1;
/* 0x37C */ s16 headRotZ;
/* 0x37E */ s16 headRotY;
/* 0x380 */ UNK_TYPE1 unk_380[0x4];
tools/disasm/functions.txt
+7 -7
View File
@@ -14050,13 +14050,13 @@
0x80B56BC0:("func_80B56BC0",),
0x80B56CAC:("func_80B56CAC",),
0x80B56D28:("EnAn_ProcessScheduleOutput",),
0x80B56E44:("func_80B56E44",),
0x80B56EB4:("func_80B56EB4",),
0x80B5702C:("func_80B5702C",),
0x80B572D4:("func_80B572D4",),
0x80B573F4:("func_80B573F4",),
0x80B575BC:("func_80B575BC",),
0x80B57674:("func_80B57674",),
0x80B56E44:("EnAn_HandleSch_InteractActor",),
0x80B56EB4:("EnAn_HandleSch_Door",),
0x80B5702C:("EnAn_HandleSch_FollowTimePath",),
0x80B572D4:("EnAn_HandleSch_80B572D4",),
0x80B573F4:("EnAn_HandleSch_LaundryPool",),
0x80B575BC:("EnAn_HandleSch_80B575BC",),
0x80B57674:("EnAn_HandleSch_80B57674",),
0x80B57718:("EnAn_HandleSchedule",),
0x80B577F0:("EnAn_Initialize",),
0x80B578F8:("EnAn_FollowSchedule",),