diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:30:35 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:30:35 -0500 |
| commit | 1cd5cb09cfb434b2f688a5a6ec13e0a2d430a41a (patch) | |
| tree | cc65eb016360235949060651e98063e01a746352 /include | |
| parent | e1b2460748dfd9d1a4b3c6eb760e86fb616a7ce6 (diff) | |
| parent | a589d4a630a130e78bdf0819b807a133562d4449 (diff) | |
Merge branch 'master' into weather-15
Diffstat (limited to 'include')
| -rw-r--r-- | include/graphics.h | 5 | ||||
| -rw-r--r-- | include/strings.h | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/graphics.h b/include/graphics.h index 48c00943b..d313bae11 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4010,6 +4010,7 @@ extern const u32 gCreditsCopyrightEnd_Gfx[]; //pokenav extern const u8 gPokenavConditionMarker_Gfx[]; extern const u16 gPokenavConditionMarker_Pal[]; +extern const u16 gPokenavLeftHeader_Pal[]; extern const u16 gPokenavHeader_Pal[]; extern const u32 gPokenavHeader_Gfx[]; extern const u32 gPokenavHeader_Tilemap[]; @@ -4889,5 +4890,9 @@ extern const u16 gFrontierPassMedalsGold_Pal[]; extern const u16 gFrontierPassMedalsSilver_Pal[]; extern const u16 gFrontierPassMapCursor_Pal[]; +// Easy Chat Screen +extern const u32 gEasyChatWindow_Gfx[]; +extern const u32 gEasyChatWindow_Tilemap[]; +extern const u16 gEasyChatMode_Pal[]; #endif //GUARD_GRAPHICS_H diff --git a/include/strings.h b/include/strings.h index af1625140..a3e743943 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2422,5 +2422,13 @@ extern const u8 gText_AllTextBeingEditedWill[]; extern const u8 gText_BeDeletedThatOkay[]; extern const u8 gText_Lady[]; extern const u8 gText_F700sQuiz[]; +extern const u8 gText_CreateAQuiz[]; +extern const u8 gText_SelectTheAnswer[]; +extern const u8 gText_OriginalSongWillBeUsed[]; +extern const u8 gText_LyricsCantBeDeleted[]; +extern const u8 gText_CombineTwoWordsOrPhrases3[]; +extern const u8 gText_OnlyOnePhrase[]; +extern const u8 gText_YouCannotQuitHere[]; +extern const u8 gText_SectionMustBeCompleted[]; #endif // GUARD_STRINGS_H |