Merge branch 'mr-origin-98'

2024-10-19 23:50:51 -05:00
parent 15390deab1 af5b823880
commit 74deec4d39
9 changed files with 535 additions and 580 deletions
--- a/src/SM/ch/smbottles.c
+++ b/src/SM/ch/smbottles.c
@@ -40,7 +40,7 @@ ActorAnimationInfo chSmBottlesAnimations[6] = {
    {ASSET_13A_ANIM_BOTTLES_ENTER, 2000000000.0f}
 };

-ActorInfo chBottles = {
+ActorInfo gChBottles = {
    MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES,
    1, chSmBottlesAnimations,
    chSmBottles_update, actor_update_func_80326224, func_802D94B4,