summaryrefslogtreecommitdiff
path: root/data/graphics/field_objects
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
parent86b7c742692565a5eb9b5824378b3e2c74f555c5 (diff)
convert .global to double colon
Diffstat (limited to 'data/graphics/field_objects')
-rw-r--r--data/graphics/field_objects/berry_tree_graphics_tables.s12
-rw-r--r--data/graphics/field_objects/field_effect_object_template_pointers.s3
-rw-r--r--data/graphics/field_objects/field_effect_objects.s12
-rw-r--r--data/graphics/field_objects/map_object_graphics_info_pointers.s3
4 files changed, 10 insertions, 20 deletions
diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.s b/data/graphics/field_objects/berry_tree_graphics_tables.s
index 85e364a7e..925f35d19 100644
--- a/data/graphics/field_objects/berry_tree_graphics_tables.s
+++ b/data/graphics/field_objects/berry_tree_graphics_tables.s
@@ -544,8 +544,7 @@ gBerryTreePaletteSlotTable_Tamato: @ 8374304
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
- .global gBerryTreeGraphicsIdTable
-gBerryTreeGraphicsIdTable: @ 837430E
+gBerryTreeGraphicsIdTable:: @ 837430E
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
@@ -553,8 +552,7 @@ gBerryTreeGraphicsIdTable: @ 837430E
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.align 2
- .global gBerryTreePicTablePointers
-gBerryTreePicTablePointers: @ 8374314
+gBerryTreePicTablePointers:: @ 8374314
.4byte gMapObjectPicTable_CheriBerryTree @ Cheri
.4byte gMapObjectPicTable_ChestoBerryTree @ Chesto
.4byte gMapObjectPicTable_PechaBerryTree @ Pecha
@@ -600,8 +598,7 @@ gBerryTreePicTablePointers: @ 8374314
.4byte gMapObjectPicTable_DurinBerryTree @ Enigma
.align 2
- .global gBerryTreePaletteSlotTablePointers
-gBerryTreePaletteSlotTablePointers: @ 83743C0
+gBerryTreePaletteSlotTablePointers:: @ 83743C0
.4byte gBerryTreePaletteSlotTable_Cheri @ Cheri
.4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
.4byte gBerryTreePaletteSlotTable_Pecha @ Pecha
@@ -647,8 +644,7 @@ gBerryTreePaletteSlotTablePointers: @ 83743C0
.4byte gBerryTreePaletteSlotTable_Durin @ Enigma
.align 2
- .global gBerryTreeGraphicsIdTablePointers
-gBerryTreeGraphicsIdTablePointers: @ 837446C
+gBerryTreeGraphicsIdTablePointers:: @ 837446C
.4byte gBerryTreeGraphicsIdTable @ Cheri
.4byte gBerryTreeGraphicsIdTable @ Chesto
.4byte gBerryTreeGraphicsIdTable @ Pecha
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 9c587c52a..f9f4c8cdf 100644
--- a/data/graphics/field_objects/field_effect_object_template_pointers.s
+++ b/data/graphics/field_objects/field_effect_object_template_pointers.s
@@ -1,6 +1,5 @@
.align 2
- .global gFieldEffectObjectTemplatePointers
-gFieldEffectObjectTemplatePointers: @ 836DFC0
+gFieldEffectObjectTemplatePointers:: @ 836DFC0
.4byte gFieldEffectObjectTemplate_ShadowSmall
.4byte gFieldEffectObjectTemplate_ShadowMedium
.4byte gFieldEffectObjectTemplate_ShadowLarge
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
diff --git a/data/graphics/field_objects/map_object_graphics_info_pointers.s b/data/graphics/field_objects/map_object_graphics_info_pointers.s
index f026dd5a8..7b17f9a5c 100644
--- a/data/graphics/field_objects/map_object_graphics_info_pointers.s
+++ b/data/graphics/field_objects/map_object_graphics_info_pointers.s
@@ -1,6 +1,5 @@
.align 2
- .global gMapObjectGraphicsInfoPointers
-gMapObjectGraphicsInfoPointers: @ 836DC58
+gMapObjectGraphicsInfoPointers:: @ 836DC58
.4byte gMapObjectGraphicsInfo_BrendanNormal
.4byte gMapObjectGraphicsInfo_BrendanMachBike
.4byte gMapObjectGraphicsInfo_BrendanSurfing