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

1 files changed, 17 insertions, 21 deletions

diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm
index ee7d14ee..e347edb9 100644
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -1,4 +1,4 @@
-_VermilionGymText_5cb72:: ; 9c000 (27:4000)
+_VermilionGymText_5cb72::
 	text "A little word of"
 	line "advice, kid!"
 
@@ -10,30 +10,26 @@ _VermilionGymText_5cb72:: ; 9c000 (27:4000)
 	cont "type #MON!"
 	done
 
-_VermilionGymText_5cb77:: ; 9c069 (27:4069)
+_VermilionGymText_5cb77::
 	text "The THUNDERBADGE"
 	line "cranks up your"
 	cont "#MON's SPEED!"
 
 	para "It also lets your"
-IF DEF(_YELLOW)
-	line "#MON FLY any-"
-ELSE
 	line "#MON FLY any"
-ENDC
 	cont "time, kid!"
 
 	para "You're special,"
 	line "kid! Take this!"
 	done
 
-_ReceivedTM24Text:: ; 9c0e0 (27:40e0)
+_ReceivedTM24Text::
 	text $52, " received "
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM24ExplanationText:: ; 9c0f5 (27:40f5)
+_TM24ExplanationText::
 	db $0
 	para "TM24 contains"
 	line "THUNDERBOLT!"
@@ -42,12 +38,12 @@ _TM24ExplanationText:: ; 9c0f5 (27:40f5)
 	line "electric #MON!"
 	done
 
-_TM24NoRoomText:: ; 9c130 (27:4130)
+_TM24NoRoomText::
 	text "Yo kid, make room"
 	line "in your pack!"
 	done
 
-_ReceivedThunderbadgeText:: ; 9c151 (27:4151)
+_ReceivedThunderbadgeText::
 	text "Whoa!"
 
 	para "You're the real"
@@ -57,18 +53,18 @@ _ReceivedThunderbadgeText:: ; 9c151 (27:4151)
 	line "the THUNDERBADGE!"
 	prompt
 
-_VermilionGymBattleText1:: ; 9c194 (27:4194)
+_VermilionGymBattleText1::
 	text "When I was in the"
 	line "Army, LT.SURGE"
 	cont "was my strict CO!"
 	done
 
-_VermilionGymEndBattleText1:: ; 9c1c8 (27:41c8)
+_VermilionGymEndBattleText1::
 	text "Stop!"
 	line "You're very good!"
 	prompt
 
-_VermilionGymAfterBattleText1:: ; 9c1e0 (27:41e0)
+_VermilionGymAfterBattleText1::
 	text "The door won't"
 	line "open?"
 
@@ -76,17 +72,17 @@ _VermilionGymAfterBattleText1:: ; 9c1e0 (27:41e0)
 	line "was cautious!"
 	done
 
-_VermilionGymBattleText2:: ; 9c213 (27:4213)
+_VermilionGymBattleText2::
 	text "I'm a lightweight,"
 	line "but I'm good with"
 	cont "electricity!"
 	done
 
-_VermilionGymEndBattleText2:: ; 9c244 (27:4244)
+_VermilionGymEndBattleText2::
 	text "Fried!"
 	prompt
 
-_VermilionGymAfterBattleText2:: ; 9c24c (27:424c)
+_VermilionGymAfterBattleText2::
 	text "OK, I'll talk!"
 
 	para "LT.SURGE said he"
@@ -94,17 +90,17 @@ _VermilionGymAfterBattleText2:: ; 9c24c (27:424c)
 	cont "inside something!"
 	done
 
-_VermilionGymBattleText3:: ; 9c290 (27:4290)
+_VermilionGymBattleText3::
 	text "This is no place"
 	line "for kids!"
 	done
 
-_VermilionGymEndBattleText3:: ; 9c2ac (27:42ac)
+_VermilionGymEndBattleText3::
 	text "Wow!"
 	line "Surprised me!"
 	prompt
 
-_VermilionGymAfterBattleText3:: ; 9c2c0 (27:42c0)
+_VermilionGymAfterBattleText3::
 	text "LT.SURGE set up"
 	line "double locks!"
 	cont "Here's a hint!"
@@ -115,7 +111,7 @@ _VermilionGymAfterBattleText3:: ; 9c2c0 (27:42c0)
 	cont "next to it!"
 	done
 
-_VermilionGymText_5cbf4:: ; 9c32b (27:432b)
+_VermilionGymText_5cbf4::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -141,7 +137,7 @@ _VermilionGymText_5cbf4:: ; 9c32b (27:432b)
 	cont "get to him!"
 	done
 
-_VermilionGymText_5cbf9:: ; 9c429 (27:4429)
+_VermilionGymText_5cbf9::
 	text "Whew! That match"
 	line "was electric!"
 	done