Merge branch 'master' into battle_records

2019-07-14 11:29:23 -04:00
parent 31c26e862a 53b950019a
commit 939bd127bb
48 changed files with 1191 additions and 3782 deletions
@@ -1299,7 +1299,7 @@ void sub_815E720(void)
 void sub_815E88C(void)
 {
    u8 windowId = VarGet(VAR_0x4001);
-    ClearMenuWindow(windowId, TRUE);
+    ClearStdWindowAndFrameToTransparent(windowId, TRUE);
    RemoveWindow(windowId);
 }