dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sys flags

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 10:42:24 -04:00
parent a1bddb8f8c
commit 221259d0d6
29 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/help_system_812B1E0.c
+3 -3
View File
@@ -950,7 +950,7 @@ static bool8 IsInDungeonMap(void)
if (
sDungeonMaps[i][0] == gSaveBlock1Ptr->location.mapGroup
&& sDungeonMaps[i][1] + j == gSaveBlock1Ptr->location.mapNum
&& (i != 15 /* TANOBY */ || FlagGet(FLAG_0x849) == TRUE)
&& (i != 15 /* TANOBY */ || FlagGet(FLAG_SYS_UNLOCKED_TANOBY_RUINS) == TRUE)
)
return TRUE;
}
@@ -990,10 +990,10 @@ bool8 sub_812B40C(void)
if (gUnknown_203B0EE == 1)
return FALSE;
if (gSaveFileStatus != SAVE_STATUS_EMPTY && gSaveFileStatus != SAVE_STATUS_INVALID && FlagGet(FLAG_0x83C))
if (gSaveFileStatus != SAVE_STATUS_EMPTY && gSaveFileStatus != SAVE_STATUS_INVALID && FlagGet(FLAG_SYS_SAW_HELP_SYSTEM_INTRO))
return FALSE;
FlagSet(FLAG_0x83C);
FlagSet(FLAG_SYS_SAW_HELP_SYSTEM_INTRO);
gUnknown_203B0EE = 1;
return TRUE;
}
src/item.c
+2 -2
View File
@@ -245,11 +245,11 @@ bool8 AddBagItem(u16 itemId, u16 count)
return FALSE;
gBagPockets[POCKET_KEY_ITEMS - 1].itemSlots[idx].itemId = ITEM_BERRY_POUCH;
SetBagItemQuantity(&gBagPockets[POCKET_KEY_ITEMS - 1].itemSlots[idx].quantity, 1);
FlagSet(FLAG_0x847);
FlagSet(FLAG_SYS_GOT_BERRY_POUCH);
}
if (itemId == ITEM_BERRY_POUCH)
FlagSet(FLAG_0x847);
FlagSet(FLAG_SYS_GOT_BERRY_POUCH);
idx = BagPocketGetFirstEmptySlot(pocket);
if (idx == -1)
src/item_use.c
+5 -5
View File
@@ -202,7 +202,7 @@ void FieldUseFunc_MachBike(u8 taskId)
PlayerGetDestCoords(&x, &y);
behavior = MapGridGetMetatileBehaviorAt(x, y);
if (FlagGet(FLAG_0x830) == TRUE
if (FlagGet(FLAG_SYS_ON_CYCLING_ROAD) == TRUE
|| MetatileBehavior_ReturnFalse_17(behavior) == TRUE
|| MetatileBehavior_ReturnFalse_18(behavior) == TRUE
|| MetatileBehavior_ReturnFalse_15(behavior) == TRUE
@@ -529,8 +529,8 @@ void FieldUseFunc_BlackFlute(u8 taskId)
ItemUse_SetQuestLogEvent(4, NULL, gSpecialVar_ItemId, 0xFFFF);
if (gSpecialVar_ItemId == ITEM_WHITE_FLUTE)
{
FlagSet(FLAG_WHITE_FLUTE_ACTIVE);
FlagClear(FLAG_BLACK_FLUTE_ACTIVE);
FlagSet(FLAG_SYS_WHITE_FLUTE_ACTIVE);
FlagClear(FLAG_SYS_BLACK_FLUTE_ACTIVE);
CopyItemName(gSpecialVar_ItemId, gStringVar2);
StringExpandPlaceholders(gStringVar4, gUnknown_84165D2);
gTasks[taskId].func = sub_80A1B48;
@@ -538,8 +538,8 @@ void FieldUseFunc_BlackFlute(u8 taskId)
}
else if (gSpecialVar_ItemId == ITEM_BLACK_FLUTE)
{
FlagSet(FLAG_BLACK_FLUTE_ACTIVE);
FlagClear(FLAG_WHITE_FLUTE_ACTIVE);
FlagSet(FLAG_SYS_BLACK_FLUTE_ACTIVE);
FlagClear(FLAG_SYS_WHITE_FLUTE_ACTIVE);
CopyItemName(gSpecialVar_ItemId, gStringVar2);
StringExpandPlaceholders(gStringVar4, gUnknown_8416600);
gTasks[taskId].func = sub_80A1B48;
src/link.c
+1 -1
View File
@@ -329,7 +329,7 @@ static void InitLocalLinkPlayer(void)
gLocalLinkPlayer.version = gGameVersion + 0x4000;
gLocalLinkPlayer.lp_field_2 = 0x8000;
gLocalLinkPlayer.name[8] = IsNationalPokedexEnabled();
if (FlagGet(FLAG_0x844))
if (FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
{
gLocalLinkPlayer.name[8] |= 0x10;
}
src/pokemon.c
+1 -1
View File
@@ -3634,7 +3634,7 @@ static u8 SendMonToPC(struct Pokemon* mon)
gSpecialVar_MonBoxId = boxNo;
gSpecialVar_MonBoxPos = boxPos;
if (get_unknown_box_id() != boxNo)
FlagClear(FLAG_0x843);
FlagClear(FLAG_SYS_CHANGED_BOX_TO_STORE_MON);
VarSet(VAR_0x4037, boxNo);
return MON_GIVEN_TO_PC;
}
src/quest_log.c
+1 -1
View File
@@ -3131,7 +3131,7 @@ static bool8 sub_8113778(u16 a0, u16 * a1)
return TRUE;
}
if (!FlagGet(FLAG_0x844))
if (!FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
{
if (a0 == 4 || a0 == 5 || a0 == 6 || a0 == 7 || a0 == 8 || a0 == 9 || a0 == 10 || a0 == 22 || a0 == 25 || a0 == 26)
return TRUE;
src/vs_seeker.c
+5 -5
View File
@@ -641,7 +641,7 @@ bool8 sub_810C4EC(void)
gSaveBlock1Ptr->trainerRematchStepCounter++;
}
if (FlagGet(FLAG_0x801) == TRUE)
if (FlagGet(FLAG_SYS_VS_SEEKER_CHARGING) == TRUE)
{
u16 x;
do {
@@ -657,7 +657,7 @@ bool8 sub_810C4EC(void)
} while (0);
if (x == 100)
{
FlagClear(FLAG_0x801);
FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640();
sub_810D0D0();
return TRUE;
@@ -743,7 +743,7 @@ bool8 sub_810C4EC(void)
void sub_810C578(void)
{
FlagClear(FLAG_0x801);
FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640();
sub_810D0D0();
sub_810C594();
@@ -972,7 +972,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (sVsSeeker->trainerWantsRematch)
{
PlaySE(SE_PIN);
FlagSet(FLAG_0x801);
FlagSet(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640();
return 2;
}
@@ -1270,7 +1270,7 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1)
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 5:
if (!FlagGet(FLAG_0x844))
if (!FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
}