Port many field_effect.c names from Emerald

asm/event_object_movement.s

@@ -669,7 +669,7 @@ sub_805E2E8: @ 805E2E8
 	bl GetCurrentMapType
 	lsls r0, 24
 	lsrs r0, 24
-	bl is_light_level_1_2_3_5_or_6
+	bl IsMapTypeOutdoors
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805E37C

asm/field_weather.s

@@ -2723,8 +2723,8 @@ _0807B0AC: .4byte gUnknown_2038684
 _0807B0B0: .4byte gUnknown_20386A4
 	thumb_func_end sub_807B084
 
-	thumb_func_start sub_807B0B4
+	thumb_func_start ResetPreservedPalettesInWeather
-sub_807B0B4: @ 807B0B4
+ResetPreservedPalettesInWeather: @ 807B0B4
 	ldr r1, _0807B0BC @ =gUnknown_20386A4
 	ldr r0, _0807B0C0 @ =gUnknown_83C2CC0
 	str r0, [r1]
@@ -2732,7 +2732,7 @@ sub_807B0B4: @ 807B0B4
 	.align 2, 0
 _0807B0BC: .4byte gUnknown_20386A4
 _0807B0C0: .4byte gUnknown_83C2CC0
-	thumb_func_end sub_807B0B4
+	thumb_func_end ResetPreservedPalettesInWeather
 
 	thumb_func_start sub_807B0C4
 sub_807B0C4: @ 807B0C4

asm/overworld.s

@@ -115,8 +115,8 @@ _08054C8A:
 _08054C9C: .4byte sWhiteOutMoneyLossBadgeFlagIDs
 	thumb_func_end CountBadgesForOverworldWhiteOutLossCalculation
 
-	thumb_func_start sub_8054CA0
+	thumb_func_start Overworld_ResetStateAfterFly
-sub_8054CA0: @ 8054CA0
+Overworld_ResetStateAfterFly: @ 8054CA0
 	push {lr}
 	bl ResetInitialPlayerAvatarState
 	movs r0, 0x83
@@ -152,7 +152,7 @@ _08054CF8: .4byte 0x00000805
 _08054CFC: .4byte 0x00000806
 _08054D00: .4byte 0x00000808
 _08054D04: .4byte 0x0000404d
-	thumb_func_end sub_8054CA0
+	thumb_func_end Overworld_ResetStateAfterFly
 
 	thumb_func_start Overworld_ResetStateAfterTeleport
 Overworld_ResetStateAfterTeleport: @ 8054D08
@@ -1242,12 +1242,12 @@ sub_805550C: @ 805550C
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
-	bl is_light_level_1_2_3_5_or_6
+	bl IsMapTypeOutdoors
 	lsls r0, 24
 	cmp r0, 0
 	beq _08055590
 	adds r0, r5, 0
-	bl is_light_level_1_2_3_5_or_6
+	bl IsMapTypeOutdoors
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1764,7 +1764,7 @@ sub_8055920: @ 8055920
 	bl sub_8054F68
 	ldr r0, _0805599C @ =gMapHeader
 	ldrb r0, [r0, 0x17]
-	bl is_light_level_1_2_3_5_or_6
+	bl IsMapTypeOutdoors
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -1815,7 +1815,7 @@ sub_80559A8: @ 80559A8
 	bl sub_8054F68
 	ldr r0, _080559E0 @ =gMapHeader
 	ldrb r0, [r0, 0x17]
-	bl is_light_level_1_2_3_5_or_6
+	bl IsMapTypeOutdoors
 	bl TrySetMapSaveWarpStatus
 	bl SetSav1WeatherFromCurrMapHeader
 	bl sub_805610C
@@ -2933,8 +2933,8 @@ sub_80561B4: @ 80561B4
 _080561D4: .4byte gUnknown_2031DB4
 	thumb_func_end sub_80561B4
 
-	thumb_func_start is_light_level_1_2_3_5_or_6
+	thumb_func_start IsMapTypeOutdoors
-is_light_level_1_2_3_5_or_6: @ 80561D8
+IsMapTypeOutdoors: @ 80561D8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2956,7 +2956,7 @@ _080561F6:
 _080561F8:
 	pop {r1}
 	bx r1
-	thumb_func_end is_light_level_1_2_3_5_or_6
+	thumb_func_end IsMapTypeOutdoors
 
 	thumb_func_start Overworld_MapTypeAllowsTeleportAndFly
 Overworld_MapTypeAllowsTeleportAndFly: @ 80561FC

asm/pokemon_storage_system.s

@@ -1801,7 +1801,7 @@ mapldr_0808C6D8: @ 808C6D8
 	bl _call_via_r4
 	adds r0, r5, 0
 	bl SetVBlankCallback
-	bl sub_807DC00
+	bl FadeInFromBlack
 	pop {r4,r5}
 	pop {r0}
 	bx r0

data/event_object_movement.s

@@ -7028,7 +7028,7 @@ gUnknown_83A5EBC:: @ 83A5EBC
 	.4byte gUnknown_83A5EA4
 
 gUnknown_83A5EC0:: @ 83A5EC0
-	spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, sub_8085604
+	spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, SpriteCB_PopOutOfAsh
 
 gUnknown_83A5ED8:: @ 83A5ED8
 	obj_pal gUnknown_839C588, 0x100D
@@ -7052,7 +7052,7 @@ gUnknown_83A5F20:: @ 83A5F20
 	.4byte gUnknown_83A5F08
 
 gUnknown_83A5F24:: @ 83A5F24
-	spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, sub_80853B0
+	spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, SpriteCB_LavaridgeGymWarp
 
 gUnknown_83A5F3C:: @ 83A5F3C
 	overworld_frame gUnknown_839CAA8, 2, 4, 0

data/field_effect.s

@@ -59,7 +59,7 @@ sFldEffScrcmdTable:: @ 83CBE30 dataptr
 	.4byte FieldEffectCmd_loadtiles_callnative
 	.4byte FieldEffectCmd_loadfadedpal_callnative
 
-gUnknown_83CBE50:: @ 83CBE50 oamdata
+gNewGameBirchOamAttributes:: @ 83CBE50 oamdata
 	.4byte 0xc0000000, 0x00000000
 
 gOamData_83CBE58:: @ 83CBE58 oamdata
@@ -71,7 +71,7 @@ gOamData_83CBE60:: @ 83CBE60 oamdata
 gUnknown_83CBE68:: @ 83CBE68 sprite_frames
 	obj_frame_tiles gUnknown_83CA770, 0x0800
 
-gUnknown_83CBE70:: @ 83CBE70 sprite_palette
+gNewGameBirchObjectPaletteInfo:: @ 83CBE70 sprite_palette
 	obj_pal gUnknown_83CAF70, 4102
 
 gUnknown_83CBE78:: @ 83CBE78
@@ -82,8 +82,8 @@ gUnknown_83CBE78:: @ 83CBE78
 gUnknown_83CBE80:: @ 83CBE80 dataptr
 	.4byte gUnknown_83CBE78
 
-gUnknown_83CBE84:: @ 83CBE84 spr_template
+gNewGameBirchObjectTemplate:: @ 83CBE84 spr_template
-	spr_template 65535, 4102, gUnknown_83CBE50, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 65535, 4102, gNewGameBirchOamAttributes, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_83CBE9C:: @ 83CBE9C sprite_palette
 	obj_pal gUnknown_83CAFB0, 4103
@@ -168,27 +168,27 @@ gUnknown_83CBF88:: @ 83CBF88 spr_template
 	spr_template 65535, 4103, gOamData_83CBE58, gUnknown_83CBF54, gUnknown_83CBEB4, gDummySpriteAffineAnimTable, SpriteCB_PokeballGlow
 
 gUnknown_83CBFA0:: @ 83CBFA0 spr_template
-	spr_template 65535, 4103, gOamData_83CBEAC, gUnknown_83CBF54, gUnknown_83CBEBC, gDummySpriteAffineAnimTable, sub_808424C
+	spr_template 65535, 4103, gOamData_83CBEAC, gUnknown_83CBF54, gUnknown_83CBEBC, gDummySpriteAffineAnimTable, SpriteCB_PokecenterMonitor
 
 gUnknown_83CBFB8:: @ 83CBFB8 spr_template
-	spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, sub_80842AC
+	spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, SpriteCB_HallOfFameMonitor
 
 	.align 2
-gUnknown_83CBFD0:: @ 83CBFD0 dataptr
+sPokecenterHealTaskCBTable:: @ 83CBFD0 dataptr
 	.4byte PokecenterHealEffect_0
 	.4byte PokecenterHealEffect_1
-	.4byte sub_8083C78
+	.4byte PokecenterHealEffect_2
 	.4byte PokecenterHealEffect_3
 
 	.align 2
-gUnknown_83CBFE0:: @ 83CBFE0 dataptr
+sHallOfFameRecordTaskCBTable:: @ 83CBFE0 dataptr
 	.4byte HallOfFameRecordEffect_0
-	.4byte sub_8083D74
+	.4byte HallOfFameRecordEffect_1
-	.4byte sub_8083DAC
+	.4byte HallOfFameRecordEffect_2
-	.4byte sub_8083DD4
+	.4byte HallOfFameRecordEffect_3
 
 	.align 2
-gUnknown_83CBFF0:: @ 83CBFF0 dataptr
+sPokeballGlowSpriteCBTable:: @ 83CBFF0 dataptr
 	.4byte PokeballGlowEffect_0
 	.4byte PokeballGlowEffect_1
 	.4byte PokeballGlowEffect_2
@@ -196,10 +196,15 @@ gUnknown_83CBFF0:: @ 83CBFF0 dataptr
 	.4byte PokeballGlowEffect_4
 	.4byte PokeballGlowEffect_5
 	.4byte PokeballGlowEffect_6
-	.4byte nullsub_50
+	.4byte PokeballGlowEffect_7
 
 gUnknown_83CC010:: @ 83CC010 data16
-	.2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008
+	.2byte 0, 0
+	.2byte 6, 0
+	.2byte 0, 4
+	.2byte 6, 4
+	.2byte 0, 8
+	.2byte 6, 8
 
 gUnknown_83CC028:: @ 83CC028 data8
 	.byte 0x10, 0x0c, 0x08, 0x00
@@ -211,23 +216,23 @@ gUnknown_83CC030:: @ 83CC030 data8
 	.byte 0x00, 0x00, 0x00, 0x00
 
 	.align 2
-gUnknown_83CC034:: @ 83CC034 dataptr
+sFallWarpEffectCBPtrs:: @ 83CC034 dataptr
-	.4byte sub_80844BC
+	.4byte FallWarpEffect_1
-	.4byte sub_8084564
+	.4byte FallWarpEffect_2
-	.4byte sub_8084580
+	.4byte FallWarpEffect_3
-	.4byte sub_80845F4
+	.4byte FallWarpEffect_4
-	.4byte sub_80846AC
+	.4byte FallWarpEffect_5
-	.4byte sub_80846C8
+	.4byte FallWarpEffect_6
-	.4byte sub_8084708
+	.4byte FallWarpEffect_7
 
 	.align 2
-gUnknown_83CC050:: @ 83CC050 dataptr
+sEscalatorWarpFieldEffectFuncs:: @ 83CC050 dataptr
-	.4byte sub_80847F8
+	.4byte EscalatorWarpEffect_1
-	.4byte sub_8084820
+	.4byte EscalatorWarpEffect_2
-	.4byte sub_8084890
+	.4byte EscalatorWarpEffect_3
-	.4byte sub_80848B4
+	.4byte EscalatorWarpEffect_4
-	.4byte sub_80848C4
+	.4byte EscalatorWarpEffect_5
-	.4byte sub_80848E8
+	.4byte EscalatorWarpEffect_6
 
 	.align 2
 gUnknown_83CC068:: @ 83CC068 dataptr
@@ -240,91 +245,91 @@ gUnknown_83CC068:: @ 83CC068 dataptr
 	.4byte sub_8084C3C
 
 	.align 2
-gUnknown_83CC084:: @ 83CC084 dataptr
+sUseWaterfallFieldEffectFuncs:: @ 83CC084 dataptr
-	.4byte sub_8084D24
+	.4byte waterfall_0_setup
 	.4byte waterfall_1_do_anim_probably
 	.4byte waterfall_2_wait_anim_finish_probably
-	.4byte sub_8084DA4
+	.4byte waterfall_3_move_player_probably
-	.4byte sub_8084DCC
+	.4byte waterfall_4_wait_player_move_probably
 
 	.align 2
-gUnknown_83CC098:: @ 83CC098 dataptr
+sDiveFieldEffectFuncPtrs:: @ 83CC098 dataptr
 	.4byte dive_1_lock
 	.4byte dive_2_unknown
 	.4byte dive_3_unknown
 
 	.align 2
-gUnknown_83CC0A4:: @ 83CC0A4 dataptr
+sLavaridgeGymB1FWarpEffectFuncs:: @ 83CC0A4 dataptr
-	.4byte sub_8084FA0
+	.4byte LavaridgeGymB1FWarpEffect_1
-	.4byte sub_8084FD8
+	.4byte LavaridgeGymB1FWarpEffect_2
-	.4byte sub_808500C
+	.4byte LavaridgeGymB1FWarpEffect_3
-	.4byte sub_8085058
+	.4byte LavaridgeGymB1FWarpEffect_4
-	.4byte sub_808514C
+	.4byte LavaridgeGymB1FWarpEffect_5
-	.4byte sub_8085168
+	.4byte LavaridgeGymB1FWarpEffect_6
 
 	.align 2
-gUnknown_83CC0BC:: @ 83CC0BC dataptr
+sLavaridgeGymB1FWarpExitEffectFuncs:: @ 83CC0BC dataptr
-	.4byte sub_8085244
+	.4byte LavaridgeGymB1FWarpExitEffect_1
-	.4byte sub_8085274
+	.4byte LavaridgeGymB1FWarpExitEffect_2
-	.4byte sub_80852C0
+	.4byte LavaridgeGymB1FWarpExitEffect_3
-	.4byte sub_8085314
+	.4byte LavaridgeGymB1FWarpExitEffect_4
 
 	.align 2
-gUnknown_83CC0CC:: @ 83CC0CC dataptr
+sLavaridgeGym1FWarpEffectFuncs:: @ 83CC0CC dataptr
-	.4byte sub_8085440
+	.4byte LavaridgeGym1FWarpEffect_1
-	.4byte sub_8085470
+	.4byte LavaridgeGym1FWarpEffect_2
-	.4byte sub_80854EC
+	.4byte LavaridgeGym1FWarpEffect_3
-	.4byte sub_8085524
+	.4byte LavaridgeGym1FWarpEffect_4
-	.4byte sub_808554C
+	.4byte LavaridgeGym1FWarpEffect_5
 
 	.align 2
-gUnknown_83CC0E0:: @ 83CC0E0 dataptr
+gEscapeRopeFieldEffectFuncs:: @ 83CC0E0 dataptr
-	.4byte sub_808566C
+	.4byte EscapeRopeFieldEffect_Step0
-	.4byte sub_8085690
+	.4byte EscapeRopeFieldEffect_Step1
 
 gUnknown_83CC0E8:: @ 83CC0E8 data8
 	.byte 0x01, 0x03, 0x04, 0x02, 0x01
 
 	.align 2
-gUnknown_83CC0F0:: @ 83CC0F0 dataptr
+sEscapeRopeExitEffectFuncs:: @ 83CC0F0 dataptr
-	.4byte sub_8085A54
+	.4byte EscapeRopeExitFieldEffect_Step0
-	.4byte sub_8085A80
+	.4byte EscapeRopeExitFieldEffect_Step1
 
 	.align 2
-gUnknown_83CC0F8:: @ 83CC0F8 dataptr
+sTeleportEffectFuncs:: @ 83CC0F8 dataptr
-	.4byte sub_8085BA8
+	.4byte TeleportFieldEffectTask1
-	.4byte sub_8085BD0
+	.4byte TeleportFieldEffectTask2
-	.4byte sub_8085C60
+	.4byte TeleportFieldEffectTask3
-	.4byte sub_8085D34
+	.4byte TeleportFieldEffectTask4
 
 gUnknown_83CC108:: @ 83CC108 data8
 	.byte 0x01, 0x03, 0x04, 0x02, 0x01
 
 	.align 2
-gUnknown_83CC110:: @ 83CC110 dataptr
+sTeleportInEffectFuncs:: @ 83CC110 dataptr
-	.4byte sub_8085E0C
+	.4byte TeleportInFieldEffectTask1
-	.4byte sub_8085E98
+	.4byte TeleportInFieldEffectTask2
-	.4byte sub_8085F9C
+	.4byte TeleportInFieldEffectTask3
 
 	.align 2
-gUnknown_83CC11C:: @ 83CC11C dataptr
+sShowMonOutdoorsEffectFuncs:: @ 83CC11C dataptr
-	.4byte sub_8086110
+	.4byte ShowMonEffect_Outdoors_1
-	.4byte sub_8086180
+	.4byte ShowMonEffect_Outdoors_2
-	.4byte sub_80861FC
+	.4byte ShowMonEffect_Outdoors_3
-	.4byte sub_8086288
+	.4byte ShowMonEffect_Outdoors_4
-	.4byte sub_80862B8
+	.4byte ShowMonEffect_Outdoors_5
-	.4byte sub_808630C
+	.4byte ShowMonEffect_Outdoors_6
-	.4byte sub_8086358
+	.4byte ShowMonEffect_Outdoors_7
 
 	.align 2
-gUnknown_83CC138:: @ 83CC138 dataptr
+sShowMonIndoorsEffectFuncs:: @ 83CC138 dataptr
-	.4byte sub_8086498
+	.4byte ShowMonEffect_Indoors_1
-	.4byte sub_80864D4
+	.4byte ShowMonEffect_Indoors_2
-	.4byte sub_8086554
+	.4byte ShowMonEffect_Indoors_3
-	.4byte sub_80865C0
+	.4byte ShowMonEffect_Indoors_4
-	.4byte sub_80865F0
+	.4byte ShowMonEffect_Indoors_5
-	.4byte sub_8086630
+	.4byte ShowMonEffect_Indoors_6
-	.4byte sub_8086650
+	.4byte ShowMonEffect_Indoors_7
 
 	.align 2
 gUnknown_83CC154:: @ 83CC154 dataptr

data/field_effect_scripts.s

@@ -174,7 +174,7 @@ gFldEffScript_DeepSandFootprints:: @ 81D988B
 
 gFldEffScript_PokecenterHeal:: @ 81D9895
 	loadfadedpal gUnknown_83CBE9C
-	loadfadedpal_callnative gUnknown_83A5340, sub_8083B8C
+	loadfadedpal_callnative gUnknown_83A5340, FldEff_PokecenterHeal
 	end 
 
 gFldEffScript_UseSecretPowerTree:: @ 81D98A4
@@ -244,7 +244,7 @@ gFldEffScript_HotSpringsWater:: @ 81D990A
 	end 
 
 gFldEffScript_UseWaterfall:: @ 81D9914
-	callnative oei_waterfall
+	callnative FldEff_UseWaterfall
 	end 
 
 gFldEffScript_UseDive:: @ 81D991A
@@ -314,7 +314,7 @@ gFldEffScript_PcturnOn:: @ 81D9976
 
 gFldEffScript_HallOfFameRecord:: @ 81D9977
 	loadfadedpal gUnknown_83CBE9C
-	loadfadedpal_callnative gUnknown_83CBEA4, sub_8083CE0
+	loadfadedpal_callnative gUnknown_83CBEA4, FldEff_HallOfFameRecord
 	end 
 
 gFldEffScript_UseTeleport:: @ 81D9986

include/field_effect.h

@@ -13,16 +13,16 @@ bool8 FieldEffectActiveListContains(u8 id);
 void sub_80B69DC(void);
 void CreateTeleportFieldEffectTask(void);
 void FieldEffectActiveListRemove(u8 id);
-void sub_8085620(void);
+void StartEscapeRopeFieldEffect(void);
 void FieldEffectStop(struct Sprite *sprite, u8 id);
 u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
-void sub_8084454(void);
+void FieldCB_FallWarpExit(void);
-void sub_8084784(u8 a0, u8 a1);
+void StartEscalatorWarp(u8 a0, u8 a1);
-void sub_8084F2C(u8 a0);
+void StartLavaridgeGymB1FWarp(u8 a0);
-void sub_80853CC(u8 a0);
+void StartLavaridgeGym1FWarp(u8 a0);
 void sub_8083598(u8 a0);
-void sub_8083A5C(struct Sprite * sprite, u8 spriteId);
+void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId);
-u8 sub_8083970(u16 species, s16 x, s16 y, bool8 unused);
+u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused);
-void sub_80842C8(void);
+void ReturnToFieldFromFlyMapSelect(void);
 
 #endif //GUARD_FIELD_EFFECTS_H

include/field_fadetransition.h

@@ -14,7 +14,7 @@ void sub_807E500(void);
 void sub_807DF64(void);
 void sub_807DC18(void);
 void FieldCallback_ReturnToEventScript2(void);
-void sub_807DC00(void);
+void FadeInFromBlack(void);
 void FadeTransition_FadeInOnReturnToStartMenu(void);
 
 void sub_807DCE4(void);

include/field_screen_effect.h

@@ -9,7 +9,7 @@ void sub_80B0244(void);
 void sub_807E3EC(void);
 void DoOutwardBarnDoorWipe(void);
 void Task_BarnDoorWipe(u8 taskId);
-void sub_807DC00(void);
+void FadeInFromBlack(void);
 void sub_807F5F0(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H

include/overworld.h

@@ -87,7 +87,7 @@ void player_avatar_init_params_reset(void);
 
 void Overworld_SetFlashLevel(s32 a1);
 u8 Overworld_GetFlashLevel(void);
-void sub_8085524(u16);
+void LavaridgeGym1FWarpEffect_4(u16);
 
 void Overworld_SetSavedMusic(u16);
 void Overworld_ChangeMusicToDefault(void);

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);
 }