Merge pull request #133 from YamaArashi/master

Remove address comments

6 files changed, 122 insertions, 122 deletions

diff --git a/text/credits_text.asm b/text/credits_text.asm
index 2c638b9e..a3d2d4d2 100755
--- a/text/credits_text.asm
+++ b/text/credits_text.asm
@@ -1,4 +1,4 @@
-CreditsTextPointers: ; 742c3 (1d:42c3)
+CreditsTextPointers:
 	dw CredVersion
 	dw CredTajiri
 	dw CredTaOota
@@ -71,129 +71,129 @@ ENDC
 IF DEF(_BLUE)
 	db -8, "BLUE VERSION STAFF@"
 ENDC
-CredTajiri: ; 74356 (1d:4356)
+CredTajiri:
 	db -6, "SATOSHI TAJIRI@"
-CredTaOota: ; 74366 (1d:4366)
+CredTaOota:
 	db -6, "TAKENORI OOTA@"
-CredMorimoto: ; 74375 (1d:4375)
+CredMorimoto:
 	db -7, "SHIGEKI MORIMOTO@"
-CredWatanabe: ; 74387 (1d:4387)
+CredWatanabe:
 	db -7, "TETSUYA WATANABE@"
-CredMasuda: ; 74399 (1d:4399)
+CredMasuda:
 	db -6, "JUNICHI MASUDA@"
-CredNisino: ; 743a9 (1d:43a9)
+CredNisino:
 	db -5, "KOHJI NISINO@"
-CredSugimori: ; 743b7 (1d:43b7)
+CredSugimori:
 	db -5, "KEN SUGIMORI@"
-CredNishida: ; 743c5 (1d:43c5)
+CredNishida:
 	db -6, "ATSUKO NISHIDA@"
-CredMiyamoto: ; 743d5 (1d:43d5)
+CredMiyamoto:
 	db -7, "SHIGERU MIYAMOTO@"
-CredKawaguchi: ; 743e7 (1d:43e7)
+CredKawaguchi:
 	db -8, "TAKASHI KAWAGUCHI@"
-CredIshihara: ; 743fa (1d:43fa)
+CredIshihara:
 	db -8, "TSUNEKAZU ISHIHARA@"
-CredYamauchi: ; 7440e (1d:440e)
+CredYamauchi:
 	db -7, "HIROSHI YAMAUCHI@"
-CredZinnai: ; 74420 (1d:4420)
+CredZinnai:
 	db -7, "HIROYUKI ZINNAI@"
-CredHishida: ; 74431 (1d:4431)
+CredHishida:
 	db -7, "TATSUYA HISHIDA@"
-CredSakai: ; 74442 (1d:4442)
+CredSakai:
 	db -6, "YASUHIRO SAKAI@"
-CredYamaguchi: ; 74452 (1d:4452)
+CredYamaguchi:
 	db -7, "WATARU YAMAGUCHI@"
-CredYamamoto: ; 74464 (1d:4464)
+CredYamamoto:
 	db -8, "KAZUYUKI YAMAMOTO@"
-CredTaniguchi: ; 74477 (1d:4477)
+CredTaniguchi:
 	db -8, "RYOHSUKE TANIGUCHI@"
-CredNonomura: ; 7448b (1d:448b)
+CredNonomura:
 	db -8, "FUMIHIRO NONOMURA@"
-CredFuziwara: ; 7449e (1d:449e)
+CredFuziwara:
 	db -7, "MOTOFUMI FUZIWARA@"
-CredMatsusima: ; 744b1 (1d:44b1)
+CredMatsusima:
 	db -7, "KENJI MATSUSIMA@"
-CredTomisawa: ; 744c2 (1d:44c2)
+CredTomisawa:
 	db -7, "AKIHITO TOMISAWA@"
-CredKawamoto: ; 744d4 (1d:44d4)
+CredKawamoto:
 	db -7, "HIROSHI KAWAMOTO@"
-CredKakei: ; 744e6 (1d:44e6)
+CredKakei:
 	db -6, "AKIYOSHI KAKEI@"
-CredTsuchiya: ; 744f6 (1d:44f6)
+CredTsuchiya:
 	db -7, "KAZUKI TSUCHIYA@"
-CredTaNakamura: ; 74507 (1d:4507)
+CredTaNakamura:
 	db -6, "TAKEO NAKAMURA@"
-CredYuda: ; 74517 (1d:4517)
+CredYuda:
 	db -6, "MASAMITSU YUDA@"
-CredMon: ; 74527 (1d:4527)
+CredMon:
 	db -3, "#MON@"
-CredDirector: ; 7452d (1d:452d)
+CredDirector:
 	db -3, "DIRECTOR@"
-CredProgrammers: ; 74537 (1d:4537)
+CredProgrammers:
 	db -5, "PROGRAMMERS@"
-CredCharDesign: ; 74544 (1d:4544)
+CredCharDesign:
 	db -7, "CHARACTER DESIGN@"
-CredMusic: ; 74556 (1d:4556)
+CredMusic:
 	db -2, "MUSIC@"
-CredSoundEffects: ; 7455d (1d:455d)
+CredSoundEffects:
 	db -6, "SOUND EFFECTS@"
-CredGameDesign: ; 7456c (1d:456c)
+CredGameDesign:
 	db -5, "GAME DESIGN@"
-CredMonsterDesign: ; 74579 (1d:4579)
+CredMonsterDesign:
 	db -6, "MONSTER DESIGN@"
-CredGameScene: ; 74589 (1d:4589)
+CredGameScene:
 	db -6, "GAME SCENARIO@"
-CredParam: ; 74598 (1d:4598)
+CredParam:
 	db -8, "PARAMETRIC DESIGN@"
-CredMap: ; 745ab (1d:45ab)
+CredMap:
 	db -4, "MAP DESIGN@"
-CredTest: ; 745b7 (1d:45b7)
+CredTest:
 	db -7, "PRODUCT TESTING@"
-CredSpecial: ; 745c8 (1d:45c8)
+CredSpecial:
 	db -6, "SPECIAL THANKS@"
-CredProducers: ; 745d8 (1d:45d8)
+CredProducers:
 	db -4, "PRODUCERS@"
-CredProducer: ; 745e3 (1d:45e3)
+CredProducer:
 	db -4, "PRODUCER@"
-CredExecutive: ; 745ed (1d:45ed)
+CredExecutive:
 	db -8, "EXECUTIVE PRODUCER@"
-CredTamada: ; 74601 (1d:4601)
+CredTamada:
 	db -6, "SOUSUKE TAMADA@"
-CredSaOota: ; 74611 (1d:4611)
+CredSaOota:
 	db -5, "SATOSHI OOTA@"
-CredYoshikawa: ; 7461f (1d:461f)
+CredYoshikawa:
 	db -6, "RENA YOSHIKAWA@"
-CredToOota: ; 7462f (1d:462f)
+CredToOota:
 	db -6, "TOMOMICHI OOTA@"
-CredUSStaff: ; 7463f (1d:463f)
+CredUSStaff:
 	db -7, "US VERSION STAFF@"
-CredUSCoord: ; 74651 (1d:4651)
+CredUSCoord:
 	db -7, "US COORDINATION@"
-CredTilden: ; 74662 (1d:4662)
+CredTilden:
 	db -5, "GAIL TILDEN@"
-CredKawakami: ; 7466f (1d:466f)
+CredKawakami:
 	db -6, "NAOKO KAWAKAMI@"
-CredHiNakamura: ; 7467f (1d:467f)
+CredHiNakamura:
 	db -6, "HIRO NAKAMURA@"
-CredGiese: ; 7468e (1d:468e)
+CredGiese:
 	db -6, "WILLIAM GIESE@"
-CredOsborne: ; 7469d (1d:469d)
+CredOsborne:
 	db -5, "SARA OSBORNE@"
-CredTrans: ; 746ab (1d:46ab)
+CredTrans:
 	db -7, "TEXT TRANSLATION@"
-CredOgasawara: ; 746bd (1d:46bd)
+CredOgasawara:
 	db -6, "NOB OGASAWARA@"
-CredIwata: ; 746cc (1d:46cc)
+CredIwata:
 	db -5, "SATORU IWATA@"
-CredIzushi: ; 746da (1d:46da)
+CredIzushi:
 	db -7, "TAKEHIRO IZUSHI@"
-CredHarada: ; 746eb (1d:46eb)
+CredHarada:
 	db -7, "TAKAHIRO HARADA@"
-CredMurakawa: ; 746fc (1d:46fc)
+CredMurakawa:
 	db -7, "TERUKI MURAKAWA@"
-CredFukui: ; 7470d (1d:470d)
+CredFukui:
 	db -5, "KOHTA FUKUI@"
-CredClub: ; 7471a (1d:471a)
+CredClub:
 	db -9, "NCL SUPER MARIO CLUB@"
-CredPAAD: ; 74730 (1d:4730)
+CredPAAD:
 	db -5, "PAAD TESTING@"
diff --git a/text/item_names.asm b/text/item_names.asm
index 3c0f4c49..e436d74d 100755
--- a/text/item_names.asm
+++ b/text/item_names.asm
@@ -1,4 +1,4 @@
-ItemNames: ; 472b (1:472b)
+ItemNames:
 	db "MASTER BALL@"
 	db "ULTRA BALL@"
 	db "GREAT BALL@"
diff --git a/text/map_names.asm b/text/map_names.asm
index dd8592be..cd9f6640 100755
--- a/text/map_names.asm
+++ b/text/map_names.asm
@@ -1,107 +1,107 @@
-MapNames: ; 71473 (1c:5473)
-PalletTownName: ; 71473 (1c:5473)
+MapNames:
+PalletTownName:
 	db "PALLET TOWN@"
-ViridianCityName: ; 7147f (1c:547f)
+ViridianCityName:
 	db "VIRIDIAN CITY@"
-PewterCityName: ; 7148d (1c:548d)
+PewterCityName:
 	db "PEWTER CITY@"
-CeruleanCityName: ; 71499 (1c:5499)
+CeruleanCityName:
 	db "CERULEAN CITY@"
-LavenderTownName: ; 714a7 (1c:54a7)
+LavenderTownName:
 	db "LAVENDER TOWN@"
-VermilionCityName: ; 714b5 (1c:54b5)
+VermilionCityName:
 	db "VERMILION CITY@"
-CeladonCityName: ; 714c4 (1c:54c4)
+CeladonCityName:
 	db "CELADON CITY@"
-FuchsiaCityName: ; 714d1 (1c:54d1)
+FuchsiaCityName:
 	db "FUCHSIA CITY@"
-CinnabarIslandName: ; 714de (1c:54de)
+CinnabarIslandName:
 	db "CINNABAR ISLAND@"
-IndigoPlateauName: ; 714ee (1c:54ee)
+IndigoPlateauName:
 	db "INDIGO PLATEAU@"
-SaffronCityName: ; 714fd (1c:54fd)
+SaffronCityName:
 	db "SAFFRON CITY@"
-Route1Name: ; 7150a (1c:550a)
+Route1Name:
 	db "ROUTE 1@"
-Route2Name: ; 71512 (1c:5512)
+Route2Name:
 	db "ROUTE 2@"
-Route3Name: ; 7151a (1c:551a)
+Route3Name:
 	db "ROUTE 3@"
-Route4Name: ; 71522 (1c:5522)
+Route4Name:
 	db "ROUTE 4@"
-Route5Name: ; 7152a (1c:552a)
+Route5Name:
 	db "ROUTE 5@"
-Route6Name: ; 71532 (1c:5532)
+Route6Name:
 	db "ROUTE 6@"
-Route7Name: ; 7153a (1c:553a)
+Route7Name:
 	db "ROUTE 7@"
-Route8Name: ; 71542 (1c:5542)
+Route8Name:
 	db "ROUTE 8@"
-Route9Name: ; 7154a (1c:554a)
+Route9Name:
 	db "ROUTE 9@"
-Route10Name: ; 71552 (1c:5552)
+Route10Name:
 	db "ROUTE 10@"
-Route11Name: ; 7155b (1c:555b)
+Route11Name:
 	db "ROUTE 11@"
-Route12Name: ; 71564 (1c:5564)
+Route12Name:
 	db "ROUTE 12@"
-Route13Name: ; 7156d (1c:556d)
+Route13Name:
 	db "ROUTE 13@"
-Route14Name: ; 71576 (1c:5576)
+Route14Name:
 	db "ROUTE 14@"
-Route15Name: ; 7157f (1c:557f)
+Route15Name:
 	db "ROUTE 15@"
-Route16Name: ; 71588 (1c:5588)
+Route16Name:
 	db "ROUTE 16@"
-Route17Name: ; 71591 (1c:5591)
+Route17Name:
 	db "ROUTE 17@"
-Route18Name: ; 7159a (1c:559a)
+Route18Name:
 	db "ROUTE 18@"
-Route19Name: ; 715a3 (1c:55a3)
+Route19Name:
 	db "SEA ROUTE 19@"
-Route20Name: ; 715b0 (1c:55b0)
+Route20Name:
 	db "SEA ROUTE 20@"
-Route21Name: ; 715bd (1c:55bd)
+Route21Name:
 	db "SEA ROUTE 21@"
-Route22Name: ; 715ca (1c:55ca)
+Route22Name:
 	db "ROUTE 22@"
-Route23Name: ; 715d3 (1c:55d3)
+Route23Name:
 	db "ROUTE 23@"
-Route24Name: ; 715dc (1c:55dc)
+Route24Name:
 	db "ROUTE 24@"
-Route25Name: ; 715e5 (1c:55e5)
+Route25Name:
 	db "ROUTE 25@"
-ViridianForestName: ; 715ee (1c:55ee)
+ViridianForestName:
 	db "VIRIDIAN FOREST@"
-MountMoonName: ; 715fe (1c:55fe)
+MountMoonName:
 	db "MT.MOON@"
-RockTunnelName: ; 71606 (1c:5606)
+RockTunnelName:
 	db "ROCK TUNNEL@"
-SeaCottageName: ; 71612 (1c:5612)
+SeaCottageName:
 	db "SEA COTTAGE@"
-SSAnneName: ; 7161e (1c:561e)
+SSAnneName:
 	db "S.S.ANNE@"
-PokemonLeagueName: ; 71627 (1c:5627)
+PokemonLeagueName:
 	db "#MON LEAGUE@"
-UndergroundPathName: ; 71633 (1c:5633)
+UndergroundPathName:
 	db "UNDERGROUND PATH@"
-PokemonTowerName: ; 71644 (1c:5644)
+PokemonTowerName:
 	db "#MON TOWER@"
-SeafoamIslandsName: ; 7164f (1c:564f)
+SeafoamIslandsName:
 	db "SEAFOAM ISLANDS@"
-VictoryRoadName: ; 7165f (1c:565f)
+VictoryRoadName:
 	db "VICTORY ROAD@"
-DiglettsCaveName: ; 7166c (1c:566c)
+DiglettsCaveName:
 	db "DIGLETT's CAVE@"
-RocketHQName: ; 7167a (1c:567a)
+RocketHQName:
 	db "ROCKET HQ@"
-SilphCoName: ; 71684 (1c:5684)
+SilphCoName:
 	db "SILPH CO.@"
-PokemonMansionName: ; 7168e (1c:568e)
+PokemonMansionName:
 	db $4a," MANSION@"
-SafariZoneName: ; 71698 (1c:5698)
+SafariZoneName:
 	db "SAFARI ZONE@"
-CeruleanCaveName: ; 716a4 (1c:56a4)
+CeruleanCaveName:
 	db "CERULEAN CAVE@"
-PowerPlantName: ; 716b2 (1c:56b2)
+PowerPlantName:
 	db "POWER PLANT@"
diff --git a/text/monster_names.asm b/text/monster_names.asm
index c7e0226f..a62b1bd9 100755
--- a/text/monster_names.asm
+++ b/text/monster_names.asm
@@ -1,4 +1,4 @@
-MonsterNames: ; 1c21e (7:421e)
+MonsterNames:
 	db "RHYDON@@@@"
 	db "KANGASKHAN"
 	db "NIDORAN♂@@"
diff --git a/text/move_names.asm b/text/move_names.asm
index 92760d45..f8706ee3 100644
--- a/text/move_names.asm
+++ b/text/move_names.asm
@@ -1,4 +1,4 @@
-MoveNames:: ; b0000 (2c:4000)
+MoveNames::
 	db "POUND@"
 	db "KARATE CHOP@"
 	db "DOUBLESLAP@"
diff --git a/text/trainer_names.asm b/text/trainer_names.asm
index 6a3cf8f7..7736738b 100755
--- a/text/trainer_names.asm
+++ b/text/trainer_names.asm
@@ -1,4 +1,4 @@
-TrainerNames: ; 399ff (e:59ff)
+TrainerNames:
 	db "YOUNGSTER@"
 	db "BUG CATCHER@"
 	db "LASS@"