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

1 files changed, 22 insertions, 26 deletions

diff --git a/text/maps/mt_moon_1f.asm b/text/maps/mt_moon_1f.asm
index 0577adf3..761a5240 100644
--- a/text/maps/mt_moon_1f.asm
+++ b/text/maps/mt_moon_1f.asm
@@ -1,123 +1,119 @@
-_MtMoon1BattleText2:: ; 80692 (20:4692)
+_MtMoon1BattleText2::
 	text "WHOA! You shocked"
 	line "me! Oh, you're"
 	cont "just a kid!"
 	done
 
-_MtMoon1EndBattleText2:: ; 806bf (20:46bf)
+_MtMoon1EndBattleText2::
 	text "Wow!"
 	line "Shocked again!"
 	prompt
 
-_MtMoon1AfterBattleText2:: ; 806d4 (20:46d4)
+_MtMoon1AfterBattleText2::
 	text "Kids like you"
 	line "shouldn't be"
 	cont "here!"
 	done
 
-_MtMoon1BattleText3:: ; 806f5 (20:46f5)
+_MtMoon1BattleText3::
 	text "Did you come to"
 	line "explore too?"
 	done
 
-_MtMoon1EndBattleText3:: ; 80713 (20:4713)
+_MtMoon1EndBattleText3::
 	text "Losing"
 	line "stinks!"
 	prompt
 
-_MtMoon1AfterBattleText3:: ; 80723 (20:4723)
+_MtMoon1AfterBattleText3::
 	text "I came down here"
 	line "to show off to"
 	cont "girls."
 	done
 
-_MtMoon1BattleText4:: ; 8074b (20:474b)
+_MtMoon1BattleText4::
 	text "Wow! It's way"
 	line "bigger in here"
 	cont "than I thought!"
 	done
 
-_MtMoon1EndBattleText4:: ; 80778 (20:4778)
+_MtMoon1EndBattleText4::
 	text "Oh!"
 	line "I lost it!"
 	prompt
 
-_MtMoon1AfterBattleText4:: ; 80788 (20:4788)
+_MtMoon1AfterBattleText4::
 	text "How do you get"
 	line "out of here?"
 	done
 
-_MtMoon1BattleText5:: ; 807a5 (20:47a5)
+_MtMoon1BattleText5::
 	text "What! Don't sneak"
 	line "up on me!"
 	done
 
-_MtMoon1EndBattleText5:: ; 807c1 (20:47c1)
+_MtMoon1EndBattleText5::
 	text "My"
 	line "#MON won't do!"
 	prompt
 
-_MtMoon1AfterBattleText5:: ; 807d3 (20:47d3)
+_MtMoon1AfterBattleText5::
 	text "I have to find"
 	line "stronger #MON."
 	done
 
-_MtMoon1BattleText6:: ; 807f2 (20:47f2)
+_MtMoon1BattleText6::
 	text "What? I'm waiting"
 	line "for my friends to"
 	cont "find me here."
 	done
 
-_MtMoon1EndBattleText6:: ; 80824 (20:4824)
+_MtMoon1EndBattleText6::
 	text "I lost?"
 	prompt
 
-_MtMoon1AfterBattleText6:: ; 8082d (20:482d)
+_MtMoon1AfterBattleText6::
 	text "I heard there are"
 	line "some very rare"
 	cont "fossils here."
 	done
 
-_MtMoon1BattleText7:: ; 8085d (20:485d)
+_MtMoon1BattleText7::
 	text "Suspicious men"
 	line "are in the cave."
 	cont "What about you?"
 	done
 
-_MtMoon1EndBattleText7:: ; 8088e (20:488e)
+_MtMoon1EndBattleText7::
 	text "You"
 	line "got me!"
 	prompt
 
-_MtMoon1AfterBattleText7:: ; 8089b (20:489b)
+_MtMoon1AfterBattleText7::
 	text "I saw them! I'm"
 	line "sure they're from"
 	cont "TEAM ROCKET!"
 	done
 
-_MtMoon1BattleText8:: ; 808c9 (20:48c9)
+_MtMoon1BattleText8::
 	text "Go through this"
 	line "cave to get to"
 	cont "CERULEAN CITY!"
 	done
 
-_MtMoon1EndBattleText8:: ; 808f8 (20:48f8)
+_MtMoon1EndBattleText8::
 	text "I"
 	line "lost."
 	prompt
 
-_MtMoon1AfterBattleText8:: ; 80901 (20:4901)
+_MtMoon1AfterBattleText8::
 	text "ZUBAT is tough!"
 	line "But, it can be"
 	cont "useful if you"
 	cont "catch one."
 	done
 
-_MtMoon1Text14:: ; 8093a (20:493a)
+_MtMoon1Text14::
 	text "Beware! ZUBAT is"
-IF DEF(_YELLOW)
-	line "a bloodsucker!"
-ELSE
 	line "a blood sucker!"
-ENDC
 	done