Merge master into ObjEvent rename

2019-12-21 05:19:27 -05:00
parent 949509aade 026e1108b2
commit 68cdd7b1cb
67 changed files with 1026 additions and 822 deletions
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -138,7 +138,7 @@ void SetUpItemUseOnFieldCallback(u8 taskId)

 void MapPostLoadHook_UseItem(void)
 {
-    pal_fill_black();
+    FadeInFromBlack();
    CreateTask(Task_CallItemUseOnFieldCallback, 8);
 }