diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:28:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:28:43 -0500 |
| commit | 1912b0cf0a0f42f23200ecffcb22651015478ef6 (patch) | |
| tree | d855404809d36965aaa76784bae08bdf6ea92cc7 /src/battle_script_commands.c | |
| parent | 2dfa84c10ff497d73b3a201480fa568ba62e5a38 (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-rtcscreen
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6df240d65..43c554e88 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5374,7 +5374,7 @@ static void Cmd_yesnoboxlearnmove(void) if (gBattleCommunication[1] == 0) { HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattleScripting.learnMoveState++; } else @@ -9942,7 +9942,7 @@ static void Cmd_displaydexinfo(void) switch (gBattleCommunication[0]) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattleCommunication[0]++; break; case 1: @@ -9973,7 +9973,7 @@ static void Cmd_displaydexinfo(void) case 4: if (!IsDma3ManagerBusyWithBgCopy()) { - BeginNormalPaletteFade(0xFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_BG, 0, 0x10, 0, RGB_BLACK); ShowBg(0); ShowBg(3); gBattleCommunication[0]++; |