diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-07-15 04:43:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-15 04:43:03 -0700 |
| commit | 07ef76277021d5cddf14004e37e785c31fcea69b (patch) | |
| tree | 2ddbc42ed88d41986a5db903ddb06ac5bbed0df3 /src/battle_main.c | |
| parent | 24f6484643ed3d7115fd4ebd92f254f224f1ca97 (diff) | |
| parent | 731d6d59bc624e0350b3396f135a35f6c9bdc4f8 (diff) | |
Merge pull request #275 from Diegoisawesome/master
Document list_menu.c and main_menu.c
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index ace481c26..24d598f4a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1819,7 +1819,7 @@ void BattleMainCB2(void) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; ResetPaletteFadeControl(); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); } } @@ -2255,7 +2255,7 @@ static void sub_8038F34(void) case 1: if (--gBattleCommunication[1] == 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattleCommunication[MULTIUSE_STATE]++; } break; @@ -2312,7 +2312,7 @@ static void sub_8038F34(void) for (i = 0; i < 2; i++) LoadChosenBattleElement(i); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gBattleCommunication[MULTIUSE_STATE]++; break; case 4: @@ -2417,7 +2417,7 @@ static void sub_80392A8(void) gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); SetMainCallback2(sub_803937C); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gBattleCommunication[MULTIUSE_STATE] = 0; } @@ -2577,7 +2577,7 @@ static void sub_803939C(void) { if (sub_800A520() == TRUE) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattleCommunication[1] = 0x20; gBattleCommunication[MULTIUSE_STATE] = 8; } @@ -2585,7 +2585,7 @@ static void sub_803939C(void) } else { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gBattleCommunication[1] = 0x20; gBattleCommunication[MULTIUSE_STATE] = 8; } |