diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
tree | a1ce27018f39d98f49d89468df426d0291e18560 /text/maps/pewter_mart.asm | |
parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/pewter_mart.asm')
-rw-r--r-- | text/maps/pewter_mart.asm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index 71760b7b..bac57a53 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -1,9 +1,5 @@ -_PewterMartText_74cc6:: ; 985ac (26:45ac) -IF DEF(_YELLOW) - text "A shady old man" -ELSE +_PewterMartText_74cc6:: text "A shady, old man" -ENDC line "got me to buy" cont "this really weird" cont "fish #MON!" @@ -12,7 +8,7 @@ ENDC line "and it cost ¥500!" done -_PewterMartText_74cd5:: ; 9860c (26:460c) +_PewterMartText_74cd5:: text "Good things can" line "happen if you" cont "raise #MON" |