summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-04-04 17:05:46 -0400
committerPhlosioneer <mattmdrr2@gmail.com>2019-04-04 17:05:46 -0400
commit1360b3a477f1107785900cd0c4e73ebf018f058c (patch)
treec050216422dc6ebe569b3926b85cb07d9cece8df /src/battle_controller_player.c
parent50da52c29b3ee075c43f9832aaa4a7b8848e0ec7 (diff)
RGB Constants
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index b377ecf64..c4e2face2 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -33,6 +33,7 @@
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/trainers.h"
+#include "constants/rgb.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM;
@@ -2408,7 +2409,7 @@ static void PlayerHandleFaintAnimation(void)
static void PlayerHandlePaletteFade(void)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
PlayerBufferExecCompleted();
}
@@ -2630,7 +2631,7 @@ static void PlayerHandleChooseItem(void)
{
s32 i;
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
@@ -2657,7 +2658,7 @@ static void PlayerHandleChoosePokemon(void)
*(&gBattleStruct->battlerPreventingSwitchout) = gBattleBufferA[gActiveBattler][1] >> 4;
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler;
}
@@ -2666,7 +2667,7 @@ static void PlayerHandleChoosePokemon(void)
static void PlayerHandleCmd23(void)
{
BattleStopLowHpSound();
- BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
PlayerBufferExecCompleted();
}