field effect graphics and scripts

asm/gpu_obj.s

@@ -554,7 +554,7 @@ super_sprites_fill: ; 8006D68
 	bcs @08006DD8
 	mov r1, sp
 	ldr r5, =0x030022f8
-	ldr r0, =gUnknown_082EC690
+	ldr r0, =gDefaultOamAttributes
 	ldr r2, [r0]
 	ldr r3, [r0, 0x4]
 @08006DBE:
@@ -1044,7 +1044,7 @@ reset_super_sprites: ; 8007150
 	cmp r3, r4
 	bcs @08007178
 	ldr r6, =0x030022f8
-	ldr r5, =gUnknown_082EC690
+	ldr r5, =gDefaultOamAttributes
 @08007162:
 	lsls r0, r3, 3
 	adds r0, r6

asm/string_util.s

@@ -231,9 +231,9 @@ CompareString: ; 8008C44
 	bx r1
 	thumb_func_end CompareString
 
-	thumb_func_start StringCompare_LimitN
-; u8 StringCompare_LimitN(u8 *s1, u8 *s2, u32 n)
-StringCompare_LimitN: ; 8008C68
+	thumb_func_start CompareString_LimitN
+; u8 CompareString_LimitN(u8 *s1, u8 *s2, u32 n)
+CompareString_LimitN: ; 8008C68
 	push {r4,lr}
 	adds r3, r0, 0
 	b @08008C80
@@ -260,7 +260,7 @@ StringCompare_LimitN: ; 8008C68
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end StringCompare_LimitN
+	thumb_func_end CompareString_LimitN
 
 	thumb_func_start IsStringLengthLessThanN
 ; BOOL IsStringLengthLessThanN(u8 *s, s32 n)
@@ -1027,9 +1027,9 @@ RepeatStringTerminator: ; 800917C
 	bx r1
 	thumb_func_end RepeatStringTerminator
 
-	thumb_func_start StringCopy_LimitN_Multibyte
-; u8 *StringCopy_LimitN_Multibyte(u8 *dest, u8 *src, u32 n)
-StringCopy_LimitN_Multibyte: ; 800918C
+	thumb_func_start CopyString_LimitN_Multibyte
+; u8 *CopyString_LimitN_Multibyte(u8 *dest, u8 *src, u32 n)
+CopyString_LimitN_Multibyte: ; 800918C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -1065,7 +1065,7 @@ StringCopy_LimitN_Multibyte: ; 800918C
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end StringCopy_LimitN_Multibyte
+	thumb_func_end CopyString_LimitN_Multibyte
 
 	thumb_func_start GetStringLength_Multibyte
 ; u32 GetStringLength_Multibyte(u8 *s)
@@ -1192,7 +1192,7 @@ sub_800924C: ; 800924C
 	thumb_func_end sub_800924C
 
 	thumb_func_start GetExtendedControlCodeLength
-; u8 GetExtendedControlCodeLength(u8 command)
+; u8 GetExtendedControlCodeLength(u8 code)
 GetExtendedControlCodeLength: ; 800927C
 	push {lr}
 	lsls r0, 24

build.bat

@@ -1,4 +1,4 @@
 as -mcpu=arm7tdmi asm/emerald.s -o emerald.o
-ld -T ld_script.txt -T wram_syms.txt -o emerald.elf emerald.o
-objcopy -O binary emerald.elf emerald.gba
-fc /b base_emerald.gba emerald.gba
+ld -T ld_script.txt -T wram_syms.txt -o pokeemerald.elf emerald.o
+objcopy -O binary pokeemerald.elf pokeemerald.gba
+diff base_emerald.gba pokeemerald.gba

data/data1.s

@@ -1203,8 +1203,10 @@ gUnknown_082DB9C1: ; 82DB9C1
 gUnknown_082DB9C8: ; 82DB9C8
 	.incbin "base_emerald.gba", 0x2db9c8, 0xc
 
-gUnknown_082DB9D4: ; 82DB9D4
-	.incbin "base_emerald.gba", 0x2db9d4, 0x334
+; 82DB9D4
+	.include "data/field_effect_scripts.s"
+
+	.align 2, 0
 
 gUnknown_082DBD08: ; 82DBD08
 	.incbin "base_emerald.gba", 0x2dbd08, 0x34

data/data2.s

@@ -138,8 +138,11 @@ gUnknown_082EC634: ; 82EC634
 gUnknown_082EC64C: ; 82EC64C
 	.incbin "base_emerald.gba", 0x2ec64c, 0x44
 
-gUnknown_082EC690: ; 82EC690
-	.incbin "base_emerald.gba", 0x2ec690, 0x8
+; off-screen and low priority relative to background
+gDefaultOamAttributes: ; 82EC690
+	.2byte 160 ; Y
+	.2byte 304 ; X
+	.2byte 3 << 10 ; priority
 
 	.align 2, 0
 
@@ -2394,8 +2397,8 @@ gUnknown_085055CD: ; 85055CD
 ; 8505620
 	.include "data/graphics/field_objects/field_object_graphics_info_pointers.s"
 
-gUnknown_085059F8: ; 85059F8
-	.incbin "base_emerald.gba", 0x5059f8, 0x94
+; 85059F8
+	.include "data/graphics/field_objects/field_effect_object_template_pointers.s"
 
 ; 8505A8C
 	.include "data/graphics/field_objects/field_object_pic_tables.s"
@@ -2427,10 +2430,10 @@ gUnknown_0850BE38: ; 850BE38
 ; 850BE48
 	.include "data/graphics/field_objects/berry_tree_graphics_tables.s"
 
-	.incbin "base_emerald.gba", 0x50c9c0, 0x8
+; 850C9C0
+	.include "data/graphics/field_objects/field_effect_objects.s"
 
-gUnknown_0850C9C8: ; 850C9C8
-	.incbin "base_emerald.gba", 0x50c9c8, 0xd14
+	.incbin "base_emerald.gba", 0x50d6d4, 0x8
 
 gUnknown_0850D6DC: ; 850D6DC
 	.incbin "base_emerald.gba", 0x50d6dc, 0x10
@@ -3417,7 +3420,19 @@ gUnknown_08553A78: ; 8553A78
 	.incbin "base_emerald.gba", 0x553a78, 0x4
 
 gUnknown_08553A7C: ; 8553A7C
-	.incbin "base_emerald.gba", 0x553a7c, 0x73d4
+	.incbin "base_emerald.gba", 0x553a7c, 0x6f14
+
+	.align 2, 0
+
+gFieldEffectObjectPalette4: ; 855A990
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_04.gbapal"
+
+	.incbin "base_emerald.gba", 0x55a9b0, 0x480
+
+	.align 2, 0
+
+gFieldEffectObjectPalette5: ; 855AE30
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_05.gbapal"
 
 gUnknown_0855AE50: ; 855AE50
 	.incbin "base_emerald.gba", 0x55ae50, 0x200
@@ -3453,7 +3468,19 @@ gUnknown_0855C230: ; 855C230
 	.incbin "base_emerald.gba", 0x55c230, 0x14
 
 gUnknown_0855C244: ; 855C244
-	.incbin "base_emerald.gba", 0x55c244, 0x68
+	.incbin "base_emerald.gba", 0x55c244, 0x18
+
+	.align 2, 0
+
+gFieldEffectObjectPaletteInfo4: ; 855C25C
+	obj_pal gFieldEffectObjectPalette4, 0x1007
+
+	.align 2, 0
+
+gFieldEffectObjectPaletteInfo5: ; 855C264
+	obj_pal gFieldEffectObjectPalette5, 0x1010
+
+	.incbin "base_emerald.gba", 0x55c26c, 0x40
 
 gUnknown_0855C2AC: ; 855C2AC
 	.incbin "base_emerald.gba", 0x55c2ac, 0x18
@@ -4056,7 +4083,12 @@ gUnknown_0857C608: ; 857C608
 	.incbin "base_emerald.gba", 0x57c608, 0x2
 
 gUnknown_0857C60A: ; 857C60A
-	.incbin "base_emerald.gba", 0x57c60a, 0x62
+	.incbin "base_emerald.gba", 0x57c60a, 0x5a
+
+	.align 2, 0
+
+gFieldEffectObjectPaletteInfo6: ; 857C664
+	obj_pal gFieldEffectObjectPalette6, 0x1000
 
 gUnknown_0857C66C: ; 857C66C
 	.incbin "base_emerald.gba", 0x57c66c, 0x18
@@ -4705,7 +4737,21 @@ gUnknown_0858D8F0: ; 858D8F0
 	.incbin "base_emerald.gba", 0x58d8f0, 0x80
 
 gUnknown_0858D970: ; 858D970
-	.incbin "base_emerald.gba", 0x58d970, 0xc90
+	.incbin "base_emerald.gba", 0x58d970, 0x2a8
+
+	.align 2, 0
+
+gFieldEffectObjectPalette7: ; 858DC18
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_07.gbapal"
+
+	.incbin "base_emerald.gba", 0x58dc38, 0x580
+
+	.align 2, 0
+
+gFieldEffectObjectPalette8: ; 858E1B8
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_08.gbapal"
+
+	.incbin "base_emerald.gba", 0x58e1d8, 0x428
 
 gUnknown_0858E600: ; 858E600
 	.incbin "base_emerald.gba", 0x58e600, 0x18
@@ -4714,10 +4760,31 @@ gUnknown_0858E618: ; 858E618
 	.incbin "base_emerald.gba", 0x58e618, 0x18
 
 gUnknown_0858E630: ; 858E630
-	.incbin "base_emerald.gba", 0x58e630, 0x5c
+	.incbin "base_emerald.gba", 0x58e630, 0x18
+
+	.align 2, 0
+
+gFieldEffectObjectPaletteInfo7: ; 858E648
+	obj_pal gFieldEffectObjectPalette7, 0x1003
+
+	.align 2, 0
+
+gFieldEffectObjectPaletteInfo8: ; 858E650
+	obj_pal gFieldEffectObjectPalette8, 0x1008
+
+	.incbin "base_emerald.gba", 0x58e658, 0x34
 
 gUnknown_0858E68C: ; 858E68C
-	.incbin "base_emerald.gba", 0x58e68c, 0x1d8
+	.incbin "base_emerald.gba", 0x58e68c, 0x18
+
+	.align 2, 0
+
+; This uses one of the secret base palettes, so there is no
+; "field_effect_object_palette_09.pal" file.
+gFieldEffectObjectPaletteInfo9: ; 858E6A4
+	obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E
+
+	.incbin "base_emerald.gba", 0x58e6ac, 0x1b8
 
 gUnknown_0858E864: ; 858E864
 	.incbin "base_emerald.gba", 0x58e864, 0x1c
@@ -6546,8 +6613,17 @@ gUnknown_085C8E24: ; 85C8E24
 gUnknown_085C8E68: ; 85C8E68
 	.incbin "base_emerald.gba", 0x5c8e68, 0x6c
 
-gUnknown_085C8ED4: ; 85C8ED4
-	.incbin "base_emerald.gba", 0x5c8ed4, 0x108
+	.align 2, 0
+
+gFieldEffectObjectPalette10: ; 85C8ED4
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_10.gbapal"
+
+	.align 2, 0
+
+gFieldEffectObjectPaletteInfo10: ; 85C8EF4
+	obj_pal gFieldEffectObjectPalette10, 0x1009
+
+	.incbin "base_emerald.gba", 0x5c8efc, 0xe0
 
 gUnknown_085C8FDC: ; 85C8FDC
 	.incbin "base_emerald.gba", 0x5c8fdc, 0x14

data/field_effect_scripts.s

@@ -0,0 +1,341 @@
+	.align 2, 0
+
+gFieldEffectScriptPointers: ; 82DB9D4
+	.4byte gFieldEffectScript_ExclamationMarkIcon1
+	.4byte gFieldEffectScript_UseCutOnTallGrass
+	.4byte gFieldEffectScript_UseCutOnTree
+	.4byte gFieldEffectScript_Shadow
+	.4byte gFieldEffectScript_TallGrass
+	.4byte gFieldEffectScript_Ripple
+	.4byte gFieldEffectScript_FieldMoveShowMon
+	.4byte gFieldEffectScript_Ash
+	.4byte gFieldEffectScript_SurfBlob
+	.4byte gFieldEffectScript_UseSurf
+	.4byte gFieldEffectScript_GroundImpactDust
+	.4byte gFieldEffectScript_Unknown11
+	.4byte gFieldEffectScript_BikeHopTallGrass
+	.4byte gFieldEffectScript_SandFootprints
+	.4byte gFieldEffectScript_BikeHopBigSplash
+	.4byte gFieldEffectScript_Splash
+	.4byte gFieldEffectScript_BikeHopSmallSplash
+	.4byte gFieldEffectScript_LongGrass
+	.4byte gFieldEffectScript_Unknown18
+	.4byte gFieldEffectScript_Unknown19
+	.4byte gFieldEffectScript_Unknown20
+	.4byte gFieldEffectScript_Unknown21
+	.4byte gFieldEffectScript_Unknown22
+	.4byte gFieldEffectScript_BerryTreeGrowthSparkle
+	.4byte gFieldEffectScript_DeepSandFootprints
+	.4byte gFieldEffectScript_Unknown25
+	.4byte gFieldEffectScript_Unknown26
+	.4byte gFieldEffectScript_Unknown27
+	.4byte gFieldEffectScript_TreeDisguise
+	.4byte gFieldEffectScript_MountainDisguise
+	.4byte gFieldEffectScript_Unknown30
+	.4byte gFieldEffectScript_UseFly
+	.4byte gFieldEffectScript_FlyIn
+	.4byte gFieldEffectScript_ExclamationMarkIcon2
+	.4byte gFieldEffectScript_FeetInFlowingWater
+	.4byte gFieldEffectScript_BikeTireTracks
+	.4byte gFieldEffectScript_SandDisguisePlaceholder
+	.4byte gFieldEffectScript_UseRockSmash
+	.4byte gFieldEffectScript_Unknown38
+	.4byte gFieldEffectScript_Unknown39
+	.4byte gFieldEffectScript_Unknown40
+	.4byte gFieldEffectScript_ShortGrass
+	.4byte gFieldEffectScript_HotSpringsWater
+	.4byte gFieldEffectScript_Unknown43
+	.4byte gFieldEffectScript_Unknown44
+	.4byte gFieldEffectScript_Unknown45
+	.4byte gFieldEffectScript_HeartIcon
+	.4byte gFieldEffectScript_Unknown47
+	.4byte gFieldEffectScript_Unknown48
+	.4byte gFieldEffectScript_JumpOutOfAsh
+	.4byte gFieldEffectScript_Unknown50
+	.4byte gFieldEffectScript_Unknown51
+	.4byte gFieldEffectScript_Unknown52
+	.4byte gFieldEffectScript_Bubbles
+	.4byte gFieldEffectScript_Unknown54
+	.4byte gFieldEffectScript_Unknown55
+	.4byte gFieldEffectScript_Unknown56
+	.4byte gFieldEffectScript_Unknown57
+	.4byte gFieldEffectScript_Unknown58
+	.4byte gFieldEffectScript_FieldMoveShowMonInit
+	.4byte gFieldEffectScript_Unknown60
+	.4byte gFieldEffectScript_Unknown61
+	.4byte gFieldEffectScript_Unknown62
+	.4byte gFieldEffectScript_Unknown63
+	.4byte gFieldEffectScript_Rayquaza
+	.4byte gFieldEffectScript_Unknown65
+	.4byte gFieldEffectScript_Unknown66
+
+gFieldEffectScript_ExclamationMarkIcon1: ; 82DBAE0
+	field_eff_callnative oei_exclamation_mark
+	field_eff_end
+
+gFieldEffectScript_UseCutOnTallGrass: ; 82DBAE6
+	field_eff_callnative sub_80D3A6C
+	field_eff_end
+
+gFieldEffectScript_UseCutOnTree: ; 82DBAEC
+	field_eff_callnative sub_80D3ABC
+	field_eff_end
+
+gFieldEffectScript_Shadow: ; 82DBAF2
+	field_eff_callnative oei_shadow
+	field_eff_end
+
+gFieldEffectScript_TallGrass: ; 82DBAF8
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_grass_normal
+	field_eff_end
+
+gFieldEffectScript_Ripple: ; 82DBB02
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ripples
+	field_eff_end
+
+gFieldEffectScript_FieldMoveShowMon: ; 82DBB0C
+	field_eff_callnative sub_80B849C
+	field_eff_end
+
+gFieldEffectScript_Ash: ; 82DBB12
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ash
+	field_eff_end
+
+gFieldEffectScript_SurfBlob: ; 82DBB1C
+	field_eff_callnative sub_8155534
+	field_eff_end
+
+gFieldEffectScript_UseSurf: ; 82DBB22
+	field_eff_callnative sub_80B8D44
+	field_eff_end
+
+gFieldEffectScript_GroundImpactDust: ; 82DBB28
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155890
+	field_eff_end
+
+gFieldEffectScript_Unknown11: ; 82DBB32
+	field_eff_callnative oei_sweet_scent
+	field_eff_end
+
+gFieldEffectScript_BikeHopTallGrass: ; 82DBB38
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154658
+	field_eff_end
+
+gFieldEffectScript_SandFootprints: ; 82DBB42
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B04
+	field_eff_end
+
+gFieldEffectScript_BikeHopBigSplash: ; 82DBB4C
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, oei_water_drop_tall
+	field_eff_end
+
+gFieldEffectScript_Splash: ; 82DBB56
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154CEC
+	field_eff_end
+
+gFieldEffectScript_BikeHopSmallSplash: ; 82DBB60
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154E1C
+	field_eff_end
+
+gFieldEffectScript_LongGrass: ; 82DBB6A
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154758
+	field_eff_end
+
+gFieldEffectScript_Unknown18: ; 82DBB74
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81548FC
+	field_eff_end
+
+gFieldEffectScript_Unknown19: ; 82DBB7E
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81551F0
+	field_eff_end
+
+gFieldEffectScript_Unknown20: ; 82DBB88
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815525C
+	field_eff_end
+
+gFieldEffectScript_Unknown21: ; 82DBB92
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_81552C8
+	field_eff_end
+
+gFieldEffectScript_Unknown22: ; 82DBB9C
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155334
+	field_eff_end
+
+gFieldEffectScript_BerryTreeGrowthSparkle: ; 82DBBA6
+	field_eff_callnative sub_8155B2C
+	field_eff_end
+
+gFieldEffectScript_DeepSandFootprints: ; 82DBBAC
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B78
+	field_eff_end
+
+gFieldEffectScript_Unknown25: ; 82DBBB6
+	field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B61A0
+	field_eff_end
+
+gFieldEffectScript_Unknown26: ; 82DBBC5
+	field_eff_callnative sub_80FA208
+	field_eff_end
+
+gFieldEffectScript_Unknown27: ; 82DBBCB
+	field_eff_callnative sub_80FA36C
+	field_eff_end
+
+gFieldEffectScript_TreeDisguise: ; 82DBBD1
+	field_eff_callnative ShowTreeDisguiseFieldEffect
+	field_eff_end
+
+gFieldEffectScript_MountainDisguise: ; 82DBBD7
+	field_eff_callnative ShowMountainDisguiseFieldEffect
+	field_eff_end
+
+gFieldEffectScript_Unknown30: ; 82DBBDD
+	field_eff_callnative sub_80B90CC
+	field_eff_end
+
+gFieldEffectScript_UseFly: ; 82DBBE3
+	field_eff_callnative sub_80B91A4
+	field_eff_end
+
+gFieldEffectScript_FlyIn: ; 82DBBE9
+	field_eff_callnative sub_80B97C0
+	field_eff_end
+
+gFieldEffectScript_ExclamationMarkIcon2: ; 82DBBEF
+	field_eff_callnative sub_80B4658
+	field_eff_end
+
+gFieldEffectScript_FeetInFlowingWater: ; 82DBBF5
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154EFC
+	field_eff_end
+
+gFieldEffectScript_BikeTireTracks: ; 82DBBFF
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154BEC
+	field_eff_end
+
+gFieldEffectScript_SandDisguisePlaceholder: ; 82DBC09
+	field_eff_callnative ShowSandDisguiseFieldEffect
+	field_eff_end
+
+gFieldEffectScript_UseRockSmash: ; 82DBC0F
+	field_eff_callnative oei_rocksmash
+	field_eff_end
+
+gFieldEffectScript_Unknown40: ; 82DBC15
+	field_eff_callnative sub_8145E2C
+	field_eff_end
+
+gFieldEffectScript_Unknown38: ; 82DBC1B
+	field_eff_callnative sub_8135780
+	field_eff_end
+
+gFieldEffectScript_Unknown39: ; 82DBC21
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155900
+	field_eff_end
+
+gFieldEffectScript_ShortGrass: ; 82DBC2B
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815496C
+	field_eff_end
+
+gFieldEffectScript_HotSpringsWater: ; 82DBC35
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81550B4
+	field_eff_end
+
+gFieldEffectScript_Unknown43: ; 82DBC3F
+	field_eff_callnative oei_waterfall
+	field_eff_end
+
+gFieldEffectScript_Unknown44: ; 82DBC45
+	field_eff_callnative sub_80B74D0
+	field_eff_end
+
+gFieldEffectScript_Unknown45: ; 82DBC4B
+	field_eff_loadpal gFieldEffectObjectPaletteInfo10
+	field_eff_callnative sub_81470D0
+	field_eff_end
+
+gFieldEffectScript_HeartIcon: ; 82DBC56
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690
+	field_eff_end
+
+gFieldEffectScript_Unknown47: ; 82DBC60
+	field_eff_callnative sub_80FA6FC
+	field_eff_end
+
+gFieldEffectScript_Unknown48: ; 82DBC66
+	field_eff_callnative sub_80FA700
+	field_eff_end
+
+gFieldEffectScript_JumpOutOfAsh: ; 82DBC6C
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B7C48
+	field_eff_end
+
+gFieldEffectScript_Unknown50: ; 82DBC76
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B79F4
+	field_eff_end
+
+gFieldEffectScript_Unknown51: ; 82DBC80
+	field_eff_callnative sub_8159F2C
+	field_eff_end
+
+gFieldEffectScript_Unknown52: ; 82DBC86
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80FAA7C
+	field_eff_end
+
+gFieldEffectScript_Bubbles: ; 82DBC90
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155A88
+	field_eff_end
+
+gFieldEffectScript_Unknown54: ; 82DBC9A
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, sub_8155DDC
+	field_eff_end
+
+gFieldEffectScript_Unknown55: ; 82DBCA4
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80FA13C
+	field_eff_end
+
+gFieldEffectScript_Unknown56: ; 82DBCAE
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA248
+	field_eff_end
+
+gFieldEffectScript_Unknown57: ; 82DBCB8
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA3AC
+	field_eff_end
+
+gFieldEffectScript_Unknown58: ; 82DBCC2
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00
+	field_eff_end
+
+gFieldEffectScript_FieldMoveShowMonInit: ; 82DBCCC
+	field_eff_callnative sub_80B84F8
+	field_eff_end
+
+gFieldEffectScript_Unknown60: ; 82DBCD2
+	field_eff_callnative sub_81799B8
+	field_eff_end
+
+gFieldEffectScript_Unknown61: ; 82DBCD8
+	field_eff_callnative sub_80FA458
+	field_eff_end
+
+gFieldEffectScript_Unknown62: ; 82DBCDE
+	field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, sub_80B62F4
+	field_eff_end
+
+gFieldEffectScript_Unknown63: ; 82DBCED
+	field_eff_callnative sub_817C91C
+	field_eff_end
+
+gFieldEffectScript_Rayquaza: ; 82DBCF3
+	field_eff_callnative sub_80B8F98
+	field_eff_end
+
+gFieldEffectScript_Unknown65: ; 82DBCF9
+	field_eff_callnative sub_80B9ADC
+	field_eff_end
+
+gFieldEffectScript_Unknown66: ; 82DBCFF
+	field_eff_callnative sub_80B9E28
+	field_eff_end

data/graphics/field_objects/field_effect_object_template_pointers.s

@@ -0,0 +1,40 @@
+	.align 2, 0
+
+gFieldEffectObjectTemplatePointers: ; 85059F8
+	.4byte gFieldEffectObjectTemplate_ShadowSmall
+	.4byte gFieldEffectObjectTemplate_ShadowMedium
+	.4byte gFieldEffectObjectTemplate_ShadowLarge
+	.4byte gFieldEffectObjectTemplate_ShadowExtraLarge
+	.4byte gFieldEffectObjectTemplate_TallGrass
+	.4byte gFieldEffectObjectTemplate_Ripple
+	.4byte gFieldEffectObjectTemplate_Ash
+	.4byte gFieldEffectObjectTemplate_SurfBlob
+	.4byte gFieldEffectObjectTemplate_Arrow
+	.4byte gFieldEffectObjectTemplate_GroundImpactDust
+	.4byte gFieldEffectObjectTemplate_BikeHopTallGrass
+	.4byte gFieldEffectObjectTemplate_SandFootprints
+	.4byte gFieldEffectObjectTemplate_BikeHopBigSplash
+	.4byte gFieldEffectObjectTemplate_Splash
+	.4byte gFieldEffectObjectTemplate_BikeHopSmallSplash
+	.4byte gFieldEffectObjectTemplate_LongGrass
+	.4byte gFieldEffectObjectTemplate_Unknown16
+	.4byte gFieldEffectObjectTemplate_Unknown17
+	.4byte gFieldEffectObjectTemplate_Unknown18
+	.4byte gFieldEffectObjectTemplate_Unknown19
+	.4byte gFieldEffectObjectTemplate_Unknown20
+	.4byte gFieldEffectObjectTemplate_Unknown21
+	.4byte gFieldEffectObjectTemplate_BerryTreeGrowthSparkle
+	.4byte gFieldEffectObjectTemplate_DeepSandFootprints
+	.4byte gFieldEffectObjectTemplate_TreeDisguise
+	.4byte gFieldEffectObjectTemplate_MountainDisguise
+	.4byte gFieldEffectObjectTemplate_Bird
+	.4byte gFieldEffectObjectTemplate_BikeTireTracks
+	.4byte gFieldEffectObjectTemplate_SandDisguisePlaceholder
+	.4byte gFieldEffectObjectTemplate_Unknown29
+	.4byte gFieldEffectObjectTemplate_ShortGrass
+	.4byte gFieldEffectObjectTemplate_HotSpringsWater
+	.4byte gFieldEffectObjectTemplate_JumpOutOfAsh
+	.4byte gFieldEffectObjectTemplate_Unknown33
+	.4byte gFieldEffectObjectTemplate_Bubbles
+	.4byte gFieldEffectObjectTemplate_Unknown35
+	.4byte gFieldEffectObjectTemplate_Rayquaza

data/graphics/field_objects/field_object_graphics.s

@@ -5707,7 +5707,35 @@ gFieldObjectPic_SSTidal: ; 84E93F8
 gFieldObjectPalette21: ; 84E9B78
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_21.gbapal"
 
-	.incbin "base_emerald.gba", 0x4e9b98, 0x300
+	.align 2, 0
+
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_0: ; 84E9B98
+	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_1: ; 84E9C18
+	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_2: ; 84E9C98
+	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_3: ; 84E9D18
+	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_4: ; 84E9D98
+	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_5: ; 84E9E18
+	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp"
 
 	.align 2, 0
 
@@ -6624,7 +6652,20 @@ gFieldObjectPic_TamatoBerryTree_4: ; 84F5218
 gFieldObjectPic_TamatoBerryTree_5: ; 84F5318
 	.incbin "data/graphics/field_objects/pics/berry_trees/tamato/5.4bpp"
 
-	.incbin "base_emerald.gba", 0x4f5418, 0x600
+	.align 2, 0
+
+gFieldEffectObjectPic_SurfBlob_0: ; 84F5418
+	.incbin "data/graphics/field_objects/pics/effects/surf_blob/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SurfBlob_1: ; 84F5618
+	.incbin "data/graphics/field_objects/pics/effects/surf_blob/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SurfBlob_2: ; 84F5818
+	.incbin "data/graphics/field_objects/pics/effects/surf_blob/2.4bpp"
 
 	.align 2, 0
 
@@ -6671,7 +6712,687 @@ gFieldObjectPalette12: ; 84F6818
 gFieldObjectPalette13: ; 84F6838
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_13.gbapal"
 
-	.incbin "base_emerald.gba", 0x4f6858, 0x54a0
+	.align 2, 0
+
+gFieldEffectObjectPic_ShadowSmall: ; 84F6858
+	.incbin "data/graphics/field_objects/pics/effects/shadow_small.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_ShadowMedium: ; 84F6878
+	.incbin "data/graphics/field_objects/pics/effects/shadow_medium.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_ShadowLarge: ; 84F68B8
+	.incbin "data/graphics/field_objects/pics/effects/shadow_large.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_ShadowExtraLarge: ; 84F6938
+	.incbin "data/graphics/field_objects/pics/effects/shadow_extra_large.4bpp"
+
+	.incbin "base_emerald.gba", 0x4f6d38, 0x160
+
+	.align 2, 0
+
+gFieldEffectObjectPalette6: ; 84F6E98
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_06.gbapal"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ripple_0: ; 84F6EB8
+	.incbin "data/graphics/field_objects/pics/effects/ripple/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ripple_1: ; 84F6F38
+	.incbin "data/graphics/field_objects/pics/effects/ripple/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ripple_2: ; 84F6FB8
+	.incbin "data/graphics/field_objects/pics/effects/ripple/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ripple_3: ; 84F7038
+	.incbin "data/graphics/field_objects/pics/effects/ripple/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ripple_4: ; 84F70B8
+	.incbin "data/graphics/field_objects/pics/effects/ripple/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ash_0: ; 84F7138
+	.incbin "data/graphics/field_objects/pics/effects/ash/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ash_1: ; 84F71B8
+	.incbin "data/graphics/field_objects/pics/effects/ash/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ash_2: ; 84F7238
+	.incbin "data/graphics/field_objects/pics/effects/ash/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ash_3: ; 84F72B8
+	.incbin "data/graphics/field_objects/pics/effects/ash/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Ash_4: ; 84F7338
+	.incbin "data/graphics/field_objects/pics/effects/ash/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Arrow_0: ; 84F73B8
+	.incbin "data/graphics/field_objects/pics/effects/arrow/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Arrow_1: ; 84F7438
+	.incbin "data/graphics/field_objects/pics/effects/arrow/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Arrow_2: ; 84F74B8
+	.incbin "data/graphics/field_objects/pics/effects/arrow/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Arrow_3: ; 84F7538
+	.incbin "data/graphics/field_objects/pics/effects/arrow/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Arrow_4: ; 84F75B8
+	.incbin "data/graphics/field_objects/pics/effects/arrow/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Arrow_5: ; 84F7638
+	.incbin "data/graphics/field_objects/pics/effects/arrow/5.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Arrow_6: ; 84F76B8
+	.incbin "data/graphics/field_objects/pics/effects/arrow/6.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Arrow_7: ; 84F7738
+	.incbin "data/graphics/field_objects/pics/effects/arrow/7.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPalette0: ; 84F77B8
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_00.gbapal"
+
+	.align 2, 0
+
+gFieldEffectObjectPalette1: ; 84F77D8
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_01.gbapal"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_GroundImpactDust_0: ; 84F77F8
+	.incbin "data/graphics/field_objects/pics/effects/ground_impact_dust/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_GroundImpactDust_1: ; 84F7838
+	.incbin "data/graphics/field_objects/pics/effects/ground_impact_dust/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_GroundImpactDust_2: ; 84F7878
+	.incbin "data/graphics/field_objects/pics/effects/ground_impact_dust/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopTallGrass_0: ; 84F78B8
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_tall_grass/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopTallGrass_1: ; 84F78F8
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_tall_grass/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopTallGrass_2: ; 84F7938
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_tall_grass/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopTallGrass_3: ; 84F7978
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_tall_grass/3.4bpp"
+
+	.incbin "base_emerald.gba", 0x4f79b8, 0x200
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown16_0: ; 84F7BB8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_16/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown16_1: ; 84F7C38
+	.incbin "data/graphics/field_objects/pics/effects/unknown_16/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown16_2: ; 84F7CB8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_16/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown16_3: ; 84F7D38
+	.incbin "data/graphics/field_objects/pics/effects/unknown_16/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown16_4: ; 84F7DB8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_16/4.4bpp"
+
+	.incbin "base_emerald.gba", 0x4f7e38, 0x80
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown16_5: ; 84F7EB8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_16/5.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown17_0: ; 84F7F38
+	.incbin "data/graphics/field_objects/pics/effects/unknown_17/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown17_1: ; 84F7FB8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_17/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown17_2: ; 84F8038
+	.incbin "data/graphics/field_objects/pics/effects/unknown_17/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown17_3: ; 84F80B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_17/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown17_4: ; 84F8138
+	.incbin "data/graphics/field_objects/pics/effects/unknown_17/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown17_5: ; 84F81B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_17/5.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown17_6: ; 84F8238
+	.incbin "data/graphics/field_objects/pics/effects/unknown_17/6.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown17_7: ; 84F82B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_17/7.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown18_0: ; 84F8338
+	.incbin "data/graphics/field_objects/pics/effects/unknown_18/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown18_1: ; 84F83B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_18/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown18_2: ; 84F8438
+	.incbin "data/graphics/field_objects/pics/effects/unknown_18/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown18_3: ; 84F84B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_18/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_LongGrass_0: ; 84F8538
+	.incbin "data/graphics/field_objects/pics/effects/long_grass/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_LongGrass_1: ; 84F85B8
+	.incbin "data/graphics/field_objects/pics/effects/long_grass/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_LongGrass_2: ; 84F8638
+	.incbin "data/graphics/field_objects/pics/effects/long_grass/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_LongGrass_3: ; 84F86B8
+	.incbin "data/graphics/field_objects/pics/effects/long_grass/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TallGrass_0: ; 84F8738
+	.incbin "data/graphics/field_objects/pics/effects/tall_grass/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TallGrass_1: ; 84F87B8
+	.incbin "data/graphics/field_objects/pics/effects/tall_grass/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TallGrass_2: ; 84F8838
+	.incbin "data/graphics/field_objects/pics/effects/tall_grass/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TallGrass_3: ; 84F88B8
+	.incbin "data/graphics/field_objects/pics/effects/tall_grass/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TallGrass_4: ; 84F8938
+	.incbin "data/graphics/field_objects/pics/effects/tall_grass/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_ShortGrass_0: ; 84F89B8
+	.incbin "data/graphics/field_objects/pics/effects/short_grass/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_ShortGrass_1: ; 84F8A38
+	.incbin "data/graphics/field_objects/pics/effects/short_grass/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandFootprints_0: ; 84F8AB8
+	.incbin "data/graphics/field_objects/pics/effects/sand_footprints/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandFootprints_1: ; 84F8B38
+	.incbin "data/graphics/field_objects/pics/effects/sand_footprints/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_DeepSandFootprints_0: ; 84F8BB8
+	.incbin "data/graphics/field_objects/pics/effects/deep_sand_footprints/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_DeepSandFootprints_1: ; 84F8C38
+	.incbin "data/graphics/field_objects/pics/effects/deep_sand_footprints/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeTireTracks_0: ; 84F8CB8
+	.incbin "data/graphics/field_objects/pics/effects/bike_tire_tracks/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeTireTracks_1: ; 84F8D38
+	.incbin "data/graphics/field_objects/pics/effects/bike_tire_tracks/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeTireTracks_2: ; 84F8DB8
+	.incbin "data/graphics/field_objects/pics/effects/bike_tire_tracks/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeTireTracks_3: ; 84F8E38
+	.incbin "data/graphics/field_objects/pics/effects/bike_tire_tracks/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown19_0: ; 84F8EB8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_19/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown19_1: ; 84F8F38
+	.incbin "data/graphics/field_objects/pics/effects/unknown_19/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown19_2: ; 84F8FB8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_19/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown19_3: ; 84F9038
+	.incbin "data/graphics/field_objects/pics/effects/unknown_19/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown29_0: ; 84F90B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_29/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown29_1: ; 84F90F8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_29/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown29_2: ; 84F9138
+	.incbin "data/graphics/field_objects/pics/effects/unknown_29/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopBigSplash_0: ; 84F9178
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_big_splash/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopBigSplash_1: ; 84F91F8
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_big_splash/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopBigSplash_2: ; 84F9278
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_big_splash/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopBigSplash_3: ; 84F92F8
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_big_splash/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Splash_0: ; 84F9378
+	.incbin "data/graphics/field_objects/pics/effects/splash/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Splash_1: ; 84F93B8
+	.incbin "data/graphics/field_objects/pics/effects/splash/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopSmallSplash_0: ; 84F93F8
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_small_splash/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopSmallSplash_1: ; 84F9438
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_small_splash/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_BikeHopSmallSplash_2: ; 84F9478
+	.incbin "data/graphics/field_objects/pics/effects/bike_hop_small_splash/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown20_0: ; 84F94B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_20/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown20_1: ; 84F9538
+	.incbin "data/graphics/field_objects/pics/effects/unknown_20/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown20_2: ; 84F95B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_20/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown20_3: ; 84F9638
+	.incbin "data/graphics/field_objects/pics/effects/unknown_20/3.4bpp"
+
+	.align 2, 0
+
+; unreferenced
+gFieldEffectObjectPic_Unknown20_4: ; 84F96B8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_20/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TreeDisguise_0: ; 84F9738
+	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TreeDisguise_1: ; 84F9838
+	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TreeDisguise_2: ; 84F9938
+	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TreeDisguise_3: ; 84F9A38
+	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TreeDisguise_4: ; 84F9B38
+	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TreeDisguise_5: ; 84F9C38
+	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/5.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_TreeDisguise_6: ; 84F9D38
+	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/6.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_MountainDisguise_0: ; 84F9E38
+	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_MountainDisguise_1: ; 84F9F38
+	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_MountainDisguise_2: ; 84FA038
+	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_MountainDisguise_3: ; 84FA138
+	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_MountainDisguise_4: ; 84FA238
+	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_MountainDisguise_5: ; 84FA338
+	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/5.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_MountainDisguise_6: ; 84FA438
+	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/6.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandDisguisePlaceholder_0: ; 84FA538
+	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandDisguisePlaceholder_1: ; 84FA638
+	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandDisguisePlaceholder_2: ; 84FA738
+	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandDisguisePlaceholder_3: ; 84FA838
+	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandDisguisePlaceholder_4: ; 84FA938
+	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandDisguisePlaceholder_5: ; 84FAA38
+	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/5.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_SandDisguisePlaceholder_6: ; 84FAB38
+	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/6.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_HotSpringsWater: ; 84FAC38
+	.incbin "data/graphics/field_objects/pics/effects/hot_springs_water.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPalette2: ; 84FACB8
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_02.gbapal"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_JumpOutOfAsh_0: ; 84FACD8
+	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_JumpOutOfAsh_1: ; 84FAD58
+	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_JumpOutOfAsh_2: ; 84FADD8
+	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_JumpOutOfAsh_3: ; 84FAE58
+	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_JumpOutOfAsh_4: ; 84FAED8
+	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown33_0: ; 84FAF58
+	.incbin "data/graphics/field_objects/pics/effects/unknown_33/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown33_1: ; 84FAFD8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_33/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown33_2: ; 84FB058
+	.incbin "data/graphics/field_objects/pics/effects/unknown_33/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown33_3: ; 84FB0D8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_33/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown33_4: ; 84FB158
+	.incbin "data/graphics/field_objects/pics/effects/unknown_33/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bubbles_0: ; 84FB1D8
+	.incbin "data/graphics/field_objects/pics/effects/bubbles/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bubbles_1: ; 84FB2D8
+	.incbin "data/graphics/field_objects/pics/effects/bubbles/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bubbles_2: ; 84FB3D8
+	.incbin "data/graphics/field_objects/pics/effects/bubbles/2.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bubbles_3: ; 84FB4D8
+	.incbin "data/graphics/field_objects/pics/effects/bubbles/3.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bubbles_4: ; 84FB5D8
+	.incbin "data/graphics/field_objects/pics/effects/bubbles/4.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bubbles_5: ; 84FB6D8
+	.incbin "data/graphics/field_objects/pics/effects/bubbles/5.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bubbles_6: ; 84FB7D8
+	.incbin "data/graphics/field_objects/pics/effects/bubbles/6.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bubbles_7: ; 84FB8D8
+	.incbin "data/graphics/field_objects/pics/effects/bubbles/7.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown35_0: ; 84FB9D8
+	.incbin "data/graphics/field_objects/pics/effects/unknown_35/0.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Unknown35_1: ; 84FBA58
+	.incbin "data/graphics/field_objects/pics/effects/unknown_35/1.4bpp"
+
+	.align 2, 0
+
+gFieldEffectObjectPalette3: ; 84FBAD8
+	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_03.gbapal"
+
+	.align 2, 0
+
+gFieldEffectObjectPic_Bird: ; 84FBAF8
+	.incbin "data/graphics/field_objects/pics/effects/bird.4bpp"
 
 	.align 2, 0
 

data/graphics/field_objects/palettes/field_effect_object_palette_00.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 172 238
+246 230 197
+238 213 180
+222 180 148
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+98 156 180
+255 189 230
+0 0 0
+238 230 164
+222 205 131
+213 180 106
+205 156 82
+0 0 0

data/graphics/field_objects/palettes/field_effect_object_palette_01.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 189 238
+180 255 131
+131 197 98
+57 139 49
+74 90 8
+49 65 0
+98 172 238
+98 172 197
+139 205 246
+148 230 255
+148 131 98
+180 172 148
+164 213 197
+115 197 164
+65 180 131
+24 164 106

data/graphics/field_objects/palettes/field_effect_object_palette_02.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+98 98 98
+213 213 139
+172 172 90
+139 139 65
+230 246 205
+189 238 180
+131 222 180
+98 172 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/graphics/field_objects/palettes/field_effect_object_palette_03.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+131 172 74
+255 255 255
+205 246 255
+156 213 255
+74 197 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255

data/graphics/field_objects/palettes/field_effect_object_palette_04.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+156 180 172
+106 115 115
+57 57 57
+156 24 24
+255 0 0
+255 123 123
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/graphics/field_objects/palettes/field_effect_object_palette_05.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+49 57 74
+172 164 255
+131 123 230
+106 98 172
+82 74 180
+82 74 98
+246 255 255
+115 172 65
+123 189 74
+148 205 90
+98 90 148
+139 156 213
+57 57 106
+148 205 90
+0 255 0

data/graphics/field_objects/palettes/field_effect_object_palette_06.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+180 255 82
+98 205 8
+41 115 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/graphics/field_objects/palettes/field_effect_object_palette_07.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+213 213 213
+189 189 189
+164 164 164
+131 131 139
+0 0 0
+0 0 0
+0 0 0
+238 213 205
+222 180 164
+189 148 139
+156 115 115
+131 90 90
+98 65 82
+0 0 0

data/graphics/field_objects/palettes/field_effect_object_palette_08.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+180 255 131
+131 197 98
+57 139 49
+57 82 0
+222 148 115
+106 90 90
+164 98 90
+65 57 49
+255 197 148
+222 106 98
+205 65 82
+164 213 197
+115 197 164
+65 180 131
+24 164 106

data/graphics/field_objects/palettes/field_effect_object_palette_10.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 172 238
+246 8 0
+238 213 180
+222 180 148
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+98 156 180
+148 0 0
+197 197 197
+238 230 164
+222 205 131
+213 180 106
+205 156 82
+0 0 0