summaryrefslogtreecommitdiff
path: root/src/pokenav_unk_4.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-05 15:33:36 -0500
committerGriffinR <griffin.richards@comcast.net>2019-12-05 15:33:36 -0500
commit548af3c0f1a2807e791fe7bbfe1fc57ddb726c5e (patch)
treee4ef44282b7599b1bdefb729ba33e74d15ba0d86 /src/pokenav_unk_4.c
parent70d1f54ab96235b0e0d07d40526f16449e7cb1e7 (diff)
Document a bit of Match Call
Diffstat (limited to 'src/pokenav_unk_4.c')
-rwxr-xr-xsrc/pokenav_unk_4.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pokenav_unk_4.c b/src/pokenav_unk_4.c
index 0f05c6f5d..4ac2ed41e 100755
--- a/src/pokenav_unk_4.c
+++ b/src/pokenav_unk_4.c
@@ -197,11 +197,11 @@ const struct WindowTemplate gUnknown_086227E0 =
.baseBlock = 38
};
-const u8 *const gUnknown_086227E8[] =
+static const u8 *const sMatchCallOptionTexts[MATCH_CALL_OPTION_COUNT] =
{
- gUnknown_085EC017,
- gUnknown_085EC01C,
- gUnknown_085EC022
+ [MATCH_CALL_OPTION_CALL] = gText_Call,
+ [MATCH_CALL_OPTION_CHECK] = gText_Check,
+ [MATCH_CALL_OPTION_CANCEL] = gText_Cancel6
};
const u8 gUnknown_086227F4[] = _("·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·\p");
@@ -1022,13 +1022,13 @@ static void sub_81CBF60(struct Pokenav4Struct *state)
u32 i;
FillWindowPixelBuffer(state->unk12, PIXEL_FILL(1));
- for (i = 0; i < 3; i++)
+ for (i = 0; i < MATCH_CALL_OPTION_COUNT; i++)
{
- int messageId = sub_81CB02C(i);
- if (messageId == 3)
+ int optionText = sub_81CB02C(i);
+ if (optionText == MATCH_CALL_OPTION_COUNT)
break;
- AddTextPrinterParameterized(state->unk12, 7, gUnknown_086227E8[messageId], 16, i * 16 + 1, TEXT_SPEED_FF, NULL);
+ AddTextPrinterParameterized(state->unk12, 7, sMatchCallOptionTexts[optionText], 16, i * 16 + 1, TEXT_SPEED_FF, NULL);
}
CopyWindowToVram(state->unk12, 2);
@@ -1226,11 +1226,11 @@ static struct Sprite *sub_81CC370(void)
static void sub_81CC39C(struct Pokenav4Struct *state)
{
u16 cursor;
- int trainerId = sub_81CAF04(GetSelectedMatchCall());
- if (trainerId >= 0)
+ int trainerPic = GetMatchCallTrainerPic(GetSelectedMatchCall());
+ if (trainerPic >= 0)
{
- DecompressPicFromTable(&gTrainerFrontPicTable[trainerId], state->unk1828, SPECIES_NONE);
- LZ77UnCompWram(gTrainerFrontPicPaletteTable[trainerId].data, state->unk2028);
+ DecompressPicFromTable(&gTrainerFrontPicTable[trainerPic], state->unk1828, SPECIES_NONE);
+ LZ77UnCompWram(gTrainerFrontPicPaletteTable[trainerPic].data, state->unk2028);
cursor = RequestDma3Copy(state->unk1828, state->unk1824, 0x800, 1);
LoadPalette(state->unk2028, state->unk1A, 0x20);
state->unk20->data[0] = 0;