Merge branch 'master' into pokemon

2019-07-15 00:04:06 +08:00
parent 277726fd5e 53b950019a
commit 96fa1a23ed
67 changed files with 7294 additions and 5170 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);
 }