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

Trainer dump pass 2; flag refactoring

Browse Source
This commit is contained in:
PikalaxALT
2019-10-17 17:11:34 -04:00
parent 0b708aeade
commit 97dc0a6903
13 changed files with 1503 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/help_system_812B1E0.c
+3 -3
View File
@@ -1185,7 +1185,7 @@ static bool8 sub_812B780(u8 id)
case 30:
case 32:
case 33:
return FlagGet(FLAG_UNK820);
return FlagGet(FLAG_0x820);
case 28:
case 40:
return sub_812BB10();
@@ -1251,7 +1251,7 @@ static bool8 sub_812B780(u8 id)
return TRUE;
return FALSE;
case 15:
return FlagGet(FLAG_UNK820);
return FlagGet(FLAG_0x820);
case 16:
case 17:
return sub_812BB10();
@@ -1325,7 +1325,7 @@ static bool8 sub_812B780(u8 id)
switch (id)
{
case 5:
return FlagGet(FLAG_UNK820);
return FlagGet(FLAG_0x820);
case 6:
return FlagGet(FLAG_0x821);
}
src/main_menu.c
+1 -1
View File
@@ -671,7 +671,7 @@ static void PrintBadgeCount(void)
u8 *ptr;
u32 flagId;
u8 nbadges = 0;
for (flagId = FLAG_UNK820; flagId < FLAG_UNK820 + 8; flagId++)
for (flagId = FLAG_0x820; flagId < FLAG_0x820 + 8; flagId++)
{
if (FlagGet(flagId))
nbadges++;
src/pokemon.c
+5 -5
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_UNK820)
if (FlagGet(FLAG_0x820)
&& !GetBattlerSide(battlerIdAtk))
attack = (110 * attack) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
if (FlagGet(FLAG_UNK824)
if (FlagGet(FLAG_0x824)
&& !GetBattlerSide(battlerIdDef))
defense = (110 * defense) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
if (FlagGet(FLAG_UNK826)
if (FlagGet(FLAG_0x826)
&& !GetBattlerSide(battlerIdAtk))
spAttack = (110 * spAttack) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER)))
{
if (FlagGet(FLAG_UNK826)
if (FlagGet(FLAG_0x826)
&& !GetBattlerSide(battlerIdDef))
spDefense = (110 * spDefense) / 100;
}
@@ -3634,7 +3634,7 @@ static u8 SendMonToPC(struct Pokemon* mon)
gSpecialVar_MonBoxId = boxNo;
gSpecialVar_MonBoxPos = boxPos;
if (get_unknown_box_id() != boxNo)
FlagClear(FLAG_UNK843);
FlagClear(FLAG_0x843);
VarSet(VAR_0x4037, boxNo);
return MON_GIVEN_TO_PC;
}
src/trainers.c
+530 -530
View File
File diff suppressed because it is too large Load Diff
src/vs_seeker.c
+4 -4
View File
@@ -1258,19 +1258,19 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1)
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 2:
if (!FlagGet(FLAG_SYS_NATIONAL_DEX))
if (!FlagGet(FLAG_0x896))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 3:
if (!FlagGet(FLAG_SYS_CAVE_SHIP))
if (!FlagGet(FLAG_0x897))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 4:
if (!FlagGet(FLAG_TRAINER_FLAG_START + 0x32c))
if (!FlagGet(FLAG_0x82C))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
case 5:
if (!FlagGet(FLAG_TRAINER_FLAG_START + 0x344))
if (!FlagGet(FLAG_0x844))
*a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
break;
}