summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-18 18:14:01 -0700
committerYamaArashi <shadow962@live.com>2016-10-18 18:14:01 -0700
commit64ee4533fe9ba24e09d6d071038ef5d803db0a3f (patch)
tree5dd0adb729513e0fcbec224aca6f87ef8d117d8f
parent562d21e8f4101ee9834fc4c21663c3001949e93b (diff)
name unknown field effect objects
-rw-r--r--data/graphics/field_objects/field_effect_object_graphics.s20
-rw-r--r--data/graphics/field_objects/field_effect_object_template_pointers.s6
-rw-r--r--data/graphics/field_objects/field_effect_objects.s44
3 files changed, 35 insertions, 35 deletions
diff --git a/data/graphics/field_objects/field_effect_object_graphics.s b/data/graphics/field_objects/field_effect_object_graphics.s
index ec3b89526..a2091f7cc 100644
--- a/data/graphics/field_objects/field_effect_object_graphics.s
+++ b/data/graphics/field_objects/field_effect_object_graphics.s
@@ -308,15 +308,15 @@ gFieldEffectPic_Unknown19_3: @ 836ADC8
.incbin "graphics/field_effect_objects/pics/unknown_19/3.4bpp"
.align 2
-gFieldEffectPic_Unknown29_0: @ 836AE48
+gFieldEffectPic_SandPile_0: @ 836AE48
.incbin "graphics/field_effect_objects/pics/unknown_29/0.4bpp"
.align 2
-gFieldEffectPic_Unknown29_1: @ 836AE88
+gFieldEffectPic_SandPile_1: @ 836AE88
.incbin "graphics/field_effect_objects/pics/unknown_29/1.4bpp"
.align 2
-gFieldEffectPic_Unknown29_2: @ 836AEC8
+gFieldEffectPic_SandPile_2: @ 836AEC8
.incbin "graphics/field_effect_objects/pics/unknown_29/2.4bpp"
.align 2
@@ -488,23 +488,23 @@ gFieldEffectPic_PopOutOfAsh_4: @ 836CC68
.incbin "graphics/field_effect_objects/pics/pop_out_of_ash/4.4bpp"
.align 2
-gFieldEffectPic_Unknown33_0: @ 836CCE8
+gFieldEffectPic_LavaridgeGymWarp_0: @ 836CCE8
.incbin "graphics/field_effect_objects/pics/unknown_33/0.4bpp"
.align 2
-gFieldEffectPic_Unknown33_1: @ 836CD68
+gFieldEffectPic_LavaridgeGymWarp_1: @ 836CD68
.incbin "graphics/field_effect_objects/pics/unknown_33/1.4bpp"
.align 2
-gFieldEffectPic_Unknown33_2: @ 836CDE8
+gFieldEffectPic_LavaridgeGymWarp_2: @ 836CDE8
.incbin "graphics/field_effect_objects/pics/unknown_33/2.4bpp"
.align 2
-gFieldEffectPic_Unknown33_3: @ 836CE68
+gFieldEffectPic_LavaridgeGymWarp_3: @ 836CE68
.incbin "graphics/field_effect_objects/pics/unknown_33/3.4bpp"
.align 2
-gFieldEffectPic_Unknown33_4: @ 836CEE8
+gFieldEffectPic_LavaridgeGymWarp_4: @ 836CEE8
.incbin "graphics/field_effect_objects/pics/unknown_33/4.4bpp"
.align 2
@@ -540,11 +540,11 @@ gFieldEffectPic_Bubbles_7: @ 836D668
.incbin "graphics/field_effect_objects/pics/bubbles/7.4bpp"
.align 2
-gFieldEffectPic_Unknown35_0: @ 836D768
+gFieldEffectPic_Sparkle_0: @ 836D768
.incbin "graphics/field_effect_objects/pics/unknown_35/0.4bpp"
.align 2
-gFieldEffectPic_Unknown35_1: @ 836D7E8
+gFieldEffectPic_Sparkle_1: @ 836D7E8
.incbin "graphics/field_effect_objects/pics/unknown_35/1.4bpp"
.align 2
diff --git a/data/graphics/field_objects/field_effect_object_template_pointers.s b/data/graphics/field_objects/field_effect_object_template_pointers.s
index 91795025f..278de275d 100644
--- a/data/graphics/field_objects/field_effect_object_template_pointers.s
+++ b/data/graphics/field_objects/field_effect_object_template_pointers.s
@@ -29,10 +29,10 @@ gFieldEffectObjectTemplatePointers:: @ 836DFC0
.4byte gFieldEffectSpriteTemplate_Bird
.4byte gFieldEffectSpriteTemplate_BikeTireTracks
.4byte gFieldEffectSpriteTemplate_SandDisguise
- .4byte gFieldEffectSpriteTemplate_Unknown29
+ .4byte gFieldEffectSpriteTemplate_SandPile
.4byte gFieldEffectSpriteTemplate_ShortGrass
.4byte gFieldEffectSpriteTemplate_HotSpringsWater
.4byte gFieldEffectSpriteTemplate_PopOutOfAsh
- .4byte gFieldEffectSpriteTemplate_Unknown33
+ .4byte gFieldEffectSpriteTemplate_LavaridgeGymWarp
.4byte gFieldEffectSpriteTemplate_Bubbles
- .4byte gFieldEffectSpriteTemplate_Unknown35
+ .4byte gFieldEffectSpriteTemplate_Sparkle
diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s
index 635e20cfe..c3a9585f4 100644
--- a/data/graphics/field_objects/field_effect_objects.s
+++ b/data/graphics/field_objects/field_effect_objects.s
@@ -600,10 +600,10 @@ gFieldEffectSpriteTemplate_Unknown19: @ 8374C94
spr_template 0xFFFF, 0x1004, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown19, gFieldEffectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_8128800
.align 2
-gFieldEffectPicTable_Unknown29: @ 8374CAC
- obj_frame_tiles gFieldEffectPic_Unknown29_0, 0x40
- obj_frame_tiles gFieldEffectPic_Unknown29_1, 0x40
- obj_frame_tiles gFieldEffectPic_Unknown29_2, 0x40
+gFieldEffectPicTable_SandPile: @ 8374CAC
+ obj_frame_tiles gFieldEffectPic_SandPile_0, 0x40
+ obj_frame_tiles gFieldEffectPic_SandPile_1, 0x40
+ obj_frame_tiles gFieldEffectPic_SandPile_2, 0x40
.align 2
gFieldEffectAnim_8374CC4: @ 8374CC4
@@ -613,12 +613,12 @@ gFieldEffectAnim_8374CC4: @ 8374CC4
obj_image_anim_end
.align 2
-gFieldEffectAnimTable_Unknown29: @ 8374CD4
+gFieldEffectAnimTable_SandPile: @ 8374CD4
.4byte gFieldEffectAnim_8374CC4
.align 2
-gFieldEffectSpriteTemplate_Unknown29: @ 8374CD8
- spr_template 0xFFFF, 0x1004, gFieldOamData_16x8, gFieldEffectAnimTable_Unknown29, gFieldEffectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81282E0
+gFieldEffectSpriteTemplate_SandPile: @ 8374CD8
+ spr_template 0xFFFF, 0x1004, gFieldOamData_16x8, gFieldEffectAnimTable_SandPile, gFieldEffectPicTable_SandPile, gDummySpriteAffineAnimTable, sub_81282E0
.align 2
gFieldEffectPicTable_Unknown20: @ 8374CF0
@@ -888,12 +888,12 @@ gFieldEffectObjectPaletteInfo2:: @ 83750E4
obj_pal gFieldEffectObjectPalette2, 0x100D
.align 2
-gFieldEffectPicTable_Unknown33: @ 83750EC
- obj_frame_tiles gFieldEffectPic_Unknown33_0, 0x80
- obj_frame_tiles gFieldEffectPic_Unknown33_1, 0x80
- obj_frame_tiles gFieldEffectPic_Unknown33_2, 0x80
- obj_frame_tiles gFieldEffectPic_Unknown33_3, 0x80
- obj_frame_tiles gFieldEffectPic_Unknown33_4, 0x80
+gFieldEffectPicTable_LavaridgeGymWarp: @ 83750EC
+ obj_frame_tiles gFieldEffectPic_LavaridgeGymWarp_0, 0x80
+ obj_frame_tiles gFieldEffectPic_LavaridgeGymWarp_1, 0x80
+ obj_frame_tiles gFieldEffectPic_LavaridgeGymWarp_2, 0x80
+ obj_frame_tiles gFieldEffectPic_LavaridgeGymWarp_3, 0x80
+ obj_frame_tiles gFieldEffectPic_LavaridgeGymWarp_4, 0x80
.align 2
gFieldEffectAnim_8375114: @ 8375114
@@ -905,12 +905,12 @@ gFieldEffectAnim_8375114: @ 8375114
obj_image_anim_end
.align 2
-gFieldEffectAnimTable_Unknown33: @ 837512C
+gFieldEffectAnimTable_LavaridgeGymWarp: @ 837512C
.4byte gFieldEffectAnim_8375114
.align 2
-gFieldEffectSpriteTemplate_Unknown33: @ 8375130
- spr_template 0xFFFF, 0x100D, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown33, gFieldEffectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_8087638
+gFieldEffectSpriteTemplate_LavaridgeGymWarp: @ 8375130
+ spr_template 0xFFFF, 0x100D, gFieldOamData_16x16, gFieldEffectAnimTable_LavaridgeGymWarp, gFieldEffectPicTable_LavaridgeGymWarp, gDummySpriteAffineAnimTable, sub_8087638
.align 2
gFieldEffectPicTable_Bubbles: @ 8375148
@@ -944,9 +944,9 @@ gFieldEffectSpriteTemplate_Bubbles: @ 83751B0
spr_template 0xFFFF, 0x1004, gFieldOamData_16x32, gFieldEffectAnimTable_Bubbles, gFieldEffectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8128410
.align 2
-gFieldEffectPicTable_Unknown35: @ 83751C8
- obj_frame_tiles gFieldEffectPic_Unknown35_0, 0x80
- obj_frame_tiles gFieldEffectPic_Unknown35_1, 0x80
+gFieldEffectPicTable_Sparkle: @ 83751C8
+ obj_frame_tiles gFieldEffectPic_Sparkle_0, 0x80
+ obj_frame_tiles gFieldEffectPic_Sparkle_1, 0x80
.align 2
gFieldEffectAnim_83751D8: @ 83751D8
@@ -956,12 +956,12 @@ gFieldEffectAnim_83751D8: @ 83751D8
obj_image_anim_end
.align 2
-gFieldEffectAnimTable_Unknown35: @ 83751E8
+gFieldEffectAnimTable_Sparkle: @ 83751E8
.4byte gFieldEffectAnim_83751D8
.align 2
-gFieldEffectSpriteTemplate_Unknown35: @ 83751EC
- spr_template 0xFFFF, 0x100F, gFieldOamData_16x16, gFieldEffectAnimTable_Unknown35, gFieldEffectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8128774
+gFieldEffectSpriteTemplate_Sparkle: @ 83751EC
+ spr_template 0xFFFF, 0x100F, gFieldOamData_16x16, gFieldEffectAnimTable_Sparkle, gFieldEffectPicTable_Sparkle, gDummySpriteAffineAnimTable, sub_8128774
.align 2
gFieldEffectObjectPaletteInfo3:: @ 8375204