summaryrefslogtreecommitdiff
path: root/data/graphics/field_objects/field_effect_objects.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-05 06:03:21 -0700
committerYamaArashi <shadow962@live.com>2016-07-05 06:03:21 -0700
commit7b01b8e827c8ecca6ad68b74d621b535bab33b8d (patch)
treea143a74280627c1838a171a15783d23f706f170f /data/graphics/field_objects/field_effect_objects.s
parent86b7c742692565a5eb9b5824378b3e2c74f555c5 (diff)
convert .global to double colon
Diffstat (limited to 'data/graphics/field_objects/field_effect_objects.s')
-rw-r--r--data/graphics/field_objects/field_effect_objects.s12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s
index 22f5f0b62..a704041b0 100644
--- a/data/graphics/field_objects/field_effect_objects.s
+++ b/data/graphics/field_objects/field_effect_objects.s
@@ -1,13 +1,11 @@
.align 2
- .global gFieldEffectObjectPaletteInfo0
-gFieldEffectObjectPaletteInfo0: @ 8374524
+gFieldEffectObjectPaletteInfo0:: @ 8374524
obj_pal gFieldEffectObjectPalette0, 0x1004
.align 2
- .global gFieldEffectObjectPaletteInfo1
-gFieldEffectObjectPaletteInfo1: @ 837452C
+gFieldEffectObjectPaletteInfo1:: @ 837452C
obj_pal gFieldEffectObjectPalette1, 0x1005
.align 2
@@ -1233,8 +1231,7 @@ gFieldEffectObjectTemplate_PopOutOfAsh: @ 83750CC
.align 2
- .global gFieldEffectObjectPaletteInfo2
-gFieldEffectObjectPaletteInfo2: @ 83750E4
+gFieldEffectObjectPaletteInfo2:: @ 83750E4
obj_pal gFieldEffectObjectPalette2, 0x100D
.align 2
@@ -1345,6 +1342,5 @@ gFieldEffectObjectTemplate_Unknown35: @ 83751EC
.align 2
- .global gFieldEffectObjectPaletteInfo3
-gFieldEffectObjectPaletteInfo3: @ 8375204
+gFieldEffectObjectPaletteInfo3:: @ 8375204
obj_pal gFieldEffectObjectPalette3, 0x100F