Merge branch 'mr-origin-53'

2024-09-01 16:26:51 -05:00
parent 35a2c13ea9 892f773f80
commit b26ae6b1f3
32 changed files with 1082 additions and 791 deletions
--- a/src/SM/ch/attacktutorial.c
+++ b/src/SM/ch/attacktutorial.c
@@ -206,7 +206,7 @@ void func_80387764(ActorMarker * marker){
        func_8028F94C(2, actor->unk1C);
    }
    //L80387848
-    if(!mapSpecificFlags_get(3) && learnedAllTutorialAbilities() && temp_a2){
+    if(!mapSpecificFlags_get(3) && chmole_learnedAllSpiralMountainAbilities() && temp_a2){
        mapSpecificFlags_set(3, 1);
        sp34 = 0xE12;
    }//L80387898