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/copycats_house_1f.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'text/maps/copycats_house_1f.asm')
| -rw-r--r-- | text/maps/copycats_house_1f.asm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm index da99566b..3ec2b151 100644 --- a/text/maps/copycats_house_1f.asm +++ b/text/maps/copycats_house_1f.asm @@ -1,11 +1,11 @@ -_CopycatsHouse1FText1:: ; a14f7 (28:54f7) +_CopycatsHouse1FText1:: text "My daughter is so" line "self-centered." cont "She only has a" cont "few friends." done -_CopycatsHouse1FText2:: ; a1535 (28:5535) +_CopycatsHouse1FText2:: text "My daughter likes" line "to mimic people." @@ -15,11 +15,6 @@ _CopycatsHouse1FText2:: ; a1535 (28:5535) cont "around here!" done -_CopycatsHouse1FText3:: ; a1596 (28:5596) -IF DEF(_YELLOW) - text "CHANSEY: Chaan" - line "sey!@@" -ELSE +_CopycatsHouse1FText3:: text "CHANSEY: Chaan!" line "Sii!@@" -ENDC |