Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx

1 files changed, 30 insertions, 30 deletions

diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm
index c3208a84..c8df3fe4 100644
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/cinnabar_gym.asm
@@ -1,4 +1,4 @@
-_BlaineBattleText:: ; a0844 (28:4844)
+_BlaineBattleText::
 	text "Hah!"
 
 	para "I am BLAINE! I"
@@ -13,14 +13,14 @@ _BlaineBattleText:: ; a0844 (28:4844)
 	line "have BURN HEAL!"
 	done
 
-_BlaineEndBattleText:: ; a08c7 (28:48c7)
+_BlaineEndBattleText::
 	text "I have"
 	line "burnt out!"
 
 	para "You have earned"
 	line "the VOLCANOBADGE!@@"
 
-_BlaineFireBlastText:: ; a08fd (28:48fd)
+_BlaineFireBlastText::
 	text "FIRE BLAST is the"
 	line "ultimate fire"
 	cont "technique!"
@@ -29,7 +29,7 @@ _BlaineFireBlastText:: ; a08fd (28:48fd)
 	line "water #MON!"
 	done
 
-_BlaineBadgeText:: ; a0946 (28:4946)
+_BlaineBadgeText::
 	text "Hah!"
 
 	para "The VOLCANOBADGE"
@@ -41,13 +41,13 @@ _BlaineBadgeText:: ; a0946 (28:4946)
 	line "have this too!"
 	done
 
-_ReceivedTM38Text:: ; a09a8 (28:49a8)
+_ReceivedTM38Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM38ExplanationText:: ; a09bc (28:49bc)
+_TM38ExplanationText::
 	db $0
 	para "TM38 contains"
 	line "FIRE BLAST!"
@@ -60,23 +60,23 @@ _TM38ExplanationText:: ; a09bc (28:49bc)
 	cont "good bets!"
 	done
 
-_TM38NoRoomText:: ; a0a1e (28:4a1e)
+_TM38NoRoomText::
 	text "Make room for my"
 	line "gift!"
 	done
 
-_CinnabarGymText_7595f:: ; a0a36 (28:4a36)
+_CinnabarGymText_7595f::
 	text "Do you know how"
 	line "hot #MON fire"
 	cont "breath can get?"
 	done
 
-_CinnabarGymText_75964:: ; a0a65 (28:4a65)
+_CinnabarGymText_75964::
 	text "Yow!"
 	line "Hot, hot, hot!"
 	prompt
 
-_CinnabarGymText_75969:: ; a0a7a (28:4a7a)
+_CinnabarGymText_75969::
 	text "Fire, or to be"
 	line "more precise,"
 	cont "combustion..."
@@ -85,66 +85,66 @@ _CinnabarGymText_75969:: ; a0a7a (28:4a7a)
 	line "blah..."
 	done
 
-_CinnabarGymText_75994:: ; a0ac0 (28:4ac0)
+_CinnabarGymText_75994::
 	text "I was a thief, but"
 	line "I became straight"
 	cont "as a trainer!"
 	done
 
-_CinnabarGymText_75999:: ; a0af4 (28:4af4)
+_CinnabarGymText_75999::
 	text "I"
 	line "surrender!"
 	prompt
 
-_CinnabarGymText_7599e:: ; a0b02 (28:4b02)
+_CinnabarGymText_7599e::
 	text "I can't help"
 	line "stealing other"
 	cont "people's #MON!"
 	done
 
-_CinnabarGymText_759c9:: ; a0b2c (28:4b2c)
+_CinnabarGymText_759c9::
 	text "You can't win!"
 	line "I have studied"
 	cont "#MON totally!"
 	done
 
-_CinnabarGymText_759ce:: ; a0b58 (28:4b58)
+_CinnabarGymText_759ce::
 	text "Waah!"
 	line "My studies!"
 	prompt
 
-_CinnabarGymText_759d3:: ; a0b6b (28:4b6b)
+_CinnabarGymText_759d3::
 	text "My theories are"
 	line "too complicated"
 	cont "for you!"
 	done
 
-_CinnabarGymText_759fe:: ; a0b95 (28:4b95)
+_CinnabarGymText_759fe::
 	text "I just like using"
 	line "fire #MON!"
 	done
 
-_CinnabarGymText_75a03:: ; a0bb3 (28:4bb3)
+_CinnabarGymText_75a03::
 	text "Too hot"
 	line "to handle!"
 	prompt
 
-_CinnabarGymText_75a08:: ; a0bc7 (28:4bc7)
+_CinnabarGymText_75a08::
 	text "I wish there was"
 	line "a thief #MON!"
 	cont "I'd use that!"
 	done
 
-_CinnabarGymText_75a33:: ; a0bf4 (28:4bf4)
+_CinnabarGymText_75a33::
 	text "I know why BLAINE"
 	line "became a trainer!"
 	done
 
-_CinnabarGymText_75a38:: ; a0c19 (28:4c19)
+_CinnabarGymText_75a38::
 	text "Ow!"
 	prompt
 
-_CinnabarGymText_75a3d:: ; a0c1e (28:4c1e)
+_CinnabarGymText_75a3d::
 	text "BLAINE was lost"
 	line "in the mountains"
 	cont "when a fiery bird"
@@ -155,40 +155,40 @@ _CinnabarGymText_75a3d:: ; a0c1e (28:4c1e)
 	cont "his way down!"
 	done
 
-_CinnabarGymText_75a68:: ; a0c90 (28:4c90)
+_CinnabarGymText_75a68::
 	text "I've been to many"
 	line "GYMs, but this is"
 	cont "my favorite!"
 	done
 
-_CinnabarGymText_75a6d:: ; a0cc1 (28:4cc1)
+_CinnabarGymText_75a6d::
 	text "Yowza!"
 	line "Too hot!"
 	prompt
 
-_CinnabarGymText_75a72:: ; a0cd2 (28:4cd2)
+_CinnabarGymText_75a72::
 	text "Us fire #MON"
 	line "fans like PONYTA"
 	cont "and NINETALES!"
 	done
 
-_CinnabarGymText_75a9d:: ; a0d00 (28:4d00)
+_CinnabarGymText_75a9d::
 	text "Fire is weak"
 	line "against H2O!"
 	done
 
-_CinnabarGymText_75aa2:: ; a0d1b (28:4d1b)
+_CinnabarGymText_75aa2::
 	text "Oh!"
 	line "Snuffed out!"
 	prompt
 
-_CinnabarGymText_75aa7:: ; a0d2d (28:4d2d)
+_CinnabarGymText_75aa7::
 	text "Water beats fire!"
 	line "But, fire melts"
 	cont "ice #MON!"
 	done
 
-_CinnabarGymText_75ac2:: ; a0d5a (28:4d5a)
+_CinnabarGymText_75ac2::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -203,7 +203,7 @@ _CinnabarGymText_75ac2:: ; a0d5a (28:4d5a)
 	line "some BURN HEALs!"
 	done
 
-_CinnabarGymText_75ac7:: ; a0dd9 (28:4dd9)
+_CinnabarGymText_75ac7::
 	text $52, "! You beat"
 	line "that fire brand!"
 	done