Merge branch 'master' into fix-eventobj

2020-01-19 20:21:53 -05:00
parent ea8b1011d3 a40f054900
commit 4c12ad00d2
30 changed files with 3398 additions and 7590 deletions
@@ -2155,7 +2155,7 @@ void sub_8129708(void)
 }

 // Unused
-void GetEventObjectLocalIdByFlag(void)
+void GetObjectEventLocalIdByFlag(void)
 {
    u8 i;