Merge branch 'master' into decomp_record_mixing

2018-05-20 12:16:45 +02:00
parent 1a8d5132d6 de60bdf2fe
commit 4d5bfc149e
161 changed files with 2902 additions and 4845 deletions
@@ -237,11 +237,11 @@ void sub_818D9C0(void)
 {
    LilycoveLady *lilycoveLady;

-    VarSet(VAR_0x4010, sUnknown_0860B07E[GetLilycoveLadyId()]);
+    VarSet(VAR_OBJ_GFX_ID_0, sUnknown_0860B07E[GetLilycoveLadyId()]);
    if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST)
    {
        lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
-        VarSet(VAR_0x4011, sUnknown_0860B074[lilycoveLady->contest.category]);
+        VarSet(VAR_OBJ_GFX_ID_1, sUnknown_0860B074[lilycoveLady->contest.category]);
        gSpecialVar_Result = TRUE;
    }
    else