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

1 files changed, 3 insertions, 82 deletions

diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm
index bb1ca0f0..3e251e13 100644
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -1,35 +1,15 @@
 PikachuFanText::
 	text "Won't you admire"
-IF DEF(_YELLOW)
-	line "my CLEFAIRY's"
-ELSE
 	line "my PIKACHU's"
-ENDC
 	cont "adorable tail?"
 	done
 
 PikachuFanBetterText::
-IF DEF(_YELLOW)
-	text "Humph! My CLEFAIRY"
-ELSE
 	text "Humph! My PIKACHU"
-ENDC
 	line "is twice as cute"
 	cont "as that one!"
 	done
 
-IF DEF(_YELLOW)
-PikachuFanPrintText::
-	text "Our CHAIRMAN's new"
-	line "hobby is taking"
-	cont "#MON photos."
-
-	para "He gave me a nice"
-	line "PRINT of my cute"
-	cont "CLEFAIRY."
-	done
-ENDC
-
 SeelFanText::
 	text "I just love my"
 	line "SEEL!"
@@ -45,22 +25,9 @@ SeelFanBetterText::
 	line "more attractive!"
 	done
 
-IF DEF(_YELLOW)
-SeelFanPrintText::
-	text "I'm going to hook"
-	line "up the cable to"
-	cont "get a photo PRINT"
-	cont "of my SEEL!"
-	done
-ENDC
-
 FanClubPikachuText::
-IF DEF(_YELLOW)
-	text "CLEFAIRY: Pippii!"
-ELSE
 	text "PIKACHU: Chu!"
 	line "Pikachu!"
-ENDC
 	done
 
 FanClubSeelText::
@@ -71,14 +38,8 @@ FanClubMeetChairText::
 	text "I chair the"
 	line "#MON Fan Club!"
 
-IF DEF(_YELLOW)
-	para "I have more than"
-	line "100 #MON. I"
-	cont "love them all!"
-ELSE
 	para "I have collected"
 	line "over 100 #MON!"
-ENDC
 
 	para "I'm very fussy"
 	line "when it comes to"
@@ -86,13 +47,8 @@ ENDC
 
 	para "So..."
 
-IF DEF(_YELLOW)
-	para "Did you come to"
-	line "hear me brag"
-ELSE
 	para "Did you come"
 	line "visit to hear"
-ENDC
 	cont "about my #MON?"
 	done
 
@@ -169,54 +125,19 @@ FanClubBagFullText::
 	line "this!"
 	done
 
-IF DEF(_YELLOW)
-FanClubChairPrintText1::
-	text "Hi there, ",$52,"!"
-	line "Have you seen my"
-	cont "#MON photos?"
-
-	para "I have them framed"
-	line "up on that wall."
-
-	para "Ah, I know!"
-
-	para "Would you like me"
-	line "to take a photo"
-	cont "of your #MON?"
-	done
-
-FanClubChairPrintText2::
-	text "No? That's really"
-	line "disappointing."
-	done
-
-FanClubChairPrintText3::
-	text "OK, I'm done."
-	done
-
-FanClubChairPrintText4::
-	text "Maybe we won't"
-	line "PRINT this now."
-	done
-ENDC
-
-_FanClubText6:: ; 9a948 (26:6948)
-IF DEF(_YELLOW)
-	text "Our CHAIRMAN is"
-ELSE
+_FanClubText6::
 	text "Our Chairman is"
-ENDC
 	line "very vocal about"
 	cont "#MON."
 	done
 
-_FanClubText7:: ; 9a970 (26:6970)
+_FanClubText7::
 	text "Let's all listen"
 	line "politely to other"
 	cont "trainers!"
 	done
 
-_FanClubText8:: ; 9a99d (26:699d)
+_FanClubText8::
 	text "If someone brags,"
 	line "brag right back!"
 	done