merge easy chat with master

This commit is contained in:
DizzyEggg
2018-08-11 14:14:51 +02:00
7 changed files with 828 additions and 1282 deletions

View File

@@ -157,6 +157,7 @@ SECTIONS {
src/item_use.o(.text);
asm/battle_anim_80FE840.o(.text);
src/bike.o(.text);
src/easy_chat.o(.text);
asm/easy_chat.o(.text);
src/mon_markings.o(.text);
src/mauville_old_man.o(.text);