From c93915120f23a9545ff0743f506af3d58a1fabff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 27 Feb 2020 11:45:08 -0500 Subject: Port many field_effect.c names from Emerald --- src/script_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 72ff1dc9e..12e89832c 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1022,7 +1022,7 @@ static void Task_ScriptShowMonPic(u8 taskId) case 1: break; case 2: - sub_8083A5C(&gSprites[task->data[2]], task->data[2]); + FreeResourcesAndDestroySprite(&gSprites[task->data[2]], task->data[2]); task->data[0]++; break; case 3: @@ -1040,7 +1040,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) return TRUE; if (FindTaskIdByFunc(Task_ScriptShowMonPic) != 0xFF) return FALSE; - spriteId = sub_8083970(species, 8 * x + 40, 8 * y + 40, FALSE); + spriteId = CreateMonSprite_PicBox(species, 8 * x + 40, 8 * y + 40, FALSE); taskId = CreateTask(Task_ScriptShowMonPic, 80); gTasks[taskId].data[5] = CreateWindowFromRect(x, y, 8, 8); gTasks[taskId].data[0] = 0; @@ -1082,7 +1082,7 @@ void sub_809D424(void) case 0: case 1: case 2: - sub_8083A5C(&gSprites[task->data[2]], task->data[2]); + FreeResourcesAndDestroySprite(&gSprites[task->data[2]], task->data[2]); DestroyScriptMenuWindow(task->data[5]); DestroyTask(taskId); break; @@ -1183,7 +1183,7 @@ void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void) { data = gTasks[taskId].data; if (data[0] < 2) - sub_8083A5C(&gSprites[data[2]], data[2]); + FreeResourcesAndDestroySprite(&gSprites[data[2]], data[2]); } taskId = FindTaskIdByFunc(Task_WaitMuseumFossilPic); if (taskId != 0xFF) -- cgit v1.2.3 From 7af1b35d17b7077b13e04c2717b48a55960fa8ce Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 16:18:45 -0500 Subject: Sync some specials/drop unnecessary prefixes --- src/script_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 12e89832c..1fd9a2990 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1116,7 +1116,7 @@ void Task_WaitMuseumFossilPic(u8 taskId) } } -bool8 Special_OpenMuseumFossilPic(void) +bool8 OpenMuseumFossilPic(void) { u8 spriteId; u8 taskId; @@ -1149,7 +1149,7 @@ bool8 Special_OpenMuseumFossilPic(void) return TRUE; } -bool8 Special_CloseMuseumFossilPic(void) +bool8 CloseMuseumFossilPic(void) { u8 taskId = FindTaskIdByFunc(Task_WaitMuseumFossilPic); if (taskId == 0xFF) @@ -1197,7 +1197,7 @@ void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void) } } -void Special_DrawSeagallopDestinationMenu(void) +void DrawSeagallopDestinationMenu(void) { // 8004 = Starting location // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit) @@ -1249,7 +1249,7 @@ void Special_DrawSeagallopDestinationMenu(void) } } -u16 Special_GetSelectedSeagallopDestination(void) +u16 GetSelectedSeagallopDestination(void) { // 8004 = Starting location // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit) -- cgit v1.2.3 From 13e06bf7f88be6d25f420704b76828ed6f24cbc2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Mar 2020 10:42:16 -0500 Subject: Combine special prefixes, drop more --- src/script_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 1fd9a2990..a4745ee10 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -944,7 +944,7 @@ static void Hask_MultichoiceGridMenu_HandleInput(u8 taskId) EnableBothScriptContexts(); } -bool8 ScrSpecial_CreatePCMenu(void) +bool8 CreatePCMenu(void) { if (FuncIsActiveTask(Task_MultichoiceMenu_HandleInput) == TRUE) return FALSE; -- cgit v1.2.3