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

1 files changed, 25 insertions, 25 deletions

diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm
index 73c9d31e..8b7c84ac 100644
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/fuchsia_gym_2.asm
@@ -1,4 +1,4 @@
-_KogaExplainToxicText:: ; a0000 (28:4000)
+_KogaExplainToxicText::
 	text "When afflicted by"
 	line "TOXIC, #MON"
 	cont "suffer more and"
@@ -9,7 +9,7 @@ _KogaExplainToxicText:: ; a0000 (28:4000)
 	line "terrorize foes!"
 	done
 
-_FuchsiaGymText9:: ; a0069 (28:4069)
+_FuchsiaGymText9::
 	text "Now that you have"
 	line "the SOULBADGE,"
 	cont "the DEFENSE of"
@@ -24,13 +24,13 @@ _FuchsiaGymText9:: ; a0069 (28:4069)
 	line "too!"
 	done
 
-_ReceivedTM06Text:: ; a00eb (28:40eb)
+_ReceivedTM06Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM06ExplanationText:: ; a00ff (28:40ff)
+_TM06ExplanationText::
 	db $0
 	para "TM06 contains"
 	line "TOXIC!"
@@ -40,12 +40,12 @@ _TM06ExplanationText:: ; a00ff (28:40ff)
 	cont "400 years old!"
 	done
 
-_TM06NoRoomText:: ; a0143 (28:4143)
+_TM06NoRoomText::
 	text "Make space for"
 	line "this, child!"
 	done
 
-_FuchsiaGymBattleText1:: ; a0160 (28:4160)
+_FuchsiaGymBattleText1::
 	text "Strength isn't"
 	line "the key for"
 	cont "#MON!"
@@ -57,54 +57,54 @@ _FuchsiaGymBattleText1:: ; a0160 (28:4160)
 	cont "brute strength!"
 	done
 
-_FuchsiaGymEndBattleText1:: ; a01c2 (28:41c2)
+_FuchsiaGymEndBattleText1::
 	text "What?"
 	line "Extraordinary!"
 	prompt
 
-_FuchsiaGymAfterBattleText1:: ; a01d8 (28:41d8)
+_FuchsiaGymAfterBattleText1::
 	text "So, you mix brawn"
 	line "with brains?"
 	cont "Good strategy!"
 	done
 
-_FuchsiaGymBattleText2:: ; a0207 (28:4207)
+_FuchsiaGymBattleText2::
 	text "I wanted to become"
 	line "a ninja, so I"
 	cont "joined this GYM!"
 	done
 
-_FuchsiaGymEndBattleText2:: ; a023a (28:423a)
+_FuchsiaGymEndBattleText2::
 	text "I'm done"
 	line "for!"
 	prompt
 
-_FuchsiaGymAfterBattleText2:: ; a0248 (28:4248)
+_FuchsiaGymAfterBattleText2::
 	text "I will keep on"
 	line "training under"
 	cont "KOGA, my ninja"
 	cont "master!"
 	done
 
-_FuchsiaGymBattleText3:: ; a027e (28:427e)
+_FuchsiaGymBattleText3::
 	text "Let's see you"
 	line "beat my special"
 	cont "techniques!"
 	done
 
-_FuchsiaGymEndBattleText3:: ; a02a8 (28:42a8)
+_FuchsiaGymEndBattleText3::
 	text "You"
 	line "had me fooled!"
 	prompt
 
-_FuchsiaGymAfterBattleText3:: ; a02bc (28:42bc)
+_FuchsiaGymAfterBattleText3::
 	text "I like poison and"
 	line "sleep techniques,"
 	cont "as they linger"
 	cont "after battle!"
 	done
 
-_FuchsiaGymBattleText4:: ; a02fe (28:42fe)
+_FuchsiaGymBattleText4::
 	text "Stop right there!"
 
 	para "Our invisible"
@@ -112,12 +112,12 @@ _FuchsiaGymBattleText4:: ; a02fe (28:42fe)
 	cont "frustrated?"
 	done
 
-_FuchsiaGymEndBattleText4:: ; a033a (28:433a)
+_FuchsiaGymEndBattleText4::
 	text "Whoa!"
 	line "He's got it!"
 	prompt
 
-_FuchsiaGymAfterBattleText4:: ; a034d (28:434d)
+_FuchsiaGymAfterBattleText4::
 	text "You impressed me!"
 	line "Here's a hint!"
 
@@ -126,7 +126,7 @@ _FuchsiaGymAfterBattleText4:: ; a034d (28:434d)
 	cont "invisible walls!"
 	done
 
-_FuchsiaGymBattleText5:: ; a03a1 (28:43a1)
+_FuchsiaGymBattleText5::
 	text "I also study the"
 	line "way of the ninja"
 	cont "with master KOGA!"
@@ -136,16 +136,16 @@ _FuchsiaGymBattleText5:: ; a03a1 (28:43a1)
 	cont "animals!"
 	done
 
-_FuchsiaGymEndBattleText5:: ; a0402 (28:4402)
+_FuchsiaGymEndBattleText5::
 	text "Awoo!"
 	prompt
 
-_FuchsiaGymAfterBattleText5:: ; a0409 (28:4409)
+_FuchsiaGymAfterBattleText5::
 	text "I still have much"
 	line "to learn!"
 	done
 
-_FuchsiaGymBattleText6:: ; a0426 (28:4426)
+_FuchsiaGymBattleText6::
 	text "Master KOGA comes"
 	line "from a long line"
 	cont "of ninjas!"
@@ -154,12 +154,12 @@ _FuchsiaGymBattleText6:: ; a0426 (28:4426)
 	line "descend from?"
 	done
 
-_FuchsiaGymEndBattleText6:: ; a0470 (28:4470)
+_FuchsiaGymEndBattleText6::
 	text "Dropped"
 	line "my balls!"
 	prompt
 
-_FuchsiaGymAfterBattleText6:: ; a0483 (28:4483)
+_FuchsiaGymAfterBattleText6::
 	text "Where there is"
 	line "light, there is"
 	cont "shadow!"
@@ -169,7 +169,7 @@ _FuchsiaGymAfterBattleText6:: ; a0483 (28:4483)
 	cont "choose?"
 	done
 
-_FuchsiaGymText_7564e:: ; a04d2 (28:44d2)
+_FuchsiaGymText_7564e::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -186,7 +186,7 @@ _FuchsiaGymText_7564e:: ; a04d2 (28:44d2)
 	cont "to reach him!"
 	done
 
-_FuchsiaGymText_75653:: ; a0574 (28:4574)
+_FuchsiaGymText_75653::
 	text "It's amazing how"
 	line "ninja can terrify"
 	cont "even now!"