Merge branch 'master' into battle

2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
@@ -639,7 +639,7 @@ static void sub_807E5EC(u8 taskId)
    }
 }

-void sub_807E654(void)
+void DoCableClubWarp(void)
 {
    ScriptContext2_Enable();
    sub_8055F88();