From 78caeff45b98bf3cce180d37606d5a5239fbb030 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 6 Feb 2020 10:44:22 -0500 Subject: Name remaining funcs in union_room.c --- src/list_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/list_menu.c') diff --git a/src/list_menu.c b/src/list_menu.c index 6c4d50961..706c1679b 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -763,7 +763,7 @@ void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y) BlitBitmapToWindow(windowId, GetMonIconPtr(speciesId, personality, 1), x, y, 32, 32); } -void sub_8107D38(u8 palOffset, u8 palId) +void ListMenuLoadStdPalAt(u8 palOffset, u8 palId) { const u16 *palette; -- cgit v1.2.3 From b7c28c4be76f19d3515ede426ae874390523457f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 15:00:56 -0500 Subject: Remove redundant include lines --- src/list_menu.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/list_menu.c') diff --git a/src/list_menu.c b/src/list_menu.c index 706c1679b..bd1d2699e 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -8,9 +8,7 @@ #include "main.h" #include "task.h" #include "graphics.h" -#include "decompress.h" #include "palette.h" -#include "malloc.h" #include "strings.h" #include "sound.h" #include "pokemon_icon.h" -- cgit v1.2.3 From 3666a47d1cf9ee654f198bf79f632187b608afa1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 24 Feb 2020 15:31:40 -0500 Subject: Port script_movement --- src/list_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/list_menu.c') diff --git a/src/list_menu.c b/src/list_menu.c index bd1d2699e..21ef40fbe 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -256,7 +256,7 @@ void DestroyListMenuTask(u8 listTaskId, u16 *cursorPos, u16 *itemsAbove) if (itemsAbove != NULL) *itemsAbove = list->itemsAbove; - if (list->taskId != TASK_NONE) + if (list->taskId != TAIL_SENTINEL) ListMenuRemoveCursorObject(list->taskId, list->template.cursorKind - 2); DestroyTask(listTaskId); @@ -346,7 +346,7 @@ static u8 ListMenuInitInternal(const struct ListMenuTemplate *listMenuTemplate, list->itemsAbove = itemsAbove; list->unk_1C = 0; list->unk_1D = 0; - list->taskId = TASK_NONE; + list->taskId = TAIL_SENTINEL; list->unk_1F = 0; gListMenuOverride.cursorPal = list->template.cursorPal; gListMenuOverride.fillValue = list->template.fillValue; @@ -418,12 +418,12 @@ static void ListMenuDrawCursor(struct ListMenu *list) case 1: break; case 2: - if (list->taskId == TASK_NONE) + if (list->taskId == TAIL_SENTINEL) list->taskId = ListMenuAddCursorObject(list, 0); ListMenuUpdateCursorObject(list->taskId, GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 - 1, GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y - 1, 0); break; case 3: - if (list->taskId == TASK_NONE) + if (list->taskId == TAIL_SENTINEL) list->taskId = ListMenuAddCursorObject(list, 1); ListMenuUpdateCursorObject(list->taskId, GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 + x, GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y, 1); break; -- cgit v1.2.3 From cb99443c51d6263425fb4d853177efc07aee5fb9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 5 Mar 2020 10:31:31 -0500 Subject: through sub_81556E0 --- src/list_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/list_menu.c') diff --git a/src/list_menu.c b/src/list_menu.c index 21ef40fbe..9439d712c 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -413,7 +413,7 @@ static void ListMenuDrawCursor(struct ListMenu *list) switch (list->template.cursorKind) { case 0: - ListMenuPrint(list, gFameCheckerText_ListMenuCursor, x, y); + ListMenuPrint(list, gText_SelectorArrow2, x, y); break; case 1: break; -- cgit v1.2.3