Merge remote-tracking branch 'pret/master'

This commit is contained in:
Diegoisawesome
2017-09-19 19:42:32 -05:00
79 changed files with 14787 additions and 32744 deletions

View File

@@ -2159,20 +2159,20 @@ gUnknown_085ED207:: @ 85ED207
gUnknown_085ED21E:: @ 85ED21E
.string "{COLOR DARK_GREY}$"
.string "{COLOR_HIGHLIGHT_SHADOW BORDER_COLOR6 WHITE BORDER_COLOR5}$"
.string "{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR6 WHITE DYNAMIC_COLOR5}$"
gUnknown_085ED228:: @ 85ED228
.string "{HIGHLIGHT DARK_GREY}$"
.string " $"
gUnknown_085ED22E:: @ 85ED22E
.string "{COLOR BORDER_COLOR2}$"
.string "{COLOR DYNAMIC_COLOR2}$"
gUnknown_085ED233:: @ 85ED233
.string "{COLOR BORDER_COLOR1}$"
.string "{COLOR DYNAMIC_COLOR1}$"
gUnknown_085ED238:: @ 85ED238
.string "{COLOR BORDER_COLOR2}$"
.string "{COLOR DYNAMIC_COLOR2}$"
gUnknown_085ED23C:: @ 85ED23C
.string "UPPER$"