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/school.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/school.asm')
| -rw-r--r-- | text/maps/school.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/text/maps/school.asm b/text/maps/school.asm index 9bdd9004..2bd526f9 100644 --- a/text/maps/school.asm +++ b/text/maps/school.asm @@ -1,21 +1,20 @@ -_SchoolText1:: ; 95d15 (25:5d15) +_SchoolText1:: text "Whew! I'm trying" line "to memorize all" cont "my notes." done -IF DEF(_YELLOW) _SchoolText3:: text "Sis says #MON" line "will become tame" cont "if you treat them" cont "nicely." -ENDC + done -_SchoolText2:: ; 95d40 (25:5d40) +_SchoolText2:: text "Okay!" para "Be sure to read" line "the blackboard" cont "carefully!" - done + done
\ No newline at end of file |