Merge branch 'mr-origin-97'

2024-10-19 23:19:49 -05:00
parent a59e1abddf 916e83bf65
commit 15390deab1
48 changed files with 390 additions and 390 deletions
--- a/src/core2/ba/marker.c
+++ b/src/core2/ba/marker.c
@@ -114,7 +114,7 @@ void __baMarker_8028B848(void){
        s0 = ASSET_E57_DIALOG_FIRST_JIGGY;
    }
    else if(map_get() == MAP_2_MM_MUMBOS_MOUNTAIN){
-        s0 = ASSET_B45_TEXT_JIGGY_COLLECT_10;
+        s0 = ASSET_B45_DIALOG_JIGGY_COLLECT_10;
    }

    if(s0){