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

sys flag rearrange

Browse Source
This commit is contained in:
PikalaxALT
2019-10-17 21:24:47 -04:00
parent 97dc0a6903
commit 2435bcc09d
32 changed files with 192 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_util.c
+4 -4
View File
@@ -3116,14 +3116,14 @@ u8 IsMonDisobedient(void)
return 0;
if (HasObedientBitSet(gBattlerAttacker)) // only if species is Mew or Deoxys
{
if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName) || FlagGet(FLAG_0x827))
if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName) || FlagGet(FLAG_BADGE08_GET))
return 0;
obedienceLevel = 10;
if (FlagGet(FLAG_0x821))
if (FlagGet(FLAG_BADGE02_GET))
obedienceLevel = 30;
if (FlagGet(FLAG_0x823))
if (FlagGet(FLAG_BADGE04_GET))
obedienceLevel = 50;
if (FlagGet(FLAG_0x825))
if (FlagGet(FLAG_BADGE06_GET))
obedienceLevel = 70;
}
if (gBattleMons[gBattlerAttacker].level <= obedienceLevel)
src/credits.c
+2 -2
View File
@@ -750,7 +750,7 @@ static void CB2_Credits(void)
sCreditsMgr->unk_1D++;
break;
case 2:
FlagClear(0x4000);
FlagClear(FLAG_SPECIAL_FLAG_0x4000);
gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_OFF;
Free(sCreditsMgr);
SoftReset(RESET_ALL);
@@ -797,7 +797,7 @@ static bool32 DoOverworldMapScrollScene(UNUSED u8 unused)
switch (sCreditsMgr->subseqno)
{
case 0:
FlagSet(0x4000);
FlagSet(FLAG_SPECIAL_FLAG_0x4000);
gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_KEEP;
sCreditsMgr->ovwldseqno = 0;
sCreditsMgr->subseqno++;
src/help_system_812B1E0.c
+12 -12
View File
@@ -1163,7 +1163,7 @@ static bool8 sub_812B780(u8 id)
return FlagGet(FLAG_WORLD_MAP_VERMILION_CITY);
case 11:
case 24:
return FlagGet(FLAG_0x8A4);
return FlagGet(FLAG_WORLD_MAP_VIRIDIAN_FOREST);
case 9:
case 13:
case 14:
@@ -1175,17 +1175,17 @@ static bool8 sub_812B780(u8 id)
case 29:
case 31:
case 37:
return FlagGet(FLAG_0x828);
return FlagGet(FLAG_SYS_POKEMON_GET);
case 21:
case 23:
return FlagGet(FLAG_0x829);
return FlagGet(FLAG_SYS_POKEDEX_GET);
case 12:
case 25:
case 27:
case 30:
case 32:
case 33:
return FlagGet(FLAG_0x820);
return FlagGet(FLAG_BADGE01_GET);
case 28:
case 40:
return sub_812BB10();
@@ -1229,7 +1229,7 @@ static bool8 sub_812B780(u8 id)
case 1:
case 30:
case 37:
return FlagGet(FLAG_0x829);
return FlagGet(FLAG_SYS_POKEDEX_GET);
case 14:
return CheckBagHasItem(ITEM_TOWN_MAP, 1);
case 2:
@@ -1244,21 +1244,21 @@ static bool8 sub_812B780(u8 id)
case 35:
case 43:
case 44:
return FlagGet(FLAG_0x828);
return FlagGet(FLAG_SYS_POKEMON_GET);
case 4:
case 34:
if (GetKantoPokedexCount(1) > 1)
return TRUE;
return FALSE;
case 15:
return FlagGet(FLAG_0x820);
return FlagGet(FLAG_BADGE01_GET);
case 16:
case 17:
return sub_812BB10();
case 18:
return FlagGet(FLAG_0x271);
case 48:
return FlagGet(FLAG_0x82C);
return FlagGet(FLAG_SYS_GAME_CLEAR);
}
return FALSE;
}
@@ -1308,7 +1308,7 @@ static bool8 sub_812B780(u8 id)
case 19:
case 20:
case 21:
return FlagGet(FLAG_0x828);
return FlagGet(FLAG_SYS_POKEMON_GET);
case 36:
case 37:
return sub_812BB10();
@@ -1316,7 +1316,7 @@ static bool8 sub_812B780(u8 id)
case 15:
case 18:
case 39:
return FlagGet(FLAG_0x8A4);
return FlagGet(FLAG_WORLD_MAP_VIRIDIAN_FOREST);
}
return TRUE;
}
@@ -1325,9 +1325,9 @@ static bool8 sub_812B780(u8 id)
switch (id)
{
case 5:
return FlagGet(FLAG_0x820);
return FlagGet(FLAG_BADGE01_GET);
case 6:
return FlagGet(FLAG_0x821);
return FlagGet(FLAG_BADGE02_GET);
}
return TRUE;
}
src/main_menu.c
+2 -2
View File
@@ -652,7 +652,7 @@ static void PrintDexCount(void)
u8 strbuf[30];
u8 *ptr;
u16 dexcount;
if (FlagGet(FLAG_0x829) == TRUE)
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
{
if (IsNationalPokedexEnabled())
dexcount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
@@ -671,7 +671,7 @@ static void PrintBadgeCount(void)
u8 *ptr;
u32 flagId;
u8 nbadges = 0;
for (flagId = FLAG_0x820; flagId < FLAG_0x820 + 8; flagId++)
for (flagId = FLAG_BADGE01_GET; flagId < FLAG_BADGE01_GET + 8; flagId++)
{
if (FlagGet(flagId))
nbadges++;
src/pokemon.c
+4 -4
View File
@@ -2362,25 +2362,25 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
// In FRLG, the Battle Tower and opponent checks are stubbed here.
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
if (FlagGet(FLAG_0x820)
if (FlagGet(FLAG_BADGE01_GET)
&& !GetBattlerSide(battlerIdAtk))
attack = (110 * attack) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
if (FlagGet(FLAG_0x824)
if (FlagGet(FLAG_BADGE05_GET)
&& !GetBattlerSide(battlerIdDef))
defense = (110 * defense) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
if (FlagGet(FLAG_0x826)
if (FlagGet(FLAG_BADGE07_GET)
&& !GetBattlerSide(battlerIdAtk))
spAttack = (110 * spAttack) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
if (FlagGet(FLAG_0x826)
if (FlagGet(FLAG_BADGE07_GET)
&& !GetBattlerSide(battlerIdDef))
spDefense = (110 * spDefense) / 100;
}
src/quest_log.c
+4 -4
View File
@@ -3125,13 +3125,13 @@ static bool8 sub_8113778(u16 a0, u16 * a1)
if (a0 == 36 || a0 == 11)
return TRUE;
if (!FlagGet(0x82C))
if (!FlagGet(FLAG_SYS_GAME_CLEAR))
{
if (a0 == 3 || a0 == 31 || sub_81137E4(a0, a1) == TRUE)
return TRUE;
}
if (!FlagGet(0x844))
if (!FlagGet(FLAG_0x844))
{
if (a0 == 4 || a0 == 5 || a0 == 6 || a0 == 7 || a0 == 8 || a0 == 9 || a0 == 10 || a0 == 22 || a0 == 25 || a0 == 26)
return TRUE;
@@ -3220,7 +3220,7 @@ static bool8 sub_8113954(u16 a0, u16 * a1)
if (a0 != 34 && a0 != 30 && a0 != 32 && a0 != 33)
return FALSE;
sub_81138F8();
if (gUnknown_3005E88 || FlagGet(0x82C) || sub_81137E4(a0, a1) != TRUE)
if (gUnknown_3005E88 || FlagGet(FLAG_SYS_GAME_CLEAR) || sub_81137E4(a0, a1) != TRUE)
{
gUnknown_203B024.unk_00 = a0;
memcpy(gUnknown_203B024.unk_04, a1, 8);
@@ -4715,7 +4715,7 @@ static const u16 * sub_81152BC(const u16 * a0)
{
if (r5_2[0] != gUnknown_8456C17[r4])
continue;
if (FlagGet(0x820 + r4) == TRUE)
if (FlagGet(FLAG_BADGE01_GET + r4) == TRUE)
StringExpandPlaceholders(gStringVar4, gUnknown_841AE8F);
else
StringExpandPlaceholders(gStringVar4, gUnknown_841AE48);
src/start_menu.c
+3 -3
View File
@@ -207,9 +207,9 @@ static void AppendToStartMenuItems(u8 newEntry)
static void SetUpStartMenu_NormalField(void)
{
if (FlagGet(FLAG_0x829) == TRUE)
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
AppendToStartMenuItems(STARTMENU_POKEDEX);
if (FlagGet(FLAG_0x828) == TRUE)
if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)
AppendToStartMenuItems(STARTMENU_POKEMON);
AppendToStartMenuItems(STARTMENU_BAG);
AppendToStartMenuItems(STARTMENU_PLAYER);
@@ -973,7 +973,7 @@ static void PrintSaveStats(void)
SaveStatToString(SAVE_STAT_BADGES, gStringVar4, 2);
AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 60, 28, sTextColor_StatValue, -1, gStringVar4);
y = 42;
if (FlagGet(FLAG_0x829) == TRUE)
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
{
AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 2, 42, sTextColor_StatName, -1, gSaveStatName_Pokedex);
SaveStatToString(SAVE_STAT_POKEDEX, gStringVar4, 2);
src/vs_seeker.c
+7 -7
View File
@@ -641,7 +641,7 @@ bool8 sub_810C4EC(void)
gSaveBlock1Ptr->trainerRematchStepCounter++;
}
if (FlagGet(0x801) == TRUE)
if (FlagGet(FLAG_0x801) == TRUE)
{
u16 x;
do {
@@ -657,7 +657,7 @@ bool8 sub_810C4EC(void)
} while (0);
if (x == 100)
{
FlagClear(0x801);
FlagClear(FLAG_0x801);
sub_810C640();
sub_810D0D0();
return TRUE;
@@ -743,7 +743,7 @@ bool8 sub_810C4EC(void)
void sub_810C578(void)
{
FlagClear(0x801);
FlagClear(FLAG_0x801);
sub_810C640();
sub_810D0D0();
sub_810C594();
@@ -972,7 +972,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
if (sVsSeeker->trainerWantsRematch)
{
PlaySE(SE_PIN);
FlagSet(0x801); // TODO: make this an enum
FlagSet(FLAG_0x801);
sub_810C640();
return 2;
}
@@ -1258,15 +1258,15 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1)
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 2:
if (!FlagGet(FLAG_0x896))
if (!FlagGet(FLAG_WORLD_MAP_CELADON_CITY))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 3:
if (!FlagGet(FLAG_0x897))
if (!FlagGet(FLAG_WORLD_MAP_FUCHSIA_CITY))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 4:
if (!FlagGet(FLAG_0x82C))
if (!FlagGet(FLAG_SYS_GAME_CLEAR))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 5: