atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed exclamation point & question mark palettes.

Browse source
This commit is contained in:
Ariel Antonitis 2020-06-23 23:26:22 -04:00
parent 2c723903a2
commit aacc17e15c
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/trainer_see.c
View file

@ -165,10 +165,12 @@ static const union AnimCmd *const sSpriteAnimTable_Icons[] =
sSpriteAnim_Icons2 sSpriteAnim_Icons2
}; };
#define OBJ_EVENT_PAL_TAG_17 0x1110 // TODO: Move this into event_object_movement.h
static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark = static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark =
{ {
.tileTag = 0xffff, .tileTag = 0xffff,
.paletteTag = 0xffff, .paletteTag = OBJ_EVENT_PAL_TAG_17,
.oam = &sOamData_Icons, .oam = &sOamData_Icons,
.anims = sSpriteAnimTable_Icons, .anims = sSpriteAnimTable_Icons,
.images = sSpriteImageTable_ExclamationQuestionMark, .images = sSpriteImageTable_ExclamationQuestionMark,
@ -698,8 +700,10 @@ u8 FldEff_ExclamationMarkIcon(void)
{ {
u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53); u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES) {
SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 0); SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 0);
UpdateSpritePaletteByTemplate(&sSpriteTemplate_ExclamationQuestionMark, &gSprites[spriteId]);
}
return 0; return 0;
} }
@ -708,8 +712,10 @@ u8 FldEff_QuestionMarkIcon(void)
{ {
u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x52); u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x52);
if (spriteId != MAX_SPRITES) if (spriteId != MAX_SPRITES) {
SetIconSpriteData(&gSprites[spriteId], FLDEFF_QUESTION_MARK_ICON, 1); SetIconSpriteData(&gSprites[spriteId], FLDEFF_QUESTION_MARK_ICON, 1);
UpdateSpritePaletteByTemplate(&sSpriteTemplate_ExclamationQuestionMark, &gSprites[spriteId]);
}
return 0; return 0;
} }
@ -723,7 +729,7 @@ u8 FldEff_HeartIcon(void)
struct Sprite *sprite = &gSprites[spriteId]; struct Sprite *sprite = &gSprites[spriteId];
SetIconSpriteData(sprite, FLDEFF_HEART_ICON, 0); SetIconSpriteData(sprite, FLDEFF_HEART_ICON, 0);
sprite->oam.paletteNum = 2; sprite->oam.paletteNum = 2; // TODO: What palette should this use?
} }
return 0; return 0;