diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-08 01:52:50 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:16:11 -0400 |
| commit | 10af88ddd712415f2a0a2b6124187d51075c95d5 (patch) | |
| tree | 0fe1145438b5cc645f95fe190b9f418cf73dedc7 /text/maps/museum_2f.asm | |
| parent | Attempt to make Yellow buildable, part 2. (diff) | |
| download | pokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.tar.gz pokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.tar.xz pokeyellow-10af88ddd712415f2a0a2b6124187d51075c95d5.zip | |
text.o
Conflicts:
main.asm
text.asm
text/maps/cerulean_trade_house.asm
text/maps/copycats_house_1f.asm
text/maps/daycare_2.asm
text/maps/museum_2f.asm
text/maps/oaks_lab.asm
text/maps/pewter_gym.asm
text/maps/route_9_1.asm
text/maps/school.asm
text/maps/vermilion_gym_1.asm
wram.asm
yellow/text.asm
Diffstat (limited to 'text/maps/museum_2f.asm')
| -rw-r--r-- | text/maps/museum_2f.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm index 46238725..31a57b58 100644 --- a/text/maps/museum_2f.asm +++ b/text/maps/museum_2f.asm @@ -33,7 +33,6 @@ _Museum2FText5:: ; 96911 (25:6911) line "soon, I promise!" done -IF DEF(_YELLOW) _Museum2FPikachuText1:: text "Your PIKACHU looks" line "untamed." @@ -46,7 +45,7 @@ _Museum2FPikachuText2:: line "that PIKACHU off" cont "you, but it's too" cont "attached to you." -ENDC + done _Museum2FText6:: ; 96933 (25:6933) text "SPACE SHUTTLE" |