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 the mouths

Browse Source
This commit is contained in:
angie
2023-10-16 11:32:22 -03:00
parent 7db0614e8f
commit 246519f7b4
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_an1.xml
+4 -4
View File
@@ -45,7 +45,7 @@
<Texture Name="gAnju1HairTex" OutName="anju_hair" Format="ci8" Width="8" Height="16" Offset="0xE160" />
<Texture Name="gAnju1EyeOpenTex" OutName="anju_eye_open" Format="ci8" Width="32" Height="32" Offset="0xE1E0" TlutOffset="0xDD20" />
<Texture Name="gAnju1EarTex" OutName="anju_ear" Format="ci8" Width="16" Height="16" Offset="0xE5E0" />
<Texture Name="gAnju1Mouth00E6E0Tex" OutName="anju_mouth_00E6E0" Format="ci8" Width="32" Height="16" Offset="0xE6E0" TlutOffset="0xDF20" />
<Texture Name="gAnju1MouthClosedTex" OutName="anju_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xE6E0" TlutOffset="0xDF20" />
<Texture Name="gAnju1ShirtButtonTex" OutName="anju_shirt_button" Format="ci8" Width="8" Height="8" Offset="0xE8E0" />
<Texture Name="gAnju1HandTex" OutName="anju_hand" Format="ci8" Width="16" Height="16" Offset="0xE920" />
<Texture Name="gAnju1SkirtTex" OutName="anju_skirt" Format="ci8" Width="32" Height="32" Offset="0xEA20" />
@@ -55,9 +55,9 @@
<Texture Name="gAnju1EyeClosedTex" OutName="anju_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF3A0" TlutOffset="0xDD20" />
<Texture Name="gAnju1MouthHappyTex" OutName="anju_mouth_happy" Format="ci8" Width="32" Height="16" Offset="0xF7A0" TlutOffset="0xDF20" />
<Texture Name="gAnju1EyeSadTex" OutName="anju_eye_sad" Format="ci8" Width="32" Height="32" Offset="0xF9A0" TlutOffset="0xDD20" />
<Texture Name="gAnju1Eye00FDA0Tex" OutName="anju_eye_00FDA0" Format="ci8" Width="32" Height="32" Offset="0xFDA0" TlutOffset="0xDD20" />
<Texture Name="gAnju1Mouth0101A0Tex" OutName="anju_mouth_0101A0" Format="ci8" Width="32" Height="16" Offset="0x101A0" TlutOffset="0xDF20" />
<Texture Name="gAnju1EyeAngryTex" OutName="anju_eye_angry" Format="ci8" Width="32" Height="32" Offset="0x103A0" TlutOffset="0xDD20" />
<Texture Name="gAnju1EyeComfortingTex" OutName="anju_eye_comforting" Format="ci8" Width="32" Height="32" Offset="0xFDA0" TlutOffset="0xDD20" />
<Texture Name="gAnju1MouthOpenTex" OutName="anju_mouth_open" Format="ci8" Width="32" Height="16" Offset="0x101A0" TlutOffset="0xDF20" />
<Texture Name="gAnju1EyeRelievedClosedTex" OutName="anju_eye_relieved_closed" Format="ci8" Width="32" Height="32" Offset="0x103A0" TlutOffset="0xDD20" />
<!-- Empty -->
<DList Name="object_an1_DL_0111E0" Offset="0x111E0" />
src/overlays/actors/ovl_Dm_An/z_dm_an.c
+3 -3
View File
@@ -369,14 +369,14 @@ void func_80C1CEFC(PlayState* play, s32 limbIndex, Actor* thisx) {
}
TexturePtr D_80C1D2E8[] = {
gAnju1Mouth00E6E0Tex,
gAnju1MouthClosedTex,
gAnju1MouthHappyTex,
gAnju1Mouth0101A0Tex,
gAnju1MouthOpenTex,
};
TexturePtr D_80C1D2F4[] = {
gAnju1EyeOpenTex, gAnju1EyeHalfTex, gAnju1EyeClosedTex, gAnju1EyeHalfTex,
gAnju1Eye00FDA0Tex, gAnju1EyeSadTex, gAnju1EyeAngryTex,
gAnju1EyeComfortingTex, gAnju1EyeSadTex, gAnju1EyeRelievedClosedTex,
};
void func_80C1D0B0(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c
+3 -3
View File
@@ -369,14 +369,14 @@ void DmGm_TransformLimbDraw(PlayState* play, s32 limbIndex, Actor* thisx) {
}
TexturePtr D_80C25238[] = {
gAnju1Mouth00E6E0Tex,
gAnju1MouthClosedTex,
gAnju1MouthHappyTex,
gAnju1Mouth0101A0Tex,
gAnju1MouthOpenTex,
};
TexturePtr D_80C25244[] = {
gAnju1EyeOpenTex, gAnju1EyeHalfTex, gAnju1EyeClosedTex, gAnju1EyeHalfTex,
gAnju1Eye00FDA0Tex, gAnju1EyeSadTex, gAnju1EyeAngryTex,
gAnju1EyeComfortingTex, gAnju1EyeSadTex, gAnju1EyeRelievedClosedTex,
};
void func_80C25000(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_En_An/z_en_an.c
+23 -23
View File
@@ -1131,16 +1131,16 @@ typedef enum EnAnEyes {
/* 1 */ ENAN_EYES_HALF1,
/* 2 */ ENAN_EYES_CLOSED,
/* 3 */ ENAN_EYES_HALF2,
/* 4 */ ENAN_EYES_4,
/* 4 */ ENAN_EYES_COMFORTING,
/* 5 */ ENAN_EYES_SAD,
/* 6 */ ENAN_EYES_ANGRY,
/* 6 */ ENAN_EYES_RELIEVED_CLOSED,
/* 7 */ ENAN_EYES_MAX
} EnAnEyes;
typedef enum EnAnMouth {
/* 0 */ ENAN_MOUTH_0,
/* 0 */ ENAN_MOUTH_CLOSED,
/* 1 */ ENAN_MOUTH_HAPPY,
/* 2 */ ENAN_MOUTH_2,
/* 2 */ ENAN_MOUTH_OPEN,
/* 3 */ ENAN_MOUTH_MAX
} EnAnMouth;
@@ -1152,21 +1152,21 @@ typedef enum EnAnFace {
/* 4 */ ENAN_FACE_4,
/* 5 */ ENAN_FACE_5,
/* 6 */ ENAN_FACE_6,
/* 7 */ ENAN_FACE_7,
/* 8 */ ENAN_FACE_8,
/* 9 */ ENAN_FACE_9,
/* 7 */ ENAN_FACE_7, // RELIEVED?
/* 8 */ ENAN_FACE_8, // COMFORTING
/* 9 */ ENAN_FACE_9, // HAPPY_BLINK?
/* 10 */ ENAN_FACE_MAX
} EnAnFace;
static s16 sMouthIndices[ENAN_FACE_MAX] = {
ENAN_MOUTH_0, // ENAN_FACE_0
ENAN_MOUTH_2, // ENAN_FACE_1
ENAN_MOUTH_0, // ENAN_FACE_2
ENAN_MOUTH_CLOSED, // ENAN_FACE_0
ENAN_MOUTH_OPEN, // ENAN_FACE_1
ENAN_MOUTH_CLOSED, // ENAN_FACE_2
ENAN_MOUTH_HAPPY, // ENAN_FACE_3
ENAN_MOUTH_2, // ENAN_FACE_4
ENAN_MOUTH_0, // ENAN_FACE_5
ENAN_MOUTH_OPEN, // ENAN_FACE_4
ENAN_MOUTH_CLOSED, // ENAN_FACE_5
ENAN_MOUTH_HAPPY, // ENAN_FACE_6
ENAN_MOUTH_2, // ENAN_FACE_7
ENAN_MOUTH_OPEN, // ENAN_FACE_7
ENAN_MOUTH_HAPPY, // ENAN_FACE_8
ENAN_MOUTH_HAPPY, // ENAN_FACE_9
};
@@ -1189,24 +1189,24 @@ void EnAn_UpdateFace(EnAn* this) {
case ENAN_FACE_5:
case ENAN_FACE_7:
if ((this->eyeTexIndex == ENAN_EYES_ANGRY) || (this->eyeTexIndex == ENAN_EYES_HALF1)) {
if ((this->eyeTexIndex == ENAN_EYES_RELIEVED_CLOSED) || (this->eyeTexIndex == ENAN_EYES_HALF1)) {
skipBlink = true;
this->eyeTexIndex = ENAN_EYES_ANGRY;
this->eyeTexIndex = ENAN_EYES_RELIEVED_CLOSED;
}
break;
case ENAN_FACE_8:
if ((this->eyeTexIndex == ENAN_EYES_4) || (this->eyeTexIndex == ENAN_EYES_CLOSED)) {
if ((this->eyeTexIndex == ENAN_EYES_COMFORTING) || (this->eyeTexIndex == ENAN_EYES_CLOSED)) {
skipBlink = true;
this->eyeTexIndex = ENAN_EYES_4;
this->eyeTexIndex = ENAN_EYES_COMFORTING;
}
break;
}
if (!skipBlink) {
if ((this->eyeTexIndex == ENAN_EYES_4) || (this->eyeTexIndex == ENAN_EYES_SAD)) {
if ((this->eyeTexIndex == ENAN_EYES_COMFORTING) || (this->eyeTexIndex == ENAN_EYES_SAD)) {
this->eyeTexIndex = ENAN_EYES_OPEN;
} else if (this->eyeTexIndex == ENAN_EYES_ANGRY) {
} else if (this->eyeTexIndex == ENAN_EYES_RELIEVED_CLOSED) {
this->eyeTexIndex = ENAN_EYES_HALF1;
}
}
@@ -3573,9 +3573,9 @@ void EnAn_Draw(Actor* thisx, PlayState* play) {
if ((this->scheduleResult != ANJU_SCH_NONE) || this->forceDraw) {
static TexturePtr sMouthTextures[ENAN_MOUTH_MAX] = {
gAnju1Mouth00E6E0Tex, // ENAN_MOUTH_0
gAnju1MouthClosedTex, // ENAN_MOUTH_CLOSED
gAnju1MouthHappyTex, // ENAN_MOUTH_HAPPY
gAnju1Mouth0101A0Tex, // ENAN_MOUTH_2
gAnju1MouthOpenTex, // ENAN_MOUTH_OPEN
};
static TexturePtr sEyeTextures[ENAN_EYES_MAX] = {
@@ -3583,9 +3583,9 @@ void EnAn_Draw(Actor* thisx, PlayState* play) {
gAnju1EyeHalfTex, // ENAN_EYES_HALF1
gAnju1EyeClosedTex, // ENAN_EYES_CLOSED
gAnju1EyeHalfTex, // ENAN_EYES_HALF2
gAnju1Eye00FDA0Tex, // ENAN_EYES_4
gAnju1EyeComfortingTex, // ENAN_EYES_COMFORTING
gAnju1EyeSadTex, // ENAN_EYES_SAD
gAnju1EyeAngryTex, // ENAN_EYES_ANGRY
gAnju1EyeRelievedClosedTex, // ENAN_EYES_RELIEVED_CLOSED
};
OPEN_DISPS(play->state.gfxCtx);