global labels

2 files changed, 87 insertions, 87 deletions

diff --git a/data/graphics/berries/berry_graphics.s b/data/graphics/berries/berry_graphics.s
index 833b9429e..ee9ca7c8f 100644
--- a/data/graphics/berries/berry_graphics.s
+++ b/data/graphics/berries/berry_graphics.s
@@ -1,429 +1,429 @@
 	.align 2, 0
 
-gBerryPic_Cheri: @ 8D9C3A8
+gBerryPic_Cheri:: @ 8D9C3A8
 	.incbin "data/graphics/berries/pics/cheri.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Oran: @ 8D9C4FC
+gBerryPic_Oran:: @ 8D9C4FC
 	.incbin "data/graphics/berries/pics/oran.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Pecha: @ 8D9C670
+gBerryPic_Pecha:: @ 8D9C670
 	.incbin "data/graphics/berries/pics/pecha.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Rawst: @ 8D9C7E4
+gBerryPic_Rawst:: @ 8D9C7E4
 	.incbin "data/graphics/berries/pics/rawst.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Aspear: @ 8D9C97C
+gBerryPic_Aspear:: @ 8D9C97C
 	.incbin "data/graphics/berries/pics/aspear.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Leppa: @ 8D9CB24
+gBerryPic_Leppa:: @ 8D9CB24
 	.incbin "data/graphics/berries/pics/leppa.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Chesto: @ 8D9CC94
+gBerryPic_Chesto:: @ 8D9CC94
 	.incbin "data/graphics/berries/pics/chesto.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Persim: @ 8D9CE78
+gBerryPic_Persim:: @ 8D9CE78
 	.incbin "data/graphics/berries/pics/persim.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Lum: @ 8D9CFC8
+gBerryPic_Lum:: @ 8D9CFC8
 	.incbin "data/graphics/berries/pics/lum.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Sitrus: @ 8D9D0E4
+gBerryPic_Sitrus:: @ 8D9D0E4
 	.incbin "data/graphics/berries/pics/sitrus.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Figy: @ 8D9D288
+gBerryPic_Figy:: @ 8D9D288
 	.incbin "data/graphics/berries/pics/figy.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Wiki: @ 8D9D434
+gBerryPic_Wiki:: @ 8D9D434
 	.incbin "data/graphics/berries/pics/wiki.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Mago: @ 8D9D628
+gBerryPic_Mago:: @ 8D9D628
 	.incbin "data/graphics/berries/pics/mago.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Aguav: @ 8D9D7DC
+gBerryPic_Aguav:: @ 8D9D7DC
 	.incbin "data/graphics/berries/pics/aguav.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Iapapa: @ 8D9D950
+gBerryPic_Iapapa:: @ 8D9D950
 	.incbin "data/graphics/berries/pics/iapapa.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Razz: @ 8D9DC08
+gBerryPic_Razz:: @ 8D9DC08
 	.incbin "data/graphics/berries/pics/razz.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Bluk: @ 8D9DE38
+gBerryPic_Bluk:: @ 8D9DE38
 	.incbin "data/graphics/berries/pics/bluk.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Nanab: @ 8D9E020
+gBerryPic_Nanab:: @ 8D9E020
 	.incbin "data/graphics/berries/pics/nanab.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Wepear: @ 8D9E194
+gBerryPic_Wepear:: @ 8D9E194
 	.incbin "data/graphics/berries/pics/wepear.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Pinap: @ 8D9E35C
+gBerryPic_Pinap:: @ 8D9E35C
 	.incbin "data/graphics/berries/pics/pinap.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Pomeg: @ 8D9E570
+gBerryPic_Pomeg:: @ 8D9E570
 	.incbin "data/graphics/berries/pics/pomeg.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Kelpsy: @ 8D9E718
+gBerryPic_Kelpsy:: @ 8D9E718
 	.incbin "data/graphics/berries/pics/kelpsy.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Qualot: @ 8D9E8C0
+gBerryPic_Qualot:: @ 8D9E8C0
 	.incbin "data/graphics/berries/pics/qualot.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Hondew: @ 8D9EA8C
+gBerryPic_Hondew:: @ 8D9EA8C
 	.incbin "data/graphics/berries/pics/hondew.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Grepa: @ 8D9ECE4
+gBerryPic_Grepa:: @ 8D9ECE4
 	.incbin "data/graphics/berries/pics/grepa.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Tamato: @ 8D9EE74
+gBerryPic_Tamato:: @ 8D9EE74
 	.incbin "data/graphics/berries/pics/tamato.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Cornn: @ 8D9F138
+gBerryPic_Cornn:: @ 8D9F138
 	.incbin "data/graphics/berries/pics/cornn.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Magost: @ 8D9F33C
+gBerryPic_Magost:: @ 8D9F33C
 	.incbin "data/graphics/berries/pics/magost.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Rabuta: @ 8D9F4E0
+gBerryPic_Rabuta:: @ 8D9F4E0
 	.incbin "data/graphics/berries/pics/rabuta.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Nomel: @ 8D9F7D4
+gBerryPic_Nomel:: @ 8D9F7D4
 	.incbin "data/graphics/berries/pics/nomel.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Spelon: @ 8D9F9B0
+gBerryPic_Spelon:: @ 8D9F9B0
 	.incbin "data/graphics/berries/pics/spelon.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Pamtre: @ 8D9FBA0
+gBerryPic_Pamtre:: @ 8D9FBA0
 	.incbin "data/graphics/berries/pics/pamtre.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Watmel: @ 8D9FDF0
+gBerryPic_Watmel:: @ 8D9FDF0
 	.incbin "data/graphics/berries/pics/watmel.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Durin: @ 8DA00D4
+gBerryPic_Durin:: @ 8DA00D4
 	.incbin "data/graphics/berries/pics/durin.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Belue: @ 8DA04A0
+gBerryPic_Belue:: @ 8DA04A0
 	.incbin "data/graphics/berries/pics/belue.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Liechi: @ 8DA0778
+gBerryPic_Liechi:: @ 8DA0778
 	.incbin "data/graphics/berries/pics/liechi.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Ganlon: @ 8DA09D0
+gBerryPic_Ganlon:: @ 8DA09D0
 	.incbin "data/graphics/berries/pics/ganlon.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Salac: @ 8DA0B68
+gBerryPic_Salac:: @ 8DA0B68
 	.incbin "data/graphics/berries/pics/salac.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Petaya: @ 8DA0DAC
+gBerryPic_Petaya:: @ 8DA0DAC
 	.incbin "data/graphics/berries/pics/petaya.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Apicot: @ 8DA1054
+gBerryPic_Apicot:: @ 8DA1054
 	.incbin "data/graphics/berries/pics/apicot.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Lansat: @ 8DA11E4
+gBerryPic_Lansat:: @ 8DA11E4
 	.incbin "data/graphics/berries/pics/lansat.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Starf: @ 8DA13D8
+gBerryPic_Starf:: @ 8DA13D8
 	.incbin "data/graphics/berries/pics/starf.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Enigma: @ 8DA15A8
+gBerryPic_Enigma:: @ 8DA15A8
 	.incbin "data/graphics/berries/pics/enigma.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPalette_Cheri: @ 8DA17C0
+gBerryPalette_Cheri:: @ 8DA17C0
 	.incbin "data/graphics/berries/palettes/cheri.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Oran: @ 8DA17E8
+gBerryPalette_Oran:: @ 8DA17E8
 	.incbin "data/graphics/berries/palettes/oran.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Pecha: @ 8DA1810
+gBerryPalette_Pecha:: @ 8DA1810
 	.incbin "data/graphics/berries/palettes/pecha.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Rawst: @ 8DA1838
+gBerryPalette_Rawst:: @ 8DA1838
 	.incbin "data/graphics/berries/palettes/rawst.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Aspear: @ 8DA1860
+gBerryPalette_Aspear:: @ 8DA1860
 	.incbin "data/graphics/berries/palettes/aspear.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Leppa: @ 8DA1888
+gBerryPalette_Leppa:: @ 8DA1888
 	.incbin "data/graphics/berries/palettes/leppa.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Chesto: @ 8DA18B0
+gBerryPalette_Chesto:: @ 8DA18B0
 	.incbin "data/graphics/berries/palettes/chesto.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Persim: @ 8DA18D8
+gBerryPalette_Persim:: @ 8DA18D8
 	.incbin "data/graphics/berries/palettes/persim.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Lum: @ 8DA1900
+gBerryPalette_Lum:: @ 8DA1900
 	.incbin "data/graphics/berries/palettes/lum.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Sitrus: @ 8DA1928
+gBerryPalette_Sitrus:: @ 8DA1928
 	.incbin "data/graphics/berries/palettes/sitrus.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Figy: @ 8DA1950
+gBerryPalette_Figy:: @ 8DA1950
 	.incbin "data/graphics/berries/palettes/figy.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Wiki: @ 8DA1978
+gBerryPalette_Wiki:: @ 8DA1978
 	.incbin "data/graphics/berries/palettes/wiki.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Mago: @ 8DA19A0
+gBerryPalette_Mago:: @ 8DA19A0
 	.incbin "data/graphics/berries/palettes/mago.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Aguav: @ 8DA19C8
+gBerryPalette_Aguav:: @ 8DA19C8
 	.incbin "data/graphics/berries/palettes/aguav.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Iapapa: @ 8DA19F0
+gBerryPalette_Iapapa:: @ 8DA19F0
 	.incbin "data/graphics/berries/palettes/iapapa.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Razz: @ 8DA1A18
+gBerryPalette_Razz:: @ 8DA1A18
 	.incbin "data/graphics/berries/palettes/razz.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Bluk: @ 8DA1A40
+gBerryPalette_Bluk:: @ 8DA1A40
 	.incbin "data/graphics/berries/palettes/bluk.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Nanab: @ 8DA1A68
+gBerryPalette_Nanab:: @ 8DA1A68
 	.incbin "data/graphics/berries/palettes/nanab.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Wepear: @ 8DA1A90
+gBerryPalette_Wepear:: @ 8DA1A90
 	.incbin "data/graphics/berries/palettes/wepear.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Pinap: @ 8DA1AB8
+gBerryPalette_Pinap:: @ 8DA1AB8
 	.incbin "data/graphics/berries/palettes/pinap.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Pomeg: @ 8DA1AE0
+gBerryPalette_Pomeg:: @ 8DA1AE0
 	.incbin "data/graphics/berries/palettes/pomeg.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Kelpsy: @ 8DA1B08
+gBerryPalette_Kelpsy:: @ 8DA1B08
 	.incbin "data/graphics/berries/palettes/kelpsy.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Qualot: @ 8DA1B30
+gBerryPalette_Qualot:: @ 8DA1B30
 	.incbin "data/graphics/berries/palettes/qualot.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Hondew: @ 8DA1B58
+gBerryPalette_Hondew:: @ 8DA1B58
 	.incbin "data/graphics/berries/palettes/hondew.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Grepa: @ 8DA1B80
+gBerryPalette_Grepa:: @ 8DA1B80
 	.incbin "data/graphics/berries/palettes/grepa.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Tamato: @ 8DA1BA8
+gBerryPalette_Tamato:: @ 8DA1BA8
 	.incbin "data/graphics/berries/palettes/tamato.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Cornn: @ 8DA1BD0
+gBerryPalette_Cornn:: @ 8DA1BD0
 	.incbin "data/graphics/berries/palettes/cornn.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Magost: @ 8DA1BF8
+gBerryPalette_Magost:: @ 8DA1BF8
 	.incbin "data/graphics/berries/palettes/magost.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Rabuta: @ 8DA1C20
+gBerryPalette_Rabuta:: @ 8DA1C20
 	.incbin "data/graphics/berries/palettes/rabuta.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Nomel: @ 8DA1C48
+gBerryPalette_Nomel:: @ 8DA1C48
 	.incbin "data/graphics/berries/palettes/nomel.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Spelon: @ 8DA1C70
+gBerryPalette_Spelon:: @ 8DA1C70
 	.incbin "data/graphics/berries/palettes/spelon.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Pamtre: @ 8DA1C98
+gBerryPalette_Pamtre:: @ 8DA1C98
 	.incbin "data/graphics/berries/palettes/pamtre.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Watmel: @ 8DA1CC0
+gBerryPalette_Watmel:: @ 8DA1CC0
 	.incbin "data/graphics/berries/palettes/watmel.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Durin: @ 8DA1CE8
+gBerryPalette_Durin:: @ 8DA1CE8
 	.incbin "data/graphics/berries/palettes/durin.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Belue: @ 8DA1D10
+gBerryPalette_Belue:: @ 8DA1D10
 	.incbin "data/graphics/berries/palettes/belue.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Liechi: @ 8DA1D38
+gBerryPalette_Liechi:: @ 8DA1D38
 	.incbin "data/graphics/berries/palettes/liechi.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Ganlon: @ 8DA1D60
+gBerryPalette_Ganlon:: @ 8DA1D60
 	.incbin "data/graphics/berries/palettes/ganlon.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Salac: @ 8DA1D88
+gBerryPalette_Salac:: @ 8DA1D88
 	.incbin "data/graphics/berries/palettes/salac.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Petaya: @ 8DA1DB0
+gBerryPalette_Petaya:: @ 8DA1DB0
 	.incbin "data/graphics/berries/palettes/petaya.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Apicot: @ 8DA1DD8
+gBerryPalette_Apicot:: @ 8DA1DD8
 	.incbin "data/graphics/berries/palettes/apicot.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Lansat: @ 8DA1E00
+gBerryPalette_Lansat:: @ 8DA1E00
 	.incbin "data/graphics/berries/palettes/lansat.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Starf: @ 8DA1E28
+gBerryPalette_Starf:: @ 8DA1E28
 	.incbin "data/graphics/berries/palettes/starf.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Enigma: @ 8DA1E50
+gBerryPalette_Enigma:: @ 8DA1E50
 	.incbin "data/graphics/berries/palettes/enigma.gbapal.lz"
diff --git a/data/graphics/berries/berry_pic_table.s b/data/graphics/berries/berry_pic_table.s
index 1dc4b5391..2ad082ee1 100644
--- a/data/graphics/berries/berry_pic_table.s
+++ b/data/graphics/berries/berry_pic_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gBerryPicTable: @ 857FC94
+gBerryPicTable:: @ 857FC94
 	.4byte gBerryPic_Cheri,  gBerryPalette_Cheri
 	.4byte gBerryPic_Chesto, gBerryPalette_Chesto
 	.4byte gBerryPic_Pecha,  gBerryPalette_Pecha