summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-07-15 04:23:38 -0700
committerDiegoisawesome <diego@domoreaweso.me>2018-07-15 04:30:37 -0700
commit731d6d59bc624e0350b3396f135a35f6c9bdc4f8 (patch)
treeb57b366f194b50cb5da6bab923f4f4a0a7bc238d /src/battle_controller_player.c
parentabc1905caba10eadcbcb271d8188e5d16444a655 (diff)
Document list_menu.c and main_menu.c
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 9fc0c68ea..7f14d5926 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2420,7 +2420,7 @@ static void PlayerHandleFaintAnimation(void)
static void PlayerHandlePaletteFade(void)
{
- BeginNormalPaletteFade(-1, 2, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
PlayerBufferExecCompleted();
}
@@ -2640,7 +2640,7 @@ static void PlayerHandleChooseItem(void)
{
s32 i;
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
@@ -2667,7 +2667,7 @@ static void PlayerHandleChoosePokemon(void)
*(&gBattleStruct->field_49) = gBattleBufferA[gActiveBattler][1] >> 4;
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBattler][3];
- BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gBattlerControllerFuncs[gActiveBattler] = sub_80597CC;
gBattlerInMenuId = gActiveBattler;
}
@@ -2676,7 +2676,7 @@ static void PlayerHandleChoosePokemon(void)
static void PlayerHandleCmd23(void)
{
BattleStopLowHpSound();
- BeginNormalPaletteFade(-1, 2, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
PlayerBufferExecCompleted();
}