Merge branch 'master' into doc-sixisland

2020-03-02 10:48:56 -05:00
parent 47f6e9f973 5198a05272
commit 6280a3786b
141 changed files with 2894 additions and 4342 deletions
@@ -34,6 +34,7 @@
 #include "constants/quest_log.h"
 #include "constants/daycare.h"
 #include "constants/easy_chat.h"
+#include "constants/trainer_card.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.set FALSE, 0