41 files changed, 74 insertions, 74 deletions
diff --git a/battle/anim_gfx.asm b/battle/anim_gfx.asm
index 996c17f1e..da6614980 100644
--- a/battle/anim_gfx.asm
+++ b/battle/anim_gfx.asm
@@ -1,41 +1,41 @@
 AnimObj00GFX: ; 84a2e
-AnimObjHitGFX: INCBIN "gfx/fx/001.2bpp.lz"
-AnimObjCutGFX: INCBIN "gfx/fx/002.2bpp.lz"
-AnimObjFireGFX: INCBIN "gfx/fx/003.2bpp.lz"
-AnimObjWaterGFX: INCBIN "gfx/fx/004.2bpp.lz"
-AnimObjLightningGFX: INCBIN "gfx/fx/005.2bpp.lz"
-AnimObj07GFX: INCBIN "gfx/fx/007.2bpp.lz"
-AnimObj08GFX: INCBIN "gfx/fx/008.2bpp.lz"
-AnimObj10GFX: INCBIN "gfx/fx/010.2bpp.lz"
-AnimObj09GFX: INCBIN "gfx/fx/009.2bpp.lz"
-AnimObj12GFX: INCBIN "gfx/fx/012.2bpp.lz"
-AnimObj06GFX: INCBIN "gfx/fx/006.2bpp.lz"
-AnimObj11GFX: INCBIN "gfx/fx/011.2bpp.lz"
-AnimObj13GFX: INCBIN "gfx/fx/013.2bpp.lz"
-AnimObj14GFX: INCBIN "gfx/fx/014.2bpp.lz"
-AnimObj24GFX: INCBIN "gfx/fx/024.2bpp.lz"
-AnimObj15GFX: INCBIN "gfx/fx/015.2bpp.lz"
-AnimObj16GFX: INCBIN "gfx/fx/016.2bpp.lz"
-AnimObj17GFX: INCBIN "gfx/fx/017.2bpp.lz"
-AnimObj18GFX: INCBIN "gfx/fx/018.2bpp.lz"
-AnimObj19GFX: INCBIN "gfx/fx/019.2bpp.lz"
-AnimObj20GFX: INCBIN "gfx/fx/020.2bpp.lz"
-AnimObj22GFX: INCBIN "gfx/fx/022.2bpp.lz"
-AnimObj21GFX: INCBIN "gfx/fx/021.2bpp.lz"
-AnimObj23GFX: INCBIN "gfx/fx/023.2bpp.lz"
-AnimObj26GFX: INCBIN "gfx/fx/026.2bpp.lz"
-AnimObj27GFX: INCBIN "gfx/fx/027.2bpp.lz"
-AnimObj28GFX: INCBIN "gfx/fx/028.2bpp.lz"
-AnimObj29GFX: INCBIN "gfx/fx/029.2bpp.lz"
-AnimObj30GFX: INCBIN "gfx/fx/030.2bpp.lz"
-AnimObj31GFX: INCBIN "gfx/fx/031.2bpp.lz"
-AnimObj32GFX: INCBIN "gfx/fx/032.2bpp.lz"
-AnimObj33GFX: INCBIN "gfx/fx/033.2bpp.lz"
-AnimObj34GFX: INCBIN "gfx/fx/034.2bpp.lz"
-AnimObj25GFX: INCBIN "gfx/fx/025.2bpp.lz"
-AnimObj35GFX: INCBIN "gfx/fx/035.2bpp.lz"
-AnimObj36GFX: INCBIN "gfx/fx/036.2bpp.lz"
-AnimObj37GFX: INCBIN "gfx/fx/037.2bpp.lz"
-AnimObj38GFX: INCBIN "gfx/fx/038.2bpp.lz"
-AnimObj39GFX: INCBIN "gfx/fx/039.2bpp.lz"
+AnimObjHitGFX:       INCBIN "gfx/fx/hit.2bpp.lz"
+AnimObjCutGFX:       INCBIN "gfx/fx/cut.2bpp.lz"
+AnimObjFireGFX:      INCBIN "gfx/fx/fire.2bpp.lz"
+AnimObjWaterGFX:     INCBIN "gfx/fx/water.2bpp.lz"
+AnimObjLightningGFX: INCBIN "gfx/fx/lightning.2bpp.lz"
+AnimObjSmokeGFX:     INCBIN "gfx/fx/smoke.2bpp.lz"
+AnimObjExplosionGFX: INCBIN "gfx/fx/explosion.2bpp.lz"
+AnimObjIceGFX:       INCBIN "gfx/fx/ice.2bpp.lz"
+AnimObjRocksGFX:     INCBIN "gfx/fx/rocks.2bpp.lz"
+AnimObjPoisonGFX:    INCBIN "gfx/fx/poison.2bpp.lz"
+AnimObjPlantGFX:     INCBIN "gfx/fx/plant.2bpp.lz"
+AnimObjPokeBallGFX:  INCBIN "gfx/fx/pokeball.2bpp.lz"
+AnimObjBubbleGFX:    INCBIN "gfx/fx/bubble.2bpp.lz"
+AnimObjNoiseGFX:     INCBIN "gfx/fx/noise.2bpp.lz"
+AnimObjReflectGFX:   INCBIN "gfx/fx/reflect.2bpp.lz"
+AnimObjPowderGFX:    INCBIN "gfx/fx/powder.2bpp.lz"
+AnimObjBeamGFX:      INCBIN "gfx/fx/beam.2bpp.lz"
+AnimObjSpeedGFX:     INCBIN "gfx/fx/speed.2bpp.lz"
+AnimObjChargeGFX:    INCBIN "gfx/fx/charge.2bpp.lz"
+AnimObjWindGFX:      INCBIN "gfx/fx/wind.2bpp.lz"
+AnimObjWhipGFX:      INCBIN "gfx/fx/whip.2bpp.lz"
+AnimObjRopeGFX:      INCBIN "gfx/fx/rope.2bpp.lz"
+AnimObjEggGFX:       INCBIN "gfx/fx/egg.2bpp.lz"
+AnimObjPsychicGFX:   INCBIN "gfx/fx/psychic.2bpp.lz"
+AnimObjSandGFX:      INCBIN "gfx/fx/sand.2bpp.lz"
+AnimObjWebGFX:       INCBIN "gfx/fx/web.2bpp.lz"
+AnimObjHazeGFX:      INCBIN "gfx/fx/haze.2bpp.lz"
+AnimObjHornGFX:      INCBIN "gfx/fx/horn.2bpp.lz"
+AnimObjFlowerGFX:    INCBIN "gfx/fx/flower.2bpp.lz"
+AnimObjMiscGFX:      INCBIN "gfx/fx/misc.2bpp.lz"
+AnimObjSkyAttackGFX: INCBIN "gfx/fx/skyattack.2bpp.lz"
+AnimObjGlobeGFX:     INCBIN "gfx/fx/globe.2bpp.lz"
+AnimObjShapesGFX:    INCBIN "gfx/fx/shapes.2bpp.lz"
+AnimObjStatusGFX:    INCBIN "gfx/fx/status.2bpp.lz"
+AnimObjObjectsGFX:   INCBIN "gfx/fx/objects.2bpp.lz"
+AnimObjShineGFX:     INCBIN "gfx/fx/shine.2bpp.lz"
+AnimObjAngelsGFX:    INCBIN "gfx/fx/angels.2bpp.lz"
+AnimObjWaveGFX:      INCBIN "gfx/fx/wave.2bpp.lz"
+AnimObjAeroblastGFX: INCBIN "gfx/fx/aeroblast.2bpp.lz"
 ; 8640e
diff --git a/battle/objects/gfx_headers.asm b/battle/objects/gfx_headers.asm
index eadd1abfb..60164918b 100755
--- a/battle/objects/gfx_headers.asm
+++ b/battle/objects/gfx_headers.asm
@@ -2,7 +2,7 @@
 AnimObjGFX: ; cfcf6
 
 object_gfx: MACRO
-; label, # tiles
+; # tiles, label
 	db  \1
 	dba \2
 ENDM
@@ -13,40 +13,40 @@ ENDM
 	object_gfx  6, AnimObjFireGFX
 	object_gfx 20, AnimObjWaterGFX
 	object_gfx 26, AnimObjLightningGFX
-	object_gfx 18, AnimObj06GFX
-	object_gfx 12, AnimObj07GFX
-	object_gfx  9, AnimObj08GFX
-	object_gfx 17, AnimObj09GFX
-	object_gfx  6, AnimObj10GFX
-	object_gfx 10, AnimObj11GFX
-	object_gfx  9, AnimObj12GFX
-	object_gfx 13, AnimObj13GFX
-	object_gfx 16, AnimObj14GFX
-	object_gfx  2, AnimObj15GFX
-	object_gfx 11, AnimObj16GFX
-	object_gfx  9, AnimObj17GFX
-	object_gfx  9, AnimObj18GFX
-	object_gfx 19, AnimObj19GFX
-	object_gfx 10, AnimObj20GFX
-	object_gfx 12, AnimObj21GFX
-	object_gfx 18, AnimObj22GFX
-	object_gfx 13, AnimObj23GFX
-	object_gfx 10, AnimObj24GFX
-	object_gfx 27, AnimObj25GFX
-	object_gfx 12, AnimObj26GFX
-	object_gfx 14, AnimObj27GFX
-	object_gfx 16, AnimObj28GFX
-	object_gfx  7, AnimObj29GFX
-	object_gfx  8, AnimObj30GFX
-	object_gfx 40, AnimObj31GFX
-	object_gfx 36, AnimObj32GFX
-	object_gfx 16, AnimObj33GFX
-	object_gfx 48, AnimObj34GFX
-	object_gfx 18, AnimObj35GFX
-	object_gfx 38, AnimObj36GFX
-	object_gfx 35, AnimObj37GFX
-	object_gfx 18, AnimObj38GFX
-	object_gfx 24, AnimObj39GFX
+	object_gfx 18, AnimObjPlantGFX
+	object_gfx 12, AnimObjSmokeGFX
+	object_gfx  9, AnimObjExplosionGFX
+	object_gfx 17, AnimObjRocksGFX
+	object_gfx  6, AnimObjIceGFX
+	object_gfx 10, AnimObjPokeBallGFX
+	object_gfx  9, AnimObjPoisonGFX
+	object_gfx 13, AnimObjBubbleGFX
+	object_gfx 16, AnimObjNoiseGFX
+	object_gfx  2, AnimObjPowderGFX
+	object_gfx 11, AnimObjBeamGFX
+	object_gfx  9, AnimObjSpeedGFX
+	object_gfx  9, AnimObjChargeGFX
+	object_gfx 19, AnimObjWindGFX
+	object_gfx 10, AnimObjWhipGFX
+	object_gfx 12, AnimObjEggGFX
+	object_gfx 18, AnimObjRopeGFX
+	object_gfx 13, AnimObjPsychicGFX
+	object_gfx 10, AnimObjReflectGFX
+	object_gfx 27, AnimObjStatusGFX
+	object_gfx 12, AnimObjSandGFX
+	object_gfx 14, AnimObjWebGFX
+	object_gfx 16, AnimObjHazeGFX
+	object_gfx  7, AnimObjHornGFX
+	object_gfx  8, AnimObjFlowerGFX
+	object_gfx 40, AnimObjMiscGFX
+	object_gfx 36, AnimObjSkyAttackGFX
+	object_gfx 16, AnimObjGlobeGFX
+	object_gfx 48, AnimObjShapesGFX
+	object_gfx 18, AnimObjObjectsGFX
+	object_gfx 38, AnimObjShineGFX
+	object_gfx 35, AnimObjAngelsGFX
+	object_gfx 18, AnimObjWaveGFX
+	object_gfx 24, AnimObjAeroblastGFX
 	object_gfx  1, NULL
 	object_gfx  1, NULL
 ; cfd9e
diff --git a/gfx/fx/019.2bpp.lz b/gfx/fx/019.2bpp.lz
deleted file mode 100644
index 9c2769b83..000000000
--- a/gfx/fx/019.2bpp.lz
+++ /dev/null
diff --git a/gfx/fx/039.2bpp.lz b/gfx/fx/aeroblast.2bpp.lz
index 5e203cb63..5e203cb63 100644
--- a/gfx/fx/039.2bpp.lz
+++ b/gfx/fx/aeroblast.2bpp.lz
diff --git a/gfx/fx/037.2bpp.lz b/gfx/fx/angels.2bpp.lz
index 61d89d224..61d89d224 100644
--- a/gfx/fx/037.2bpp.lz
+++ b/gfx/fx/angels.2bpp.lz
diff --git a/gfx/fx/016.2bpp.lz b/gfx/fx/beam.2bpp.lz
index 1ce9ab82c..1ce9ab82c 100644
--- a/gfx/fx/016.2bpp.lz
+++ b/gfx/fx/beam.2bpp.lz
diff --git a/gfx/fx/013.2bpp.lz b/gfx/fx/bubble.2bpp.lz
index 3d546191a..3d546191a 100644
--- a/gfx/fx/013.2bpp.lz
+++ b/gfx/fx/bubble.2bpp.lz
diff --git a/gfx/fx/018.2bpp.lz b/gfx/fx/charge.2bpp.lz
index 32c82243c..32c82243c 100644
--- a/gfx/fx/018.2bpp.lz
+++ b/gfx/fx/charge.2bpp.lz
diff --git a/gfx/fx/002.2bpp.lz b/gfx/fx/cut.2bpp.lz
index 740a48799..740a48799 100644
--- a/gfx/fx/002.2bpp.lz
+++ b/gfx/fx/cut.2bpp.lz
diff --git a/gfx/fx/021.2bpp.lz b/gfx/fx/egg.2bpp.lz
index fb55f2edc..fb55f2edc 100644
--- a/gfx/fx/021.2bpp.lz
+++ b/gfx/fx/egg.2bpp.lz
diff --git a/gfx/fx/008.2bpp.lz b/gfx/fx/explosion.2bpp.lz
index 4303302a1..4303302a1 100644
--- a/gfx/fx/008.2bpp.lz
+++ b/gfx/fx/explosion.2bpp.lz
diff --git a/gfx/fx/003.2bpp.lz b/gfx/fx/fire.2bpp.lz
index e15e9f9bb..e15e9f9bb 100644
--- a/gfx/fx/003.2bpp.lz
+++ b/gfx/fx/fire.2bpp.lz
diff --git a/gfx/fx/030.2bpp.lz b/gfx/fx/flower.2bpp.lz
index ef628afb4..ef628afb4 100644
--- a/gfx/fx/030.2bpp.lz
+++ b/gfx/fx/flower.2bpp.lz
diff --git a/gfx/fx/033.2bpp.lz b/gfx/fx/globe.2bpp.lz
index 99fa15c6f..99fa15c6f 100644
--- a/gfx/fx/033.2bpp.lz
+++ b/gfx/fx/globe.2bpp.lz
diff --git a/gfx/fx/028.2bpp.lz b/gfx/fx/haze.2bpp.lz
index e0cdc644c..e0cdc644c 100644
--- a/gfx/fx/028.2bpp.lz
+++ b/gfx/fx/haze.2bpp.lz
diff --git a/gfx/fx/001.2bpp.lz b/gfx/fx/hit.2bpp.lz
index 5d9ffbe5d..5d9ffbe5d 100644
--- a/gfx/fx/001.2bpp.lz
+++ b/gfx/fx/hit.2bpp.lz
diff --git a/gfx/fx/029.2bpp.lz b/gfx/fx/horn.2bpp.lz
index a92f74796..a92f74796 100644
--- a/gfx/fx/029.2bpp.lz
+++ b/gfx/fx/horn.2bpp.lz
diff --git a/gfx/fx/010.2bpp.lz b/gfx/fx/ice.2bpp.lz
index 3d059700b..3d059700b 100644
--- a/gfx/fx/010.2bpp.lz
+++ b/gfx/fx/ice.2bpp.lz
diff --git a/gfx/fx/005.2bpp.lz b/gfx/fx/lightning.2bpp.lz
index 81de5850f..81de5850f 100644
--- a/gfx/fx/005.2bpp.lz
+++ b/gfx/fx/lightning.2bpp.lz
diff --git a/gfx/fx/031.2bpp.lz b/gfx/fx/misc.2bpp.lz
index d0c5f0dfc..d0c5f0dfc 100644
--- a/gfx/fx/031.2bpp.lz
+++ b/gfx/fx/misc.2bpp.lz
diff --git a/gfx/fx/014.2bpp.lz b/gfx/fx/noise.2bpp.lz
index e195da453..e195da453 100644
--- a/gfx/fx/014.2bpp.lz
+++ b/gfx/fx/noise.2bpp.lz
diff --git a/gfx/fx/035.2bpp.lz b/gfx/fx/objects.2bpp.lz
index 1a52d6350..1a52d6350 100644
--- a/gfx/fx/035.2bpp.lz
+++ b/gfx/fx/objects.2bpp.lz
diff --git a/gfx/fx/006.2bpp.lz b/gfx/fx/plant.2bpp.lz
index 589fc48b6..589fc48b6 100644
--- a/gfx/fx/006.2bpp.lz
+++ b/gfx/fx/plant.2bpp.lz
diff --git a/gfx/fx/012.2bpp.lz b/gfx/fx/poison.2bpp.lz
index df2cbe604..df2cbe604 100644
--- a/gfx/fx/012.2bpp.lz
+++ b/gfx/fx/poison.2bpp.lz
diff --git a/gfx/fx/011.2bpp.lz b/gfx/fx/pokeball.2bpp.lz
index e09b082db..e09b082db 100644
--- a/gfx/fx/011.2bpp.lz
+++ b/gfx/fx/pokeball.2bpp.lz
diff --git a/gfx/fx/015.2bpp.lz b/gfx/fx/powder.2bpp.lz
index 375d0bf9c..375d0bf9c 100644
--- a/gfx/fx/015.2bpp.lz
+++ b/gfx/fx/powder.2bpp.lz
diff --git a/gfx/fx/023.2bpp.lz b/gfx/fx/psychic.2bpp.lz
index d6402dd3d..d6402dd3d 100644
--- a/gfx/fx/023.2bpp.lz
+++ b/gfx/fx/psychic.2bpp.lz
diff --git a/gfx/fx/024.2bpp.lz b/gfx/fx/reflect.2bpp.lz
index a563de1a8..a563de1a8 100644
--- a/gfx/fx/024.2bpp.lz
+++ b/gfx/fx/reflect.2bpp.lz
diff --git a/gfx/fx/009.2bpp.lz b/gfx/fx/rocks.2bpp.lz
index d5481ea6e..d5481ea6e 100644
--- a/gfx/fx/009.2bpp.lz
+++ b/gfx/fx/rocks.2bpp.lz
diff --git a/gfx/fx/022.2bpp.lz b/gfx/fx/rope.2bpp.lz
index f7d6a480f..f7d6a480f 100644
--- a/gfx/fx/022.2bpp.lz
+++ b/gfx/fx/rope.2bpp.lz
diff --git a/gfx/fx/026.2bpp.lz b/gfx/fx/sand.2bpp.lz
index 3508a1f58..3508a1f58 100644
--- a/gfx/fx/026.2bpp.lz
+++ b/gfx/fx/sand.2bpp.lz
diff --git a/gfx/fx/034.2bpp.lz b/gfx/fx/shapes.2bpp.lz
index d7d48020f..d7d48020f 100644
--- a/gfx/fx/034.2bpp.lz
+++ b/gfx/fx/shapes.2bpp.lz
diff --git a/gfx/fx/036.2bpp.lz b/gfx/fx/shine.2bpp.lz
index 3e47170b1..3e47170b1 100644
--- a/gfx/fx/036.2bpp.lz
+++ b/gfx/fx/shine.2bpp.lz
diff --git a/gfx/fx/032.2bpp.lz b/gfx/fx/skyattack.2bpp.lz
index e0412dd81..e0412dd81 100644
--- a/gfx/fx/032.2bpp.lz
+++ b/gfx/fx/skyattack.2bpp.lz
diff --git a/gfx/fx/007.2bpp.lz b/gfx/fx/smoke.2bpp.lz
index bf26fed2b..bf26fed2b 100644
--- a/gfx/fx/007.2bpp.lz
+++ b/gfx/fx/smoke.2bpp.lz
diff --git a/gfx/fx/017.2bpp.lz b/gfx/fx/speed.2bpp.lz
index 5d09f9a6a..5d09f9a6a 100644
--- a/gfx/fx/017.2bpp.lz
+++ b/gfx/fx/speed.2bpp.lz
diff --git a/gfx/fx/025.2bpp.lz b/gfx/fx/status.2bpp.lz
index e5ce7df8a..e5ce7df8a 100644
--- a/gfx/fx/025.2bpp.lz
+++ b/gfx/fx/status.2bpp.lz
diff --git a/gfx/fx/004.2bpp.lz b/gfx/fx/water.2bpp.lz
index 6a81bbb65..6a81bbb65 100644
--- a/gfx/fx/004.2bpp.lz
+++ b/gfx/fx/water.2bpp.lz
diff --git a/gfx/fx/038.2bpp.lz b/gfx/fx/wave.2bpp.lz
index d94a5cb35..d94a5cb35 100644
--- a/gfx/fx/038.2bpp.lz
+++ b/gfx/fx/wave.2bpp.lz
diff --git a/gfx/fx/027.2bpp.lz b/gfx/fx/web.2bpp.lz
index 84b4018e5..84b4018e5 100644
--- a/gfx/fx/027.2bpp.lz
+++ b/gfx/fx/web.2bpp.lz
diff --git a/gfx/fx/020.2bpp.lz b/gfx/fx/whip.2bpp.lz
index da62ba918..da62ba918 100644
--- a/gfx/fx/020.2bpp.lz
+++ b/gfx/fx/whip.2bpp.lz