more renaming

2 files changed, 56 insertions, 56 deletions

diff --git a/src/contest.c b/src/contest.c
index d2fa37977..9d1107976 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -61,7 +61,6 @@ extern u16 gBattle_BG0_Y;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_WIN0H;
-extern u32 gContestRngValue;  // saved RNG value
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 
@@ -401,7 +400,7 @@ void ClearContestVars(void)
         sub_80B0F28(0);
     for (i = 0; i < 4; i++)
     {
-        sContestantStatus[i].unk19 = 0xFF;
+        sContestantStatus[i].nextTurnOrder = 0xFF;
         sContest.unk19218[i] = gUnknown_02038696[i];
     }
     sub_80B159C();
@@ -1255,15 +1254,15 @@ void sub_80AC2CC(u8 taskId)
             gTasks[taskId].data[0] = 23;
         return;
     case 48:
-        if (sContestantStatus[r7].unk11_0 == 1)
+        if (sContestantStatus[r7].turnOrderModAction == 1)
         {
             sub_80B1710(5);
         }
-        else if (sContestantStatus[r7].unk11_0 == 2)
+        else if (sContestantStatus[r7].turnOrderModAction == 2)
         {
             sub_80B1710(6);
         }
-        else if (sContestantStatus[r7].unk11_0 == 3)
+        else if (sContestantStatus[r7].turnOrderModAction == 3)
         {
             sub_80B1710(7);
         }
@@ -1291,7 +1290,7 @@ void sub_80AC2CC(u8 taskId)
             gTasks[taskId].data[0] = 35;
         return;
     case 35:
-        if (sContestantStatus[r7].unk10_4 == 1)
+        if (sContestantStatus[r7].conditionMod == 1)
             sub_80B1710(8);
         gTasks[taskId].data[0] = 36;
         return;
@@ -1542,7 +1541,7 @@ void sub_80AC2CC(u8 taskId)
         else
         {
             r4 = shared19328.bits_0;
-            if (sContestantStatus[r7].unk11_4)
+            if (sContestantStatus[r7].overrideCategoryExcitementMod)
             {
                 r4 = 1;
                 StringCopy(gStringVar3, gMoveNames[sContestantStatus[r7].currMove]);
@@ -2678,10 +2677,10 @@ bool8 sub_80AEE54(u8 a, u8 b)
     u16 r8;
     s32 r4;
 
-    if (sContestantStatus[a].unk10_4 == 0)
+    if (sContestantStatus[a].conditionMod == 0)
         return FALSE;
     r9 = gUnknown_02038696[a] * 5 + 2;
-    if (sContestantStatus[a].unk10_4 == 1)
+    if (sContestantStatus[a].conditionMod == 1)
     {
         r8 = sub_80AEE4C(a);
         r4 = 0;
@@ -2693,7 +2692,7 @@ bool8 sub_80AEE54(u8 a, u8 b)
         if (b != 0)
         {
             PlaySE(SE_EXPMAX);
-            sContestantStatus[a].unk10_4 = 0;
+            sContestantStatus[a].conditionMod = 0;
         }
     }
     else
@@ -2708,7 +2707,7 @@ bool8 sub_80AEE54(u8 a, u8 b)
         if (b != 0)
         {
             PlaySE(SE_FU_ZAKU2);
-            sContestantStatus[a].unk10_4 = 0;
+            sContestantStatus[a].conditionMod = 0;
         }
     }
     return TRUE;
@@ -2976,11 +2975,11 @@ void sub_80AF438(void)
         sContestantStatus[i].nervous = 0;
         sContestantStatus[i].effectStringId = 0xFF;
         sContestantStatus[i].effectStringId2 = -1;
-        sContestantStatus[i].unk10_4 = 0;
+        sContestantStatus[i].conditionMod = 0;
         sContestantStatus[i].unk15_2 = sContestantStatus[i].disappointedRepeat;
         sContestantStatus[i].disappointedRepeat = FALSE;
-        sContestantStatus[i].unk11_0 = 0;
-        sContestantStatus[i].unk11_5 = 0;
+        sContestantStatus[i].turnOrderModAction = 0;
+        sContestantStatus[i].appealTripleCondition = 0;
         if (sContestantStatus[i].turnSkipped)
         {
             sContestantStatus[i].numTurnsSkipped = 1;
@@ -2991,7 +2990,7 @@ void sub_80AF438(void)
             sContestantStatus[i].noMoreTurns = 1;
             sContestantStatus[i].exploded = 0;
         }
-        sContestantStatus[i].unk11_4 = 0;
+        sContestantStatus[i].overrideCategoryExcitementMod = 0;
     }
     for (i = 0; i < 4; i++)
     {
@@ -4549,14 +4548,14 @@ void sub_80B114C(u8 contestant)
         for (i = 0; i < 4; i++)
         {
             sContestantStatus[i].unkE = 0;
-            shared192D0.unkD[i] = 0;
+            shared192D0.unnervedPokes[i] = 0;
         }
         if (sContestantStatus[contestant].hasJudgesAttention && AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove) == 0)
             sContestantStatus[contestant].hasJudgesAttention = 0;
         gContestEffectFuncs[effect]();
-        if (sContestantStatus[contestant].unk10_4 == 1)
+        if (sContestantStatus[contestant].conditionMod == 1)
             sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition - 10;
-        else if (sContestantStatus[contestant].unk11_5)
+        else if (sContestantStatus[contestant].appealTripleCondition)
             sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition * 3;
         else
             sContestantStatus[contestant].appeal2 += sContestantStatus[contestant].condition;
@@ -4596,7 +4595,7 @@ void sub_80B114C(u8 contestant)
             sContestantStatus[contestant].appeal1 = 0;
         }
         shared19328.bits_0 = Contest_GetMoveExcitement(sContestantStatus[contestant].currMove);
-        if (sContestantStatus[contestant].unk11_4)
+        if (sContestantStatus[contestant].overrideCategoryExcitementMod)
             shared19328.bits_0 = 1;
         if (shared19328.bits_0 > 0)
         {
@@ -4692,7 +4691,7 @@ void sub_80B159C(void)
     {
         for (j = 0; j < 4; j++)
         {
-            if (sContestantStatus[j].unk19 == i)
+            if (sContestantStatus[j].nextTurnOrder == i)
             {
                 sp0[j] = i;
                 sp4[j] = 1;
@@ -4703,7 +4702,7 @@ void sub_80B159C(void)
         {
             for (j = 0; j < 4; j++)
             {
-                if (sp4[j] == 0 && sContestantStatus[j].unk19 == 0xFF)
+                if (sp4[j] == 0 && sContestantStatus[j].nextTurnOrder == 0xFF)
                 {
                     r12 = j;
                     j++;
@@ -4712,7 +4711,7 @@ void sub_80B159C(void)
             }
             for (; j < 4; j++)
             {
-                if (sp4[j] == 0 && sContestantStatus[j].unk19 == 0xFF
+                if (sp4[j] == 0 && sContestantStatus[j].nextTurnOrder == 0xFF
                  && gUnknown_02038696[r12] > gUnknown_02038696[j])
                     r12 = j;
             }
@@ -4724,8 +4723,8 @@ void sub_80B159C(void)
     for (i = 0; i < 4; i++)
     {
         shared192D0.turnOrder[i] = sp0[i];
-        sContestantStatus[i].unk19 = 0xFF;
-        sContestantStatus[i].unk10_6 = 0;
+        sContestantStatus[i].nextTurnOrder = 0xFF;
+        sContestantStatus[i].turnOrderMod = 0;
         gUnknown_02038696[i] = sp0[i];
     }
 }
@@ -5068,7 +5067,7 @@ void sub_80B1FD0(bool8 a)
 
     for (i = 0; i < 4; i++)
     {
-        if (sContestantStatus[i].unk10_6 != 0 && a)
+        if (sContestantStatus[i].turnOrderMod != 0 && a)
         {
             CpuCopy32(
               GetTurnOrderNumberGfx(i),
@@ -5086,10 +5085,10 @@ void sub_80B1FD0(bool8 a)
 
 const u8 *GetTurnOrderNumberGfx(u8 contestant)
 {
-    if (sContestantStatus[contestant].unk10_6 != 1)
+    if (sContestantStatus[contestant].turnOrderMod != 1)
         return gContestNextTurnRandomGfx;
     else
-        return gContestNextTurnNumbersGfx + sContestantStatus[contestant].unk19 * 64;
+        return gContestNextTurnNumbersGfx + sContestantStatus[contestant].nextTurnOrder * 64;
 }
 
 void sub_80B20C4(void)
@@ -5098,7 +5097,7 @@ void sub_80B20C4(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (shared192D0.unkD[i] != 0 && !Contest_IsMonsTurnDisabled(i))
+        if (shared192D0.unnervedPokes[i] != 0 && !Contest_IsMonsTurnDisabled(i))
         {
             u8 r4 = gUnknown_02038696[i] * 5 + 2;
             u16 r0 = sub_80AEFE8(i, 3);
diff --git a/src/contest_effect.c b/src/contest_effect.c
index 6025453ca..1b81929c5 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -48,7 +48,7 @@ static void ContestEffect_45(void);
 static void ContestEffect_46(void);
 static void ContestEffect_47(void);
 static void JamByMoveCategory(u8);
-static bool8 sub_80B90C0(u8);
+static bool8 CanUnnerveContestant(u8);
 static u8 WasAtLeastOneOpponentJammed(void);
 static void sub_80B9200(u8, u8);
 static s16 RoundTowardsZero(s16);
@@ -246,7 +246,7 @@ static void ContestEffect_16(void)
         {
             if (shared192D0.turnOrder[r7] > shared192D0.turnOrder[r6] &&
                 sContestantStatus[r6].hasJudgesAttention &&
-                sub_80B90C0(r6))
+                CanUnnerveContestant(r6))
             {
                 sContestantStatus[r6].hasJudgesAttention = FALSE;
                 sContestantStatus[r6].unk15_5 = TRUE;
@@ -356,7 +356,7 @@ static void ContestEffect_25(void)
         {
             if (shared192D0.turnOrder[shared192D0.contestant] + 1 == shared192D0.turnOrder[r5])
             {
-                if (sub_80B90C0(r5))
+                if (CanUnnerveContestant(r5))
                 {
                     MakeContestantNervous(r5);
                     SetContestantEffectStringID(r5, 10);
@@ -428,7 +428,7 @@ static void ContestEffect_26(void)
         {
             if (Random() % 100 < sp10[r6] + sp08[sp00[r6]])
             {
-                if (sub_80B90C0(sp00[r6]))
+                if (CanUnnerveContestant(sp00[r6]))
                 {
                     MakeContestantNervous(sp00[r6]);
                     SetContestantEffectStringID(sp00[r6], 10);
@@ -443,7 +443,7 @@ static void ContestEffect_26(void)
                 SetContestantEffectStringID(sp00[r6], 60);
                 r9++;
             }
-            shared192D0.unkD[sp00[r6]] = 1;
+            shared192D0.unnervedPokes[sp00[r6]] = 1;
         }
     }
     SetContestantEffectStringID(shared192D0.contestant, 11);
@@ -461,10 +461,10 @@ static void ContestEffect_27(void)
     {
         if (shared192D0.turnOrder[shared192D0.contestant] > shared192D0.turnOrder[r6] &&
             sContestantStatus[r6].condition > 0 &&
-            sub_80B90C0(r6))
+            CanUnnerveContestant(r6))
         {
             sContestantStatus[r6].condition = 0;
-            sContestantStatus[r6].unk10_4 = 2;
+            sContestantStatus[r6].conditionMod = 2;
             SetContestantEffectStringID(r6, 13);
             r8++;
         }
@@ -815,7 +815,7 @@ static void ContestEffect_38(void)
     if (sContestantStatus[shared192D0.contestant].condition < 30)
     {
         sContestantStatus[shared192D0.contestant].condition += 10;
-        sContestantStatus[shared192D0.contestant].unk10_4 = 1;
+        sContestantStatus[shared192D0.contestant].conditionMod = 1;
         SetContestantEffectStringID(shared192D0.contestant, 35);
     }
     else
@@ -825,7 +825,7 @@ static void ContestEffect_38(void)
 static void ContestEffect_39(void)
 // The appeal works well if the user’s condition is good.
 {
-    sContestantStatus[shared192D0.contestant].unk11_5 = TRUE;
+    sContestantStatus[shared192D0.contestant].appealTripleCondition = TRUE;
     if (sContestantStatus[shared192D0.contestant].condition != 0)
         SetContestantEffectStringID(shared192D0.contestant, 36);
     else
@@ -842,7 +842,7 @@ static void ContestEffect_40(void)
     if (sContest.turnNumber != 4)
     {
         for (i = 0; i < 4; i++)
-            sp00[i] = sContestantStatus[i].unk19;
+            sp00[i] = sContestantStatus[i].nextTurnOrder;
 
         sp00[shared192D0.contestant] = 0xFF;
 
@@ -852,7 +852,7 @@ static void ContestEffect_40(void)
             {
                 if (j != shared192D0.contestant &&
                     i == sp00[j] &&
-                    sp00[j] == sContestantStatus[j].unk19)
+                    sp00[j] == sContestantStatus[j].nextTurnOrder)
                 {
                     sp00[j]++;
                     break;
@@ -863,13 +863,13 @@ static void ContestEffect_40(void)
         }
 
         sp00[shared192D0.contestant] = 0;
-        sContestantStatus[shared192D0.contestant].unk10_6 = 1;
+        sContestantStatus[shared192D0.contestant].turnOrderMod = 1;
 
         for (i = 0; i < 4; i++)
         {
-            sContestantStatus[i].unk19 = sp00[i];
+            sContestantStatus[i].nextTurnOrder = sp00[i];
         }
-        sContestantStatus[shared192D0.contestant].unk11_0 = 1;
+        sContestantStatus[shared192D0.contestant].turnOrderModAction = 1;
         SetContestantEffectStringID(shared192D0.contestant, 37);
     }
 }
@@ -884,7 +884,7 @@ static void ContestEffect_41(void)
     if (sContest.turnNumber != 4)
     {
         for (i = 0; i < 4; i++)
-            sp00[i] = sContestantStatus[i].unk19;
+            sp00[i] = sContestantStatus[i].nextTurnOrder;
 
         sp00[shared192D0.contestant] = 0xFF;
 
@@ -894,7 +894,7 @@ static void ContestEffect_41(void)
             {
                 if (j != shared192D0.contestant &&
                     i == sp00[j] &&
-                    sp00[j] == sContestantStatus[j].unk19)
+                    sp00[j] == sContestantStatus[j].nextTurnOrder)
                 {
                     sp00[j]--;
                     break;
@@ -905,13 +905,13 @@ static void ContestEffect_41(void)
         }
 
         sp00[shared192D0.contestant] = 3;
-        sContestantStatus[shared192D0.contestant].unk10_6 = 1;
+        sContestantStatus[shared192D0.contestant].turnOrderMod = 1;
 
         for (i = 0; i < 4; i++)
         {
-            sContestantStatus[i].unk19 = sp00[i];
+            sContestantStatus[i].nextTurnOrder = sp00[i];
         }
-        sContestantStatus[shared192D0.contestant].unk11_0 = 2;
+        sContestantStatus[shared192D0.contestant].turnOrderModAction = 2;
         SetContestantEffectStringID(shared192D0.contestant, 38);
     }
 }
@@ -934,7 +934,7 @@ static void ContestEffect_43(void)
     {
         for (i = 0; i < 4; i++)
         {
-            sp00[i] = sContestantStatus[i].unk19;
+            sp00[i] = sContestantStatus[i].nextTurnOrder;
             sp04[i] = i;
         }
 
@@ -960,10 +960,10 @@ static void ContestEffect_43(void)
 
         for (i = 0; i < 4; i++)
         {
-            sContestantStatus[i].unk19 = sp00[i];
-            sContestantStatus[i].unk10_6 = 2;
+            sContestantStatus[i].nextTurnOrder = sp00[i];
+            sContestantStatus[i].turnOrderMod = 2;
         }
-        sContestantStatus[shared192D0.contestant].unk11_0 = 3;
+        sContestantStatus[shared192D0.contestant].turnOrderModAction = 3;
         SetContestantEffectStringID(shared192D0.contestant, 39);
     }
 }
@@ -973,7 +973,7 @@ static void ContestEffect_44(void)
 {
     if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory != gSpecialVar_ContestCategory)
     {
-        sContestantStatus[shared192D0.contestant].unk11_4 = TRUE;
+        sContestantStatus[shared192D0.contestant].overrideCategoryExcitementMod = TRUE;
     }
 }
 
@@ -1074,9 +1074,10 @@ static void JamByMoveCategory(u8 category)
 }
 
 #ifdef NONMATCHING
-static bool8 sub_80B90C0(u8 i)
+static bool8 CanUnnerveContestant(u8 i)
 {
-    shared192D0.unkD[i] = 1;
+    // For whatever reason, i is copied to r4.  I cannot optimize this out.
+    shared192D0.unnervedPokes[i] = 1;
     if (sContestantStatus[i].immune)
     {
         SetContestantEffectStringID(i, 45);
@@ -1091,7 +1092,7 @@ static bool8 sub_80B90C0(u8 i)
     return FALSE;
 }
 #else
-static __attribute__((naked)) bool8 sub_80B90C0(u8 i)
+static __attribute__((naked)) bool8 CanUnnerveContestant(u8 i)
 {
     asm_unified("\tpush {lr}\n"
                 "\tlsls r0, 24\n"
@@ -1156,7 +1157,7 @@ static bool8 WasAtLeastOneOpponentJammed(void)
     for (i = 0; shared192D0.jamQueue[i] != 0xFF; i++)
     {
         u8 r4 = shared192D0.jamQueue[i];
-        if (sub_80B90C0(r4))
+        if (CanUnnerveContestant(r4))
         {
             shared192D0.jam2 = shared192D0.jam;
             if (sContestantStatus[r4].moreEasilyStartled)