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/saffron_gates.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/saffron_gates.asm')
| -rw-r--r-- | text/maps/saffron_gates.asm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm index b7db1751..30ad6cbd 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/saffron_gates.asm @@ -1,17 +1,13 @@ -_SaffronGateText_1dfe7:: ; 8aa5c (22:6a5c) +_SaffronGateText_1dfe7:: text "I'm on guard duty." line "Gee, I'm thirsty," cont "though!" -IF DEF(_YELLOW) - para "Oh, wait there," -ELSE para "Oh wait there," -ENDC line "the road's closed." done -_SaffronGateText_8aaa9:: ; 8aaa9 (22:6aa9) +_SaffronGateText_8aaa9:: text "Whoa, boy!" line "I'm parched!" cont "..." @@ -19,14 +15,10 @@ _SaffronGateText_8aaa9:: ; 8aaa9 (22:6aa9) cont "this drink?" cont "Gee, thanks!@@" -_SaffronGateText_1dff1:: ; 8aaef (22:6aef) +_SaffronGateText_1dff1:: db $0 para "..." -IF DEF(_YELLOW) - line "Glug, glug..." -ELSE line "Glug glug..." -ENDC cont "..." cont "Gulp..." cont "If you want to go" @@ -38,7 +30,7 @@ ENDC cont "the other guards!" done -_SaffronGateText_1dff6:: ; 8ab74 (22:6b74) +_SaffronGateText_1dff6:: text "Hi, thanks for" line "the cool drinks!" done |