summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-09-08 15:27:08 -0400
committerscnorton <scnorton@biociphers.org>2017-09-08 15:27:08 -0400
commit2d3ce87c4c653d1789192e0083ee93a2090cdca5 (patch)
tree049dce7ba8cfd52b166945cdd67a7004d6099741 /src
parent444887ba228a94866641bfa2d420cf1903af1a82 (diff)
sub_808E8F4
Diffstat (limited to 'src')
-rw-r--r--src/field_map_obj.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 1ae142075..ccc88db15 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -35,12 +35,12 @@ void sub_8096518(struct MapObject *, struct Sprite *);
static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **);
/*static*/ void GetFieldObjectMovingCameraOffset(s16 *, s16 *);
/*static*/ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8, u8, u8);
-/*static*/ void sub_808E894(u16);
+static void sub_808E894(u16);
static void RemoveFieldObjectIfOutsideView(struct MapObject *);
static void sub_808E1B8(u8, s16, s16);
static void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8);
/*static*/ void sub_808E38C(struct MapObject *);
-/*static*/ void sub_808E8F4(const struct SpritePalette *);
+/*static*/ u8 sub_808E8F4(const struct SpritePalette *);
/*static*/ u16 FindFieldObjectPaletteIndexByTag(u16);
// ROM data
@@ -1115,7 +1115,7 @@ void gpu_pal_allocator_reset__manage_upper_four(void)
gReservedSpritePaletteCount = 12;
}
-void sub_808E894(u16 paletteTag)
+static void sub_808E894(u16 paletteTag)
{
u16 paletteSlot;
@@ -1135,3 +1135,12 @@ void sub_808E8C0(u16 *paletteTags)
sub_808E894(paletteTags[i]);
}
}
+
+u8 sub_808E8F4(const struct SpritePalette *spritePalette)
+{
+ if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xff)
+ {
+ return 0xff;
+ }
+ return LoadSpritePalette(spritePalette);
+}