Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers

4 files changed, 52 insertions, 53 deletions

diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm
index 786a035bf..65f0b4628 100644
--- a/battle/anim_objects.asm
+++ b/battle/anim_objects.asm
@@ -6,4 +6,4 @@ INCLUDE "battle/objects/functions.asm"
 INCLUDE "battle/objects/helpers.asm"
 INCLUDE "battle/objects/framesets.asm"
 INCLUDE "battle/objects/oam.asm"
-INCLUDE "battle/objects/gfx_headers.asm"
+INCLUDE "battle/objects/object_gfx.asm"
diff --git a/battle/objects/gfx_headers.asm b/battle/objects/gfx_headers.asm
deleted file mode 100755
index 901144ec7..000000000
--- a/battle/objects/gfx_headers.asm
+++ /dev/null
@@ -1,51 +0,0 @@
-object_gfx: MACRO
-; # tiles, label
-	db  \1
-	dba \2
-ENDM
-
-AnimObjGFX: ; cfcf6
-; entries correspond to ANIM_GFX_* constants
-	object_gfx  0, AnimObj00GFX
-	object_gfx 21, AnimObjHitGFX
-	object_gfx  6, AnimObjCutGFX
-	object_gfx  6, AnimObjFireGFX
-	object_gfx 20, AnimObjWaterGFX
-	object_gfx 26, AnimObjLightningGFX
-	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/battle/objects/oam.asm b/battle/objects/oam.asm
index 8ae6651a4..79b475c71 100755
--- a/battle/objects/oam.asm
+++ b/battle/objects/oam.asm
@@ -1,4 +1,3 @@
-
 BattleAnimOAMData: ; ceeae
 ; vtile offset (?), length, address
 	dbbw $00, 16, .OAMData_00 ; 00
diff --git a/battle/objects/object_gfx.asm b/battle/objects/object_gfx.asm
new file mode 100755
index 000000000..133298d13
--- /dev/null
+++ b/battle/objects/object_gfx.asm
@@ -0,0 +1,51 @@
+anim_obj_gfx: MACRO
+; # tiles, label
+	db  \1
+	dba \2
+ENDM
+
+AnimObjGFX: ; cfcf6
+; entries correspond to ANIM_GFX_* constants
+	anim_obj_gfx  0, AnimObj00GFX
+	anim_obj_gfx 21, AnimObjHitGFX
+	anim_obj_gfx  6, AnimObjCutGFX
+	anim_obj_gfx  6, AnimObjFireGFX
+	anim_obj_gfx 20, AnimObjWaterGFX
+	anim_obj_gfx 26, AnimObjLightningGFX
+	anim_obj_gfx 18, AnimObjPlantGFX
+	anim_obj_gfx 12, AnimObjSmokeGFX
+	anim_obj_gfx  9, AnimObjExplosionGFX
+	anim_obj_gfx 17, AnimObjRocksGFX
+	anim_obj_gfx  6, AnimObjIceGFX
+	anim_obj_gfx 10, AnimObjPokeBallGFX
+	anim_obj_gfx  9, AnimObjPoisonGFX
+	anim_obj_gfx 13, AnimObjBubbleGFX
+	anim_obj_gfx 16, AnimObjNoiseGFX
+	anim_obj_gfx  2, AnimObjPowderGFX
+	anim_obj_gfx 11, AnimObjBeamGFX
+	anim_obj_gfx  9, AnimObjSpeedGFX
+	anim_obj_gfx  9, AnimObjChargeGFX
+	anim_obj_gfx 19, AnimObjWindGFX
+	anim_obj_gfx 10, AnimObjWhipGFX
+	anim_obj_gfx 12, AnimObjEggGFX
+	anim_obj_gfx 18, AnimObjRopeGFX
+	anim_obj_gfx 13, AnimObjPsychicGFX
+	anim_obj_gfx 10, AnimObjReflectGFX
+	anim_obj_gfx 27, AnimObjStatusGFX
+	anim_obj_gfx 12, AnimObjSandGFX
+	anim_obj_gfx 14, AnimObjWebGFX
+	anim_obj_gfx 16, AnimObjHazeGFX
+	anim_obj_gfx  7, AnimObjHornGFX
+	anim_obj_gfx  8, AnimObjFlowerGFX
+	anim_obj_gfx 40, AnimObjMiscGFX
+	anim_obj_gfx 36, AnimObjSkyAttackGFX
+	anim_obj_gfx 16, AnimObjGlobeGFX
+	anim_obj_gfx 48, AnimObjShapesGFX
+	anim_obj_gfx 18, AnimObjObjectsGFX
+	anim_obj_gfx 38, AnimObjShineGFX
+	anim_obj_gfx 35, AnimObjAngelsGFX
+	anim_obj_gfx 18, AnimObjWaveGFX
+	anim_obj_gfx 24, AnimObjAeroblastGFX
+	anim_obj_gfx  1, NULL
+	anim_obj_gfx  1, NULL
+; cfd9e