diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-12 01:57:52 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-12 01:57:52 -0400 |
| commit | de67e7cf5fbe55bdfcb4dcd069e7ffa64187c72a (patch) | |
| tree | 7cb13c4e6d90c1f1ec03e4e16dbb26b20c9610e6 /src/battle_interface.c | |
| parent | 0354f2cc5ae9771d745e6ffadd4715bdc8ff5221 (diff) | |
| parent | 184436635fdca28399d03e805814a0deda67d200 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index d4a9f9cce..a9175ac10 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1498,7 +1498,7 @@ u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d) { for (i = 0; i < 6; i++) //_08044A9A { - if (gBattleTypeFlags & BATTLE_TYPE_40) // && b[i] != 0xFFFF && b[i] + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) // && b[i] != 0xFFFF && b[i] { if (b[i].unk0 == 0xFFFF) { @@ -1546,7 +1546,7 @@ u8 sub_8044804(u8 a, const struct UnknownStruct8 *b, u8 c, u8 d) // Mismatch occurrs in this loop initialization for (i = 0; i < 6; i++) { - if (gBattleTypeFlags & BATTLE_TYPE_40) + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { if (b[i].unk0 == 0xFFFF) { |