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

Add notes to every reamining schedule enum value

Browse Source
This commit is contained in:
angie
2023-10-12 15:55:07 -03:00
parent 87bf041c78
commit 6b0ffd76f1
13 changed files with 190 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_an1.xml
+1 -1
View File
@@ -57,7 +57,7 @@
<DList Name="object_an1_DL_0111E0" Offset="0x111E0" />
<DList Name="gAnju1FoodTrayDL" Offset="0x111E8" /> <!-- Original name is "an_obon_model" -->
<Texture Name="object_an1_Tex_011928" OutName="tex_011928" Format="i8" Width="32" Height="32" Offset="0x11928" />
<Texture Name="gAnju1PlateTex" OutName="plate" Format="i8" Width="32" Height="32" Offset="0x11928" />
<Texture Name="object_an1_Tex_011D28" OutName="tex_011D28" Format="rgba16" Width="16" Height="16" Offset="0x11D28" />
<Texture Name="object_an1_Tex_011F28" OutName="tex_011F28" Format="rgba16" Width="16" Height="16" Offset="0x11F28" />
<Texture Name="object_an1_Tex_012128" OutName="tex_012128" Format="i8" Width="16" Height="16" Offset="0x12128" />
src/overlays/actors/ovl_En_An/z_en_an.c
+163 -151
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
@@ -75,7 +75,7 @@ typedef struct EnAn {
/* 0x384 */ s16 timePathTimeSpeed;
/* 0x386 */ s16 unk_386; // timer
/* 0x388 */ s16 unk_388; // timer
/* 0x38A */ s16 unk_38A; // EnAnFace enum
/* 0x38A */ s16 savedFaceIndex; // EnAnFace enum
/* 0x38C */ s16 faceIndex; // EnAnFace enum
/* 0x38E */ s16 eyeTimer;
/* 0x390 */ s16 eyeTexIndex;
src/overlays/actors/ovl_En_Door/z_en_door.c
+4 -4
View File
@@ -514,7 +514,7 @@ void func_80866B20(EnDoor* this, PlayState* play) {
Flags_SetSwitch(play, this->switchFlag);
Actor_PlaySfx(&this->knobDoor.dyna.actor, NA_SE_EV_CHAIN_KEY_UNLOCK);
}
} else if (this->unk_1A7 != 0) {
} else if (this->openTimer != 0) {
this->actionFunc = func_80866F94;
Actor_PlaySfx(&this->knobDoor.dyna.actor, NA_SE_EV_DOOR_OPEN);
} else if (!Player_InCsMode(play)) {
@@ -585,14 +585,14 @@ void func_80866B20(EnDoor* this, PlayState* play) {
void func_80866F94(EnDoor* this, PlayState* play) {
s32 direction;
if (this->unk_1A7 != 0) {
if (this->unk_1A7 >= 0) {
if (this->openTimer != 0) {
if (this->openTimer >= 0) {
direction = 1;
} else {
direction = -1;
}
if (Math_ScaledStepToS(&this->knobDoor.dyna.actor.world.rot.y, direction * 0x3E80, 0x7D0)) {
Math_StepToC(&this->unk_1A7, 0, 1);
Math_StepToC(&this->openTimer, 0, 1);
}
} else {
if (Math_ScaledStepToS(&this->knobDoor.dyna.actor.world.rot.y, 0, 0x7D0)) {
src/overlays/actors/ovl_En_Door/z_en_door.h
+2 -2
View File
@@ -25,10 +25,10 @@ typedef enum EnDoorType {
typedef struct EnDoor {
/* 0x000 */ KnobDoorActor knobDoor;
/* 0x1A4 */ u8 doorType;
/* 0x1A4 */ u8 doorType; // EnDoorType enum
/* 0x1A5 */ u8 switchFlag;
/* 0x1A6 */ u8 unk_1A6;
/* 0x1A7 */ s8 unk_1A7;
/* 0x1A7 */ s8 openTimer; // For how long the door will be open. positive/negative means the opening direction
/* 0x1A8 */ Vec3s limbTable[DOOR_LIMB_MAX];
/* 0x1C8 */ EnDoorActionFunc actionFunc;
} EnDoor;
src/overlays/actors/ovl_En_Gm/z_en_gm.c
+2 -2
View File
@@ -1480,9 +1480,9 @@ s32 func_80950804(EnGm* this, PlayState* play) {
if (!SubS_InCsMode(play) && (this->timePathTimeSpeed != 0)) {
if ((door != NULL) && (door->knobDoor.dyna.actor.update != NULL)) {
if ((this->unk_3BA / (f32)this->unk_3B8) <= 0.9f) {
door->unk_1A7 = this->unk_261;
door->openTimer = this->unk_261;
} else {
door->unk_1A7 = 0;
door->openTimer = 0;
}
}
src/overlays/actors/ovl_En_Ig/z_en_ig.c
+2 -2
View File
@@ -767,9 +767,9 @@ s32 func_80BF2470(EnIg* this, PlayState* play) {
if (!SubS_InCsMode(play) && (this->timePathTimeSpeed != 0)) {
if ((door != NULL) && (door->knobDoor.dyna.actor.update != NULL)) {
if (((f32)this->unk_3E2 / this->unk_3E0) <= 0.9f) {
door->unk_1A7 = this->unk_2A4;
door->openTimer = this->unk_2A4;
} else {
door->unk_1A7 = 0;
door->openTimer = 0;
}
}
this->unk_3E2 = CLAMP(this->unk_3E2, 0, this->unk_3E0);
src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
+1 -1
View File
@@ -473,7 +473,7 @@ void func_80BD9338(EnPamera* this, PlayState* play) {
func_80BD84F0(this, play);
actor = this->actor.child;
if ((actor != NULL) && (actor->id == ACTOR_EN_DOOR)) {
((EnDoor*)actor)->unk_1A7 = -0x32;
((EnDoor*)actor)->openTimer = -50;
}
}
src/overlays/actors/ovl_En_Pm/z_en_pm.c
+2 -2
View File
@@ -1711,9 +1711,9 @@ s32 func_80AF9D04(EnPm* this, PlayState* play) {
if (!SubS_InCsMode(play) && (this->timePathTimeSpeed != 0)) {
if ((door != NULL) && (door->knobDoor.dyna.actor.update != NULL)) {
if (((f32)this->unk_36E / this->unk_36C) <= 0.9f) {
door->unk_1A7 = this->unk_260;
door->openTimer = this->unk_260;
} else {
door->unk_1A7 = 0;
door->openTimer = 0;
}
}
this->unk_36E = CLAMP(this->unk_36E, 0, this->unk_36C);
src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
+1 -1
View File
@@ -768,7 +768,7 @@ s32 func_80BABDD8(EnSuttari* this, PlayState* play, ScheduleOutput* scheduleOutp
this->unk434 = sp44 - scheduleOutput->time0;
this->unk436 = scheduleOutput->time1 - scheduleOutput->time0;
if ((scheduleOutput->result != 10) && (scheduleOutput->result != 11)) {
sp48->unk_1A7 = 0x4B;
sp48->openTimer = 75;
}
Math_Vec3f_Copy(&this->unk438, &sp38);
Math_Vec3f_Copy(&this->unk444, &sp2C);
src/overlays/actors/ovl_En_Tk/z_en_tk.c
+2 -2
View File
@@ -472,7 +472,7 @@ s32 func_80AECE60(EnTk* this, PlayState* play) {
Vec3f sp5C;
Actor_OffsetOfPointInActorCoords(&this->actor, &sp5C, &door->knobDoor.dyna.actor.world.pos);
door->unk_1A7 = 2;
door->openTimer = 2;
if (sp5C.z < -20.0f) {
this->unk_2CA &= ~0x400;
this->unk_2CA |= 0x800;
@@ -480,7 +480,7 @@ s32 func_80AECE60(EnTk* this, PlayState* play) {
}
if (door != NULL) {
if ((this->unk_2CA & 0x800) && (door->unk_1A7 == 0)) {
if ((this->unk_2CA & 0x800) && (door->openTimer == 0)) {
this->unk_2CA &= ~0x800;
}
}
tools/disasm/functions.txt
+4 -4
View File
@@ -14030,10 +14030,10 @@
0x80B552E4:("func_80B552E4",),
0x80B553AC:("EnAn_UpdateHeadRot",),
0x80B554E8:("func_80B554E8",),
0x80B555C8:("func_80B555C8",),
0x80B556F8:("func_80B556F8",),
0x80B557AC:("func_80B557AC",),
0x80B55860:("func_80B55860",),
0x80B555C8:("EnAn_ChooseAnimAfterTalking",),
0x80B556F8:("EnAn_DialogueFunc_80B556F8",),
0x80B557AC:("EnAn_DialogueFunc_80B557AC",),
0x80B55860:("EnAn_DialogueFunc_80B55860",),
0x80B55914:("EnAn_HandleDialogue",),
0x80B55D20:("EnAn_FindLookAtActor",),
0x80B55D98:("func_80B55D98",),
tools/disasm/variables.txt
+5 -5
View File
@@ -14449,16 +14449,16 @@
0x80B58784:("sAnjuMsgScript_SchAttendGoron","UNK_TYPE1","",0x1),
0x80B58808:("sAnjuMsgScript_SchGiveLunchToGrandma","UNK_TYPE1","",0x1),
0x80B5885C:("sAnjuMsgScript_Sch12_B","UNK_TYPE1","",0x1),
0x80B58938:("sAnjuMsgScript_Sch13_Sch2F","UNK_TYPE1","",0x1),
0x80B58938:("sAnjuMsgScript_InnCloseTime","UNK_TYPE1","",0x1),
0x80B58944:("sAnjuMsgScript_Sch30","UNK_TYPE1","",0x1),
0x80B5894C:("sAnjuMsgScript_Sch28","UNK_TYPE1","",0x1),
0x80B58954:("sAnjuMsgScript_SchCooking","UNK_TYPE1","",0x1),
0x80B58980:("D_80B58980","UNK_TYPE1","",0x1),
0x80B58988:("sAnjuMsgScript_Sch16","UNK_TYPE1","",0x1),
0x80B58988:("sAnjuMsgScript_SchSweeping","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),
0x80B589FC:("sAnjuMsgScript_80B589FC","UNK_TYPE1","",0x1),
0x80B58A04:("sAnjuMsgScript_DekuDefault","UNK_TYPE1","",0x1),
0x80B58A24:("sAnjuMsgScript_SchLaundryPoolDeku","UNK_TYPE1","",0x1),
0x80B58A3C:("sAnjuMsgScript_Sch12_A","UNK_TYPE1","",0x1),
@@ -14468,8 +14468,8 @@
0x80B58AE8:("sAnjuMsgScript_SchWaitingForKafei","UNK_TYPE1","",0x1),
0x80B58AF4:("sAnjuMsgScript_SchLaundryPoolDefault","UNK_TYPE1","",0x1),
0x80B58B3C:("sAnjuMsgScript_SchLaundryPoolKafeiMask","UNK_TYPE1","",0x1),
0x80B58B7C:("D_80B58B7C","UNK_TYPE1","",0x1),
0x80B58B88:("sAnjuMsgScript_Sch31","UNK_TYPE1","",0x1),
0x80B58B7C:("sAnjuMsgScript_80B58B7C","UNK_TYPE1","",0x1),
0x80B58B88:("sAnjuMsgScript_80B58B88","UNK_TYPE1","",0x1),
0x80B58B90:("sAnjuMsgScript_Sch19","UNK_TYPE1","",0x1),
0x80B58B9C:("En_An_InitVars","UNK_TYPE1","",0x1),
0x80B58BBC:("sCylinderInit","UNK_TYPE1","",0x1),