summaryrefslogtreecommitdiff
path: root/src/contest_effect.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/contest_effect.c')
-rw-r--r--src/contest_effect.c446
1 files changed, 219 insertions, 227 deletions
diff --git a/src/contest_effect.c b/src/contest_effect.c
index 699da6740..ae082b0e5 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -13,10 +13,6 @@ static void ContestEffect_06(void);
static void ContestEffect_07(void);
static void ContestEffect_08(void);
static void ContestEffect_09(void);
-static void ContestEffect_08(void);
-static void ContestEffect_09(void);
-static void ContestEffect_08(void);
-static void ContestEffect_09(void);
static void ContestEffect_14(void);
static void ContestEffect_15(void);
static void ContestEffect_16(void);
@@ -51,9 +47,9 @@ static void ContestEffect_44(void);
static void ContestEffect_45(void);
static void ContestEffect_46(void);
static void ContestEffect_47(void);
-static void sub_80B9038(u8);
+static void JamByMoveCategory(u8);
static bool8 sub_80B90C0(u8);
-static u8 sub_80B9120(void);
+static u8 WasAtLeastOneOpponentJammed(void);
static void sub_80B9200(u8, u8);
static s16 RoundTowardsZero(s16);
static s16 RoundUp(s16);
@@ -62,10 +58,6 @@ static s16 RoundUp(s16);
#include "data/contest_moves.h"
-//extern bool8 const gComboStarterLookupTable[];
-
-#define curContestant (&sContestantStatus[shared192D0.unk11])
-
bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove) {
u8 nextMoveComboMoves[4];
u8 lastMoveComboStarterId = gContestMoves[lastMove].comboStarterId;
@@ -91,95 +83,95 @@ static void ContestEffect_00(void)
static void ContestEffect_01(void)
// After this move, the user is more easily startled.
{
- curContestant->unk10_2 = TRUE;
- SetContestantStatusUnk13(shared192D0.unk11, 0);
+ sContestantStatus[shared192D0.contestant].moreEasilyStartled = TRUE;
+ SetContestantEffectStringID(shared192D0.contestant, 0);
}
static void ContestEffect_02(void)
// Makes a great appeal, but allows no more to the end.
{
- curContestant->unk11_3 = TRUE;
- SetContestantStatusUnk13(shared192D0.unk11, 1);
+ sContestantStatus[shared192D0.contestant].exploded = TRUE;
+ SetContestantEffectStringID(shared192D0.contestant, 1);
}
static void ContestEffect_03(void)
// Can be used repeatedly without boring the JUDGE.
{
- curContestant->unk10_3 = TRUE;
- curContestant->disappointedRepeat = FALSE;
- curContestant->moveRepeatCount = 0;
+ sContestantStatus[shared192D0.contestant].usedRepeatableMove = TRUE;
+ sContestantStatus[shared192D0.contestant].disappointedRepeat = FALSE;
+ sContestantStatus[shared192D0.contestant].moveRepeatCount = 0;
}
static void ContestEffect_04(void)
// Can avoid being startled by others once.
{
- curContestant->unk12 = 1;
- SetContestantStatusUnk13(shared192D0.unk11, 2);
+ sContestantStatus[shared192D0.contestant].jamSafetyCount = 1;
+ SetContestantEffectStringID(shared192D0.contestant, 2);
}
static void ContestEffect_05(void)
// Can avoid being startled by others.
{
- curContestant->unk10_1 = TRUE;
- SetContestantStatusUnk13(shared192D0.unk11, 3);
+ sContestantStatus[shared192D0.contestant].immune = TRUE;
+ SetContestantEffectStringID(shared192D0.contestant, 3);
}
static void ContestEffect_06(void)
// Can avoid being startled by others a little.
{
- curContestant->unkF = 20;
- SetContestantStatusUnk13(shared192D0.unk11, 4);
+ sContestantStatus[shared192D0.contestant].jamReduction = 20;
+ SetContestantEffectStringID(shared192D0.contestant, 4);
}
static void ContestEffect_07(void)
// After this move, the user is less likely to be startled.
{
- curContestant->unk10_0 = TRUE;
- SetContestantStatusUnk13(shared192D0.unk11, 5);
+ sContestantStatus[shared192D0.contestant].resistant = TRUE;
+ SetContestantEffectStringID(shared192D0.contestant, 5);
}
static void ContestEffect_08(void)
// Slightly startles the POKéMON in front.
{
u8 idx = 0;
- u8 a = shared192D0.unk11;
+ u8 a = shared192D0.contestant;
- if (shared192D0.unk0[a] != 0) {
+ if (shared192D0.turnOrder[a] != 0) {
int i;
for (i = 0; i < 4; i++)
{
- if (shared192D0.unk0[a] - 1 == shared192D0.unk0[i])
+ if (shared192D0.turnOrder[a] - 1 == shared192D0.turnOrder[i])
break;
}
shared192D0.unk8[0] = i;
shared192D0.unk8[1] = 0xFF;
- idx = sub_80B9120();
+ idx = WasAtLeastOneOpponentJammed();
}
if (idx == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_09(void)
// Slightly startles those that have made appeals.
{
u8 idx = 0;
- u8 a = shared192D0.unk11;
+ u8 a = shared192D0.contestant;
- if (shared192D0.unk0[a] != 0) {
+ if (shared192D0.turnOrder[a] != 0) {
int i;
int j = 0;
for (i = 0; i < 4; i++)
- if (shared192D0.unk0[a] > shared192D0.unk0[i])
+ if (shared192D0.turnOrder[a] > shared192D0.turnOrder[i])
shared192D0.unk8[j++] = i;
shared192D0.unk8[j] = 0xFF;
- idx = sub_80B9120();
+ idx = WasAtLeastOneOpponentJammed();
}
if (idx == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_14(void)
@@ -193,7 +185,7 @@ static void ContestEffect_14(void)
r1 = 40;
else
r1 = 60;
- shared192D0.unk4 = r1;
+ shared192D0.jam = r1;
ContestEffect_08();
}
@@ -201,15 +193,15 @@ static void ContestEffect_15(void)
// Startles all POKéMON that appealed before the user.
{
u8 r7 = 0;
- u8 r6 = shared192D0.unk11;
+ u8 r6 = shared192D0.contestant;
- if (shared192D0.unk0[r6] != 0)
+ if (shared192D0.turnOrder[r6] != 0)
{
int r5;
for (r5 = 0; r5 < 4; r5++)
{
- if (shared192D0.unk0[r6] > shared192D0.unk0[r5])
+ if (shared192D0.turnOrder[r6] > shared192D0.turnOrder[r5])
{
shared192D0.unk8[0] = r5;
shared192D0.unk8[1] = 0xFF;
@@ -228,45 +220,45 @@ static void ContestEffect_15(void)
r1 = 40;
else
r1 = 60;
- shared192D0.unk4 = r1;
+ shared192D0.jam = r1;
}
- if (sub_80B9120())
+ if (WasAtLeastOneOpponentJammed())
r7++;
}
}
}
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
if (r7 == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
}
static void ContestEffect_16(void)
// Shifts the JUDGE’s attention from others.
{
bool32 r9 = FALSE;
- u8 r7 = shared192D0.unk11;
+ u8 r7 = shared192D0.contestant;
- if (shared192D0.unk0[shared192D0.unk11] != 0)
+ if (shared192D0.turnOrder[shared192D0.contestant] != 0)
{
int r6;
for (r6 = 0; r6 < 4; r6++)
{
- if (shared192D0.unk0[r7] > shared192D0.unk0[r6] &&
- sContestantStatus[r6].unk15_4 &&
+ if (shared192D0.turnOrder[r7] > shared192D0.turnOrder[r6] &&
+ sContestantStatus[r6].hasJudgesAttention &&
sub_80B90C0(r6))
{
- sContestantStatus[r6].unk15_4 = FALSE;
+ sContestantStatus[r6].hasJudgesAttention = FALSE;
sContestantStatus[r6].unk15_5 = TRUE;
- SetContestantStatusUnk13(r6, 8);
+ SetContestantEffectStringID(r6, 8);
r9 = TRUE;
}
}
}
- SetContestantStatusUnk13(shared192D0.unk11, 7);
+ SetContestantEffectStringID(shared192D0.contestant, 7);
if (!r9)
{
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
}
}
@@ -274,81 +266,81 @@ static void ContestEffect_17(void)
// Startles the POKéMON that has the JUDGE’s attention.
{
u8 r9 = 0;
- u8 r8 = shared192D0.unk11;
+ u8 r8 = shared192D0.contestant;
- if (shared192D0.unk0[shared192D0.unk11] != 0)
+ if (shared192D0.turnOrder[shared192D0.contestant] != 0)
{
int r5;
for (r5 = 0; r5 < 4; r5++)
{
- if (shared192D0.unk0[r8] > shared192D0.unk0[r5])
+ if (shared192D0.turnOrder[r8] > shared192D0.turnOrder[r5])
{
- if (sContestantStatus[r5].unk15_4)
- shared192D0.unk4 = 50;
+ if (sContestantStatus[r5].hasJudgesAttention)
+ shared192D0.jam = 50;
else
- shared192D0.unk4 = 10;
+ shared192D0.jam = 10;
shared192D0.unk8[0] = r5;
shared192D0.unk8[1] = 0xFF;
- if (sub_80B9120())
+ if (WasAtLeastOneOpponentJammed())
r9++;
}
}
}
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
if (r9 == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
}
static void ContestEffect_18(void)
// Jams the others, and misses one turn of appeals.
{
- curContestant->unk11_2 = TRUE;
+ sContestantStatus[shared192D0.contestant].turnSkipped = TRUE;
ContestEffect_09();
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_19(void)
// Startles POKéMON that made a same-type appeal.
{
- u16 move = curContestant->currMove;
- sub_80B9038(gContestMoves[move].contestCategory);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ u16 move = sContestantStatus[shared192D0.contestant].currMove;
+ JamByMoveCategory(gContestMoves[move].contestCategory);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_20(void)
// Badly startles POKéMON that made COOL appeals.
{
- sub_80B9038(CONTEST_CATEGORY_COOL);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ JamByMoveCategory(CONTEST_CATEGORY_COOL);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_21(void)
// Badly startles POKéMON that made BEAUTY appeals.
{
- sub_80B9038(CONTEST_CATEGORY_BEAUTY);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ JamByMoveCategory(CONTEST_CATEGORY_BEAUTY);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_22(void)
// Badly startles POKéMON that made CUTE appeals.
{
- sub_80B9038(CONTEST_CATEGORY_CUTE);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ JamByMoveCategory(CONTEST_CATEGORY_CUTE);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_23(void)
// Badly startles POKéMON that made SMART appeals.
{
- sub_80B9038(CONTEST_CATEGORY_SMART);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ JamByMoveCategory(CONTEST_CATEGORY_SMART);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_24(void)
// Badly startles POKéMON that made TOUGH appeals.
{
- sub_80B9038(CONTEST_CATEGORY_TOUGH);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ JamByMoveCategory(CONTEST_CATEGORY_TOUGH);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_25(void)
@@ -356,31 +348,31 @@ static void ContestEffect_25(void)
{
bool32 r4 = FALSE;
- if (shared192D0.unk0[shared192D0.unk11] != 3)
+ if (shared192D0.turnOrder[shared192D0.contestant] != 3)
{
int r5;
for (r5 = 0; r5 < 4; r5++)
{
- if (shared192D0.unk0[shared192D0.unk11] + 1 == shared192D0.unk0[r5])
+ if (shared192D0.turnOrder[shared192D0.contestant] + 1 == shared192D0.turnOrder[r5])
{
if (sub_80B90C0(r5))
{
- sub_80B157C(r5);
- SetContestantStatusUnk13(r5, 10);
+ MakeContestantNervous(r5);
+ SetContestantEffectStringID(r5, 10);
r4 = TRUE;
}
else
{
- SetContestantStatusUnk13(r5, 60);
+ SetContestantEffectStringID(r5, 60);
r4 = TRUE;
}
}
}
}
- SetContestantStatusUnk13(shared192D0.unk11, 9);
+ SetContestantEffectStringID(shared192D0.contestant, 9);
if (!r4)
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
}
static void ContestEffect_26(void)
@@ -397,8 +389,8 @@ static void ContestEffect_26(void)
memset(sp00, 0xFF, ARRAY_COUNT(sp00));
for (r6 = 0, r4 = 0; r6 < 4; r6++)
{
- if (shared192D0.unk0[shared192D0.unk11] < shared192D0.unk0[r6] &&
- !sContestantStatus[r6].unkC_0 && !Contest_IsMonsTurnDisabled(r6))
+ if (shared192D0.turnOrder[shared192D0.contestant] < shared192D0.turnOrder[r6] &&
+ !sContestantStatus[r6].nervous && !Contest_IsMonsTurnDisabled(r6))
sp00[r4++] = r6;
}
@@ -424,11 +416,11 @@ static void ContestEffect_26(void)
}
for (r6 = 0; r6 < 4; r6++)
{
- if (sContestantStatus[r6].unk15_4 && sub_80B214C(r6))
+ if (sContestantStatus[r6].hasJudgesAttention && sub_80B214C(r6))
sp08[r6] = gComboStarterLookupTable[gContestMoves[sContestantStatus[r6].prevMove].comboStarterId] * 10;
else
sp08[r6] = 0;
- sp08[r6] -= (sContestantStatus[r6].unkD / 10) * 10;
+ sp08[r6] -= (sContestantStatus[r6].condition / 10) * 10;
}
if (sp10[0] != 0)
{
@@ -438,8 +430,8 @@ static void ContestEffect_26(void)
{
if (sub_80B90C0(sp00[r6]))
{
- sub_80B157C(sp00[r6]);
- SetContestantStatusUnk13(sp00[r6], 10);
+ MakeContestantNervous(sp00[r6]);
+ SetContestantEffectStringID(sp00[r6], 10);
r9++;
} else
sp18 = TRUE;
@@ -448,15 +440,15 @@ static void ContestEffect_26(void)
if (sp18)
{
sp18 = FALSE;
- SetContestantStatusUnk13(sp00[r6], 60);
+ SetContestantEffectStringID(sp00[r6], 60);
r9++;
}
shared192D0.unkD[sp00[r6]] = 1;
}
}
- SetContestantStatusUnk13(shared192D0.unk11, 11);
+ SetContestantEffectStringID(shared192D0.contestant, 11);
if (r9 == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
}
static void ContestEffect_27(void)
@@ -467,20 +459,20 @@ static void ContestEffect_27(void)
for (r6 = 0; r6 < 4; r6++)
{
- if (shared192D0.unk0[shared192D0.unk11] > shared192D0.unk0[r6] &&
- sContestantStatus[r6].unkD > 0 &&
+ if (shared192D0.turnOrder[shared192D0.contestant] > shared192D0.turnOrder[r6] &&
+ sContestantStatus[r6].condition > 0 &&
sub_80B90C0(r6))
{
- sContestantStatus[r6].unkD = 0;
+ sContestantStatus[r6].condition = 0;
sContestantStatus[r6].unk10_4 = 2;
- SetContestantStatusUnk13(r6, 13);
+ SetContestantEffectStringID(r6, 13);
r8++;
}
}
- SetContestantStatusUnk13(shared192D0.unk11, 12);
+ SetContestantEffectStringID(shared192D0.contestant, 12);
if (r8 == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x39);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x39);
}
static void ContestEffect_28(void)
@@ -491,42 +483,42 @@ static void ContestEffect_28(void)
for (r5 = 0; r5 < 4; r5++)
{
- if (shared192D0.unk0[shared192D0.unk11] > shared192D0.unk0[r5])
+ if (shared192D0.turnOrder[shared192D0.contestant] > shared192D0.turnOrder[r5])
{
- if (sContestantStatus[r5].unkD > 0)
- shared192D0.unk4 = 40;
+ if (sContestantStatus[r5].condition > 0)
+ shared192D0.jam = 40;
else
- shared192D0.unk4 = 10;
+ shared192D0.jam = 10;
shared192D0.unk8[0] = r5;
shared192D0.unk8[1] = 0xFF;
- if (sub_80B9120())
+ if (WasAtLeastOneOpponentJammed())
r7++;
}
}
- SetContestantStatusUnk13(shared192D0.unk11, 14);
+ SetContestantEffectStringID(shared192D0.contestant, 14);
if (r7 == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x39);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x39);
}
static void ContestEffect_29(void)
// The appeal works great if performed first.
{
- if (gUnknown_02038696[shared192D0.unk11] == 0)
+ if (gUnknown_02038696[shared192D0.contestant] == 0)
{
- u16 move = curContestant->currMove;
- curContestant->appeal2 += 2 * gContestEffects[gContestMoves[move].effect].appeal;
- SetContestantStatusUnk13(shared192D0.unk11, 15);
+ u16 move = sContestantStatus[shared192D0.contestant].currMove;
+ sContestantStatus[shared192D0.contestant].appeal2 += 2 * gContestEffects[gContestMoves[move].effect].appeal;
+ SetContestantEffectStringID(shared192D0.contestant, 15);
}
}
static void ContestEffect_30(void)
// The appeal works great if performed last.
{
- if (gUnknown_02038696[shared192D0.unk11] == 3)
+ if (gUnknown_02038696[shared192D0.contestant] == 3)
{
- u16 move = curContestant->currMove;
- curContestant->appeal2 += 2 * gContestEffects[gContestMoves[move].effect].appeal;
- SetContestantStatusUnk13(shared192D0.unk11, 16);
+ u16 move = sContestantStatus[shared192D0.contestant].currMove;
+ sContestantStatus[shared192D0.contestant].appeal2 += 2 * gContestEffects[gContestMoves[move].effect].appeal;
+ SetContestantEffectStringID(shared192D0.contestant, 16);
}
}
@@ -538,19 +530,19 @@ static void ContestEffect_31(void)
for (r1 = 0, r3 = 0; r1 < 4; r1++)
{
- if (shared192D0.unk0[shared192D0.unk11] > shared192D0.unk0[r1])
+ if (shared192D0.turnOrder[shared192D0.contestant] > shared192D0.turnOrder[r1])
r3 += sContestantStatus[r1].appeal2;
}
if (r3 < 0)
r3 = 0;
- if (shared192D0.unk0[shared192D0.unk11] == 0 || r3 == 0)
- SetContestantStatusUnk13(shared192D0.unk11, 18);
+ if (shared192D0.turnOrder[shared192D0.contestant] == 0 || r3 == 0)
+ SetContestantEffectStringID(shared192D0.contestant, 18);
else
{
- curContestant->appeal2 += r3 / 2;
- SetContestantStatusUnk13(shared192D0.unk11, 17);
+ sContestantStatus[shared192D0.contestant].appeal2 += r3 / 2;
+ SetContestantEffectStringID(shared192D0.contestant, 17);
}
- sContestantStatus[shared192D0.unk11].appeal2 = RoundTowardsZero(sContestantStatus[shared192D0.unk11].appeal2);
+ sContestantStatus[shared192D0.contestant].appeal2 = RoundTowardsZero(sContestantStatus[shared192D0.contestant].appeal2);
}
static void ContestEffect_32(void)
@@ -558,40 +550,40 @@ static void ContestEffect_32(void)
{
s16 r6 = 0;
- if (shared192D0.unk0[shared192D0.unk11] != 0)
+ if (shared192D0.turnOrder[shared192D0.contestant] != 0)
{
int i;
for (i = 0; i < 4; i++)
{
- if (shared192D0.unk0[shared192D0.unk11] - 1 == shared192D0.unk0[i])
+ if (shared192D0.turnOrder[shared192D0.contestant] - 1 == shared192D0.turnOrder[i])
r6 = sContestantStatus[i].appeal2;
}
}
- if (shared192D0.unk0[shared192D0.unk11] == 0 || r6 <= 0)
- SetContestantStatusUnk13(shared192D0.unk11, 20);
+ if (shared192D0.turnOrder[shared192D0.contestant] == 0 || r6 <= 0)
+ SetContestantEffectStringID(shared192D0.contestant, 20);
else
{
- curContestant->appeal2 += r6;
- SetContestantStatusUnk13(shared192D0.unk11, 19);
+ sContestantStatus[shared192D0.contestant].appeal2 += r6;
+ SetContestantEffectStringID(shared192D0.contestant, 19);
}
}
static void ContestEffect_33(void)
// The appeal works better the later it is performed.
{
- u8 r3 = shared192D0.unk0[shared192D0.unk11];
+ u8 r3 = shared192D0.turnOrder[shared192D0.contestant];
if (r3 == 0)
- sContestantStatus[shared192D0.unk11].appeal2 = 10;
+ sContestantStatus[shared192D0.contestant].appeal2 = 10;
else
- sContestantStatus[shared192D0.unk11].appeal2 = 20 * r3;
+ sContestantStatus[shared192D0.contestant].appeal2 = 20 * r3;
if (r3 == 0)
- SetContestantStatusUnk13(shared192D0.unk11, 21);
+ SetContestantEffectStringID(shared192D0.contestant, 21);
else if (r3 == 1)
- SetContestantStatusUnk13(shared192D0.unk11, 22);
+ SetContestantEffectStringID(shared192D0.contestant, 22);
else if (r3 == 2)
- SetContestantStatusUnk13(shared192D0.unk11, 23);
+ SetContestantEffectStringID(shared192D0.contestant, 23);
else
- SetContestantStatusUnk13(shared192D0.unk11, 24);
+ SetContestantEffectStringID(shared192D0.contestant, 24);
}
static void ContestEffect_34(void)
@@ -603,26 +595,26 @@ static void ContestEffect_34(void)
if (r0 < 3)
{
r4 = 10;
- SetContestantStatusUnk13(shared192D0.unk11, 26);
+ SetContestantEffectStringID(shared192D0.contestant, 26);
} else if (r0 < 6)
{
r4 = 20;
- SetContestantStatusUnk13(shared192D0.unk11, 27);
+ SetContestantEffectStringID(shared192D0.contestant, 27);
} else if (r0 < 8)
{
r4 = 40;
- SetContestantStatusUnk13(shared192D0.unk11, 28);
+ SetContestantEffectStringID(shared192D0.contestant, 28);
} else if (r0 < 9)
{
r4 = 60;
- SetContestantStatusUnk13(shared192D0.unk11, 29);
+ SetContestantEffectStringID(shared192D0.contestant, 29);
}
else
{
r4 = 80;
- SetContestantStatusUnk13(shared192D0.unk11, 30);
+ SetContestantEffectStringID(shared192D0.contestant, 30);
}
- curContestant->appeal2 = r4;
+ sContestantStatus[shared192D0.contestant].appeal2 = r4;
}
#ifdef NONMATCHING
@@ -633,21 +625,21 @@ static void ContestEffect_35(void)
s8 r4;
s8 r2;
- for (r4 = shared192D0.unk0[shared192D0.unk11]; r4 > 0; r4--)
+ for (r4 = shared192D0.turnOrder[shared192D0.contestant]; r4 > 0; r4--)
{
for (r2 = 0; r2 < 4; r2++)
{
- if (shared192D0.unk0[r2] == r4 - 1)
+ if (shared192D0.turnOrder[r2] == r4 - 1)
break;
}
- if (!(sContestantStatus[r2].unkB_7 || sContestantStatus[r2].unkC_0 || sContestantStatus[r2].unkC_1))
+ if (!(sContestantStatus[r2].noMoreTurns || sContestantStatus[r2].nervous || sContestantStatus[r2].numTurnsSkipped))
{
- u16 move = curContestant->currMove;
+ u16 move = sContestantStatus[shared192D0.contestant].currMove;
if (gContestMoves[move].contestCategory == gContestMoves[sContestantStatus[r2].currMove].contestCategory)
{
- curContestant->appeal2 += gContestEffects[gContestMoves[move].effect].appeal * 2;
- SetContestantStatusUnk13(shared192D0.unk11, 31);
+ sContestantStatus[shared192D0.contestant].appeal2 += gContestEffects[gContestMoves[move].effect].appeal * 2;
+ SetContestantEffectStringID(shared192D0.contestant, 31);
}
break;
}
@@ -759,7 +751,7 @@ __attribute__((naked)) void ContestEffect_35(void)
"\tmov r2, r12\n"
"\tldrb r0, [r2, 0x11]\n"
"\tmovs r1, 0x1F\n"
- "\tbl SetContestantStatusUnk13\n"
+ "\tbl SetContestantEffectStringID\n"
"_080B8994:\n"
"\tpop {r4-r7}\n"
"\tpop {r0}\n"
@@ -773,18 +765,18 @@ __attribute__((naked)) void ContestEffect_35(void)
static void ContestEffect_36(void)
// Works well if different in type than the one before.
{
- if (shared192D0.unk0[shared192D0.unk11] != 0)
+ if (shared192D0.turnOrder[shared192D0.contestant] != 0)
{
- u16 move = curContestant->currMove;
+ u16 move = sContestantStatus[shared192D0.contestant].currMove;
int i;
for (i = 0; i < 4; i++)
{
- if (shared192D0.unk0[shared192D0.unk11] - 1 == shared192D0.unk0[i] &&
+ if (shared192D0.turnOrder[shared192D0.contestant] - 1 == shared192D0.turnOrder[i] &&
gContestMoves[move].contestCategory != gContestMoves[sContestantStatus[i].currMove].contestCategory)
{
- curContestant->appeal2 += gContestEffects[gContestMoves[move].effect].appeal * 2;
- SetContestantStatusUnk13(shared192D0.unk11, 32);
+ sContestantStatus[shared192D0.contestant].appeal2 += gContestEffects[gContestMoves[move].effect].appeal * 2;
+ SetContestantEffectStringID(shared192D0.contestant, 32);
break;
}
}
@@ -794,23 +786,23 @@ static void ContestEffect_36(void)
static void ContestEffect_37(void)
// Affected by how well the appeal in front goes.
{
- if (shared192D0.unk0[shared192D0.unk11] != 0)
+ if (shared192D0.turnOrder[shared192D0.contestant] != 0)
{
int i;
for (i = 0; i < 4; i++)
{
- if (shared192D0.unk0[shared192D0.unk11] - 1 == shared192D0.unk0[i])
+ if (shared192D0.turnOrder[shared192D0.contestant] - 1 == shared192D0.turnOrder[i])
{
- if (curContestant->appeal2 > sContestantStatus[i].appeal2)
+ if (sContestantStatus[shared192D0.contestant].appeal2 > sContestantStatus[i].appeal2)
{
- curContestant->appeal2 *= 2;
- SetContestantStatusUnk13(shared192D0.unk11, 33);
+ sContestantStatus[shared192D0.contestant].appeal2 *= 2;
+ SetContestantEffectStringID(shared192D0.contestant, 33);
}
- else if (curContestant->appeal2 < sContestantStatus[i].appeal2)
+ else if (sContestantStatus[shared192D0.contestant].appeal2 < sContestantStatus[i].appeal2)
{
- curContestant->appeal2 = 0;
- SetContestantStatusUnk13(shared192D0.unk11, 34);
+ sContestantStatus[shared192D0.contestant].appeal2 = 0;
+ SetContestantEffectStringID(shared192D0.contestant, 34);
}
}
}
@@ -820,24 +812,24 @@ static void ContestEffect_37(void)
static void ContestEffect_38(void)
// Ups the user’s condition. Helps prevent nervousness.
{
- if (curContestant->unkD < 30)
+ if (sContestantStatus[shared192D0.contestant].condition < 30)
{
- curContestant->unkD += 10;
- curContestant->unk10_4 = 1;
- SetContestantStatusUnk13(shared192D0.unk11, 35);
+ sContestantStatus[shared192D0.contestant].condition += 10;
+ sContestantStatus[shared192D0.contestant].unk10_4 = 1;
+ SetContestantEffectStringID(shared192D0.contestant, 35);
}
else
- SetContestantStatusUnk13(shared192D0.unk11, 58);
+ SetContestantEffectStringID(shared192D0.contestant, 58);
}
static void ContestEffect_39(void)
// The appeal works well if the user’s condition is good.
{
- curContestant->unk11_5 = TRUE;
- if (curContestant->unkD != 0)
- SetContestantStatusUnk13(shared192D0.unk11, 36);
+ sContestantStatus[shared192D0.contestant].unk11_5 = TRUE;
+ if (sContestantStatus[shared192D0.contestant].condition != 0)
+ SetContestantEffectStringID(shared192D0.contestant, 36);
else
- SetContestantStatusUnk13(shared192D0.unk11, 59);
+ SetContestantEffectStringID(shared192D0.contestant, 59);
}
static void ContestEffect_40(void)
@@ -852,13 +844,13 @@ static void ContestEffect_40(void)
for (i = 0; i < 4; i++)
sp00[i] = sContestantStatus[i].unk19;
- sp00[shared192D0.unk11] = 0xFF;
+ sp00[shared192D0.contestant] = 0xFF;
for (i = 0; i < 4; i++)
{
for (j = 0; j < 4; j++)
{
- if (j != shared192D0.unk11 &&
+ if (j != shared192D0.contestant &&
i == sp00[j] &&
sp00[j] == sContestantStatus[j].unk19)
{
@@ -870,15 +862,15 @@ static void ContestEffect_40(void)
break;
}
- sp00[shared192D0.unk11] = 0;
- curContestant->unk10_6 = 1;
+ sp00[shared192D0.contestant] = 0;
+ sContestantStatus[shared192D0.contestant].unk10_6 = 1;
for (i = 0; i < 4; i++)
{
sContestantStatus[i].unk19 = sp00[i];
}
- curContestant->unk11_0 = 1;
- SetContestantStatusUnk13(shared192D0.unk11, 37);
+ sContestantStatus[shared192D0.contestant].unk11_0 = 1;
+ SetContestantEffectStringID(shared192D0.contestant, 37);
}
}
@@ -894,13 +886,13 @@ static void ContestEffect_41(void)
for (i = 0; i < 4; i++)
sp00[i] = sContestantStatus[i].unk19;
- sp00[shared192D0.unk11] = 0xFF;
+ sp00[shared192D0.contestant] = 0xFF;
for (i = 3; i > -1; i--)
{
for (j = 0; j < 4; j++)
{
- if (j != shared192D0.unk11 &&
+ if (j != shared192D0.contestant &&
i == sp00[j] &&
sp00[j] == sContestantStatus[j].unk19)
{
@@ -912,15 +904,15 @@ static void ContestEffect_41(void)
break;
}
- sp00[shared192D0.unk11] = 3;
- curContestant->unk10_6 = 1;
+ sp00[shared192D0.contestant] = 3;
+ sContestantStatus[shared192D0.contestant].unk10_6 = 1;
for (i = 0; i < 4; i++)
{
sContestantStatus[i].unk19 = sp00[i];
}
- curContestant->unk11_0 = 2;
- SetContestantStatusUnk13(shared192D0.unk11, 38);
+ sContestantStatus[shared192D0.contestant].unk11_0 = 2;
+ SetContestantEffectStringID(shared192D0.contestant, 38);
}
}
@@ -971,17 +963,17 @@ static void ContestEffect_43(void)
sContestantStatus[i].unk19 = sp00[i];
sContestantStatus[i].unk10_6 = 2;
}
- curContestant->unk11_0 = 3;
- SetContestantStatusUnk13(shared192D0.unk11, 39);
+ sContestantStatus[shared192D0.contestant].unk11_0 = 3;
+ SetContestantEffectStringID(shared192D0.contestant, 39);
}
}
static void ContestEffect_44(void)
// An appeal that excites the audience in any CONTEST.
{
- if (gContestMoves[curContestant->currMove].contestCategory != gSpecialVar_ContestCategory)
+ if (gContestMoves[sContestantStatus[shared192D0.contestant].currMove].contestCategory != gSpecialVar_ContestCategory)
{
- curContestant->unk11_4 = TRUE;
+ sContestantStatus[shared192D0.contestant].unk11_4 = TRUE;
}
}
@@ -993,24 +985,24 @@ static void ContestEffect_45(void)
for (i = 0; i < 4; i++)
{
- if (shared192D0.unk0[shared192D0.unk11] > shared192D0.unk0[i])
+ if (shared192D0.turnOrder[shared192D0.contestant] > shared192D0.turnOrder[i])
{
if (sContestantStatus[i].appeal2 > 0)
{
- shared192D0.unk4 = sContestantStatus[i].appeal2 / 2;
- shared192D0.unk4 = RoundUp(shared192D0.unk4);
+ shared192D0.jam = sContestantStatus[i].appeal2 / 2;
+ shared192D0.jam = RoundUp(shared192D0.jam);
}
else
- shared192D0.unk4 = 10;
+ shared192D0.jam = 10;
shared192D0.unk8[0] = i;
shared192D0.unk8[1] = 0xFF;
- if (sub_80B9120())
+ if (WasAtLeastOneOpponentJammed())
r7++;
}
}
if (r7 == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
- SetContestantStatusUnk13(shared192D0.unk11, 48);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
+ SetContestantEffectStringID(shared192D0.contestant, 48);
}
static void ContestEffect_46(void)
@@ -1021,80 +1013,80 @@ static void ContestEffect_46(void)
if (sContest.applauseLevel == 0)
{
appeal = 10;
- SetContestantStatusUnk13(shared192D0.unk11, 26);
+ SetContestantEffectStringID(shared192D0.contestant, 26);
}
else if (sContest.applauseLevel == 1)
{
appeal = 20;
- SetContestantStatusUnk13(shared192D0.unk11, 27);
+ SetContestantEffectStringID(shared192D0.contestant, 27);
}
else if (sContest.applauseLevel == 2)
{
appeal = 30;
- SetContestantStatusUnk13(shared192D0.unk11, 28);
+ SetContestantEffectStringID(shared192D0.contestant, 28);
}
else if (sContest.applauseLevel == 3)
{
appeal = 50;
- SetContestantStatusUnk13(shared192D0.unk11, 29);
+ SetContestantEffectStringID(shared192D0.contestant, 29);
}
else
{
appeal = 60;
- SetContestantStatusUnk13(shared192D0.unk11, 30);
+ SetContestantEffectStringID(shared192D0.contestant, 30);
}
- curContestant->appeal2 = appeal;
+ sContestantStatus[shared192D0.contestant].appeal2 = appeal;
}
static void ContestEffect_47(void)
// Temporarily stops the crowd from growing excited.
{
- if (!shared19328.bits_8)
+ if (!shared19328.excitementFrozen)
{
- shared19328.bits_8 = TRUE;
- shared19328.bits_9 = shared192D0.unk11;
- SetContestantStatusUnk13(shared192D0.unk11, 61);
+ shared19328.excitementFrozen = TRUE;
+ shared19328.excitementFreezer = shared192D0.contestant;
+ SetContestantEffectStringID(shared192D0.contestant, 61);
}
}
-static void sub_80B9038(u8 category)
+static void JamByMoveCategory(u8 category)
{
int i;
int r7 = 0;
for (i = 0; i < 4; i++)
{
- if (shared192D0.unk0[shared192D0.unk11] > shared192D0.unk0[i])
+ if (shared192D0.turnOrder[shared192D0.contestant] > shared192D0.turnOrder[i])
{
if (category == gContestMoves[sContestantStatus[i].currMove].contestCategory)
- shared192D0.unk4 = 40;
+ shared192D0.jam = 40;
else
- shared192D0.unk4 = 10;
+ shared192D0.jam = 10;
shared192D0.unk8[0] = i;
shared192D0.unk8[1] = 0xFF;
- if (sub_80B9120())
+ if (WasAtLeastOneOpponentJammed())
r7++;
}
}
if (r7 == 0)
- SetContestantStatusUnk14(shared192D0.unk11, 0x36);
+ SetContestantEffectStringID2(shared192D0.contestant, 0x36);
}
#ifdef NONMATCHING
static bool8 sub_80B90C0(u8 i)
{
shared192D0.unkD[i] = 1;
- if (sContestantStatus[i].unk10_1)
+ if (sContestantStatus[i].immune)
{
- SetContestantStatusUnk13(i, 45);
+ SetContestantEffectStringID(i, 45);
}
- else if (sContestantStatus[i].unk12 != 0)
+ else if (sContestantStatus[i].jamSafetyCount != 0)
{
- sContestantStatus[i].unk12--;
- SetContestantStatusUnk13(i, 44);
+ sContestantStatus[i].jamSafetyCount--;
+ SetContestantEffectStringID(i, 44);
}
- else if (!sContestantStatus[i].unkB_7 && sContestantStatus[i].unkC_1 == 0)
+ else if (!sContestantStatus[i].noMoreTurns && sContestantStatus[i].numTurnsSkipped == 0)
return TRUE;
return FALSE;
}
@@ -1147,7 +1139,7 @@ static __attribute__((naked)) bool8 sub_80B90C0(u8 i)
"\tadds r0, r3, 0\n"
"\tmovs r1, 0x2C\n"
"_080B9116:\n"
- "\tbl SetContestantStatusUnk13\n"
+ "\tbl SetContestantEffectStringID\n"
"_080B911A:\n"
"\tmovs r0, 0\n"
"_080B911C:\n"
@@ -1156,7 +1148,7 @@ static __attribute__((naked)) bool8 sub_80B90C0(u8 i)
}
#endif
-static bool8 sub_80B9120(void)
+static bool8 WasAtLeastOneOpponentJammed(void)
{
s16 sp00[4] = {0};
int i;
@@ -1166,24 +1158,24 @@ static bool8 sub_80B9120(void)
u8 r4 = shared192D0.unk8[i];
if (sub_80B90C0(r4))
{
- shared192D0.unk6 = shared192D0.unk4;
- if (sContestantStatus[r4].unk10_2)
- shared192D0.unk6 *= 2;
- if (sContestantStatus[r4].unk10_0)
+ shared192D0.jam2 = shared192D0.jam;
+ if (sContestantStatus[r4].moreEasilyStartled)
+ shared192D0.jam2 *= 2;
+ if (sContestantStatus[r4].resistant)
{
- shared192D0.unk6 = 10;
- SetContestantStatusUnk13(r4, 47);
+ shared192D0.jam2 = 10;
+ SetContestantEffectStringID(r4, 47);
}
- else if ((shared192D0.unk6 -= sContestantStatus[r4].unkF) <= 0)
+ else if ((shared192D0.jam2 -= sContestantStatus[r4].jamReduction) <= 0)
{
- shared192D0.unk6 = 0;
- SetContestantStatusUnk13(r4, 46);
+ shared192D0.jam2 = 0;
+ SetContestantEffectStringID(r4, 46);
}
else
{
- sub_80B9200(r4, shared192D0.unk6);
- sub_80B141C(r4, shared192D0.unk6);
- sp00[r4] = shared192D0.unk6;
+ sub_80B9200(r4, shared192D0.jam2);
+ sub_80B141C(r4, shared192D0.jam2);
+ sp00[r4] = shared192D0.jam2;
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 06:55:21 +0000