Merge branch 'master' into battle

2019-10-24 01:42:52 +08:00
parent 9a53686a4e 6e36c22920
commit 1dc0b25c1e
1127 changed files with 79056 additions and 34785 deletions
@@ -1263,8 +1263,8 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)

 bool8 ScrCmd_textcolor(struct ScriptContext *ctx)
 {
-    gUnknown_20370DC = gUnknown_20370DA;
-    gUnknown_20370DA = ScriptReadByte(ctx);
+    gSpecialVar_PrevTextColor = gSpecialVar_TextColor;
+    gSpecialVar_TextColor = ScriptReadByte(ctx);
    return FALSE;
 }