From 72c958444f0cf3d3dfb2b5be797d7946e25cb38a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 10 May 2017 16:56:25 -0500 Subject: BATTLE_TYPE_40 -> BATTLE_TYPE_MULTI --- src/battle_2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_2.c b/src/battle_2.c index 17de219ce..f623b3da2 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -114,7 +114,7 @@ void sub_8010824(void); void sub_800E7C4(void) { - if (gBattleTypeFlags & BATTLE_TYPE_40) + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { sub_800B858(); SetMainCallback2(sub_800F104); @@ -179,7 +179,7 @@ void sub_800E7F8(void) gReservedSpritePaletteCount = 4; SetVBlankCallback(sub_800FCFC); setup_poochyena_battle(); - if (gBattleTypeFlags & BATTLE_TYPE_40) + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) SetMainCallback2(sub_800F298); else SetMainCallback2(sub_800EC9C); @@ -268,7 +268,7 @@ void sub_800EB08(void) struct BattleEnigmaBerry *src; u8 r4; - if (gBattleTypeFlags & BATTLE_TYPE_40) + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) r8 = 4; else r8 = 2; -- cgit v1.2.3