diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
| commit | 13efa1ef62b3e23e2b0662e318ed155893e17e88 (patch) | |
| tree | 57ae51e1b35c38d24d69e090dbf39b27a687d17b /data/event_scripts.s | |
| parent | d31600e70e53fb252fe67e8c427ecb7498719b86 (diff) | |
| parent | 7defc27b994069715e5749245700d20dd740e4f0 (diff) | |
fixing conflicts
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 25b0c7b52..c2906e649 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5887,10 +5887,10 @@ gText_SoAmusing:: @ 82942E3 gText_SoMagical:: @ 82942F0 .string " so magical!$" -gUnknown_082942FD:: @ 82942FD +gOtherText_Is:: @ 82942FD .string " is$" -gUnknown_08294301:: @ 8294301 +gOtherText_DontYouAgree:: @ 8294301 .string "\n" .string "Don’t you agree?$" |