Rename most special vars
This commit is contained in:
+5
-5
@@ -1038,9 +1038,9 @@ static void FCSetup_ResetBGCoords(void)
|
||||
|
||||
void SetFlavorTextFlagFromSpecialVars(void)
|
||||
{
|
||||
if (gUnknown_20370C0 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 6)
|
||||
if (gSpecialVar_0x8004 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 6)
|
||||
{
|
||||
gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].flavorTextFlags |= (1 << gSpecialVar_0x8005);
|
||||
gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].flavorTextFlags |= (1 << gSpecialVar_0x8005);
|
||||
gSpecialVar_0x8005 = FCPICKSTATE_SILHOUETTE;
|
||||
UpdatePickStateFromSpecialVar8005();
|
||||
}
|
||||
@@ -1048,15 +1048,15 @@ void SetFlavorTextFlagFromSpecialVars(void)
|
||||
|
||||
void UpdatePickStateFromSpecialVar8005(void)
|
||||
{
|
||||
if (gUnknown_20370C0 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 3)
|
||||
if (gSpecialVar_0x8004 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 3)
|
||||
{
|
||||
if (gSpecialVar_0x8005 == FCPICKSTATE_NO_DRAW)
|
||||
return;
|
||||
if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE
|
||||
&& gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState == FCPICKSTATE_COLORED
|
||||
&& gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState == FCPICKSTATE_COLORED
|
||||
)
|
||||
return;
|
||||
gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState = gSpecialVar_0x8005;
|
||||
gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState = gSpecialVar_0x8005;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -107,7 +107,7 @@ void sub_8146CA4(void)
|
||||
|
||||
u16 sub_8146CE8(void)
|
||||
{
|
||||
u16 *r6 = &gUnknown_20370D0;
|
||||
u16 *r6 = &gSpecialVar_Result;
|
||||
struct MysteryEventStruct *r4 = sub_8143D94();
|
||||
u16 r5;
|
||||
|
||||
|
||||
+4
-4
@@ -523,7 +523,7 @@ void sub_8110A3C(void)
|
||||
|
||||
void sub_8110AB4(void)
|
||||
{
|
||||
gUnknown_20370D0 = gUnknown_203ADFA;
|
||||
gSpecialVar_Result = gUnknown_203ADFA;
|
||||
}
|
||||
|
||||
u8 sub_8110AC8(void)
|
||||
@@ -2654,7 +2654,7 @@ bool16 sub_8113364(void)
|
||||
|
||||
bool16 sub_811337C(struct Var4038Struct * a0)
|
||||
{
|
||||
return (a0->unk_1 >> gUnknown_20370C0) & 1;
|
||||
return (a0->unk_1 >> gSpecialVar_0x8004) & 1;
|
||||
}
|
||||
|
||||
void sub_8113390(struct Var4038Struct * a0)
|
||||
@@ -2669,7 +2669,7 @@ void sub_81133A4(void)
|
||||
u8 r3 = 0;
|
||||
u8 r2 = 0;
|
||||
|
||||
switch (gUnknown_20370C0)
|
||||
switch (gSpecialVar_0x8004)
|
||||
{
|
||||
case 0:
|
||||
r2 = 0;
|
||||
@@ -2770,7 +2770,7 @@ void sub_8113524(struct Var4038Struct * a0)
|
||||
|
||||
u8 sub_8113530(void)
|
||||
{
|
||||
return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0);
|
||||
return sub_8113114(VAR_0x4038_STRUCT, gSpecialVar_0x8004);
|
||||
}
|
||||
|
||||
static u16 * (*const sQuestLogStorageCBs[])(u16 *, const u16 *) = {
|
||||
|
||||
+5
-5
@@ -63,7 +63,7 @@ struct VsSeekerStruct
|
||||
u8 responseCode:5;
|
||||
};
|
||||
|
||||
extern u16 gUnknown_20370D2;
|
||||
extern u16 gSpecialVar_LastTalked;
|
||||
extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT];
|
||||
extern u8 gUnknown_3005074;
|
||||
|
||||
@@ -588,7 +588,7 @@ void Task_VsSeeker_0(u8 taskId)
|
||||
}
|
||||
else if (respval == 2)
|
||||
{
|
||||
sub_80A2294(4, 0, gUnknown_203AD30, 0xffff);
|
||||
sub_80A2294(4, 0, gSpecialVar_ItemId, 0xffff);
|
||||
FieldEffectStart(FLDEFF_UNK_41); // TODO: name this enum
|
||||
gTasks[taskId].func = Task_VsSeeker_1;
|
||||
gTasks[taskId].data[0] = 15;
|
||||
@@ -1078,7 +1078,7 @@ static bool8 sub_810CD80(const VsSeekerData *vsSeekerData, u16 trainerBattleOppo
|
||||
return FALSE;
|
||||
if (rematchIdx >= 0 && rematchIdx < ARRAY_COUNT(sVsSeekerData))
|
||||
{
|
||||
if (IsThisTrainerRematchable(gUnknown_20370D2))
|
||||
if (IsThisTrainerRematchable(gSpecialVar_LastTalked))
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
@@ -1097,7 +1097,7 @@ static bool8 HasRematchTrainerAlreadyBeenFought(const VsSeekerData *vsSeekerData
|
||||
|
||||
void sub_810CDE8(void)
|
||||
{
|
||||
gSaveBlock1Ptr->trainerRematches[gUnknown_20370D2] = 0;
|
||||
gSaveBlock1Ptr->trainerRematches[gSpecialVar_LastTalked] = 0;
|
||||
sub_80803FC();
|
||||
}
|
||||
|
||||
@@ -1148,7 +1148,7 @@ static bool8 sub_810CED0(const VsSeekerData * a0, u16 a1)
|
||||
return FALSE;
|
||||
if ((u32)r1 >= ARRAY_COUNT(sVsSeekerData))
|
||||
return FALSE;
|
||||
if (!IsThisTrainerRematchable(gUnknown_20370D2))
|
||||
if (!IsThisTrainerRematchable(gSpecialVar_LastTalked))
|
||||
return FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user