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

a bit of asset naming

Browse Source
This commit is contained in:
angie
2023-10-14 12:10:08 -03:00
parent 2e7a22cced
commit e16092df5e
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_an2.xml
+8 -4
View File
@@ -1,13 +1,17 @@
<Root>
<!-- Assets for Anju on the rainy second day -->
<File Name="object_an2" Segment="6">
<!-- Empty -->
<DList Name="object_an2_DL_000370" Offset="0x370" />
<!-- Umbrella -->
<DList Name="gAnju2UmbrellaDL" Offset="0x378" /> <!-- Original name is "an_kasa_model" ("umbrella; parasol") -->
<Texture Name="gAnju2UmbrellaCircleTex" OutName="umbrella_circle" Format="i8" Width="16" Height="16" Offset="0x578" />
<Texture Name="gAnju2UmbrellaDesignTex" OutName="umbrella_design" Format="i8" Width="32" Height="32" Offset="0x678" />
<Texture Name="object_an2_Tex_000578" OutName="tex_000578" Format="i8" Width="16" Height="16" Offset="0x578" />
<Texture Name="object_an2_Tex_000678" OutName="tex_000678" Format="i8" Width="32" Height="32" Offset="0x678" />
<!-- Animations holding the umbrella -->
<Animation Name="gAnju2UmbrellaCryingAnim" Offset="0x1B80" /> <!-- Original name is "an_kasasuwarinaku" ("suwari" = "sitting", "naku" = "to cry; to weep; to sob") -->
<Animation Name="object_an2_Anim_0028DC" Offset="0x28DC" /> <!-- Original name is "an_kasawait" -->
<Animation Name="gAnju2UmbrellaIdleAnim" Offset="0x28DC" /> <!-- Original name is "an_kasawait" -->
<Animation Name="gAnju2UmbrellaSitAnim" Offset="0x38A0" /> <!-- Original name is "an_kasawait2suwaru" ("suwaru" = "to sit") -->
<Animation Name="gAnju2UmbrellaWalkAnim" Offset="0x42CC" /> <!-- Original name is "an_kasawalk" -->
</File>
assets/xml/objects/object_an3.xml
+8 -4
View File
@@ -1,12 +1,16 @@
<Root>
<!-- Assets for Anju sweeping on the third day -->
<File Name="object_an3" Segment="6">
<!-- Empty -->
<DList Name="object_an3_DL_000300" Offset="0x300" />
<!-- Broom -->
<DList Name="gAnju3BroomDL" Offset="0x308" /> <!-- Original name is "an_hoki_model" ("broom") -->
<Texture Name="gAnju3BroomCircleTex" OutName="broom_circle" Format="i8" Width="16" Height="16" Offset="0x4C8" />
<Texture Name="gAnju3BroomSideTex" OutName="broom_side" Format="rgba16" Width="8" Height="32" Offset="0x5C8" />
<Texture Name="gAnju3BroomBaseTex" OutName="broom_base" Format="rgba16" Width="8" Height="8" Offset="0x7C8" />
<Texture Name="object_an3_Tex_0004C8" OutName="tex_0004C8" Format="i8" Width="16" Height="16" Offset="0x4C8" />
<Texture Name="object_an3_Tex_0005C8" OutName="tex_0005C8" Format="rgba16" Width="8" Height="32" Offset="0x5C8" />
<Texture Name="object_an3_Tex_0007C8" OutName="tex_0007C8" Format="rgba16" Width="8" Height="8" Offset="0x7C8" />
<!-- Broom-related animations -->
<Animation Name="gAnju3BroomSweepAnim" Offset="0x12C0" /> <!-- Original name is "an_hokihaku" ("haku" = "to sweep; to brush; to clean​") -->
<Animation Name="gAnju3BroomIdleAnim" Offset="0x201C" /> <!-- Original name is "an_hokiwait" -->
<Animation Name="gAnju3BroomWalkAnim" Offset="0x2A4C" /> <!-- Original name is "an_hokiwalk" -->
src/overlays/actors/ovl_En_An/z_en_an.c
+4 -4
View File
@@ -942,7 +942,7 @@ typedef enum EnAnAnimation {
/* 16 */ ENAN_ANIM_WALKING_WITH_TRAY,
/* 17 */ ENAN_ANIMOBJ_AN2,
/* 17 */ ENAN_ANIM_17 = ENAN_ANIMOBJ_AN2,
/* 17 */ ENAN_ANIM_UMBRELLA_IDLE = ENAN_ANIMOBJ_AN2,
/* 18 */ ENAN_ANIM_UMBRELLA_WALK,
/* 19 */ ENAN_ANIM_UMBRELLA_SIT,
/* 20 */ ENAN_ANIM_UMBRELLA_CRYING,
@@ -988,7 +988,7 @@ static AnimationInfoS sAnimationInfo[ENAN_ANIM_MAX] = {
{ &gAnju1WalkingWithTrayAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WALKING_WITH_TRAY
// ENAN_ANIMOBJ_AN2
{ &object_an2_Anim_0028DC, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_17
{ &gAnju2UmbrellaIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_UMBRELLA_IDLE
{ &gAnju2UmbrellaWalkAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_UMBRELLA_WALK
{ &gAnju2UmbrellaSitAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_UMBRELLA_SIT
{ &gAnju2UmbrellaCryingAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_UMBRELLA_CRYING
@@ -1890,7 +1890,7 @@ s32 EnAn_ChooseAnimAfterTalking(EnAn* this, PlayState* play) {
if (this->animIndex == ENAN_ANIM_WAITING_WITH_TRAY) {
EnAn_ChangeAnim(this, play, ENAN_ANIM_WALKING_WITH_TRAY);
}
if (this->animIndex == ENAN_ANIM_17) {
if (this->animIndex == ENAN_ANIM_UMBRELLA_IDLE) {
EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_WALK);
}
if ((this->animIndex == ENAN_ANIM_IDLE) || (this->animIndex == ENAN_ANIM_IDLE_MORPH)) {
@@ -2091,7 +2091,7 @@ s32 EnAn_HandleDialogue(EnAn* this, PlayState* play) {
EnAn_ChangeAnim(this, play, ENAN_ANIM_WAITING_WITH_TRAY);
}
if (this->animIndex == ENAN_ANIM_UMBRELLA_WALK) {
EnAn_ChangeAnim(this, play, ENAN_ANIM_17);
EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_IDLE);
}
if ((this->animIndex == ENAN_ANIM_BROOM_WALK) || (this->animIndex == ENAN_ANIM_BROOM_SWEEP)) {
EnAn_ChangeAnim(this, play, ENAN_ANIM_BROOM_IDLE);