Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts:
#	engine/items/mart.asm

data/pokemon/cries.asm

@@ -3,7 +3,7 @@ mon_cry: MACRO
 	dw \1, \2, \3
 ENDM
 
-PokemonCries:: ; f2787
+PokemonCries::
 ; entries correspond to constants/pokemon_constants.asm
 	mon_cry CRY_BULBASAUR,   $080,  $081 ; BULBASAUR
 	mon_cry CRY_BULBASAUR,   $020,  $100 ; IVYSAUR
@@ -260,4 +260,3 @@ PokemonCries:: ; f2787
 	mon_cry CRY_NIDORAN_M,      0,     0 ; 253
 	mon_cry CRY_NIDORAN_M,      0,     0 ; 254
 	mon_cry CRY_NIDORAN_M,      0,     0 ; 255
-; f2d81

data/pokemon/dex_entry_pointers.asm

@@ -1,4 +1,4 @@
-PokedexDataPointerTable: ; 0x44378
+PokedexDataPointerTable:
 ; entries correspond to constants/pokemon_constants.asm
 	dw BulbasaurPokedexEntry
 	dw IvysaurPokedexEntry
@@ -251,4 +251,3 @@ PokedexDataPointerTable: ; 0x44378
 	dw LugiaPokedexEntry
 	dw HoOhPokedexEntry
 	dw CelebiPokedexEntry
-; 0x4456e

data/pokemon/dex_order_alpha.asm

@@ -1,6 +1,6 @@
 ; Every Pokémon sorted alphabetically by name.
 
-AlphabeticalPokedexOrder: ; 0x40c65
+AlphabeticalPokedexOrder:
 	db ABRA
 	db AERODACTYL
 	db AIPOM
@@ -252,4 +252,3 @@ AlphabeticalPokedexOrder: ; 0x40c65
 	db YANMA
 	db ZAPDOS
 	db ZUBAT
-; 0x40d60

data/pokemon/dex_order_new.asm

@@ -1,6 +1,6 @@
 ; Every Pokémon sorted in New Pokédex Order.
 
-NewPokedexOrder: ; 0x40d60
+NewPokedexOrder:
 	db CHIKORITA
 	db BAYLEEF
 	db MEGANIUM
@@ -252,4 +252,3 @@ NewPokedexOrder: ; 0x40d60
 	db MEWTWO
 	db MEW
 	db CELEBI
-; 0x40e5b

data/pokemon/egg_move_pointers.asm

@@ -1,4 +1,4 @@
-EggMovePointers:: ; 0x23b11
+EggMovePointers::
 	dw BulbasaurEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
@@ -254,4 +254,3 @@ endc
 	dw NoEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
-; 0x23d07

data/pokemon/evos_attacks_pointers.asm

@@ -1,6 +1,6 @@
 ; Evolutions and attacks are grouped together since they're both checked at level-up.
 
-EvosAttacksPointers:: ; 0x425b1
+EvosAttacksPointers::
 	dw BulbasaurEvosAttacks
 	dw IvysaurEvosAttacks
 	dw VenusaurEvosAttacks
@@ -252,4 +252,3 @@ EvosAttacksPointers:: ; 0x425b1
 	dw LugiaEvosAttacks
 	dw HoOhEvosAttacks
 	dw CelebiEvosAttacks
-; 0x427a7

data/pokemon/ezchat_order.asm

@@ -93,4 +93,3 @@ EZChat_SortedPokemon:
 .ro:       db VULPIX, -1
 .wa:       db JUMPLUFF, TOTODILE, MACHOP ;, -1
 .end:      db -1
-; 11d67e

data/pokemon/gen1_base_special.asm

@@ -1,6 +1,6 @@
 ; The original base Special stat for each Pokémon from Red/Blue
 
-KantoMonSpecials: ; fb656
+KantoMonSpecials:
 	db  65 ; BULBASAUR
 	db  80 ; IVYSAUR
 	db 100 ; VENUSAUR
@@ -152,4 +152,3 @@ KantoMonSpecials: ; fb656
 	db 100 ; DRAGONITE
 	db 154 ; MEWTWO
 	db 100 ; MEW
-; fb6ed

data/pokemon/gen1_order.asm

@@ -1,4 +1,4 @@
-Pokered_MonIndices: ; fb91c
+Pokered_MonIndices:
 	db RHYDON
 	db KANGASKHAN
 	db NIDORAN_M
@@ -252,4 +252,3 @@ Pokered_MonIndices: ; fb91c
 	db QWILFISH
 	db WOBBUFFET
 	db WOBBUFFET
-; fba18

data/pokemon/menu_icons.asm

@@ -1,6 +1,6 @@
 ; party menu icons
 
-MonMenuIcons: ; 8eac4
+MonMenuIcons:
 	db ICON_BULBASAUR   ; BULBASAUR
 	db ICON_BULBASAUR   ; IVYSAUR
 	db ICON_BULBASAUR   ; VENUSAUR
@@ -252,4 +252,3 @@ MonMenuIcons: ; 8eac4
 	db ICON_LUGIA       ; LUGIA
 	db ICON_HO_OH       ; HO_OH
 	db ICON_HUMANSHAPE  ; CELEBI
-; 8ebbf

data/pokemon/palettes.asm

@@ -1,4 +1,4 @@
-PokemonPalettes: ; a8ce
+PokemonPalettes:
 ; entries correspond to Pokémon species, two apiece
 
 ; 000
@@ -534,5 +534,3 @@ INCLUDE "gfx/pokemon/egg/shiny.pal"
 ; 255 shiny
 	RGB 23, 23, 23
 	RGB 17, 17, 17
-
-; b0ce

data/pokemon/unown_words.asm

@@ -7,7 +7,7 @@ endr
 	db -1
 ENDM
 
-UnownWords: ; fba5a
+UnownWords:
 ; entries correspond to UNOWN_* form constants
 	dw UnownWordA
 	dw UnownWordA
@@ -36,7 +36,6 @@ UnownWords: ; fba5a
 	dw UnownWordX
 	dw UnownWordY
 	dw UnownWordZ
-; fba90
 
 UnownWordA: unownword "ANGRY"
 UnownWordB: unownword "BEAR"
@@ -64,4 +63,3 @@ UnownWordW: unownword "WANT"
 UnownWordX: unownword "XXXXX"
 UnownWordY: unownword "YIELD"
 UnownWordZ: unownword "ZOOM"
-; fbb32