diff options
| author | huderlem <huderlem@gmail.com> | 2019-04-08 17:30:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 17:30:28 -0500 |
| commit | ce93d3ab9ac460ba771863df60e36be8497b7c78 (patch) | |
| tree | c0b78fe2cd3bd406c16d244dd257ccd5d751f9ef /src/option_menu.c | |
| parent | c8ce1a0a1f533a265d5134660c31b1ec6e8b86e0 (diff) | |
| parent | 50350cc2e1c26082f9d852e97e1698f7254d4145 (diff) | |
Merge pull request #661 from Phlosioneer/contest-ai-cleanup
contest & contest_ai cleanup
Diffstat (limited to 'src/option_menu.c')
| -rw-r--r-- | src/option_menu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index 2fc0d6f3e..3ffb2738f 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -14,6 +14,7 @@ #include "international_string_util.h" #include "strings.h" #include "gba/m4a_internal.h" +#include "constants/rgb.h" // Task data enum @@ -250,7 +251,7 @@ void CB2_InitOptionMenu(void) break; } case 11: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); return; @@ -359,7 +360,7 @@ static void Task_OptionMenuSave(u8 taskId) gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE]; gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE]; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_OptionMenuFadeOut; } |