From cb90fda18d63e0d780b6766d2fce95193127e208 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 3 May 2021 13:27:37 -0400
Subject: [PATCH] Refactor some field effect graphics

---
 .../object_events/pics/effects/fly_blob.png   | Bin 0 -> 1006 bytes
 .../pics/effects/lavaridge_warp.png           | Bin 0 -> 420 bytes
 .../pics/effects/pop_out_of_ash.png           | Bin 0 -> 353 bytes
 .../pics/effects/small_sparkle.png            | Bin 0 -> 188 bytes
 .../pics/effects/underwater_bubbles.png       | Bin 0 -> 556 bytes
 graphics_file_rules.mk                        |   5 +-
 include/constants/field_effects.h             |  37 ++++++++
 .../field_effect_object_template_pointers.h   |  80 +++++++++---------
 src/data/field_effects/field_effect_objects.h |  38 ++++-----
 .../object_events/object_event_graphics.h     |  38 +++------
 src/event_object_movement.c                   |   4 +-
 src/field_effect.c                            |   8 +-
 src/pokemon.c                                 |   2 +-
 13 files changed, 118 insertions(+), 94 deletions(-)
 create mode 100644 graphics/object_events/pics/effects/fly_blob.png
 create mode 100644 graphics/object_events/pics/effects/lavaridge_warp.png
 create mode 100644 graphics/object_events/pics/effects/pop_out_of_ash.png
 create mode 100644 graphics/object_events/pics/effects/small_sparkle.png
 create mode 100644 graphics/object_events/pics/effects/underwater_bubbles.png

diff --git a/graphics/object_events/pics/effects/fly_blob.png b/graphics/object_events/pics/effects/fly_blob.png
new file mode 100644
index 0000000000000000000000000000000000000000..124d755a0a888b2744e622627c5347aafb2d5f9c
GIT binary patch
literal 1006
zcmV<K0}=d*P)<h;3K|Lk000e1NJLTq002M$00BS*0{{R3{xD}*0000mP)t-sgL|Z`
zdqMxjl-`tcdqF`#LDe}qdvm14YAGr1?*Fv3)&FWr#W^|u-deq!IRF3v0pt=p00001
zbW%=J06^y0W&i*KY)M2xRA_<in6YaVQ4q$r3Mqs~AiWU%4=#O7vZNBXvQHro5`<TY
zrIrT<(jDxX!b-U1;96xZEG*2qn8wyFSRSh^gNB1~=G|(9dox=^B*Ob3)%=(@`*L^l
z?Uy7`QCAdp)v;FV22pQ;9RN2_kI(_rae{$5Q5%3o^#rumq5>GIJ8cAWSr0SNcBrMx
z247zc8UhT@=%5`m)WA{Ab^@*)B=`)#1JIuYI4t~(PPi+?2?5$=8kj6PB+_Nl^ZWbO
zKTtG^RX<VwK05%bw($3H#TL*3FwybtG+p1`sHmu@>!+??F4N&V{4PjV`~9cl2?VSj
zmE|jmV1Vjn`BnyM54@KFoPQ|G$^&M3Vg^o5$CU@ziiCjCcv@A*3GWQI1n|l~9Oc7z
zU+=ILS-v(lFMG5~c6aa4R>I{De8%q9#<yFW>~#W15a62L#!inL1b31_2TiY+HQqvm
z0C3JVdzL2*jo{ZIRy$i(T8mt#Dg4?DHCQZESQv<)37W9M0eSD5iDT~pqJJ<{zL=ow
zFX;bs=mE(M5&(rm5ba=V1yKaxvK~Id{3605dQq{%lt)EHMO|BU+5`R7$-f2afM2$n
zf1qVquRf#YFA-qD-O%g-1DF0GU=QfE+Z|P9`KC(3_J9DGSJlEl1nmI<*aBgDKs(Xh
zt<L7hN!T9HMOnAm@Aosw9`KZ#>H4;44|wlllV&K{0|vg&a1N3^;34MsK7Vr3_V&QX
z*}0SK!3Fi6r?YdA>;VDp2@NUQgMuC&++%hSf`351O9vo?2Y|o^Ky(KTSkVCaBievO
z{_GlD1SneI<rMqCQvJmrh*EFucT`kV)PJbIlRvCjyDy$Vz{+8s4<v#Cs^|F&8K^z*
zQU+l7{B>TO@)_a$0Zyjlq8jbX`NIX-hhk96`2&pd+`6n5^9Nq457H)6^M~76D(4T#
z`2#nQ@`r}=hqNPqxUc6Ak7E81^M|OYs3=|kD1YF!BLnmkZ1a355gachw3_qbz6`AV
z288_KU`oVrAm<N1#?zu059Is-hU2Q5IwgOw2jpRDC4WeH>t;&+u)RjQspJn01MCl^
z{GmzL*49&y^M@uSN$~&!h*Sq9f4~fJ4odzo`(huSY5BvfsHPJwf53t)f|ft<6~_D_
cDymaI0j#dUkVhvLmjD0&07*qoM6N<$f_G2X4gdfE

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/effects/lavaridge_warp.png b/graphics/object_events/pics/effects/lavaridge_warp.png
new file mode 100644
index 0000000000000000000000000000000000000000..57bb24beb6959d8217f4043a30dfa6bd4ac5b425
GIT binary patch
literal 420
zcmeAS@N?(olHy`uVBq!ia0vp^0ze$V!VDxIwZ5<eQU(D&A+A9B|Ns9<Nl90)cCT3z
z)!ps*?AzJB@3u7G+mf`V8z_qgd}fAg1BDn%g8YIR9G=}s1G1GoT^vI+CiVtyENeF4
z5#hFoj?A#<7yGkmY4_5+633+1Qy%R<dou0BYwx(l2d(6*?)-H56126v!e+(BMH_87
zg6xi+$>LAz{vK?0+P=@IODnX~{i^QP_*olQXNWRoStS+!HP>3Ow2kR?#0<YLK{NUk
zUrpmGXg+4}<V@bS%KY`a;%+~BRAcu){mit0d%_h`H~z2qYxBM7pXAKTyBivqnlD9e
zlVxv>EV@>?aL%I0u9;=NweqQ-OJ;aG?Ou5!?8?OR@?Q_1ldXu8{d}~#$X-xk*Zh|D
zMa;cZTxPm1W;SMDdtY+CLC>KNEA7~S?SE}>biLBLPgibmi|(^O#nt57tgjrA)aP(8
zCPd7M<xEE-3%efIgJ+Ddd?fWcb>-%Y2gW{KTzeN7@>2>;vh9mOq3P-B=d#Wzp$Py9
Cb+5_*

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/effects/pop_out_of_ash.png b/graphics/object_events/pics/effects/pop_out_of_ash.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a1dfc29689204f1c4af5d49fd784c376e73cfbe
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0vp^0ze$V!VDxIwZ5<eQU(D&A+A9B|Ns9<Nl90)cCT3z
z)!ps*?AzJB@3u7G+mf`V8z_qgd}fAg1BDn%g8YIR9G=}s19I+rx;TbtOq?6&n0Lg0
z!=>pjzmN^X$uIYuKmT7pg;9O&B-@aq8*O_y<qR&?_kQJ@mOsIAcM99L>k}($m}FB;
zt_b8CAD3M-cfuRKBhR>!>Ki_1+!QNmTz{s2?V}&7H_Xu7;$b=C5BmnA)nW2nI_v_>
z8@lupvhL13^G;y7zJ_qw_A5@Ad9f38jQa)ie}%Of`IXmKW$^~Bz1{g+oBc_egbzEb
zMB2ne6DQ{tcchwL9rI$#xh@lHai^lok%KAK-tGK9=E@1u-j*iL>#n?2cGFwtE9Wz(
j((%HYS{-%K{Zne0vuq8MOZitwgMz}-)z4*}Q$iB}wz-A(

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/effects/small_sparkle.png b/graphics/object_events/pics/effects/small_sparkle.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef62dffbb9cb0d0510590819f2612569d30777a2
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt#`Z@%sP&|JiT<=Un~o
zb@cy#1_H=h@2opeFJnoNUoeBivm0qZj+Lj2V~E7m<OBt235QHEL5;%!7Z`k5*0lva
zXh>YZV0AcBV$}%`jx{GD1vnIv0t8h|XWSB0JN%Z3k>TldRzW72EpLIQFnGH9xvX<a
GXaWFVbV&IC

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/effects/underwater_bubbles.png b/graphics/object_events/pics/effects/underwater_bubbles.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ebbf24b188ca43d8f0ab640b39dbde5185a2485
GIT binary patch
literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000mP)t-s{{Zgx
z=Ed&SwBEFo|NsBq=I*`C=A5+NVw|)9000000Pg0b-qnlMy>rF1S^xk5{UnSh00001
zbW%=J06^y0W&i*Is!2paR7i>KQ?YV`Fbvfo9ekDtLo#Z>O~(#Rn~@>8bY!9BvujH>
z-~dUlQ-|s}?8MU3)AIx1KOP0z2MM<3yXR!z=zhZIX(Pc}fu?d;Pe5Duk|57YH1@p{
z2!?f%{B_ln%B@r2vMWOZE~m6cdbe;<4vf1Sc4t}134n26k8K7}znHkK{I4UJ=Pv6~
zUpt@BRDif=cp@aqX_~<&(Cdl!jjv={Oi5vM8i3gak)~?2CJpFooFlDe29wC4u3D4?
zB%mmDwF~4#7;h1p-9aQ_ggwv)2lnA#mJ>`IKA=3Sax|h#A&&xDQOL<NHAoa}YcTTF
zH{Z-}3Ipn2q}U+On7RADi+>SYfK^;+!}X%pDuPWaZ9t>#bu-;_5i5-*T>ErD^JD*!
zUNoT_Npa@YgKM>^JD40gr4PxwN+PS)hNC~irYLR`z;Tp@I7b*csWh}aNXQtZA#X8+
zweXS$X@X6X$ufw_m!lxG6Wf{C(!c2;3(EE!=Y!>Z5^kI?-S0xFXlB}W$aG1o=LT52
uZ*Y*V?etzok!rUQ9(^xc<bRIv=i?hRVNGW`b9#gT0000<MNUMnLSTYQZ~im@

literal 0
HcmV?d00001

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 72dd013b0..abd2da07f 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -13,7 +13,7 @@ RAYQUAZAGFXDIR := graphics/rayquaza_scene
 ROULETTEGFXDIR := graphics/roulette
 SLOTMACHINEGFXDIR := graphics/slot_machine
 PSSGFXDIR := graphics/pokemon_storage
-EVENTOBJGFXDIR := graphics/event_objects
+EVENTOBJGFXDIR := graphics/object_events
 MISCGFXDIR := graphics/misc
 TEXTWINDOWGFXDIR := graphics/text_window
 SLOTMACHINEGFXDIR := graphics/slot_machine
@@ -432,6 +432,9 @@ $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whisca
 $(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 11
 
+$(EVENTOBJGFXDIR)/pics/effects/underwater_bubbles.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 8
 	
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 92795246a..276d073b1 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -72,4 +72,41 @@
 #define FLDEFF_DESTROY_DEOXYS_ROCK       68
 #define FLDEFF_UNK_45                    69 // TODO: related to fame checker photos
 
+#define FLDEFFGFX_SHADOW_SMALL             0
+#define FLDEFFGFX_SHADOW_MEDIUM            1
+#define FLDEFFGFX_SHADOW_LARGE             2
+#define FLDEFFGFX_SHADOW_EXTRA_LARGE       3
+#define FLDEFFGFX_04                       4
+#define FLDEFFGFX_05                       5
+#define FLDEFFGFX_06                       6
+#define FLDEFFGFX_07                       7
+#define FLDEFFGFX_08                       8
+#define FLDEFFGFX_09                       9
+#define FLDEFFGFX_10                      10
+#define FLDEFFGFX_11                      11
+#define FLDEFFGFX_12                      12
+#define FLDEFFGFX_13                      13
+#define FLDEFFGFX_14                      14
+#define FLDEFFGFX_15                      15
+#define FLDEFFGFX_16                      16
+#define FLDEFFGFX_17                      17
+#define FLDEFFGFX_18                      18
+#define FLDEFFGFX_19                      19
+#define FLDEFFGFX_20                      20
+#define FLDEFFGFX_REFLECTION                      21
+#define FLDEFFGFX_22                      22
+#define FLDEFFGFX_23                      23
+#define FLDEFFGFX_24                      24
+#define FLDEFFGFX_25                      25
+#define FLDEFFGFX_FLY_BLOB                      26
+#define FLDEFFGFX_27                      27
+#define FLDEFFGFX_28                      28
+#define FLDEFFGFX_29                      29
+#define FLDEFFGFX_30                      30
+#define FLDEFFGFX_31                      31
+#define FLDEFFGFX_32                      32
+#define FLDEFFGFX_33                      33
+#define FLDEFFGFX_34                      34
+#define FLDEFFGFX_35                      35
+
 #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h
index 39321bb3d..be9cbeef9 100644
--- a/src/data/field_effects/field_effect_object_template_pointers.h
+++ b/src/data/field_effects/field_effect_object_template_pointers.h
@@ -1,7 +1,7 @@
-const struct SpriteTemplate gUnknown_83A537C;
-const struct SpriteTemplate gUnknown_83A5394;
-const struct SpriteTemplate gUnknown_83A53AC;
-const struct SpriteTemplate gUnknown_83A53C4;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowXL;
 const struct SpriteTemplate gUnknown_83A5420;
 const struct SpriteTemplate gUnknown_83A5488;
 const struct SpriteTemplate gUnknown_83A54E4;
@@ -35,40 +35,40 @@ const struct SpriteTemplate gUnknown_83A5FA4;
 const struct SpriteTemplate gUnknown_83A5FE0;
 
 const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
-    &gUnknown_83A537C,
-    &gUnknown_83A5394,
-    &gUnknown_83A53AC,
-    &gUnknown_83A53C4,
-    &gUnknown_83A5420,
-    &gUnknown_83A5488,
-    &gUnknown_83A54E4,
-    &gUnknown_83A556C,
-    &gUnknown_83A5604,
-    &gUnknown_83A5648,
-    &gUnknown_83A5698,
-    &gUnknown_83A56F4,
-    &gUnknown_83A583C,
-    &gUnknown_83A589C,
-    &gUnknown_83A58E0,
-    &gUnknown_83A593C,
-    &gUnknown_83A59A4,
-    &gUnknown_83A5A30,
-    &gUnknown_83A5A88,
-    &gUnknown_83A5AD8,
-    &gUnknown_83A5B74,
-    &gUnknown_83A5C34,
-    NULL,
-    &gUnknown_83A5750,
-    &gUnknown_83A5CB4,
-    &gUnknown_83A5D34,
-    &gUnknown_83A5E00,
-    &gUnknown_83A57EC,
-    &gUnknown_83A5D84,
-    &gUnknown_83A5B1C,
-    &gUnknown_83A5E38,
-    &gUnknown_83A5E64,
-    &gUnknown_83A5EC0,
-    &gUnknown_83A5F24,
-    &gUnknown_83A5FA4,
-    &gUnknown_83A5FE0,
+    [FLDEFFGFX_SHADOW_SMALL] = &gFieldEffectObjectTemplate_ShadowS,
+    [FLDEFFGFX_SHADOW_MEDIUM] = &gFieldEffectObjectTemplate_ShadowM,
+    [FLDEFFGFX_SHADOW_LARGE] = &gFieldEffectObjectTemplate_ShadowL,
+    [FLDEFFGFX_SHADOW_EXTRA_LARGE] = &gFieldEffectObjectTemplate_ShadowXL,
+    [FLDEFFGFX_04] = &gUnknown_83A5420,
+    [FLDEFFGFX_05] = &gUnknown_83A5488,
+    [FLDEFFGFX_06] = &gUnknown_83A54E4,
+    [FLDEFFGFX_07] = &gUnknown_83A556C,
+    [FLDEFFGFX_08] = &gUnknown_83A5604,
+    [FLDEFFGFX_09] = &gUnknown_83A5648,
+    [FLDEFFGFX_10] = &gUnknown_83A5698,
+    [FLDEFFGFX_11] = &gUnknown_83A56F4,
+    [FLDEFFGFX_12] = &gUnknown_83A583C,
+    [FLDEFFGFX_13] = &gUnknown_83A589C,
+    [FLDEFFGFX_14] = &gUnknown_83A58E0,
+    [FLDEFFGFX_15] = &gUnknown_83A593C,
+    [FLDEFFGFX_16] = &gUnknown_83A59A4,
+    [FLDEFFGFX_17] = &gUnknown_83A5A30,
+    [FLDEFFGFX_18] = &gUnknown_83A5A88,
+    [FLDEFFGFX_19] = &gUnknown_83A5AD8,
+    [FLDEFFGFX_20] = &gUnknown_83A5B74,
+    [FLDEFFGFX_REFLECTION] = &gUnknown_83A5C34,
+    [FLDEFFGFX_22] = NULL,
+    [FLDEFFGFX_23] = &gUnknown_83A5750,
+    [FLDEFFGFX_24] = &gUnknown_83A5CB4,
+    [FLDEFFGFX_25] = &gUnknown_83A5D34,
+    [FLDEFFGFX_FLY_BLOB] = &gUnknown_83A5E00,
+    [FLDEFFGFX_27] = &gUnknown_83A57EC,
+    [FLDEFFGFX_28] = &gUnknown_83A5D84,
+    [FLDEFFGFX_29] = &gUnknown_83A5B1C,
+    [FLDEFFGFX_30] = &gUnknown_83A5E38,
+    [FLDEFFGFX_31] = &gUnknown_83A5E64,
+    [FLDEFFGFX_32] = &gUnknown_83A5EC0,
+    [FLDEFFGFX_33] = &gUnknown_83A5F24,
+    [FLDEFFGFX_34] = &gUnknown_83A5FA4,
+    [FLDEFFGFX_35] = &gUnknown_83A5FE0,
 };
diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h
index 0f2694de2..e8d5c4f50 100644
--- a/src/data/field_effects/field_effect_objects.h
+++ b/src/data/field_effects/field_effect_objects.h
@@ -1,62 +1,62 @@
 const struct SpritePalette gUnknown_83A5340 = { .data = gUnknown_8398FA8, .tag = 0x1004 };
 const struct SpritePalette gUnknown_83A5348 = { .data = gUnknown_8398FC8, .tag = 0x1005 };
 
-const union AnimCmd gUnknown_83A5350[] =
+const union AnimCmd gSpriteAnimCmd_FieldShadow0[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_83A5358[] = 
+const union AnimCmd *const gSpriteAnimTable_FieldShadow[] =
 {
-    gUnknown_83A5350,
+    gSpriteAnimCmd_FieldShadow0,
 };
 
-const struct SpriteFrameImage gUnknown_83A535C[] = { obj_frame_tiles(gUnknown_8398048) };
-const struct SpriteFrameImage gUnknown_83A5364[] = { obj_frame_tiles(gUnknown_8398068) };
-const struct SpriteFrameImage gUnknown_83A536C[] = { obj_frame_tiles(gUnknown_83980A8) };
-const struct SpriteFrameImage gUnknown_83A5374[] = { obj_frame_tiles(gUnknown_8398128) };
+const struct SpriteFrameImage gSpriteFrameImage_FieldShadowS[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowS) };
+const struct SpriteFrameImage gSpriteFrameImage_FieldShadowM[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowM) };
+const struct SpriteFrameImage gSpriteFrameImage_FieldShadowL[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowL) };
+const struct SpriteFrameImage gSpriteFrameImage_FieldShadowXL[] = { obj_frame_tiles(gSpriteImageGfx_FieldShadowXL) };
 
-const struct SpriteTemplate gUnknown_83A537C =
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowS =
 {
     .tileTag = SPRITE_INVALID_TAG,
     .paletteTag = SPRITE_INVALID_TAG,
     .oam = &gObjectEventBaseOam_8x8,
-    .anims = gUnknown_83A5358,
-    .images = gUnknown_83A535C,
+    .anims = gSpriteAnimTable_FieldShadow,
+    .images = gSpriteFrameImage_FieldShadowS,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = UpdateShadowFieldEffect,
 };
 
-const struct SpriteTemplate gUnknown_83A5394 =
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowM =
 {
     .tileTag = SPRITE_INVALID_TAG,
     .paletteTag = SPRITE_INVALID_TAG,
     .oam = &gObjectEventBaseOam_16x8,
-    .anims = gUnknown_83A5358,
-    .images = gUnknown_83A5364,
+    .anims = gSpriteAnimTable_FieldShadow,
+    .images = gSpriteFrameImage_FieldShadowM,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = UpdateShadowFieldEffect,
 };
 
-const struct SpriteTemplate gUnknown_83A53AC =
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowL =
 {
     .tileTag = SPRITE_INVALID_TAG,
     .paletteTag = SPRITE_INVALID_TAG,
     .oam = &gObjectEventBaseOam_32x8,
-    .anims = gUnknown_83A5358,
-    .images = gUnknown_83A536C,
+    .anims = gSpriteAnimTable_FieldShadow,
+    .images = gSpriteFrameImage_FieldShadowL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = UpdateShadowFieldEffect,
 };
 
-const struct SpriteTemplate gUnknown_83A53C4 =
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowXL =
 {
     .tileTag = SPRITE_INVALID_TAG,
     .paletteTag = SPRITE_INVALID_TAG,
     .oam = &gObjectEventBaseOam_64x32,
-    .anims = gUnknown_83A5358,
-    .images = gUnknown_83A5374,
+    .anims = gSpriteAnimTable_FieldShadow,
+    .images = gSpriteFrameImage_FieldShadowXL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = UpdateShadowFieldEffect,
 };
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 87451cae1..8597bea5a 100644
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -186,10 +186,10 @@ const u32 gObjectEventPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/m
 const u32 gObjectEventPic_Policeman[] = INCBIN_U32("graphics/object_events/pics/people/policeman.4bpp");
 const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal");
 const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal");
-const u32 gUnknown_8398048[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp");
-const u32 gUnknown_8398068[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp");
-const u32 gUnknown_83980A8[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp");
-const u32 gUnknown_8398128[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp");
+const u32 gSpriteImageGfx_FieldShadowS[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp");
+const u32 gSpriteImageGfx_FieldShadowM[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp");
+const u32 gSpriteImageGfx_FieldShadowL[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp");
+const u32 gSpriteImageGfx_FieldShadowXL[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp");
 const u32 filler_8398188[0x48] = {};
 const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp");
 const u32 gUnknown_8398668[] = INCBIN_U32("graphics/field_effects/fldeff_cut.4bpp");
@@ -236,26 +236,10 @@ const u32 gUnknown_839B008[] = INCBIN_U32("graphics/object_events/pics/unknown/8
 const u32 gUnknown_839B708[] = INCBIN_U32("graphics/object_events/pics/unknown/839B708.4bpp");
 const u32 gUnknown_839BE08[] = INCBIN_U32("graphics/object_events/pics/unknown/839BE08.4bpp");
 const u32 gUnknown_839C508[] = INCBIN_U32("graphics/object_events/pics/unknown/839C508.4bpp");
-const u16 gUnknown_839C588[] = INCBIN_U16("graphics/object_events/palettes/839C588.gbapal");
-const u32 gUnknown_839C5A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C5A8.4bpp");
-const u32 gUnknown_839C628[] = INCBIN_U32("graphics/object_events/pics/unknown/839C628.4bpp");
-const u32 gUnknown_839C6A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C6A8.4bpp");
-const u32 gUnknown_839C728[] = INCBIN_U32("graphics/object_events/pics/unknown/839C728.4bpp");
-const u32 gUnknown_839C7A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C7A8.4bpp");
-const u32 gUnknown_839C828[] = INCBIN_U32("graphics/object_events/pics/unknown/839C828.4bpp");
-const u32 gUnknown_839C8A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C8A8.4bpp");
-const u32 gUnknown_839C928[] = INCBIN_U32("graphics/object_events/pics/unknown/839C928.4bpp");
-const u32 gUnknown_839C9A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839C9A8.4bpp");
-const u32 gUnknown_839CA28[] = INCBIN_U32("graphics/object_events/pics/unknown/839CA28.4bpp");
-const u32 gUnknown_839CAA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CAA8.4bpp");
-const u32 gUnknown_839CBA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CBA8.4bpp");
-const u32 gUnknown_839CCA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CCA8.4bpp");
-const u32 gUnknown_839CDA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CDA8.4bpp");
-const u32 gUnknown_839CEA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CEA8.4bpp");
-const u32 gUnknown_839CFA8[] = INCBIN_U32("graphics/object_events/pics/unknown/839CFA8.4bpp");
-const u32 gUnknown_839D0A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839D0A8.4bpp");
-const u32 gUnknown_839D1A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839D1A8.4bpp");
-const u32 gUnknown_839D2A8[] = INCBIN_U32("graphics/object_events/pics/unknown/839D2A8.4bpp");
-const u32 gUnknown_839D328[] = INCBIN_U32("graphics/object_events/pics/unknown/839D328.4bpp");
-const u16 gUnknown_839D3A8[] = INCBIN_U16("graphics/object_events/palettes/839D3A8.gbapal");
-const u32 gUnknown_839D3C8[] = INCBIN_U32("graphics/object_events/pics/unknown/839D3C8.4bpp");
+const u16 gUnknown_839C588[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal");
+const u16 gUnknown_839C5A8[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp");
+const u16 gUnknown_839C828[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp");
+const u16 gUnknown_839CAA8[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp");
+const u16 gUnknown_839D2A8[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp");
+const u16 gUnknown_839D3A8[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal");
+const u16 gUnknown_839D3C8[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.4bpp");
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 6b9445d8e..5d2b5a1bf 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1243,13 +1243,13 @@ void ResetObjectEvents(void)
 
 static void CreateReflectionEffectSprites(void)
 {
-    u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
+    u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_REFLECTION], 0, 0, 31);
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     InitSpriteAffineAnim(&gSprites[spriteId]);
     StartSpriteAffineAnim(&gSprites[spriteId], 0);
     gSprites[spriteId].invisible = TRUE;
 
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_REFLECTION], 0, 0, 31);
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     InitSpriteAffineAnim(&gSprites[spriteId]);
     StartSpriteAffineAnim(&gSprites[spriteId], 1);
diff --git a/src/field_effect.c b/src/field_effect.c
index c2b507882..e193ab3b5 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1903,7 +1903,7 @@ u8 FldEff_LavaridgeGymWarp(void)
 {
     u8 spriteId;
     sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
     gSprites[spriteId].coordOffsetEnabled = TRUE;
     return spriteId;
@@ -1996,7 +1996,7 @@ u8 FldEff_PopOutOfAsh(void)
 {
     u8 spriteId;
     sub_8063BC4((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFGFX_32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
     gSprites[spriteId].coordOffsetEnabled = TRUE;
     return spriteId;
@@ -3048,7 +3048,7 @@ static void sub_8086D94(struct Sprite * sprite);
 
 u8 FldEff_NpcFlyOut(void)
 {
-    u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0x78, 0, 1);
+    u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0x78, 0, 1);
     struct Sprite * sprite = &gSprites[spriteId];
 
     sprite->oam.paletteNum = 0;
@@ -3239,7 +3239,7 @@ static u8 sub_8087168(void)
 {
     u8 spriteId;
     struct Sprite * sprite;
-    spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0xff, 0xb4, 0x1);
+    spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFGFX_FLY_BLOB], 0xff, 0xb4, 0x1);
     sprite = &gSprites[spriteId];
     sprite->oam.paletteNum = 0;
     sprite->oam.priority = 1;
diff --git a/src/pokemon.c b/src/pokemon.c
index c59fd226e..350395763 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -3770,7 +3770,7 @@ static void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord
         }
     }
     gBattleTypeFlags = 8;
-    gTrainerBattleOpponent_A = 0x400;
+    gTrainerBattleOpponent_A = SECRET_BASE_OPPONENT;
 }
 
 u8 GetSecretBaseTrainerPicIndex(void)