add emotion defines

This commit is contained in:
DizzyEggg 2024-11-01 13:37:22 +01:00
parent b6efce3120
commit a9c8d282f4
3 changed files with 20 additions and 20 deletions

View File

@ -2,21 +2,21 @@
#define GUARD_CONSTANTS_EMOTIONS_H
#define EMOTION_NORMAL 0
#define EMOTION_HAPPY 2
#define EMOTION_PAINED 4
#define EMOTION_ANGRY 6
#define EMOTION_WORRIED 8
#define EMOTION_SAD 10
#define EMOTION_CRYING 12
#define EMOTION_SHOUTING 14
#define EMOTION_TEARY_EYE 16
#define EMOTION_DETERMINED 18
#define EMOTION_JOYOUS 20
#define EMOTION_INSPIRED 22
#define EMOTION_SUPRISED 24
#define EMOTION_DIZZY 26
#define EMOTION_SIGH 32
#define EMOTION_STUNNED 34
#define MAX_EMOTIONS 40
#define EMOTION_HAPPY 1
#define EMOTION_PAINED 2
#define EMOTION_ANGRY 3
#define EMOTION_WORRIED 4
#define EMOTION_SAD 5
#define EMOTION_CRYING 6
#define EMOTION_SHOUTING 7
#define EMOTION_TEARY_EYE 8
#define EMOTION_DETERMINED 9
#define EMOTION_JOYOUS 10
#define EMOTION_INSPIRED 11
#define EMOTION_SUPRISED 12
#define EMOTION_DIZZY 13
#define EMOTION_SIGH 16
#define EMOTION_STUNNED 17
#define MAX_EMOTIONS 20
#endif // GUARD_CONSTANTS_EMOTIONS_H

View File

@ -398,8 +398,8 @@ static void PersonalityTest_DisplayStarterSprite(void)
sub_80073B8(1);
faceFile = (void*) GetDialogueSpriteDataPtr(starterID);
gfx = faceFile->data->sprites[1].gfx;
emotionId = 1;
gfx = faceFile->data->sprites[EMOTION_HAPPY].gfx;
emotionId = EMOTION_HAPPY;
for (palleteIndex = 0; palleteIndex < 0x10; palleteIndex++) {
SetBGPaletteBufferColorArray(palleteIndex + 0xE0, &faceFile->data->sprites[emotionId].pal[palleteIndex]);
}

View File

@ -253,8 +253,8 @@ static void PersonalityTest_DisplayPartnerSprite(void)
CallPrepareTextbox_8008C54(1);
sub_80073B8(1);
faceFile = (void*) GetDialogueSpriteDataPtr(partnerID);
gfx = faceFile->data->sprites[0].gfx;
emotionId = 0;
gfx = faceFile->data->sprites[EMOTION_NORMAL].gfx;
emotionId = EMOTION_NORMAL;
for (palleteIndex = 0; palleteIndex < 0x10; palleteIndex++) {
SetBGPaletteBufferColorArray(palleteIndex + 0xE0, &faceFile->data->sprites[emotionId].pal[palleteIndex]);
}