Merge branch 'master' into sync-text

2022-11-26 18:08:49 -05:00
parent f0974b6fe6 f24fee8e57
commit 673c86c56f
67 changed files with 3835 additions and 3431 deletions
@@ -10,7 +10,7 @@
 #include "link.h"
 #include "load_save.h"
 #include "m4a.h"
-#include "mevent.h"
+#include "mystery_gift.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"
 #include "quest_log.h"