summaryrefslogtreecommitdiff
path: root/src/mon_markings.c
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2020-12-10 23:30:52 -0500
committerKurausukun <lord.uber1@gmail.com>2020-12-10 23:30:52 -0500
commit58976ebaa8d73d174940f622ec36f22bcd2fd8a2 (patch)
treec27ab24ed83fdb16654b5814d681af487b119601 /src/mon_markings.c
parent32ae13f9b66ab1b01146e5746e9350f97f055526 (diff)
parent8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (diff)
Merge remote-tracking branch 'upstream/master' into berry_crush
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 c2afdda83..a819d4f9a 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;