diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:37 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:37 -0500 |
| commit | 46c1cb5af0f808f56cbb2288dd5741ec6e476998 (patch) | |
| tree | b9ab5e60b66e5a600afc90b41e35ae26ae5cd432 /src/battle_interface.c | |
| parent | 32153295edc1e93bd27894f75f2ab01f9140bed5 (diff) | |
| parent | f546ea4f0bf95ddd4f4a07f7f83b1abc37cf57ea (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
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 d097598b5..9938c4b54 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) { |