diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-05-23 18:24:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-23 18:24:30 -0500 |
commit | de2fe2cbbae599d9b336cb6762e3a03445cd5027 (patch) | |
tree | d8cea366e68eca40bac0a6c0edf0c85a27eda520 /src/battle/battle_controller_player.c | |
parent | 294d223dd0218c64267b6b6851575150e36593fb (diff) | |
parent | 22e6e3532900b2470d0134f1347981d77828b22c (diff) |
Merge pull request #616 from huderlem/misc
Misc labeling
Diffstat (limited to 'src/battle/battle_controller_player.c')
-rw-r--r-- | src/battle/battle_controller_player.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 004963b70..d1dcf8bf4 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2655,7 +2655,7 @@ void PlayerHandlecmd10(void) void PlayerHandlecmd11(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB(0, 0, 0)); PlayerBufferExecCompleted(); } @@ -2835,7 +2835,7 @@ void PlayerHandleOpenBag(void) { s32 i; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_802E004; gBankInMenu = gActiveBattler; for (i = 0; i < 3; i++) @@ -2853,7 +2853,7 @@ void PlayerHandlecmd22(void) ewram160C0 = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; i++) gUnknown_02038470[i] = gBattleBufferA[gActiveBattler][4 + i]; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_802DF30; gBankInMenu = gActiveBattler; } @@ -2861,7 +2861,7 @@ void PlayerHandlecmd22(void) void PlayerHandlecmd23(void) { BattleStopLowHpSound(); - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB(0, 0, 0)); PlayerBufferExecCompleted(); } |