Merge branch 'mr-origin-80'

2024-09-26 19:10:37 -05:00
parent e8eed5ecb9 249f5a7329
commit 8a312a3e64
170 changed files with 1495 additions and 1305 deletions
--- a/src/FP/ch/xmastree.c
+++ b/src/FP/ch/xmastree.c
@@ -127,7 +127,7 @@ void chXmasTree_update(Actor *this){
            this->lifetime_value = 2.0f;
            func_8025A6EC(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
            func_802BAFE4(0x1A);
-            func_80311480(0xC14, 0, NULL, NULL, NULL, NULL);
+            gcdialog_showText(0xC14, 0, NULL, NULL, NULL, NULL);
            break;

        case 3: // L803872F0