diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-06 19:49:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-06 19:49:14 -0500 |
| commit | 2b944fd7213baa0d54003e0b876c4e3e5df4dfbd (patch) | |
| tree | a6b514e610ec3ef32e597f1917c77d34f5e272e8 /src/easy_chat.c | |
| parent | 25d026aded10c9a9567d214e46bf41ff4153eb46 (diff) | |
| parent | 1475c4d8da2e27734aa5a738e2287222c1e21386 (diff) | |
Merge branch 'master' into doc-trickhouse
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index 05f51ed4e..ce5fe3c7a 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -532,11 +532,11 @@ static const u16 sMysteryGiftPhrase[] = { }; static const u16 sBerryMasterWifePhrases[][2] = { - {EC_WORD_GREAT, EC_WORD_BATTLE}, - {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, - {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, - {EC_WORD_COOL, EC_POKEMON(LATIOS)}, - {EC_WORD_SUPER, EC_WORD_HUSTLE}, + [PHRASE_GREAT_BATTLE - 1] = {EC_WORD_GREAT, EC_WORD_BATTLE}, + [PHRASE_CHALLENGE_CONTEST - 1] = {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, + [PHRASE_OVERWHELMING_LATIAS - 1] = {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, + [PHRASE_COOL_LATIOS - 1] = {EC_WORD_COOL, EC_POKEMON(LATIOS)}, + [PHRASE_SUPER_HUSTLE - 1] = {EC_WORD_SUPER, EC_WORD_HUSTLE}, }; static const u16 sEasyChatTriangleCursorPalette[] = INCBIN_U16("graphics/easy_chat/triangle_cursor.gbapal"); |