Merge branch 'mr-origin-72'

2024-09-13 20:43:08 -05:00
parent 351f4e9fea 6307691657
commit 0d83006835
14 changed files with 18 additions and 18 deletions
--- a/src/MM/ch/orange.c
+++ b/src/MM/ch/orange.c
@@ -73,7 +73,7 @@ void MM_func_80387FF4(Actor * this){
            break;
        case ORANGE_LANDED_STATE:
            if(this->lifetime_value < 324.0){
-                this->marker->collidable = 0;
+                this->marker->collidable = FALSE;
            }
            this->lifetime_value -= 4.0;
            if(this->lifetime_value < 4.0){