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/GV/ch/gobi1.c
+++ b/src/GV/ch/gobi1.c
@@ -176,13 +176,13 @@ void chGobi1_update(Actor *this){
    }

    if(this->state == 1 || this->state == 2){
-        if( !this->is_first_encounter
+        if( !this->has_met_before
            && func_80329530(this, 250)
            && !func_80329530(this, 80)
            && func_8028F2A0()
-            && func_80311480(0xa73, 0, NULL, NULL, NULL, NULL)
+            && gcdialog_showText(0xa73, 0, NULL, NULL, NULL, NULL)
        ){
-            this->is_first_encounter = TRUE;
+            this->has_met_before = TRUE;
        }
    }//L803877A4