Port many field_effect.c names from Emerald

src/field_fadetransition.c

@@ -84,7 +84,7 @@ static void sub_807DBAC(void)
     }
 }
 
-void sub_807DC00(void)
+void FadeInFromBlack(void)
 {
     palette_bg_faded_fill_black();
     FadeScreen(0, 0);
@@ -138,7 +138,7 @@ void sub_807DCE4(void)
 {
     ScriptContext2_Enable();
     Overworld_PlaySpecialMapMusic();
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(task0A_nop_for_a_while, 10);
 }
 
@@ -155,14 +155,14 @@ void FieldCallback_ReturnToEventScript2(void)
 {
     ScriptContext2_Enable();
     Overworld_PlaySpecialMapMusic();
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10);
 }
 
 void sub_807DD44(void)
 {
     ScriptContext2_Enable();
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10);
 }
 
@@ -280,7 +280,7 @@ static void sub_807DF4C(bool8 a0)
     if (!a0)
         pal_fill_for_maplights();
     else
-        sub_807DC00();
+        FadeInFromBlack();
 }
 
 void sub_807DF64(void)
@@ -485,7 +485,7 @@ static void Task_WaitFadeAndCreateStartMenuTask(u8 taskId)
 
 void FadeTransition_FadeInOnReturnToStartMenu(void)
 {
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(Task_WaitFadeAndCreateStartMenuTask, 80);
     ScriptContext2_Enable();
 }
@@ -510,7 +510,7 @@ void sub_807E3EC(void)
 {
     ScriptContext2_Enable();
     Overworld_PlaySpecialMapMusic();
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(task_mpl_807E3C8, 10);
 }
 
@@ -580,25 +580,25 @@ void sub_807E524(void)
 void DoFallWarp(void)
 {
     DoDiveWarp();
-    gFieldCallback = sub_8084454;
+    gFieldCallback = FieldCB_FallWarpExit;
 }
 
 void sub_807E560(u8 a0)
 {
     ScriptContext2_Enable();
-    sub_8084784(a0, 10);
+    StartEscalatorWarp(a0, 10);
 }
 
 void sub_807E57C(void)
 {
     ScriptContext2_Enable();
-    sub_8084F2C(10);
+    StartLavaridgeGymB1FWarp(10);
 }
 
 void sub_807E58C(void)
 {
     ScriptContext2_Enable();
-    sub_80853CC(10);
+    StartLavaridgeGym1FWarp(10);
 }
 
 void sub_807E59C(void)

src/field_screen_effect.c

@@ -430,7 +430,7 @@ static void sub_807F45C(u8 taskId)
         CopyWindowToVram(windowId, 1);
         RemoveWindow(windowId);
         palette_bg_faded_fill_black();
-        sub_807DC00();
+        FadeInFromBlack();
         ++gTasks[taskId].data[0];
         break;
     case 3:

src/item_use.c

@@ -170,7 +170,7 @@ static void sub_80A103C(u8 taskId)
 
 static void sub_80A1084(void)
 {
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(sub_80A109C, 8);
 }
 
@@ -223,7 +223,7 @@ static bool8 sub_80A1194(void)
 {
     FreezeObjectEvents();
     ScriptContext2_Enable();
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(sub_80A11C0, 10);
     gUnknown_2031DE0 = 0;
     return TRUE;
@@ -646,7 +646,7 @@ static void sub_80A1C08(u8 taskId)
 void sub_80A1C44(u8 taskId)
 {
     ResetInitialPlayerAvatarState();
-    sub_8085620();
+    StartEscapeRopeFieldEffect();
     DestroyTask(taskId);
 }
 

src/map_preview_screen.c

@@ -490,7 +490,7 @@ static void sub_80F83D0(u8 taskId)
     case 1:
         if (!IsDma3ManagerBusyWithBgCopy())
         {
-            sub_807DC00();
+            FadeInFromBlack();
             data[0]++;
         }
         break;

src/party_menu.c

@@ -4044,7 +4044,7 @@ static void Task_HandleFieldMoveExitAreaYesNoInput(u8 taskId)
 
 bool8 FieldCallback_PrepareFadeInFromMenu(void)
 {
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(Task_FieldMoveWaitForFade, 8);
     return TRUE;
 }
@@ -6361,7 +6361,7 @@ void ChoosePartyMonByMenuType(u8 menuType)
 
 static bool8 CB2_FadeFromPartyMenu(void)
 {
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(Task_PartyMenuWaitForFade, 10);
     return TRUE;
 }

src/player_pc.c

@@ -347,7 +347,7 @@ static void CB2_ReturnFromDepositMenu(void)
     DrawDialogueFrame(0, TRUE);
     taskId = CreateTask(Task_ReturnToItemStorageSubmenu, 0);
     Task_CreateItemStorageSubmenu(taskId, 1);
-    sub_807DC00();
+    FadeInFromBlack();
 }
 
 static void Task_PlayerPcWithdrawItem(u8 taskId)
@@ -376,7 +376,7 @@ static void CB2_ReturnFromWithdrawMenu(void)
     DrawDialogueFrame(0, TRUE);
     taskId = CreateTask(Task_ReturnToItemStorageSubmenu, 0);
     Task_CreateItemStorageSubmenu(taskId, 0);
-    sub_807DC00();
+    FadeInFromBlack();
 }
 
 static void Task_WithdrawItem_WaitFadeAndGoToItemStorage(u8 taskId)
@@ -590,7 +590,7 @@ static void CB2_ReturnToMailbox(void)
         Task_DrawMailboxPcMenu(taskId);
     else
         DestroyTask(taskId);
-    sub_807DC00();
+    FadeInFromBlack();
 }
 
 static void CB2_SetCbToReturnToMailbox(void)
@@ -705,7 +705,7 @@ static void CB2_ReturnToMailboxPc_UpdateScrollVariables(void)
         Task_DrawMailboxPcMenu(taskId);
     else
         DestroyTask(taskId);
-    sub_807DC00();
+    FadeInFromBlack();
 }
 
 void Mailbox_ReturnToMailListAfterDeposit(void)

src/region_map.c

@@ -4395,5 +4395,5 @@ static void sub_80C527C(u16 mapsec)
     {
         warp1_set_2(sMapsecToSpawn[idx][0], sMapsecToSpawn[idx][1], -1);
     }
-    sub_80842C8();
+    ReturnToFieldFromFlyMapSelect();
 }

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)

src/shop.c

@@ -336,7 +336,7 @@ static void Task_GoToBuyOrSellMenu(u8 taskId)
 
 static void MapPostLoadHook_ReturnToShopMenu(void)
 {
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(Task_ReturnToShopMenu, 8);
 }