Merge pull request #279 from PikalaxALT/field_effect

Field effect

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
@@ -12893,12 +12893,12 @@ sub_8063AD4: @ 8063AD4
 	subs r1, r0
 	lsls r1, 4
 	strh r1, [r3]
-	ldr r1, _08063B14 @ =gUnknown_300506C
+	ldr r1, _08063B14 @ =gTotalCameraPixelOffsetX
 	ldrh r0, [r2]
 	ldrh r1, [r1]
 	subs r0, r1
 	strh r0, [r2]
-	ldr r1, _08063B18 @ =gUnknown_3005068
+	ldr r1, _08063B18 @ =gTotalCameraPixelOffsetY
 	ldrh r0, [r3]
 	ldrh r1, [r1]
 	subs r0, r1
@@ -12908,8 +12908,8 @@ sub_8063AD4: @ 8063AD4
 	bx r0
 	.align 2, 0
 _08063B10: .4byte gSaveBlock1Ptr
-_08063B14: .4byte gUnknown_300506C
-_08063B18: .4byte gUnknown_3005068
+_08063B14: .4byte gTotalCameraPixelOffsetX
+_08063B18: .4byte gTotalCameraPixelOffsetY
 	thumb_func_end sub_8063AD4
 
 	thumb_func_start sub_8063B1C
@@ -12921,7 +12921,7 @@ sub_8063B1C: @ 8063B1C
 	lsrs r5, r0, 16
 	lsls r1, 16
 	lsrs r6, r1, 16
-	ldr r0, _08063BB0 @ =gUnknown_300506C
+	ldr r0, _08063BB0 @ =gTotalCameraPixelOffsetX
 	ldrh r0, [r0]
 	negs r0, r0
 	ldr r1, _08063BB4 @ =gUnknown_3005050
@@ -12929,7 +12929,7 @@ sub_8063B1C: @ 8063B1C
 	subs r0, r2
 	lsls r0, 16
 	lsrs r3, r0, 16
-	ldr r0, _08063BB8 @ =gUnknown_3005068
+	ldr r0, _08063BB8 @ =gTotalCameraPixelOffsetY
 	ldrh r0, [r0]
 	negs r0, r0
 	ldr r1, [r1, 0x14]
@@ -12992,9 +12992,9 @@ _08063B7C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08063BB0: .4byte gUnknown_300506C
+_08063BB0: .4byte gTotalCameraPixelOffsetX
 _08063BB4: .4byte gUnknown_3005050
-_08063BB8: .4byte gUnknown_3005068
+_08063BB8: .4byte gTotalCameraPixelOffsetY
 _08063BBC: .4byte 0xfff00000
 _08063BC0: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_8063B1C

asm/field_camera.s

@@ -956,11 +956,11 @@ _0805AC7E:
 	adds r1, r7, 0
 	mov r2, r8
 	bl coords8_add
-	ldr r1, _0805ACAC @ =gUnknown_300506C
+	ldr r1, _0805ACAC @ =gTotalCameraPixelOffsetX
 	ldrh r0, [r1]
 	subs r0, r7
 	strh r0, [r1]
-	ldr r1, _0805ACB0 @ =gUnknown_3005068
+	ldr r1, _0805ACB0 @ =gTotalCameraPixelOffsetY
 	ldrh r0, [r1]
 	mov r2, r8
 	subs r0, r2
@@ -973,8 +973,8 @@ _0805AC7E:
 	.align 2, 0
 _0805ACA4: .4byte gUnknown_3005050
 _0805ACA8: .4byte gUnknown_3000E90
-_0805ACAC: .4byte gUnknown_300506C
-_0805ACB0: .4byte gUnknown_3005068
+_0805ACAC: .4byte gTotalCameraPixelOffsetX
+_0805ACB0: .4byte gTotalCameraPixelOffsetY
 	thumb_func_end CameraUpdate
 
 	thumb_func_start sub_805ACB4
@@ -989,12 +989,12 @@ sub_805ACB4: @ 805ACB4
 	asrs r1, 16
 	bl UpdateObjectEventsForCameraUpdate
 	bl DrawWholeMapView
-	ldr r1, _0805ACE8 @ =gUnknown_300506C
+	ldr r1, _0805ACE8 @ =gTotalCameraPixelOffsetX
 	lsls r4, 4
 	ldrh r0, [r1]
 	subs r0, r4
 	strh r0, [r1]
-	ldr r1, _0805ACEC @ =gUnknown_3005068
+	ldr r1, _0805ACEC @ =gTotalCameraPixelOffsetY
 	lsls r5, 4
 	ldrh r0, [r1]
 	subs r0, r5
@@ -1003,8 +1003,8 @@ sub_805ACB4: @ 805ACB4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805ACE8: .4byte gUnknown_300506C
-_0805ACEC: .4byte gUnknown_3005068
+_0805ACE8: .4byte gTotalCameraPixelOffsetX
+_0805ACEC: .4byte gTotalCameraPixelOffsetY
 	thumb_func_end sub_805ACB4
 
 	thumb_func_start sub_805ACF0
@@ -1184,14 +1184,14 @@ UpdateCameraPanning: @ 805AE28
 	bl _call_via_r0
 _0805AE36:
 	ldr r2, _0805AE5C @ =gSpriteCoordOffsetX
-	ldr r0, _0805AE60 @ =gUnknown_300506C
+	ldr r0, _0805AE60 @ =gTotalCameraPixelOffsetX
 	ldr r1, _0805AE64 @ =gUnknown_3000E98
 	ldrh r0, [r0]
 	ldrh r1, [r1]
 	subs r0, r1
 	strh r0, [r2]
 	ldr r2, _0805AE68 @ =gSpriteCoordOffsetY
-	ldr r0, _0805AE6C @ =gUnknown_3005068
+	ldr r0, _0805AE6C @ =gTotalCameraPixelOffsetY
 	ldr r1, _0805AE70 @ =gUnknown_3000E9A
 	ldrh r0, [r0]
 	ldrh r1, [r1]
@@ -1203,10 +1203,10 @@ _0805AE36:
 	.align 2, 0
 _0805AE58: .4byte gUnknown_3000EA0
 _0805AE5C: .4byte gSpriteCoordOffsetX
-_0805AE60: .4byte gUnknown_300506C
+_0805AE60: .4byte gTotalCameraPixelOffsetX
 _0805AE64: .4byte gUnknown_3000E98
 _0805AE68: .4byte gSpriteCoordOffsetY
-_0805AE6C: .4byte gUnknown_3005068
+_0805AE6C: .4byte gTotalCameraPixelOffsetY
 _0805AE70: .4byte gUnknown_3000E9A
 	thumb_func_end UpdateCameraPanning
 

asm/field_effect_helpers.s

@@ -1369,8 +1369,8 @@ _080DB800: .4byte gFieldEffectObjectTemplatePointers
 _080DB804: .4byte gSprites
 	thumb_func_end FldEff_JumpLongGrass
 
-	thumb_func_start sub_80DB808
-sub_80DB808: @ 80DB808
+	thumb_func_start FldEff_ShortGrass
+FldEff_ShortGrass: @ 80DB808
 	push {r4-r6,lr}
 	ldr r6, _080DB89C @ =gFieldEffectArguments
 	ldrb r0, [r6]
@@ -1449,7 +1449,7 @@ _080DB89C: .4byte gFieldEffectArguments
 _080DB8A0: .4byte gObjectEvents
 _080DB8A4: .4byte gFieldEffectObjectTemplatePointers
 _080DB8A8: .4byte gSprites
-	thumb_func_end sub_80DB808
+	thumb_func_end FldEff_ShortGrass
 
 	thumb_func_start sub_80DB8AC
 sub_80DB8AC: @ 80DB8AC
@@ -2310,8 +2310,8 @@ _080DBF48: .4byte gFieldEffectArguments
 _080DBF4C: .4byte gSprites
 	thumb_func_end oei_ripples
 
-	thumb_func_start sub_80DBF50
-sub_80DBF50: @ 80DBF50
+	thumb_func_start FldEff_HotSpringsWater
+FldEff_HotSpringsWater: @ 80DBF50
 	push {r4-r6,lr}
 	ldr r6, _080DBFE4 @ =gFieldEffectArguments
 	ldrb r0, [r6]
@@ -2390,7 +2390,7 @@ _080DBFE4: .4byte gFieldEffectArguments
 _080DBFE8: .4byte gObjectEvents
 _080DBFEC: .4byte gFieldEffectObjectTemplatePointers
 _080DBFF0: .4byte gSprites
-	thumb_func_end sub_80DBF50
+	thumb_func_end FldEff_HotSpringsWater
 
 	thumb_func_start sub_80DBFF4
 sub_80DBFF4: @ 80DBFF4
@@ -2720,8 +2720,8 @@ StartAshFieldEffect: @ 80DC23C
 _080DC26C: .4byte gFieldEffectArguments
 	thumb_func_end StartAshFieldEffect
 
-	thumb_func_start oei_ash
-oei_ash: @ 80DC270
+	thumb_func_start FldEff_Ash
+FldEff_Ash: @ 80DC270
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, _080DC2F0 @ =gFieldEffectArguments
@@ -2789,7 +2789,7 @@ _080DC2E6:
 _080DC2F0: .4byte gFieldEffectArguments
 _080DC2F4: .4byte gFieldEffectObjectTemplatePointers
 _080DC2F8: .4byte gSprites
-	thumb_func_end oei_ash
+	thumb_func_end FldEff_Ash
 
 	thumb_func_start sub_80DC2FC
 sub_80DC2FC: @ 80DC2FC
@@ -2906,8 +2906,8 @@ _080DC3C8:
 	bx r0
 	thumb_func_end sub_80DC3A8
 
-	thumb_func_start sub_80DC3D0
-sub_80DC3D0: @ 80DC3D0
+	thumb_func_start FldEff_SurfBlob
+FldEff_SurfBlob: @ 80DC3D0
 	push {r4,r5,lr}
 	ldr r4, _080DC43C @ =gFieldEffectArguments
 	adds r1, r4, 0x4
@@ -2964,7 +2964,7 @@ _080DC43C: .4byte gFieldEffectArguments
 _080DC440: .4byte gFieldEffectObjectTemplatePointers
 _080DC444: .4byte gSprites
 _080DC448: .4byte 0x0000ffff
-	thumb_func_end sub_80DC3D0
+	thumb_func_end FldEff_SurfBlob
 
 	thumb_func_start sub_80DC44C
 sub_80DC44C: @ 80DC44C
@@ -3723,11 +3723,11 @@ _080DC9D0:
 _080DC9D8: .4byte 0x00001004
 	thumb_func_end sub_80DC99C
 
-	thumb_func_start sub_80DC9DC
-sub_80DC9DC: @ 80DC9DC
+	thumb_func_start FldEff_BerryTreeGrowthSparkle
+FldEff_BerryTreeGrowthSparkle: @ 80DC9DC
 	movs r0, 0
 	bx lr
-	thumb_func_end sub_80DC9DC
+	thumb_func_end FldEff_BerryTreeGrowthSparkle
 
 	thumb_func_start ShowTreeDisguiseFieldEffect
 ShowTreeDisguiseFieldEffect: @ 80DC9E0

asm/field_player_avatar.s

@@ -5337,7 +5337,7 @@ _0805DBBA:
 	strh r0, [r7, 0x22]
 	movs r2, 0x22
 	ldrsh r1, [r7, r2]
-	ldr r0, _0805DBF0 @ =gUnknown_3005068
+	ldr r0, _0805DBF0 @ =gTotalCameraPixelOffsetY
 	movs r2, 0
 	ldrsh r0, [r0, r2]
 	adds r1, r0
@@ -5350,7 +5350,7 @@ _0805DBBA:
 	strh r0, [r5]
 	b _0805DBFA
 	.align 2, 0
-_0805DBF0: .4byte gUnknown_3005068
+_0805DBF0: .4byte gTotalCameraPixelOffsetY
 _0805DBF4:
 	adds r0, r2, 0
 	bl DestroyTask

asm/field_weather.s

@@ -2698,8 +2698,8 @@ _0807B07C: .4byte gUnknown_2037F34
 _0807B080: .4byte 0x000006c6
 	thumb_func_end sub_807B070
 
-	thumb_func_start sub_807B084
-sub_807B084: @ 807B084
+	thumb_func_start PreservePaletteInWeather
+PreservePaletteInWeather: @ 807B084
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -2721,10 +2721,10 @@ sub_807B084: @ 807B084
 _0807B0A8: .4byte gUnknown_83C2CC0
 _0807B0AC: .4byte gUnknown_2038684
 _0807B0B0: .4byte gUnknown_20386A4
-	thumb_func_end sub_807B084
+	thumb_func_end PreservePaletteInWeather
 
-	thumb_func_start sub_807B0B4
-sub_807B0B4: @ 807B0B4
+	thumb_func_start ResetPreservedPalettesInWeather
+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
-sub_8054CA0: @ 8054CA0
+	thumb_func_start Overworld_ResetStateAfterFly
+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
@@ -2611,8 +2611,8 @@ _08055F82:
 	bx r1
 	thumb_func_end GetMapMusicFadeoutSpeed
 
-	thumb_func_start sub_8055F88
-sub_8055F88: @ 8055F88
+	thumb_func_start TryFadeOutOldMapMusic
+TryFadeOutOldMapMusic: @ 8055F88
 	push {r4,lr}
 	bl sub_8055DA4
 	lsls r0, 16
@@ -2638,7 +2638,7 @@ _08055FB8:
 	bx r0
 	.align 2, 0
 _08055FC0: .4byte 0x00004001
-	thumb_func_end sub_8055F88
+	thumb_func_end TryFadeOutOldMapMusic
 
 	thumb_func_start BGMusicStopped
 BGMusicStopped: @ 8055FC4
@@ -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
-is_light_level_1_2_3_5_or_6: @ 80561D8
+	thumb_func_start IsMapTypeOutdoors
+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
@@ -4659,10 +4659,10 @@ _0805706A:
 	thumb_func_start sub_8057074
 sub_8057074: @ 8057074
 	push {lr}
-	ldr r0, _08057094 @ =gUnknown_300506C
+	ldr r0, _08057094 @ =gTotalCameraPixelOffsetX
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, _08057098 @ =gUnknown_3005068
+	ldr r0, _08057098 @ =gTotalCameraPixelOffsetY
 	strh r1, [r0]
 	bl sub_805DE74
 	movs r0, 0
@@ -4672,18 +4672,18 @@ sub_8057074: @ 8057074
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08057094: .4byte gUnknown_300506C
-_08057098: .4byte gUnknown_3005068
+_08057094: .4byte gTotalCameraPixelOffsetX
+_08057098: .4byte gTotalCameraPixelOffsetY
 	thumb_func_end sub_8057074
 
 	thumb_func_start mli4_mapscripts_and_other
 mli4_mapscripts_and_other: @ 805709C
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r0, _080570F4 @ =gUnknown_300506C
+	ldr r0, _080570F4 @ =gTotalCameraPixelOffsetX
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, _080570F8 @ =gUnknown_3005068
+	ldr r0, _080570F8 @ =gTotalCameraPixelOffsetY
 	strh r1, [r0]
 	bl sub_805DE74
 	mov r4, sp
@@ -4715,8 +4715,8 @@ mli4_mapscripts_and_other: @ 805709C
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080570F4: .4byte gUnknown_300506C
-_080570F8: .4byte gUnknown_3005068
+_080570F4: .4byte gTotalCameraPixelOffsetX
+_080570F8: .4byte gTotalCameraPixelOffsetY
 _080570FC: .4byte gSaveBlock2Ptr
 	thumb_func_end mli4_mapscripts_and_other
 

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

@@ -1,432 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83CA770:: @ 3CA770 4bpp
-	.incbin "graphics/field_effects/unk_83CA770.4bpp"
-
-gUnknown_83CAF70:: @ 83CAF70 gbapal
-	.incbin "graphics/field_effects/unk_83CAF70.gbapal"
-
-gUnknown_83CAF90:: @ 83CAF90 4bpp
-	.incbin "graphics/field_effects/unk_83CAF90.4bpp"
-
-gUnknown_83CAFB0:: @ 83CAFB0 gbapal
-	.incbin "graphics/field_effects/unk_83CAFB0.gbapal"
-
-gUnknown_83CAFD0:: @ 83CAFD0 4bpp
-	.incbin "graphics/field_effects/unk_83CAFD0.4bpp"
-
-gUnknown_83CB3D0:: @ 83CB3D0 gbapal
-	.incbin "graphics/field_effects/unk_83CB3D0.gbapal"
-
-gUnknown_83CB3F0:: @ 83CB3F0 4bpp
-	.incbin "graphics/field_effects/unk_83CB3F0.4bpp"
-
-gUnknown_83CB5F0:: @ 83CB5F0 4bpp
-	.incbin "graphics/field_effects/unk_83CB5F0.4bpp"
-
-gUnknown_83CB7F0:: @ 83CB7F0 gbapal gUnknown_83CB5F0
-	.incbin "graphics/field_effects/unk_83CB7F0.gbapal"
-
-gUnknown_83CB810:: @ 83CB810 4bpp
-	.incbin "graphics/field_effects/unk_83CB810.bin"
-
-gUnknown_83CBA90:: @ 83CBA90 4bpp
-	.incbin "graphics/field_effects/unk_83CBA90.4bpp"
-
-gUnknown_83CBB10:: @ 83CBB10 gbapal gUnknown_83CBA90
-	.incbin "graphics/field_effects/unk_83CBB10.gbapal"
-
-gUnknown_83CBB30:: @ 83CBB30 4bpp
-	.incbin "graphics/field_effects/unk_83CBB30.bin"
-
-gUnknown_83CBDB0::
-	.incbin "graphics/field_effects/unk_83CBDB0.4bpp"
-
-	.align 2
-gUnknown_83CBE30:: @ 83CBE30 dataptr
-	.4byte FieldEffectCmd_loadtiles
-	.4byte FieldEffectCmd_loadfadedpal
-	.4byte FieldEffectCmd_loadpal
-	.4byte FieldEffectCmd_callnative
-	.4byte sub_80834DC
-	.4byte FieldEffectCmd_loadgfx_callnative
-	.4byte FieldEffectCmd_loadtiles_callnative
-	.4byte FieldEffectCmd_loadfadedpal_callnative
-
-gUnknown_83CBE50:: @ 83CBE50 oamdata
-	.4byte 0xc0000000, 0x00000000
-
-gOamData_83CBE58:: @ 83CBE58 oamdata
-	.4byte 0x00000000, 0x00000000
-
-gOamData_83CBE60:: @ 83CBE60 oamdata
-	.4byte 0x40000000, 0x00000000
-
-gUnknown_83CBE68:: @ 83CBE68 sprite_frames
-	obj_frame_tiles gUnknown_83CA770, 0x0800
-
-gUnknown_83CBE70:: @ 83CBE70 sprite_palette
-	obj_pal gUnknown_83CAF70, 4102
-
-gUnknown_83CBE78:: @ 83CBE78
-	obj_image_anim_frame 0x0000, 1
-	obj_image_anim_end
-
-	.align 2
-gUnknown_83CBE80:: @ 83CBE80 dataptr
-	.4byte gUnknown_83CBE78
-
-gUnknown_83CBE84:: @ 83CBE84 spr_template
-	spr_template 65535, 4102, gUnknown_83CBE50, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_83CBE9C:: @ 83CBE9C sprite_palette
-	obj_pal gUnknown_83CAFB0, 4103
-
-gUnknown_83CBEA4:: @ 83CBEA4 sprite_palette
-	obj_pal gUnknown_83CB3D0, 4112
-
-gOamData_83CBEAC:: @ 83CBEAC oam_data
-	.4byte 0x80004000, 0x00000000
-
-gUnknown_83CBEB4:: @ 83CBEB4 sprite_frames
-	obj_frame_tiles gUnknown_83CAF90, 0x0020
-
-gUnknown_83CBEBC:: @ 83CBEBC sprite_frames
-	obj_frame_tiles gUnknown_83CAFD0 + 0x000, 0x0100
-	obj_frame_tiles gUnknown_83CAFD0 + 0x100, 0x0100
-	obj_frame_tiles gUnknown_83CAFD0 + 0x200, 0x0100
-	obj_frame_tiles gUnknown_83CAFD0 + 0x300, 0x0100
-
-gUnknown_83CBEDC:: @ 83CBEDC sprite_frames
-	obj_frame_tiles gUnknown_83CB3F0 + 0x000, 0x0080
-	obj_frame_tiles gUnknown_83CB3F0 + 0x080, 0x0080
-	obj_frame_tiles gUnknown_83CB3F0 + 0x100, 0x0080
-	obj_frame_tiles gUnknown_83CB3F0 + 0x180, 0x0080
-
-gUnknown_83CBEFC:: @ 83CBEFC unknown
-	.byte 0xf4, 0xf8, 0x01, 0x80
-	.byte 0x04, 0xf8, 0x20, 0x80
-	.byte 0xf4, 0x00, 0x31, 0x80
-	.byte 0x04, 0x00, 0x50, 0x80
-	.byte 0x04, 0x00, 0x00, 0x00
-
-gUnknown_83CBF10:: @ 83CBF10 dataptr
-	.4byte gUnknown_83CBEFC
-
-gUnknown_83CBF14:: @ 83CBF14 unknown
-	.byte 0xe0, 0xf8, 0x05, 0x80
-	.byte 0x00, 0xf8, 0x45, 0x80
-	.byte 0xe0, 0x00, 0x85, 0x80
-	.byte 0x00, 0x00, 0xc5, 0x80
-	.byte 0x04, 0x00, 0x00, 0x00
-
-gUnknown_83CBF28:: @ 83CBE28 dataptr
-	.4byte gUnknown_83CBF14
-
-gUnknown_83CBF2C:: @ 83CBF2C animcmd
-	obj_image_anim_frame 0x0000, 1
-	obj_image_anim_jump 0
-
-gUnknown_83CBF34:: @ 83CBF34 animcmd
-	obj_image_anim_frame 0x0001, 5
-	obj_image_anim_frame 0x0002, 5
-	obj_image_anim_frame 0x0003, 7
-	obj_image_anim_frame 0x0002, 5
-	obj_image_anim_frame 0x0001, 5
-	obj_image_anim_frame 0x0000, 5
-	obj_image_anim_loop 3
-	obj_image_anim_end
-
-	.align 2
-gUnknown_83CBF54:: @ 83CBF54 dataptr
-	.4byte gUnknown_83CBF2C
-	.4byte gUnknown_83CBF34
-
-gUnknown_83CBF5C:: @ 83CBF5C animcmd
-	obj_image_anim_frame 0x0003, 8
-	obj_image_anim_frame 0x0002, 8
-	obj_image_anim_frame 0x0001, 8
-	obj_image_anim_frame 0x0000, 8
-	obj_image_anim_frame 0x0001, 8
-	obj_image_anim_frame 0x0002, 8
-	obj_image_anim_loop 2
-	obj_image_anim_frame 0x0001, 8
-	obj_image_anim_frame 0x0000, 8
-	obj_image_anim_end
-
-	.align 2
-gUnknown_83CBF84:: @ 83CBF84 dataptr
-	.4byte gUnknown_83CBF5C
-
-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
-
-gUnknown_83CBFB8:: @ 83CBFB8 spr_template
-	spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, sub_80842AC
-
-	.align 2
-gUnknown_83CBFD0:: @ 83CBFD0 dataptr
-	.4byte PokecenterHealEffect_0
-	.4byte PokecenterHealEffect_1
-	.4byte sub_8083C78
-	.4byte PokecenterHealEffect_3
-
-	.align 2
-gUnknown_83CBFE0:: @ 83CBFE0 dataptr
-	.4byte HallOfFameRecordEffect_0
-	.4byte sub_8083D74
-	.4byte sub_8083DAC
-	.4byte sub_8083DD4
-
-	.align 2
-gUnknown_83CBFF0:: @ 83CBFF0 dataptr
-	.4byte PokeballGlowEffect_0
-	.4byte PokeballGlowEffect_1
-	.4byte PokeballGlowEffect_2
-	.4byte PokeballGlowEffect_3
-	.4byte PokeballGlowEffect_4
-	.4byte PokeballGlowEffect_5
-	.4byte PokeballGlowEffect_6
-	.4byte nullsub_50
-
-gUnknown_83CC010:: @ 83CC010 data16
-	.2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008
-
-gUnknown_83CC028:: @ 83CC028 data8
-	.byte 0x10, 0x0c, 0x08, 0x00
-
-gUnknown_83CC02C:: @ 83CC02C data8
-	.byte 0x10, 0x0c, 0x08, 0x00
-
-gUnknown_83CC030:: @ 83CC030 data8
-	.byte 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_83CC034:: @ 83CC034 dataptr
-	.4byte sub_80844BC
-	.4byte sub_8084564
-	.4byte sub_8084580
-	.4byte sub_80845F4
-	.4byte sub_80846AC
-	.4byte sub_80846C8
-	.4byte sub_8084708
-
-	.align 2
-gUnknown_83CC050:: @ 83CC050 dataptr
-	.4byte sub_80847F8
-	.4byte sub_8084820
-	.4byte sub_8084890
-	.4byte sub_80848B4
-	.4byte sub_80848C4
-	.4byte sub_80848E8
-
-	.align 2
-gUnknown_83CC068:: @ 83CC068 dataptr
-	.4byte sub_8084A5C
-	.4byte sub_8084AD8
-	.4byte sub_8084B18
-	.4byte sub_8084B78
-	.4byte sub_8084BB8
-	.4byte sub_8084C18
-	.4byte sub_8084C3C
-
-	.align 2
-gUnknown_83CC084:: @ 83CC084 dataptr
-	.4byte sub_8084D24
-	.4byte waterfall_1_do_anim_probably
-	.4byte waterfall_2_wait_anim_finish_probably
-	.4byte sub_8084DA4
-	.4byte sub_8084DCC
-
-	.align 2
-gUnknown_83CC098:: @ 83CC098 dataptr
-	.4byte dive_1_lock
-	.4byte dive_2_unknown
-	.4byte dive_3_unknown
-
-	.align 2
-gUnknown_83CC0A4:: @ 83CC0A4 dataptr
-	.4byte sub_8084FA0
-	.4byte sub_8084FD8
-	.4byte sub_808500C
-	.4byte sub_8085058
-	.4byte sub_808514C
-	.4byte sub_8085168
-
-	.align 2
-gUnknown_83CC0BC:: @ 83CC0BC dataptr
-	.4byte sub_8085244
-	.4byte sub_8085274
-	.4byte sub_80852C0
-	.4byte sub_8085314
-
-	.align 2
-gUnknown_83CC0CC:: @ 83CC0CC dataptr
-	.4byte sub_8085440
-	.4byte sub_8085470
-	.4byte sub_80854EC
-	.4byte sub_8085524
-	.4byte sub_808554C
-
-	.align 2
-gUnknown_83CC0E0:: @ 83CC0E0 dataptr
-	.4byte sub_808566C
-	.4byte sub_8085690
-
-gUnknown_83CC0E8:: @ 83CC0E8 data8
-	.byte 0x01, 0x03, 0x04, 0x02, 0x01
-
-	.align 2
-gUnknown_83CC0F0:: @ 83CC0F0 dataptr
-	.4byte sub_8085A54
-	.4byte sub_8085A80
-
-	.align 2
-gUnknown_83CC0F8:: @ 83CC0F8 dataptr
-	.4byte sub_8085BA8
-	.4byte sub_8085BD0
-	.4byte sub_8085C60
-	.4byte sub_8085D34
-
-gUnknown_83CC108:: @ 83CC108 data8
-	.byte 0x01, 0x03, 0x04, 0x02, 0x01
-
-	.align 2
-gUnknown_83CC110:: @ 83CC110 dataptr
-	.4byte sub_8085E0C
-	.4byte sub_8085E98
-	.4byte sub_8085F9C
-
-	.align 2
-gUnknown_83CC11C:: @ 83CC11C dataptr
-	.4byte sub_8086110
-	.4byte sub_8086180
-	.4byte sub_80861FC
-	.4byte sub_8086288
-	.4byte sub_80862B8
-	.4byte sub_808630C
-	.4byte sub_8086358
-
-	.align 2
-gUnknown_83CC138:: @ 83CC138 dataptr
-	.4byte sub_8086498
-	.4byte sub_80864D4
-	.4byte sub_8086554
-	.4byte sub_80865C0
-	.4byte sub_80865F0
-	.4byte sub_8086630
-	.4byte sub_8086650
-
-	.align 2
-gUnknown_83CC154:: @ 83CC154 dataptr
-	.4byte sub_80869C0
-	.4byte sub_8086A20
-	.4byte sub_8086A6C
-	.4byte sub_8086AB4
-	.4byte sub_8086B30
-
-	.align 2
-gUnknown_83CC168:: @ 83CC168 dataptr
-	.4byte sub_8086C00
-	.4byte sub_8086C24
-	.4byte sub_8086C70
-	.4byte sub_8086CF4
-
-gUnknown_83CC178:: @ 83CC178 dataptr (incomplete)
-	.4byte sub_8086E70
-	.4byte sub_8086EC8
-	.4byte sub_8086F0C
-	.4byte sub_8086F64
-	.4byte sub_8086FA8
-	.4byte sub_8086FFC
-	.4byte sub_808706C
-	.4byte sub_8087118
-	.4byte sub_8087138
-
-gUnknown_83CC19C:: @ 83CC19C affineanimcmd
-	obj_rot_scal_anim_frame 8, 8, 226, 0
-	obj_rot_scal_anim_frame 28, 28, 0, 30
-	obj_rot_scal_anim_end
-
-gUnknown_83CC1B4:: @ 83CC1B4 affineanimcmd
-	obj_rot_scal_anim_frame 256, 256, 64, 0
-	obj_rot_scal_anim_frame -10, -10, 0, 22
-	obj_rot_scal_anim_end
-
-	.align 2
-gUnknown_83CC1CC:: @ 83CC1CC dataptr
-	.4byte gUnknown_83CC19C
-	.4byte gUnknown_83CC1B4
-
-	.align 2
-gUnknown_83CC1D4:: @ 83CC1D4 dataptr
-	.4byte sub_80874C8
-	.4byte sub_80875C8
-	.4byte sub_8087644
-	.4byte sub_8087698
-	.4byte sub_8087710
-	.4byte sub_8087748
-	.4byte fishE
-
-gUnknown_83CC1F0:: @ 83CC1F0 data16
-	.2byte 0xfffe, 0xfffc, 0xfffb, 0xfffa, 0xfff9, 0xfff8, 0xfff8, 0xfff8, 0xfff9, 0xfff9, 0xfffa, 0xfffb, 0xfffd, 0xfffe, 0x0000, 0x0002
-	.2byte 0x0004, 0x0008
-
-gUnknown_83CC214:: @ 83CC214 affineanimcmd
-	obj_rot_scal_anim_frame 24, 24, 0, 1
-	obj_rot_scal_anim_jump 0
-
-gUnknown_83CC224:: @ 83CC224 affineanimcmd
-	obj_rot_scal_anim_frame 512, 512, 0, 1
-	obj_rot_scal_anim_frame -16, -16, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gUnknown_83CC23C:: @ 83CC23C dataptr
-	.4byte gUnknown_83CC214
-	.4byte gUnknown_83CC224
-
-gUnknown_83CC244:: @ 83CC244 dataptr
-	.4byte sub_8087C00
-	.4byte sub_8087C2C
-	.4byte sub_8087CB4
-
-gUnknown_83CC250:: @ 83CC250 sprite_frames
-	obj_frame_tiles gUnknown_83CBDB0 + 0x00, 0x0020
-	obj_frame_tiles gUnknown_83CBDB0 + 0x20, 0x0020
-	obj_frame_tiles gUnknown_83CBDB0 + 0x40, 0x0020
-	obj_frame_tiles gUnknown_83CBDB0 + 0x60, 0x0020
-
-gUnknown_83CC270:: @ 83CC270 animcmd
-	obj_image_anim_frame 0x0000, 0
-	obj_image_anim_end
-
-gUnknown_83CC278:: @ 83CC278 animcmd
-	obj_image_anim_frame 0x0001, 0
-	obj_image_anim_end
-
-gUnknown_83CC280:: @ 83CC280 animcmd
-	obj_image_anim_frame 0x0002, 0
-	obj_image_anim_end
-
-gUnknown_83CC288:: @ 83CC288 animcmd
-	obj_image_anim_frame 0x0003, 0
-	obj_image_anim_end
-
-gUnknown_83CC290:: @ 83CC290 dataptr
-	.4byte gUnknown_83CC270
-	.4byte gUnknown_83CC278
-	.4byte gUnknown_83CC280
-	.4byte gUnknown_83CC288
-
-gUnknown_83CC2A0:: @ 83CC2A0 spr_template
-	spr_template 65535, 4371, gOamData_83CBE58, gUnknown_83CC290, gUnknown_83CC250, gDummySpriteAffineAnimTable, sub_8087D90

data/field_effect_scripts.s

@@ -1,7 +1,7 @@
 	.include "asm/macros/field_effect_script.inc"
 	.section script_data, "aw", %progbits
 	.align 2
-gUnknown_81D96AC:: @ 81D96AC
+gFieldEffectScriptPointers:: @ 81D96AC
 	.4byte gFldEffScript_ExclamationMarkIcon
 	.4byte gFldEffScript_UseCutOnGrass
 	.4byte gFldEffScript_UseCutOnTree
@@ -67,9 +67,9 @@ gUnknown_81D96AC:: @ 81D96AC
 	.4byte gFldEffScript_HallOfFameRecord
 	.4byte gFldEffScript_UseTeleport
 	.4byte gFldEffScript_SmileyFaceIcon
-	.4byte gFldEffScript_Unk41
+	.4byte gFldEffScript_UseVsSeeker
 	.4byte gFldEffScript_DoubleExclMarkIcon
-	.4byte gFldEffScript_Unk43
+	.4byte gFldEffScript_MoveDeoxysRock
 	.4byte gFldEffScript_Unk44
 	.4byte gFldEffScript_Unk45
 
@@ -102,15 +102,15 @@ gFldEffScript_FieldMoveShowMon:: @ 81D97F0
 	end 
 
 gFldEffScript_Ash:: @ 81D97F6
-	loadfadedpal_callnative gUnknown_83A5348, oei_ash
+	loadfadedpal_callnative gUnknown_83A5348, FldEff_Ash
 	end 
 
 gFldEffScript_SurfBlob:: @ 81D9800
-	callnative sub_80DC3D0
+	callnative FldEff_SurfBlob
 	end 
 
 gFldEffScript_UseSurf:: @ 81D9806
-	callnative sub_8086944
+	callnative FldEff_UseSurf
 	end 
 
 gFldEffScript_Dust:: @ 81D980C
@@ -165,7 +165,7 @@ gFldEffScript_Unknown22:: @ 81D987B
 	end 
 
 gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885
-	callnative sub_80DC9DC
+	callnative FldEff_BerryTreeGrowthSparkle
 	end 
 
 gFldEffScript_DeepSandFootprints:: @ 81D988B
@@ -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
@@ -192,7 +192,7 @@ gFldEffScript_MountainDisguise:: @ 81D98AC
 	end 
 
 gFldEffScript_NpcflyOut:: @ 81D98B2
-	callnative sub_8086D38
+	callnative FldEff_NpcFlyOut
 	end 
 
 gFldEffScript_UseFly:: @ 81D98B8
@@ -224,7 +224,7 @@ gFldEffScript_UseRockSmash:: @ 81D98E4
 	end 
 
 gFldEffScript_UseStrength:: @ 81D98EA
-	callnative sub_80D0860
+	callnative FldEff_UseStrength
 	end 
 
 gFldEffScript_UseDig:: @ 81D98F0
@@ -236,15 +236,15 @@ gFldEffScript_SandPile:: @ 81D98F6
 	end 
 
 gFldEffScript_ShortGrass:: @ 81D9900
-	loadfadedpal_callnative gUnknown_83A5348, sub_80DB808
+	loadfadedpal_callnative gUnknown_83A5348, FldEff_ShortGrass
 	end 
 
 gFldEffScript_HotSpringsWater:: @ 81D990A
-	loadfadedpal_callnative gUnknown_83A5348, sub_80DBF50
+	loadfadedpal_callnative gUnknown_83A5348, FldEff_HotSpringsWater
 	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
@@ -325,22 +325,22 @@ gFldEffScript_SmileyFaceIcon:: @ 81D998C
 	callnative FldEff_SmileyFaceIcon
 	end 
 
-gFldEffScript_Unk41:: @ 81D9992
-	callnative sub_8086BA8
+gFldEffScript_UseVsSeeker:: @ 81D9992
+	callnative FldEff_UseVsSeeker
 	end 
 
 gFldEffScript_DoubleExclMarkIcon:: @ 81D9998
 	callnative FldEff_DoubleExclMarkIcon
 	end 
 
-gFldEffScript_Unk43:: @ 81D999E
-	callnative sub_8087924
+gFldEffScript_MoveDeoxysRock:: @ 81D999E
+	callnative FldEff_MoveDeoxysRock
 	end 
 
 gFldEffScript_Unk44:: @ 81D99A4
-	callnative sub_8087AB4
+	callnative FldEff_Unk44
 	end 
 
 gFldEffScript_Unk45:: @ 81D99AA
-	callnative sub_8087E28
+	callnative FldEff_Unk45
 	end 

include/constants/event_object_movement.h

@@ -153,7 +153,7 @@
 #define MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW              0x42
 #define MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW            0x43
 #define MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW           0x44
-#define MOVEMENT_ACTION_UNKNOWN_STEP_45                 0x45
+#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION         0x45
 #define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN               0x46
 #define MOVEMENT_ACTION_JUMP_SPECIAL_UP                 0x47
 #define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT               0x48

include/constants/field_effects.h

@@ -66,9 +66,9 @@
 #define FLDEFF_HALL_OF_FAME_RECORD       62
 #define FLDEFF_USE_TELEPORT              63
 #define FLDEFF_SMILEY_FACE_ICON          64
-#define FLDEFF_UNK_41                    65 // TODO: related to vs_seeker
+#define FLDEFF_USE_VS_SEEKER             65
 #define FLDEFF_DOUBLE_EXCL_MARK_ICON     66
-#define FLDEFF_UNK_43                    67 // TODO: related to deoxys
+#define FLDEFF_MOVE_DEOXYS_ROCK          67
 #define FLDEFF_UNK_44                    68 // TODO: related to ???
 #define FLDEFF_UNK_45                    69 // TODO: related to fame checker photos
 

include/data.h

@@ -28,7 +28,7 @@ extern const struct MonCoords gMonFrontPicCoords[];
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const struct MonCoords gMonBackPicCoords[];
 extern const struct CompressedSpriteSheet gMonBackPicTable[];
-extern const struct CompressedSpritePalette gMonPaletteTable[];
+extern struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
 extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
 extern const struct MonCoords gTrainerFrontPicCoords[];

include/event_object_movement.h

@@ -41,7 +41,7 @@ void sub_808E16C(s16, s16);
 void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
 void sub_8092FF0(s16, s16, s16 *, s16 *);
 u8 ObjectEventDirectionToImageAnimId(u8);
-void sub_80930E0(s16 *, s16 *, s16, s16);
+void sub_8063BC4(s16 *, s16 *, s16, s16);
 void ObjectEventClearAnim(struct ObjectEvent *);
 void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *);
 void SpawnObjectEventsInView(s16, s16);
@@ -116,6 +116,9 @@ void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible);
 bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
 void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
 bool32 RfuUnionObjectIsWarping(u8 objectEventId);
+u8 sub_8063F2C(u8 direction);
+u8 sub_8064194(u8 direction);
+u8 sub_80641C0(u8 direction);
 
 void sub_805F378(s16 x, s16 y);
 
@@ -128,5 +131,6 @@ extern const struct OamData gObjectEventBaseOam_32x32;
 extern const struct UCoords16 gUnknown_83A64C8[];
 extern const u16 gUnknown_8398648[];
 extern const u16 gUnknown_8398688[];
+void sub_805F724(struct ObjectEvent *, s16 x, s16 y);
 
 #endif // GUARD_EVENT_OBJECT_MOVEMENT_H

include/field_camera.h

@@ -15,12 +15,12 @@ struct CameraObject
     s32 y;
 };
 
-extern struct CameraObject gUnknown_03005DD0;
+extern struct CameraObject gFieldCamera;
 
 // Exported RAM declarations
 
-extern u16 gUnknown_03005DEC;
-extern u16 gUnknown_03005DE8;
+extern u16 gTotalCameraPixelOffsetX;
+extern u16 gTotalCameraPixelOffsetY;
 
 // Exported ROM declarations
 
@@ -29,6 +29,7 @@ void CurrentMapDrawMetatileAt(int x, int y);
 void sub_805A658(s16 *x, s16 *y);
 void SetCameraPanningCallback(void (*cb)(void));
 void SetCameraPanning(s16 x, s16 y);
+void UpdateCameraPanning(void);
 void InstallCameraPanAheadCallback(void);
 void DrawDoorMetatileAt(int x, int y, const u16 *data);
 

include/field_control_avatar.h

@@ -8,5 +8,6 @@ extern u32 gUnknown_3005078;
 void RestartWildEncounterImmunitySteps(void);
 void ClearPoisonStepCounter(void);
 void SetCableClubWarp(void);
+void dive_warp(struct MapPosition * pos, u16 behavior);
 
 #endif //GUARD_FIELD_CONTROL_AVATAR_H

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 sub_8084784(u8 a0, u8 a1);
-void sub_8084F2C(u8 a0);
-void sub_80853CC(u8 a0);
+void FieldCB_FallWarpExit(void);
+void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
+void StartLavaridgeGymB1FWarp(u8 a0);
+void StartLavaridgeGym1FWarp(u8 a0);
 void sub_8083598(u8 a0);
-void sub_8083A5C(struct Sprite * sprite, u8 spriteId);
-u8 sub_8083970(u16 species, s16 x, s16 y, bool8 unused);
-void sub_80842C8(void);
+void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId);
+u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused);
+void ReturnToFieldFromFlyMapSelect(void);
 
 #endif //GUARD_FIELD_EFFECTS_H

include/field_effect_helpers.h

@@ -15,6 +15,7 @@
 u8 sub_8154228(void);
 bool8 sub_8155DA0(struct ObjectEvent *);
 void sub_80DC44C(u8, u8);
+void sub_80DC478(u8, u8);
 void StartAshFieldEffect(s16, s16, u16, s16);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H

include/field_effect_scripts.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_FIELD_EFFECT_SCRIPTS_H
+#define GUARD_FIELD_EFFECT_SCRIPTS_H
+
+extern const u8 *const gFieldEffectScriptPointers[];
+
+#endif //GUARD_FIELD_EFFECT_SCRIPTS_H

include/field_fadetransition.h

@@ -12,10 +12,11 @@ void DoFallWarp(void);
 void sub_807E59C(void);
 void sub_807E500(void);
 void sub_807DF64(void);
-void sub_807DC18(void);
+void WarpFadeOutScreen(void);
 void FieldCallback_ReturnToEventScript2(void);
-void sub_807DC00(void);
+void FadeInFromBlack(void);
 void FadeTransition_FadeInOnReturnToStartMenu(void);
+void WarpFadeInScreen(void);
 
 void sub_807DCE4(void);
 

include/field_player_avatar.h

@@ -36,5 +36,6 @@ bool32 sub_805DC24(void);
 bool8 PartyHasMonWithSurf(void);
 bool8 IsPlayerSurfingNorth(void);
 void player_get_pos_including_state_based_drift(s16 *x, s16 *y);
+void sub_805CBE8(void);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H

include/field_screen_effect.h

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

include/field_weather.h

@@ -18,5 +18,8 @@ void SetWeatherScreenFadeOut(void);
 void sub_807B070(void);
 u8 GetCurrentWeather(void);
 void FieldWeather_StartFadingOutCreditsMap(u8, u8, u32);
+void sub_807AA8C(u8 palIdx);
+void ResetPreservedPalettesInWeather(void);
+void PreservePaletteInWeather(u8 palIdx);
 
 #endif // GUARD_WEATHER_H

include/fldeff.h

@@ -37,7 +37,7 @@ bool32 FldEffPoison_IsActive(void);
 
 // strength
 bool8 SetUpFieldMove_Strength(void);
-bool8 sub_80D0860(void);
+bool8 FldEff_UseStrength(void);
 
 // teleport
 bool8 SetUpFieldMove_Teleport(void);

include/global.fieldmap.h

@@ -4,6 +4,13 @@
 #define OBJECT_EVENTS_COUNT 16
 
 #define METATILE_COLLISION_MASK 0x0C00
+#define METATILE_ID_MASK 0x03FF
+#define METATILE_ID_UNDEFINED 0x03FF
+#define METATILE_ELEVATION_SHIFT 12
+#define METATILE_COLLISION_SHIFT 10
+#define METATILE_ELEVATION_MASK 0xF000
+
+#define METATILE_ID(tileset, name) (METATILE_##tileset##_##name)
 
 enum
 {
@@ -17,8 +24,6 @@ enum
 
 typedef void (*TilesetCB)(void);
 
-#define METATILE_ID(tileset, name) (METATILE_##tileset##_##name)
-
 struct Tileset
 {
     /*0x00*/ bool8 isCompressed;
@@ -280,7 +285,7 @@ struct PlayerAvatar /* 0x202E858 */
     /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
     /*0x04*/ u8 spriteId;
     /*0x05*/ u8 objectEventId;
-    /*0x06*/ u8 unk6;
+    /*0x06*/ bool8 preventStep;
     /*0x07*/ u8 gender;
     u8 acroBikeState;
     u8 unk9;

include/overworld.h

@@ -82,12 +82,16 @@ void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void sub_8084E2C(s8, s8, s8, s8, s8);
 void sub_8084E80(s8, s8, s8, s8, s8);
 void sub_8084EBC(s16, s16);
+void sub_80555E0(void);
+void copy_saved_warp3_bank_and_enter_x_to_warp1(void);
+u8 IsMapTypeOutdoors(u8 mapType);
+void sav1_reset_battle_music_maybe(void);
+bool32 sub_8056124(u16 song);
 
 void player_avatar_init_params_reset(void);
 
 void Overworld_SetFlashLevel(s32 a1);
 u8 Overworld_GetFlashLevel(void);
-void sub_8085524(u16);
 
 void Overworld_SetSavedMusic(u16);
 void Overworld_ChangeMusicToDefault(void);
@@ -155,7 +159,7 @@ u8 GetCurrentMapType(void);
 
 u8 get_map_light_from_warp0(void);
 const struct MapHeader *warp1_get_mapheader(void);
-void sub_8055F88(void);
+void TryFadeOutOldMapMusic(void);
 void CB2_ReturnToFieldCableClub(void);
 void ResetGameStats(void);
 
@@ -177,6 +181,8 @@ void sub_805546C(u8 a0);
 bool32 sub_80582E0(void);
 bool32 sub_8058274(void);
 u8 GetCurrentMapBattleScene(void);
+void Overworld_ResetStateAfterFly(void);
+bool8 sub_8055B38(u16 metatileBehavior);
 void sub_8055DB8(void);
 void sub_8057F5C(void);
 void sub_8057F34(void);

include/quest_log.h

@@ -29,7 +29,7 @@ void sub_811539C(void);
 void sub_8115748(u16);
 u8 sub_8112CAC(void);
 bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
-void sub_8111F38(u16, u16);
+void sub_8111F38(u16 offset, u16 idx);
 void sub_8111134(void);
 void DestroyHelpMessageWindow(u8 a0);
 u8 CreateHelpMessageWindow(void);
@@ -50,6 +50,8 @@ void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
 void sub_8110840(void *oldSave);
 void sub_8112F18(u8 windowId);
 bool8 sub_8111C2C(void);
+void sub_81128BC(u8 a0);
+void sub_811278C(u8, u8);
 void Special_UpdateTrainerFansAfterLinkBattle(void);
 
 #endif //GUARD_QUEST_LOG_H

include/special_field_anim.h

@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void StartEscalator(u8 a0);
+void StartEscalator(bool8 goingUp);
 void StopEscalator(void);
 bool8 IsEscalatorMoving(void);
 

ld_script.txt

@@ -123,7 +123,7 @@ SECTIONS {
         src/cable_club.o(.text);
         src/trainer_see.o(.text);
         src/wild_encounter.o(.text);
-        asm/field_effect.o(.text);
+        src/field_effect.o(.text);
         src/scanline_effect.o(.text);
         src/option_menu.o(.text);
         src/pokedex.o(.text);
@@ -444,7 +444,7 @@ SECTIONS {
         src/cable_club.o(.rodata);
         src/trainer_see.o(.rodata);
         src/wild_encounter.o(.rodata);
-        data/field_effect.o(.rodata);
+        src/field_effect.o(.rodata);
         src/option_menu.o(.rodata);
         src/trainer_card.o(.rodata);
         data/pokemon_storage_system.o(.rodata);

src/data/pokemon_graphics/palette_table.h

@@ -1,4 +1,5 @@
-const struct CompressedSpritePalette gMonPaletteTable[] =
+// A dirty hack because field_effect.c requires this not be const
+__attribute__((section(".rodata"))) struct CompressedSpritePalette gMonPaletteTable[] =
 {
     SPECIES_PAL(NONE, gMonPalette_CircledQuestionMark),
     SPECIES_PAL(BULBASAUR, gMonPalette_Bulbasaur),

src/field_fadetransition.c

@@ -50,7 +50,7 @@ void palette_bg_faded_fill_black(void)
     CpuFastFill16(RGB_BLACK, gPlttBufferFaded, 0x400);
 }
 
-void pal_fill_for_maplights(void)
+void WarpFadeInScreen(void)
 {
     switch (sub_80C9DCC(get_map_light_from_warp0(), GetCurrentMapType()))
     {
@@ -84,14 +84,14 @@ static void sub_807DBAC(void)
     }
 }
 
-void sub_807DC00(void)
+void FadeInFromBlack(void)
 {
     palette_bg_faded_fill_black();
     FadeScreen(0, 0);
     palette_bg_faded_fill_black();
 }
 
-void sub_807DC18(void)
+void WarpFadeOutScreen(void)
 {
     const struct MapHeader *header = warp1_get_mapheader();
     if (header->regionMapSectionId != gMapHeader.regionMapSectionId && sub_80F8110(header->regionMapSectionId, FALSE))
@@ -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);
 }
 
@@ -178,7 +178,7 @@ static void task_mpl_807DD60(u8 taskId)
     case 1:
         if (gTasks[task->data[1]].isActive != TRUE)
         {
-            pal_fill_for_maplights();
+            WarpFadeInScreen();
             task->data[0]++;
         }
         break;
@@ -212,7 +212,7 @@ static void sub_807DDF0(u8 taskId)
     case 1:
         if (IsLinkTaskFinished())
         {
-            pal_fill_for_maplights();
+            WarpFadeInScreen();
             task->data[0]++;
         }
         break;
@@ -278,9 +278,9 @@ static void sub_807DE78(bool8 a0)
 static void sub_807DF4C(bool8 a0)
 {
     if (!a0)
-        pal_fill_for_maplights();
+        WarpFadeInScreen();
     else
-        sub_807DC00();
+        FadeInFromBlack();
 }
 
 void sub_807DF64(void)
@@ -302,7 +302,7 @@ void sub_807DF7C(void)
 static void sub_807DF94(void)
 {
     Overworld_PlaySpecialMapMusic();
-    pal_fill_for_maplights();
+    WarpFadeInScreen();
     sub_8111CF0();
     PlaySE(SE_TK_WARPOUT);
     CreateTask(sub_807E31C, 10);
@@ -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);
 }
 
@@ -530,8 +530,8 @@ bool32 sub_807E418(void)
 void DoWarp(void)
 {
     ScriptContext2_Enable();
-    sub_8055F88();
-    sub_807DC18();
+    TryFadeOutOldMapMusic();
+    WarpFadeOutScreen();
     PlayRainStoppingSoundEffect();
     PlaySE(SE_KAIDAN);
     gFieldCallback = sub_807DF64;
@@ -541,8 +541,8 @@ void DoWarp(void)
 void DoDiveWarp(void)
 {
     ScriptContext2_Enable();
-    sub_8055F88();
-    sub_807DC18();
+    TryFadeOutOldMapMusic();
+    WarpFadeOutScreen();
     PlayRainStoppingSoundEffect();
     gFieldCallback = sub_807DF64;
     CreateTask(sub_807E718, 10);
@@ -580,31 +580,31 @@ 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)
 {
     ScriptContext2_Enable();
-    sub_8055F88();
+    TryFadeOutOldMapMusic();
     CreateTask(sub_807E784, 10);
     gFieldCallback = sub_807DF94;
 }
@@ -612,7 +612,7 @@ void sub_807E59C(void)
 void sub_807E5C4(void)
 {
     ScriptContext2_Enable();
-    sub_807DC18();
+    WarpFadeOutScreen();
     CreateTask(sub_807E718, 10);
     gFieldCallback = nullsub_60;
 }
@@ -641,8 +641,8 @@ static void sub_807E5EC(u8 taskId)
 void DoCableClubWarp(void)
 {
     ScriptContext2_Enable();
-    sub_8055F88();
-    sub_807DC18();
+    TryFadeOutOldMapMusic();
+    WarpFadeOutScreen();
     PlaySE(SE_KAIDAN);
     CreateTask(sub_807E5EC, 10);
 }
@@ -655,7 +655,7 @@ static void sub_807E678(u8 taskId)
     case 0:
         ClearLinkCallback_2();
         FadeScreen(1, 0);
-        sub_8055F88();
+        TryFadeOutOldMapMusic();
         PlaySE(SE_KAIDAN);
         data[0]++;
         break;
@@ -719,7 +719,7 @@ static void sub_807E784(u8 taskId)
     case 1:
         if (!sub_805DAD0())
         {
-            sub_807DC18();
+            WarpFadeOutScreen();
             task->data[0]++;
         }
         break;
@@ -773,14 +773,14 @@ static void sub_807E80C(u8 taskId)
         }
         break;
     case 4:
-        sub_8055F88();
-        sub_807DC18();
+        TryFadeOutOldMapMusic();
+        WarpFadeOutScreen();
         PlayRainStoppingSoundEffect();
         task->data[0] = 0;
         task->func = sub_807E718;
         break;
     case 5:
-        sub_8055F88();
+        TryFadeOutOldMapMusic();
         PlayRainStoppingSoundEffect();
         task->data[0] = 0;
         task->func = sub_807E718;
@@ -808,7 +808,7 @@ static void sub_807E980(u8 taskId)
                 data[15]--;
             else
             {
-                sub_8055F88();
+                TryFadeOutOldMapMusic();
                 PlayRainStoppingSoundEffect();
                 playerSpr->oam.priority = 1;
                 sub_807EB64(data[1], &data[2], &data[3]);
@@ -822,7 +822,7 @@ static void sub_807E980(u8 taskId)
         data[15]++;
         if (data[15] >= 12)
         {
-            sub_807DC18();
+            WarpFadeOutScreen();
             data[0]++;
         }
         break;
@@ -906,7 +906,7 @@ static void sub_807EC34(u8 taskId)
         break;
     case 0:
         Overworld_PlaySpecialMapMusic();
-        pal_fill_for_maplights();
+        WarpFadeInScreen();
         ScriptContext2_Enable();
         sub_807ECBC(&data[1], &data[2], &data[3], &data[4], &data[5]);
         data[0]++;

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/field_specials.c

@@ -2389,13 +2389,13 @@ static void MoveDeoxysObject(u8 num)
         gFieldEffectArguments[5] = 60;
     else
         gFieldEffectArguments[5] = 5;
-    FieldEffectStart(FLDEFF_UNK_43);
+    FieldEffectStart(FLDEFF_MOVE_DEOXYS_ROCK);
     Overworld_SetMapObjTemplateCoords(1, sDeoxysCoords[num][0], sDeoxysCoords[num][1]);
 }
 
 static void Task_WaitDeoxysFieldEffect(u8 taskId)
 {
-    if (!FieldEffectActiveListContains(FLDEFF_UNK_43))
+    if (!FieldEffectActiveListContains(FLDEFF_MOVE_DEOXYS_ROCK))
     {
         EnableBothScriptContexts();
         DestroyTask(taskId);

src/fldeff_rocksmash.c

@@ -48,7 +48,7 @@ static void Task_FieldEffectShowMon_Init(u8 taskId)
     u8 mapObjId;
 
     ScriptContext2_Enable();
-    gPlayerAvatar.unk6 = TRUE;
+    gPlayerAvatar.preventStep = TRUE;
     mapObjId = gPlayerAvatar.objectEventId;
     if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId])
      || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[mapObjId]))
@@ -62,7 +62,7 @@ static void Task_FieldEffectShowMon_Init(u8 taskId)
         else
         {
             sub_805CB70();
-            ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], MOVEMENT_ACTION_UNKNOWN_STEP_45);
+            ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
             gTasks[taskId].func = Task_FieldEffectShowMon_WaitPlayerAnim;
         }
     }
@@ -100,7 +100,7 @@ static void Task_FieldEffectShowMon_WaitFldeff(u8 taskId)
 static void Task_FieldEffectShowMon_Cleanup(u8 taskId)
 {
     FLDEFF_CALL_FUNC_IN_DATA();
-    gPlayerAvatar.unk6 = FALSE;
+    gPlayerAvatar.preventStep = FALSE;
     DestroyTask(taskId);
 }
 

src/fldeff_strength.c

@@ -8,8 +8,8 @@
 #include "event_scripts.h"
 #include "constants/event_objects.h"
 
-static void FldEff_UseStrength(void);
-static void sub_80D08A8(void);
+static void FieldCB_UseStrength(void);
+static void ShowMonCB_UseStrength(void);
 
 bool8 SetUpFieldMove_Strength(void)
 {
@@ -21,25 +21,25 @@ bool8 SetUpFieldMove_Strength(void)
     {
         gSpecialVar_Result = GetCursorSelectionMonId();
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-        gPostMenuFieldCallback = FldEff_UseStrength;
+        gPostMenuFieldCallback = FieldCB_UseStrength;
         return TRUE;
     }
 }
-static void FldEff_UseStrength(void)
+static void FieldCB_UseStrength(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
     ScriptContext1_SetupScript(EventScript_FldEffStrength);
 }
 
-bool8 sub_80D0860(void)
+bool8 FldEff_UseStrength(void)
 {
     u8 taskId = CreateFieldEffectShowMon();
-    FLDEFF_SET_FUNC_TO_DATA(sub_80D08A8);
+    FLDEFF_SET_FUNC_TO_DATA(ShowMonCB_UseStrength);
     GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
     return FALSE;
 }
 
-static void sub_80D08A8(void)
+static void ShowMonCB_UseStrength(void)
 {
     FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
     EnableBothScriptContexts();

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/main.c

@@ -20,6 +20,7 @@
 #include "battle_controllers.h"
 #include "scanline_effect.h"
 #include "save_failed_screen.h"
+#include "quest_log.h"
 
 extern u32 intr_main[];
 
@@ -77,9 +78,6 @@ static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7;
 EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0};
 EWRAM_DATA u16 gTrainerId = 0;
 
-extern bool8 gWirelessCommType;
-extern bool8 gUnknown_3005E88;
-
 static void UpdateLinkAndCallCallbacks(void);
 static void InitMainCallbacks(void);
 static void CallCallbacks(void);
@@ -178,7 +176,7 @@ static void InitMainCallbacks(void)
     gSaveBlock2Ptr = &gSaveBlock2;
     gSaveBlock1Ptr = &gSaveBlock1;
     gSaveBlock2.encryptionKey = 0;
-    gUnknown_3005E88 = FALSE;
+    gUnknown_3005E88 = 0;
 }
 
 static void CallCallbacks(void)

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

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
@@ -7,7 +7,6 @@
 #include "battle_interface.h"
 #include "battle_tower.h"
 #include "berry_pouch.h"
-#include "bg.h"
 #include "data.h"
 #include "decompress.h"
 #include "easy_chat.h"
@@ -15,11 +14,10 @@
 #include "evolution_scene.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
-#include "field_screen_effect.h"
+#include "field_fadetransition.h"
 #include "field_weather.h"
 #include "fieldmap.h"
 #include "fldeff.h"
-#include "gpu_regs.h"
 #include "graphics.h"
 #include "help_system.h"
 #include "item.h"
@@ -36,7 +34,6 @@
 #include "new_menu_helpers.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
-#include "palette.h"
 #include "party_menu.h"
 #include "player_pc.h"
 #include "pokedex.h"
@@ -50,19 +47,15 @@
 #include "reshow_battle_screen.h"
 #include "scanline_effect.h"
 #include "script.h"
-#include "sound.h"
-#include "sprite.h"
 #include "start_menu.h"
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "teachy_tv.h"
-#include "text.h"
 #include "text_window.h"
 #include "tm_case.h"
 #include "trade.h"
 #include "union_room.h"
-#include "window.h"
 #include "constants/battle.h"
 #include "constants/easy_chat.h"
 #include "constants/field_effects.h"
@@ -4044,7 +4037,7 @@ static void Task_HandleFieldMoveExitAreaYesNoInput(u8 taskId)
 
 bool8 FieldCallback_PrepareFadeInFromMenu(void)
 {
-    sub_807DC00();
+    FadeInFromBlack();
     CreateTask(Task_FieldMoveWaitForFade, 8);
     return TRUE;
 }
@@ -6361,7 +6354,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/quest_log.c

@@ -2761,7 +2761,7 @@ static bool8 TrySetTrainerBattleQuestLogEvent(u16 eventId, const u16 *eventData)
         return FALSE;
 
     sub_81138F8();
-    if (gUnknown_3005E88 || FlagGet(FLAG_SYS_GAME_CLEAR) || sub_81137E4(eventId, eventData) != TRUE)
+    if (gUnknown_3005E88 != 0 || FlagGet(FLAG_SYS_GAME_CLEAR) || sub_81137E4(eventId, eventData) != TRUE)
     {
         gUnknown_203B024.unk_00 = eventId;
         memcpy(gUnknown_203B024.unk_04, eventData, 8);

src/quest_log_player.c

@@ -80,7 +80,7 @@ static void sub_8150530(void)
     {
         u8 taskId;
         ScriptContext2_Enable();
-        gPlayerAvatar.unk6 = 1;
+        gPlayerAvatar.preventStep = TRUE;
         taskId = CreateTask(sub_81505C4, 0xFF);
         gTasks[taskId].data[0] = 0;
     }
@@ -156,13 +156,13 @@ static void sub_8150708(void)
 
 static void sub_815077C(void)
 {
-    FieldEffectStart(FLDEFF_UNK_41);
+    FieldEffectStart(FLDEFF_USE_VS_SEEKER);
     CreateTask(sub_8150794, 0x00);
 }
 
 static void sub_8150794(u8 taskId)
 {
-    if (!FieldEffectActiveListContains(0x41))
+    if (!FieldEffectActiveListContains(FLDEFF_USE_VS_SEEKER))
     {
         UnfreezeObjectEvents();
         ScriptContext2_Disable();

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/seagallop.c

@@ -295,7 +295,7 @@ static void Task_Seagallop_1(u8 taskId)
     if (++task->data[1] == 140)
     {
         Overworld_FadeOutMapMusic();
-        sub_807DC18();
+        WarpFadeOutScreen();
         task->func = Task_Seagallop_2;
     }
 }

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

src/vs_seeker.c

@@ -748,7 +748,7 @@ void Task_VsSeeker_0(u8 taskId)
     else if (respval == 2)
     {
         ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, 0, gSpecialVar_ItemId, 0xffff);
-        FieldEffectStart(FLDEFF_UNK_41); // TODO: name this enum
+        FieldEffectStart(FLDEFF_USE_VS_SEEKER);
         gTasks[taskId].func = Task_VsSeeker_1;
         gTasks[taskId].data[0] = 15;
     }
@@ -774,7 +774,7 @@ static void Task_VsSeeker_2(u8 taskId)
         data[2]++;
     }
 
-    if (!FieldEffectActiveListContains(FLDEFF_UNK_41))
+    if (!FieldEffectActiveListContains(FLDEFF_USE_VS_SEEKER))
     {
         data[1] = 0;
         data[2] = 0;

sym_bss.txt

@@ -60,10 +60,8 @@ gUnknown_3000EA0: @ 3000EA0
 	.include "src/tileset_anims.o"
 	.align 2
 	.include "src/sound.o"
-
 	.align 2
-gUnknown_3000FC8: @ 3000FC8
-	.space 0x20
+	.include "src/field_effect.o"
 
 gUnknown_3000FE8: @ 3000FE8
 	.space 0x184

sym_common.txt

@@ -51,10 +51,10 @@ gFieldLinkPlayerCount: @ 3005030
 gUnknown_3005050: @ 3005050
 	.space 0x18
 
-gUnknown_3005068: @ 3005068
+gTotalCameraPixelOffsetY: @ 3005068
 	.space 0x4
 
-gUnknown_300506C: @ 300506C
+gTotalCameraPixelOffsetX: @ 300506C
 	.space 0x4
 
 	.align 2