summaryrefslogtreecommitdiff
path: root/src/mon_markings.c
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2020-11-02 18:43:40 -0500
committerKurausukun <lord.uber1@gmail.com>2020-11-02 18:43:40 -0500
commit6545745e5997f48e0c853b30b144a10244e7ba20 (patch)
tree5b0e10ea033a9501105983f1671a76ea39ef8ab0 /src/mon_markings.c
parent8bf401c2272b7c4182f54cb1285f6067fb5247f9 (diff)
parent9794b077b501ca8c9e5e3f1b6cdd705ec2129d24 (diff)
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
Diffstat (limited to 'src/mon_markings.c')
-rw-r--r--src/mon_markings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mon_markings.c b/src/mon_markings.c
index db5df07e8..e1897af76 100644
--- a/src/mon_markings.c
+++ b/src/mon_markings.c
@@ -390,7 +390,7 @@ void sub_811FAF8(void)
}
}
-bool8 sub_811FBA4(void)
+bool8 MonMarkingsMenuHandleInput(void)
{
u16 i;
@@ -564,7 +564,7 @@ static void sub_811FF7C(struct Sprite *sprite)
sprite->pos1.y = (16 * sMenu->cursorPos) + sprite->data[0];
}
-struct Sprite *sub_811FF94(u16 tileTag, u16 paletteTag, const u16 *palette)
+struct Sprite *CreateMonMarkingsSpriteWithPal(u16 tileTag, u16 paletteTag, const u16 *palette)
{
if (!palette)
palette = gUnknown_0859E65C;