dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

RGB Constants

Browse Source
This commit is contained in:
Phlosioneer
2019-04-04 17:05:46 -04:00
parent 50da52c29b
commit 1360b3a477
56 changed files with 211 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dodrio_berry_picking.s
+1 -1
View File
@@ -377,7 +377,7 @@ _08024C5A:
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _08024D20 beq _08024D20
bl LoadWirelessStatusIndicatorSprite bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl CreateWirelessStatusIndicatorSprite bl CreateWirelessStatusIndicatorSprite
asm/pokemon_jump.s
+1 -1
View File
@@ -416,7 +416,7 @@ _0802AD0C:
ldr r0, [r4] ldr r0, [r4]
adds r0, 0xA4 adds r0, 0xA4
bl sub_802D074 bl sub_802D074
bl LoadWirelessStatusIndicatorSprite bl LoadWirelessStatusIndicatorSpriteGfx
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl CreateWirelessStatusIndicatorSprite bl CreateWirelessStatusIndicatorSprite
include/contest.h
+10 -7
View File
@@ -7,13 +7,16 @@
#define APPLAUSE_METER_SIZE 5 #define APPLAUSE_METER_SIZE 5
#define CONTEST_TURN_COUNT 5 #define CONTEST_TURN_COUNT 5
#define CONTEST_DEBUG_MODE_OFF 0 enum
// Prints the totalPoints value for each contestant. {
#define CONTEST_DEBUG_MODE_PRINT_POINT_TOTAL 1 CONTEST_DEBUG_MODE_OFF,
// Prints the ContestResourcesField1C::unk_C value as a bitstring for each contestant. // Prints the totalPoints value for each contestant.
#define CONTEST_DEBUG_MODE_PRINT_UNK_C 2 CONTEST_DEBUG_MODE_PRINT_POINT_TOTAL,
// Prints the ContestResourcesField1C::unk_D value as a bitstring for each contestant. // Prints the ContestResourcesField1C::unk_C value as a bitstring for each contestant.
#define CONTEST_DEBUG_MODE_PRINT_UNK_D 3 CONTEST_DEBUG_MODE_PRINT_UNK_C,
// Prints the ContestResourcesField1C::unk_D value as a bitstring for each contestant.
CONTEST_DEBUG_MODE_PRINT_UNK_D
};
#define LINK_CONTEST_FLAG_IS_LINK (1 << 0) #define LINK_CONTEST_FLAG_IS_LINK (1 << 0)
#define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1) #define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1)
include/link.h
+1 -1
View File
@@ -235,7 +235,7 @@ void LinkVSync(void);
void Timer3Intr(void); void Timer3Intr(void);
void SerialCB(void); void SerialCB(void);
bool32 InUnionRoom(void); bool32 InUnionRoom(void);
void LoadWirelessStatusIndicatorSprite(void); void LoadWirelessStatusIndicatorSpriteGfx(void);
bool8 IsLinkTaskFinished(void); bool8 IsLinkTaskFinished(void);
void CreateWirelessStatusIndicatorSprite(u8, u8); void CreateWirelessStatusIndicatorSprite(u8, u8);
void sub_800ADF8(void); void sub_800ADF8(void);
src/battle_controller_player.c
+5 -4
View File
@@ -33,6 +33,7 @@
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/rgb.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
@@ -2408,7 +2409,7 @@ static void PlayerHandleFaintAnimation(void)
static void PlayerHandlePaletteFade(void) static void PlayerHandlePaletteFade(void)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
@@ -2630,7 +2631,7 @@ static void PlayerHandleChooseItem(void)
{ {
s32 i; s32 i;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
@@ -2657,7 +2658,7 @@ static void PlayerHandleChoosePokemon(void)
*(&gBattleStruct->battlerPreventingSwitchout) = gBattleBufferA[gActiveBattler][1] >> 4; *(&gBattleStruct->battlerPreventingSwitchout) = gBattleBufferA[gActiveBattler][1] >> 4;
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
} }
@@ -2666,7 +2667,7 @@ static void PlayerHandleChoosePokemon(void)
static void PlayerHandleCmd23(void) static void PlayerHandleCmd23(void)
{ {
BattleStopLowHpSound(); BattleStopLowHpSound();
BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
src/battle_controller_safari.c
+2 -1
View File
@@ -22,6 +22,7 @@
#include "window.h" #include "window.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/rgb.h"
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
@@ -473,7 +474,7 @@ static void SafariHandleChooseItem(void)
{ {
s32 i; s32 i;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase; gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
} }
src/battle_controller_wally.c
+2 -1
View File
@@ -30,6 +30,7 @@
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/rgb.h"
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
@@ -1244,7 +1245,7 @@ static void WallyHandleChooseMove(void)
static void WallyHandleChooseItem(void) static void WallyHandleChooseItem(void)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAfterPaletteFade; gBattlerControllerFuncs[gActiveBattler] = OpenBagAfterPaletteFade;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
} }
src/battle_factory_screen.c
+6 -6
View File
@@ -1166,7 +1166,7 @@ static void CB2_InitSelectScreen(void)
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
SetVBlankCallback(Select_VblankCb); SetVBlankCallback(Select_VblankCb);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP);
if (sFactorySelectScreen->fromSummaryScreen == TRUE) if (sFactorySelectScreen->fromSummaryScreen == TRUE)
{ {
@@ -1405,7 +1405,7 @@ static void Task_FromSelectScreenToSummaryScreen(u8 taskId)
{ {
case 6: case 6:
gPlttBufferUnfaded[228] = gPlttBufferFaded[228]; gPlttBufferUnfaded[228] = gPlttBufferFaded[228];
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].data[0] = 7; gTasks[taskId].data[0] = 7;
break; break;
case 7: case 7:
@@ -1442,7 +1442,7 @@ static void Task_CloseSelectionScreen(u8 taskId)
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 1: case 1:
@@ -2274,7 +2274,7 @@ static void Task_FromSwapScreenToSummaryScreen(u8 taskId)
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
case 6: case 6:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].data[0] = 7; gTasks[taskId].data[0] = 7;
break; break;
case 7: case 7:
@@ -2327,7 +2327,7 @@ static void Task_CloseSwapScreen(u8 taskId)
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 2: case 2:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 3: case 3:
@@ -3218,7 +3218,7 @@ static void CB2_InitSwapScreen(void)
gMain.state++; gMain.state++;
break; break;
case 14: case 14:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
src/battle_main.c
+3 -3
View File
@@ -981,7 +981,7 @@ static void CB2_HandleStartBattle(void)
gBattleCommunication[MULTIUSE_STATE] = 1; gBattleCommunication[MULTIUSE_STATE] = 1;
} }
if (gWirelessCommType) if (gWirelessCommType)
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
break; break;
case 1: case 1:
if (gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_LINK)
@@ -1176,7 +1176,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
gBattleCommunication[MULTIUSE_STATE] = 1; gBattleCommunication[MULTIUSE_STATE] = 1;
} }
if (gWirelessCommType) if (gWirelessCommType)
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
// fall through // fall through
case 1: case 1:
if (gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_LINK)
@@ -1576,7 +1576,7 @@ static void CB2_HandleStartMultiBattle(void)
gBattleCommunication[MULTIUSE_STATE] = 1; gBattleCommunication[MULTIUSE_STATE] = 1;
} }
if (gWirelessCommType) if (gWirelessCommType)
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
break; break;
case 1: case 1:
if (gBattleTypeFlags & BATTLE_TYPE_LINK) if (gBattleTypeFlags & BATTLE_TYPE_LINK)
src/battle_records.c
+3 -2
View File
@@ -22,6 +22,7 @@
#include "gpu_regs.h" #include "gpu_regs.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"
#include "trainer_hill.h" #include "trainer_hill.h"
#include "constants/rgb.h"
// this file's functions // this file's functions
static void Task_CloseTrainerHillRecordsOnButton(u8 taskId); static void Task_CloseTrainerHillRecordsOnButton(u8 taskId);
@@ -364,7 +365,7 @@ static void Task_CloseTrainerHillRecordsOnButton(u8 taskId)
static void Task_BeginPaletteFade(u8 taskId) static void Task_BeginPaletteFade(u8 taskId)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_ExitTrainerHillRecords; gTasks[taskId].func = Task_ExitTrainerHillRecords;
} }
@@ -511,7 +512,7 @@ static void CB2_ShowTrainerHillRecords(void)
gMain.state++; gMain.state++;
break; break;
case 6: case 6:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
gMain.state++; gMain.state++;
break; break;
case 7: case 7:
src/battle_script_commands.c
+4 -3
View File
@@ -50,6 +50,7 @@
#include "pokemon_summary_screen.h" #include "pokemon_summary_screen.h"
#include "pokenav.h" #include "pokenav.h"
#include "menu_specialized.h" #include "menu_specialized.h"
#include "constants/rgb.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
@@ -5695,7 +5696,7 @@ static void atk5A_yesnoboxlearnmove(void)
if (gBattleCommunication[1] == 0) if (gBattleCommunication[1] == 0)
{ {
HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR); HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattleScripting.learnMoveState++; gBattleScripting.learnMoveState++;
} }
else else
@@ -10274,7 +10275,7 @@ static void atkF2_displaydexinfo(void)
switch (gBattleCommunication[0]) switch (gBattleCommunication[0])
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattleCommunication[0]++; gBattleCommunication[0]++;
break; break;
case 1: case 1:
@@ -10305,7 +10306,7 @@ static void atkF2_displaydexinfo(void)
case 4: case 4:
if (!IsDma3ManagerBusyWithBgCopy()) if (!IsDma3ManagerBusyWithBgCopy())
{ {
BeginNormalPaletteFade(0xFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFF, 0, 0x10, 0, RGB_BLACK);
ShowBg(0); ShowBg(0);
ShowBg(3); ShowBg(3);
gBattleCommunication[0]++; gBattleCommunication[0]++;
src/battle_transition.c
+9 -8
View File
@@ -23,6 +23,7 @@
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/rgb.h"
struct TransitionData struct TransitionData
{ {
@@ -1076,7 +1077,7 @@ static bool8 Phase2_Blur_Func2(struct Task *task)
{ {
task->tData1 = 4; task->tData1 = 4;
if (++task->tData2 == 10) if (++task->tData2 == 10)
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_BLACK);
SetGpuReg(REG_OFFSET_MOSAIC, (task->tData2 & 15) * 17); SetGpuReg(REG_OFFSET_MOSAIC, (task->tData2 & 15) * 17);
if (task->tData2 > 14) if (task->tData2 > 14)
task->tState++; task->tState++;
@@ -1103,7 +1104,7 @@ static bool8 Phase2_Swirl_Func1(struct Task *task)
{ {
sub_8149F08(); sub_8149F08();
ScanlineEffect_Clear(); ScanlineEffect_Clear();
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK);
sub_8149F98(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_14, 0, 2, 0, 160); sub_8149F98(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_14, 0, 2, 0, 160);
SetVBlankCallback(VBlankCB_Phase2_Swirl); SetVBlankCallback(VBlankCB_Phase2_Swirl);
@@ -1158,7 +1159,7 @@ static bool8 Phase2_Shuffle_Func1(struct Task *task)
sub_8149F08(); sub_8149F08();
ScanlineEffect_Clear(); ScanlineEffect_Clear();
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK);
memset(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_16, 0x140); memset(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_16, 0x140);
SetVBlankCallback(VBlankCB_Phase2_Shuffle); SetVBlankCallback(VBlankCB_Phase2_Shuffle);
@@ -1461,7 +1462,7 @@ static bool8 Phase2_Kyogre_Func5(struct Task *task)
static bool8 Phase2_WeatherDuo_Func6(struct Task *task) static bool8 Phase2_WeatherDuo_Func6(struct Task *task)
{ {
BeginNormalPaletteFade(0xFFFF8000, 1, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFF8000, 1, 0, 0x10, RGB_BLACK);
task->tState++; task->tState++;
return FALSE; return FALSE;
} }
@@ -1546,7 +1547,7 @@ static bool8 Phase2_FramesCountdown(struct Task *task)
static bool8 Phase2_WeatherTrio_Func1(struct Task *task) static bool8 Phase2_WeatherTrio_Func1(struct Task *task)
{ {
BeginNormalPaletteFade(0x0000FFFF, 1, 0, 0x10, 0); BeginNormalPaletteFade(0x0000FFFF, 1, 0, 0x10, RGB_BLACK);
task->tState++; task->tState++;
return FALSE; return FALSE;
} }
@@ -1969,7 +1970,7 @@ static bool8 Phase2_Ripple_Func2(struct Task *task)
if (++task->tData3 == 81) if (++task->tData3 == 81)
{ {
task->tData4++; task->tData4++;
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 0x10, RGB_BLACK);
} }
if (task->tData4 != 0 && !gPaletteFade.active) if (task->tData4 != 0 && !gPaletteFade.active)
@@ -3159,7 +3160,7 @@ static bool8 Phase2_Rayquaza_Func6(struct Task *task)
{ {
task->tState++; task->tState++;
task->tData1 = 0; task->tData1 = 0;
BeginNormalPaletteFade(0xFFFF8000, 2, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFF8000, 2, 0, 0x10, RGB_BLACK);
} }
return FALSE; return FALSE;
@@ -3978,7 +3979,7 @@ static bool8 Phase2_30_Func4(struct Task *task)
if (++task->tData3 == 101) if (++task->tData3 == 101)
{ {
task->tData4++; task->tData4++;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
} }
if (task->tData4 != 0 && !gPaletteFade.active) if (task->tData4 != 0 && !gPaletteFade.active)
src/berry_blender.c
+8 -7
View File
@@ -36,6 +36,7 @@
#include "new_game.h" #include "new_game.h"
#include "save.h" #include "save.h"
#include "link.h" #include "link.h"
#include "constants/rgb.h"
#define BLENDER_SCORE_BEST 0 #define BLENDER_SCORE_BEST 0
#define BLENDER_SCORE_GOOD 1 #define BLENDER_SCORE_GOOD 1
@@ -996,7 +997,7 @@ static void sub_807FAC8(void)
} }
if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
SetVBlankCallback(VBlankCB0_BerryBlender); SetVBlankCallback(VBlankCB0_BerryBlender);
@@ -1004,7 +1005,7 @@ static void sub_807FAC8(void)
} }
break; break;
case 2: case 2:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
sub_8082D28(); sub_8082D28();
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
break; break;
@@ -1018,7 +1019,7 @@ static void sub_807FAC8(void)
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
break; break;
case 5: case 5:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
break; break;
case 6: case 6:
@@ -1202,13 +1203,13 @@ static void sub_8080018(void)
} }
if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType) if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
break; break;
case 3: case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
break; break;
case 4: case 4:
@@ -1534,7 +1535,7 @@ static void sub_80808D4(void)
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
break; break;
case 3: case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
sBerryBlenderData->mainState++; sBerryBlenderData->mainState++;
sBerryBlenderData->framesToWait = 0; sBerryBlenderData->framesToWait = 0;
break; break;
@@ -2700,7 +2701,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
case 9: case 9:
if (IsLinkTaskFinished()) if (IsLinkTaskFinished())
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
sBerryBlenderData->gameEndState++; sBerryBlenderData->gameEndState++;
} }
break; break;
src/berry_crush.c
+1 -1
View File
@@ -511,7 +511,7 @@ int sub_802104C(void)
CopyBgTilemapBufferToVram(3); CopyBgTilemapBufferToVram(3);
break; break;
case 8: case 8:
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
sub_8022730(var0); sub_8022730(var0);
SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY); SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY);
src/berry_tag_screen.c
+3 -2
View File
@@ -28,6 +28,7 @@
#include "item_menu_icons.h" #include "item_menu_icons.h"
#include "decompress.h" #include "decompress.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "constants/rgb.h"
// There are 4 windows used in berry tag screen. // There are 4 windows used in berry tag screen.
enum enum
@@ -279,7 +280,7 @@ static bool8 InitBerryTagScreen(void)
gMain.state++; gMain.state++;
break; break;
case 15: case 15:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = 0; gPaletteFade.bufferTransferDisabled = 0;
gMain.state++; gMain.state++;
break; break;
@@ -513,7 +514,7 @@ static void DestroyFlavorCircleSprites(void)
static void PrepareToCloseBerryTagScreen(u8 taskId) static void PrepareToCloseBerryTagScreen(u8 taskId)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_CloseBerryTagScreen; gTasks[taskId].func = Task_CloseBerryTagScreen;
} }
src/clear_save_data_screen.c
+1 -1
View File
@@ -163,7 +163,7 @@ static bool8 SetupClearSaveDataScreen(void)
ShowBg(3); ShowBg(3);
SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDCNT, 0);
InitClearSaveDataScreenWindows(); InitClearSaveDataScreenWindows();
BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, 0xFFFF); BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITEALPHA);
EnableInterrupts(INTR_FLAG_VBLANK); EnableInterrupts(INTR_FLAG_VBLANK);
SetVBlankCallback(VBlankCB); SetVBlankCallback(VBlankCB);
gMain.state = 1; gMain.state = 1;
src/contest.c
+20 -17
View File
@@ -51,21 +51,24 @@
// Contestant 0 will use palette color 10, contestant 1 will use color 11, etc. // Contestant 0 will use palette color 10, contestant 1 will use color 11, etc.
#define CONTESTANT_TEXT_COLOR_START 10 #define CONTESTANT_TEXT_COLOR_START 10
enum
{
// The "{Pokemon Name} / {Trainer Name}" windows. // The "{Pokemon Name} / {Trainer Name}" windows.
#define CONTEST_WINDOW_CONTESTANT0_NAME 0 CONTEST_WINDOW_CONTESTANT0_NAME,
#define CONTEST_WINDOW_CONTESTANT1_NAME 1 CONTEST_WINDOW_CONTESTANT1_NAME,
#define CONTEST_WINDOW_CONTESTANT2_NAME 2 CONTEST_WINDOW_CONTESTANT2_NAME,
#define CONTEST_WINDOW_CONTESTANT3_NAME 3 CONTEST_WINDOW_CONTESTANT3_NAME,
#define CONTEST_WINDOW_GENERAL_TEXT 4 CONTEST_WINDOW_GENERAL_TEXT,
// The available moves, from top to bottom // The available moves, from top to bottom
#define CONTEST_WINDOW_MOVE0 5 CONTEST_WINDOW_MOVE0,
#define CONTEST_WINDOW_MOVE1 6 CONTEST_WINDOW_MOVE1,
#define CONTEST_WINDOW_MOVE2 7 CONTEST_WINDOW_MOVE2,
#define CONTEST_WINDOW_MOVE3 8 CONTEST_WINDOW_MOVE3,
// The small "/" character between the move category and the // The small "/" character between the move category and the
// appeal/jam display // appeal/jam display
#define CONTEST_WINDOW_SLASH 9 CONTEST_WINDOW_SLASH,
#define CONTEST_WINDOW_MOVE_DESCRIPTION 10 CONTEST_WINDOW_MOVE_DESCRIPTION
};
#define MOVE_WINDOWS_START CONTEST_WINDOW_MOVE0 #define MOVE_WINDOWS_START CONTEST_WINDOW_MOVE0
@@ -1098,7 +1101,7 @@ void CB2_StartContest(void)
SetMainCallback2(CB2_ContestMain); SetMainCallback2(CB2_ContestMain);
if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS) if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(8, 8); CreateWirelessStatusIndicatorSprite(8, 8);
} }
break; break;
@@ -2576,7 +2579,7 @@ static void sub_80DA740(u8 taskId)
} }
else else
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = sub_80DA830; gTasks[taskId].func = sub_80DA830;
} }
} }
@@ -2595,7 +2598,7 @@ static void sub_80DA7A0(u8 taskId)
static void sub_80DA7EC(u8 taskId) static void sub_80DA7EC(u8 taskId)
{ {
DestroyTask(taskId); DestroyTask(taskId);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[eContest.mainTaskId].func = sub_80DA830; gTasks[eContest.mainTaskId].func = sub_80DA830;
} }
src/contest_link_80F57C4.c
+1 -1
View File
@@ -909,7 +909,7 @@ static void sub_80F6AE8(void)
if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS) if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(8, 8); CreateWirelessStatusIndicatorSprite(8, 8);
gSprites[gWirelessStatusIndicatorSpriteId].subpriority = 1; gSprites[gWirelessStatusIndicatorSpriteId].subpriority = 1;
sheet = LoadSpriteSheet(&gUnknown_0858D8E0); sheet = LoadSpriteSheet(&gUnknown_0858D8E0);
src/diploma.c
+3 -2
View File
@@ -14,6 +14,7 @@
#include "overworld.h" #include "overworld.h"
#include "menu.h" #include "menu.h"
#include "pokedex.h" #include "pokedex.h"
#include "constants/rgb.h"
extern const u8 gText_DexNational[]; extern const u8 gText_DexNational[];
extern const u8 gText_DexHoenn[]; extern const u8 gText_DexHoenn[];
@@ -83,7 +84,7 @@ void CB2_ShowDiploma(void)
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
DisplayDiplomaText(); DisplayDiplomaText();
BlendPalettes(-1, 16, 0); BlendPalettes(-1, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
EnableInterrupts(1); EnableInterrupts(1);
SetVBlankCallback(VBlankCB); SetVBlankCallback(VBlankCB);
SetMainCallback2(MainCB2); SetMainCallback2(MainCB2);
@@ -108,7 +109,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId)
{ {
if (gMain.newKeys & (A_BUTTON | B_BUTTON)) if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_DiplomaFadeOut; gTasks[taskId].func = Task_DiplomaFadeOut;
} }
} }
src/easy_chat.c
+4 -3
View File
@@ -32,6 +32,7 @@
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/rgb.h"
#define EZCHAT_TASK_STATE 0 #define EZCHAT_TASK_STATE 0
#define EZCHAT_TASK_TYPE 1 #define EZCHAT_TASK_TYPE 1
@@ -1139,20 +1140,20 @@ static void sub_811A2FC(u8 taskId)
case 0: case 0:
SetVBlankCallback(VBlankCallback_EasyChatScreen); SetVBlankCallback(VBlankCallback_EasyChatScreen);
BlendPalettes(0xFFFFFFFF, 16, 0); BlendPalettes(0xFFFFFFFF, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
data[EZCHAT_TASK_STATE] = 5; data[EZCHAT_TASK_STATE] = 5;
break; break;
case 1: case 1:
v0 = sub_811AAAC(); v0 = sub_811AAAC();
if (sub_811A88C(v0)) if (sub_811A88C(v0))
{ {
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
data[EZCHAT_TASK_STATE] = 3; data[EZCHAT_TASK_STATE] = 3;
data[EZCHAT_TASK_UNK06] = v0; data[EZCHAT_TASK_UNK06] = v0;
} }
else if (v0 == 0x18) else if (v0 == 0x18)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
data[EZCHAT_TASK_STATE] = 4; data[EZCHAT_TASK_STATE] = 4;
} }
else if (v0 != 0) else if (v0 != 0)
src/egg_hatch.c
+5 -4
View File
@@ -34,6 +34,7 @@
#include "pokemon_storage_system.h" #include "pokemon_storage_system.h"
#include "field_screen_effect.h" #include "field_screen_effect.h"
#include "battle.h" // to get rid of later #include "battle.h" // to get rid of later
#include "constants/rgb.h"
struct EggHatchData struct EggHatchData
{ {
@@ -596,7 +597,7 @@ static void CB2_EggHatch_1(void)
switch (sEggHatchData->CB2_state) switch (sEggHatchData->CB2_state)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
sEggHatchData->eggSpriteID = CreateSprite(&sSpriteTemplate_EggHatch, 120, 75, 5); sEggHatchData->eggSpriteID = CreateSprite(&sSpriteTemplate_EggHatch, 120, 75, 5);
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
@@ -679,7 +680,7 @@ static void CB2_EggHatch_1(void)
} }
break; break;
case 11: case 11:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
sEggHatchData->CB2_state++; sEggHatchData->CB2_state++;
break; break;
case 12: case 12:
@@ -789,7 +790,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
{ {
s16 i; s16 i;
if (sprite->data[0] == 0) if (sprite->data[0] == 0)
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0xFFFF); BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_WHITEALPHA);
if (sprite->data[0] < 4u) if (sprite->data[0] < 4u)
{ {
for (i = 0; i <= 3; i++) for (i = 0; i <= 3; i++)
@@ -813,7 +814,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite)
StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1); StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1);
} }
if (sprite->data[0] == 8) if (sprite->data[0] == 8)
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, 0xFFFF); BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, RGB_WHITEALPHA);
if (sprite->data[0] <= 9) if (sprite->data[0] <= 9)
gSprites[sEggHatchData->pokeSpriteID].pos1.y -= 1; gSprites[sEggHatchData->pokeSpriteID].pos1.y -= 1;
if (sprite->data[0] > 40) if (sprite->data[0] > 40)
src/evolution_graphics.c
+6 -5
View File
@@ -8,6 +8,7 @@
#include "sound.h" #include "sound.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "palette.h" #include "palette.h"
#include "constants/rgb.h"
// this file's functions // this file's functions
static void EvoSparkle_DummySpriteCb(struct Sprite* sprite); static void EvoSparkle_DummySpriteCb(struct Sprite* sprite);
@@ -268,7 +269,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID)
{ {
SetEvoSparklesMatrices(); SetEvoSparklesMatrices();
gTasks[taskID].tFrameCounter = 0; gTasks[taskID].tFrameCounter = 0;
BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, 0x7FFF); BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, RGB_WHITE);
gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1; gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1;
PlaySE(SE_W025); PlaySE(SE_W025);
} }
@@ -386,7 +387,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID)
SetEvoSparklesMatrices(); SetEvoSparklesMatrices();
gTasks[taskID].tFrameCounter = 0; gTasks[taskID].tFrameCounter = 0;
CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
BeginNormalPaletteFade(0xFFF9041C, 0, 0, 0x10, 0x7FFF); // was 0xFFF9001C in R/S BeginNormalPaletteFade(0xFFF9041C, 0, 0, 0x10, RGB_WHITE); // was 0xFFF9001C in R/S
gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash; gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash;
PlaySE(SE_W080); PlaySE(SE_W080);
} }
@@ -407,7 +408,7 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID)
CreatePostEvoSparkleSet2(i); CreatePostEvoSparkleSet2(i);
break; break;
case 32: case 32:
BeginNormalPaletteFade(0xFFFF041C, 0x10, 0x10, 0, 0x7FFF); // was 0xFFF9001C in R/S BeginNormalPaletteFade(0xFFFF041C, 0x10, 0x10, 0, RGB_WHITE); // was 0xFFF9001C in R/S
break; break;
} }
gTasks[taskID].tFrameCounter++; gTasks[taskID].tFrameCounter++;
@@ -434,7 +435,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID)
SetEvoSparklesMatrices(); SetEvoSparklesMatrices();
gTasks[taskID].tFrameCounter = 0; gTasks[taskID].tFrameCounter = 0;
CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
BeginNormalPaletteFade(0xFFF90400, 0, 0, 0x10, 0x7FFF); // was 0xFFFF0001 in R/S BeginNormalPaletteFade(0xFFF90400, 0, 0, 0x10, RGB_WHITE); // was 0xFFFF0001 in R/S
gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade; gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade;
PlaySE(SE_W080); PlaySE(SE_W080);
} }
@@ -455,7 +456,7 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID)
CreatePostEvoSparkleSet2(i); CreatePostEvoSparkleSet2(i);
break; break;
case 32: case 32:
BeginNormalPaletteFade(0xFFFF0400, 0x10, 0x10, 0, 0x7FFF); // was 0xFFFF0001 in R/S BeginNormalPaletteFade(0xFFFF0400, 0x10, 0x10, 0, RGB_WHITE); // was 0xFFFF0001 in R/S
break; break;
} }
gTasks[taskID].tFrameCounter++; gTasks[taskID].tFrameCounter++;
src/evolution_scene.c
+14 -13
View File
@@ -32,6 +32,7 @@
#include "constants/battle_string_ids.h" #include "constants/battle_string_ids.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/rgb.h"
struct EvoInfo struct EvoInfo
{ {
@@ -171,7 +172,7 @@ static void Task_BeginEvolutionScene(u8 taskID)
switch (gTasks[taskID].tState) switch (gTasks[taskID].tState)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskID].tState++; gTasks[taskID].tState++;
break; break;
case 1: case 1:
@@ -368,7 +369,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
SetVBlankCallback(VBlankCB_EvolutionScene); SetVBlankCallback(VBlankCB_EvolutionScene);
SetMainCallback2(CB2_EvolutionSceneUpdate); SetMainCallback2(CB2_EvolutionSceneUpdate);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
@@ -445,14 +446,14 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
case 6: case 6:
if (gWirelessCommType) if (gWirelessCommType)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
BlendPalettes(-1,0x10, 0); BlendPalettes(-1,0x10, 0);
gMain.state++; gMain.state++;
break; break;
case 7: case 7:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
sub_807B140(); sub_807B140();
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
@@ -605,7 +606,7 @@ static void Task_EvolutionScene(u8 taskID)
switch (gTasks[taskID].tState) switch (gTasks[taskID].tState)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
gSprites[sEvoStructPtr->preEvoSpriteID].invisible = FALSE; gSprites[sEvoStructPtr->preEvoSpriteID].invisible = FALSE;
gTasks[taskID].tState++; gTasks[taskID].tState++;
ShowBg(0); ShowBg(0);
@@ -640,7 +641,7 @@ static void Task_EvolutionScene(u8 taskID)
{ {
PlayNewMapMusic(MUS_SHINKA); PlayNewMapMusic(MUS_SHINKA);
gTasks[taskID].tState++; gTasks[taskID].tState++;
BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0); BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
} }
break; break;
case 5: // launch moving bg task, preapre evo sparkles case 5: // launch moving bg task, preapre evo sparkles
@@ -698,7 +699,7 @@ static void Task_EvolutionScene(u8 taskID)
m4aMPlayAllStop(); m4aMPlayAllStop();
memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, 0x60); memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, 0x60);
sub_8140174(); sub_8140174();
BeginNormalPaletteFade(0x1C, 0, 0x10, 0, 0); BeginNormalPaletteFade(0x1C, 0, 0x10, 0, RGB_BLACK);
gTasks[taskID].tState++; gTasks[taskID].tState++;
} }
break; break;
@@ -753,7 +754,7 @@ static void Task_EvolutionScene(u8 taskID)
} }
else // no move to learn else // no move to learn
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskID].tState++; gTasks[taskID].tState++;
} }
} }
@@ -781,7 +782,7 @@ static void Task_EvolutionScene(u8 taskID)
if (!gTasks[sEvoGraphicsTaskID].isActive) if (!gTasks[sEvoGraphicsTaskID].isActive)
{ {
m4aMPlayAllStop(); m4aMPlayAllStop();
BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, 0x7FFF); BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, RGB_WHITE);
gTasks[taskID].tState++; gTasks[taskID].tState++;
} }
break; break;
@@ -887,7 +888,7 @@ static void Task_EvolutionScene(u8 taskID)
{ {
gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7; gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
if (gTasks[taskID].tLearnMoveState == 5) if (gTasks[taskID].tLearnMoveState == 5)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
} }
} }
if (gMain.newKeys & B_BUTTON) if (gMain.newKeys & B_BUTTON)
@@ -1009,7 +1010,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
{ {
PlayBGM(MUS_SHINKA); PlayBGM(MUS_SHINKA);
gTasks[taskID].tState++; gTasks[taskID].tState++;
BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0); BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
} }
break; break;
case 4: case 4:
@@ -1130,7 +1131,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (!gTasks[sEvoGraphicsTaskID].isActive) if (!gTasks[sEvoGraphicsTaskID].isActive)
{ {
m4aMPlayAllStop(); m4aMPlayAllStop();
BeginNormalPaletteFade((1 << (gSprites[sEvoStructPtr->preEvoSpriteID].oam.paletteNum + 16)) | (0x4001C), 0, 0x10, 0, 0x7FFF); BeginNormalPaletteFade((1 << (gSprites[sEvoStructPtr->preEvoSpriteID].oam.paletteNum + 16)) | (0x4001C), 0, 0x10, 0, RGB_WHITE);
gTasks[taskID].tState++; gTasks[taskID].tState++;
} }
break; break;
@@ -1213,7 +1214,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
sub_807F1A8(0, gDisplayedStringBattle, 1); sub_807F1A8(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7; gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
if (gTasks[taskID].tLearnMoveState == 5) if (gTasks[taskID].tLearnMoveState == 5)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
break; break;
case 1: case 1:
case -1: case -1:
src/field_region_map.c
+3 -2
View File
@@ -11,6 +11,7 @@
#include "text.h" #include "text.h"
#include "text_window.h" #include "text_window.h"
#include "window.h" #include "window.h"
#include "constants/rgb.h"
// Static type declarations // Static type declarations
@@ -145,7 +146,7 @@ static void FieldUpdateRegionMap(void)
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
DrawStdFrameWithCustomTileAndPalette(0, 0, 0x27, 0xd); DrawStdFrameWithCustomTileAndPalette(0, 0, 0x27, 0xd);
PrintRegionMapSecName(); PrintRegionMapSecName();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
sFieldRegionMapHandler->state++; sFieldRegionMapHandler->state++;
break; break;
case 2: case 2:
@@ -173,7 +174,7 @@ static void FieldUpdateRegionMap(void)
} }
break; break;
case 5: case 5:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
sFieldRegionMapHandler->state++; sFieldRegionMapHandler->state++;
break; break;
case 6: case 6:
src/hof_pc.c
+2 -1
View File
@@ -6,6 +6,7 @@
#include "script.h" #include "script.h"
#include "script_menu.h" #include "script_menu.h"
#include "task.h" #include "task.h"
#include "constants/rgb.h"
static void ReshowPCMenuAfterHallOfFamePC(void); static void ReshowPCMenuAfterHallOfFamePC(void);
static void Task_WaitForPaletteFade(u8); static void Task_WaitForPaletteFade(u8);
@@ -28,7 +29,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
ScrSpecial_CreatePCMenu(); ScrSpecial_CreatePCMenu();
ScriptMenu_DisplayPCStartupPrompt(); ScriptMenu_DisplayPCStartupPrompt();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
CreateTask(Task_WaitForPaletteFade, 10); CreateTask(Task_WaitForPaletteFade, 10);
} }
src/item_menu.c
+3 -2
View File
@@ -49,6 +49,7 @@
#include "window.h" #include "window.h"
#include "apprentice.h" #include "apprentice.h"
#include "battle_pike.h" #include "battle_pike.h"
#include "constants/rgb.h"
void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
void CB2_Bag(void); void CB2_Bag(void);
@@ -659,7 +660,7 @@ bool8 setup_bag_menu(void)
gMain.state++; gMain.state++;
break; break;
case 20: case 20:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = FALSE; gPaletteFade.bufferTransferDisabled = FALSE;
gMain.state++; gMain.state++;
break; break;
@@ -942,7 +943,7 @@ void free_bag_item_list_buffers(void)
void unknown_ItemMenu_Confirm(u8 taskId) void unknown_ItemMenu_Confirm(u8 taskId)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = task_close_bag_menu_2; gTasks[taskId].func = task_close_bag_menu_2;
} }
src/link.c
+2 -1
View File
@@ -27,6 +27,7 @@
#include "battle.h" #include "battle.h"
#include "link.h" #include "link.h"
#include "link_rfu.h" #include "link_rfu.h"
#include "constants/rgb.h"
extern u16 gHeldKeyCodeToSend; extern u16 gHeldKeyCodeToSend;
@@ -444,7 +445,7 @@ static void LinkTestProcessKeyInput(void)
} }
if (gMain.newKeys & L_BUTTON) if (gMain.newKeys & L_BUTTON)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 2); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(2, 0, 0));
} }
if (gMain.newKeys & START_BUTTON) if (gMain.newKeys & START_BUTTON)
{ {
src/link_rfu.c
+1 -1
View File
@@ -2254,7 +2254,7 @@ void DestroyWirelessStatusIndicatorSprite(void)
} }
} }
void LoadWirelessStatusIndicatorSprite(void) void LoadWirelessStatusIndicatorSpriteGfx(void)
{ {
if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF) if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF)
{ {
src/mail.c
+3 -2
View File
@@ -19,6 +19,7 @@
#include "constants/species.h" #include "constants/species.h"
#include "alloc.h" #include "alloc.h"
#include "easy_chat.h" #include "easy_chat.h"
#include "constants/rgb.h"
extern const u16 gMailPalette_Orange[]; extern const u16 gMailPalette_Orange[];
extern const u16 gMailPalette_Harbor[]; extern const u16 gMailPalette_Harbor[];
@@ -417,7 +418,7 @@ static bool8 MailReadBuildGraphics(void)
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
ShowBg(2); ShowBg(2);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = FALSE; gPaletteFade.bufferTransferDisabled = FALSE;
sMailRead->callback2 = CB2_WaitForPaletteExitOnKeyPress; sMailRead->callback2 = CB2_WaitForPaletteExitOnKeyPress;
return TRUE; return TRUE;
@@ -526,7 +527,7 @@ static void CB2_ExitOnKeyPress(void)
{ {
if (gMain.newKeys & (A_BUTTON | B_BUTTON)) if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
sMailRead->callback2 = CB2_ExitMailReadFreeVars; sMailRead->callback2 = CB2_ExitMailReadFreeVars;
} }
} }
src/main_menu.c
+5 -5
View File
@@ -584,9 +584,9 @@ static u32 InitMainMenu(bool8 returningFromOptionsMenu)
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
if (returningFromOptionsMenu) if (returningFromOptionsMenu)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0x0000); // fade to black BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); // fade to black
else else
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0xFFFF); // fade to white BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_WHITEALPHA); // fade to white
ResetBgsAndClearDma3BusyFlags(0); ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, sMainMenuBgTemplates, ARRAY_COUNT(sMainMenuBgTemplates)); InitBgsFromTemplates(0, sMainMenuBgTemplates, ARRAY_COUNT(sMainMenuBgTemplates));
ChangeBgX(0, 0, 0); ChangeBgX(0, 0, 0);
@@ -1098,7 +1098,7 @@ static void Task_HandleMainMenuAPressed(u8 taskId)
SetGpuReg(REG_OFFSET_BG1VOFS, 0); SetGpuReg(REG_OFFSET_BG1VOFS, 0);
SetGpuReg(REG_OFFSET_BG0HOFS, 0); SetGpuReg(REG_OFFSET_BG0HOFS, 0);
SetGpuReg(REG_OFFSET_BG0VOFS, 0); SetGpuReg(REG_OFFSET_BG0VOFS, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
return; return;
} }
FreeAllWindowBuffers(); FreeAllWindowBuffers();
@@ -1287,7 +1287,7 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId)
FreeAllSpritePalettes(); FreeAllSpritePalettes();
ResetAllPicSprites(); ResetAllPicSprites();
AddBirchSpeechObjects(taskId); AddBirchSpeechObjects(taskId);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
gTasks[taskId].tBG1HOFS = 0; gTasks[taskId].tBG1HOFS = 0;
gTasks[taskId].func = Task_NewGameBirchSpeech_WaitToShowBirch; gTasks[taskId].func = Task_NewGameBirchSpeech_WaitToShowBirch;
gTasks[taskId].tPlayerSpriteId = 0xFF; gTasks[taskId].tPlayerSpriteId = 0xFF;
@@ -1846,7 +1846,7 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void)
gSprites[spriteId].invisible = FALSE; gSprites[spriteId].invisible = FALSE;
gTasks[taskId].tPlayerSpriteId = spriteId; gTasks[taskId].tPlayerSpriteId = spriteId;
SetGpuReg(REG_OFFSET_BG1HOFS, -60); SetGpuReg(REG_OFFSET_BG1HOFS, -60);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0H, 0);
SetGpuReg(REG_OFFSET_WIN0V, 0); SetGpuReg(REG_OFFSET_WIN0V, 0);
SetGpuReg(REG_OFFSET_WININ, 0); SetGpuReg(REG_OFFSET_WININ, 0);
src/mevent_801BAAC.c
+9 -8
View File
@@ -14,6 +14,7 @@
#include "link_rfu.h" #include "link_rfu.h"
#include "mevent.h" #include "mevent.h"
#include "mystery_gift.h" #include "mystery_gift.h"
#include "constants/rgb.h"
struct UnkStruct_8467FB8 struct UnkStruct_8467FB8
{ {
@@ -186,7 +187,7 @@ s32 FadeToWonderCardMenu(void)
switch(sWonderCardData->unk_0174) switch(sWonderCardData->unk_0174)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
break; break;
case 1: case 1:
if (UpdatePaletteFade()) if (UpdatePaletteFade())
@@ -231,7 +232,7 @@ s32 FadeToWonderCardMenu(void)
ShowBg(2); ShowBg(2);
gPaletteFade.bufferTransferDisabled = FALSE; gPaletteFade.bufferTransferDisabled = FALSE;
sub_801C4C0(); sub_801C4C0();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
UpdatePaletteFade(); UpdatePaletteFade();
break; break;
default: default:
@@ -251,7 +252,7 @@ s32 FadeOutFromWonderCard(bool32 flag)
switch (sWonderCardData->unk_0174) switch (sWonderCardData->unk_0174)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
break; break;
case 1: case 1:
if (UpdatePaletteFade()) if (UpdatePaletteFade())
@@ -279,7 +280,7 @@ s32 FadeOutFromWonderCard(bool32 flag)
case 5: case 5:
PrintMysteryGiftOrEReaderTopMenu(gGiftIsFromEReader, flag); PrintMysteryGiftOrEReaderTopMenu(gGiftIsFromEReader, flag);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
break; break;
default: default:
if (UpdatePaletteFade()) if (UpdatePaletteFade())
@@ -575,7 +576,7 @@ s32 FadeToWonderNewsMenu(void)
switch (sWonderNewsData->unk_01C0_1) switch (sWonderNewsData->unk_01C0_1)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
break; break;
case 1: case 1:
if (UpdatePaletteFade()) if (UpdatePaletteFade())
@@ -629,7 +630,7 @@ s32 FadeToWonderNewsMenu(void)
ShowBg(3); ShowBg(3);
gPaletteFade.bufferTransferDisabled = FALSE; gPaletteFade.bufferTransferDisabled = FALSE;
sWonderNewsData->unk_01C1 = AddScrollIndicatorArrowPair(&sWonderNewsData->unk_0394, &sWonderNewsData->unk_01C6); sWonderNewsData->unk_01C1 = AddScrollIndicatorArrowPair(&sWonderNewsData->unk_0394, &sWonderNewsData->unk_01C6);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
UpdatePaletteFade(); UpdatePaletteFade();
break; break;
default: default:
@@ -650,7 +651,7 @@ s32 FadeOutFromWonderNews(bool32 flag)
switch (sWonderNewsData->unk_01C0_1) switch (sWonderNewsData->unk_01C0_1)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
break; break;
case 1: case 1:
if (UpdatePaletteFade()) if (UpdatePaletteFade())
@@ -692,7 +693,7 @@ s32 FadeOutFromWonderNews(bool32 flag)
MG_DrawCheckerboardPattern(3); MG_DrawCheckerboardPattern(3);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(3); CopyBgTilemapBufferToVram(3);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
break; break;
default: default:
if (UpdatePaletteFade()) if (UpdatePaletteFade())
src/mystery_event_menu.c
+3 -2
View File
@@ -18,6 +18,7 @@
#include "gpu_regs.h" #include "gpu_regs.h"
#include "text_window.h" #include "text_window.h"
#include "decompress.h" #include "decompress.h"
#include "constants/rgb.h"
// this file's functions // this file's functions
static void CB2_MysteryEventMenu(void); static void CB2_MysteryEventMenu(void);
@@ -137,7 +138,7 @@ static void CB2_MysteryEventMenu(void)
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, 3); CopyWindowToVram(0, 3);
ShowBg(0); ShowBg(0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
gMain.state++; gMain.state++;
break; break;
case 1: case 1:
@@ -280,7 +281,7 @@ static void CB2_MysteryEventMenu(void)
} }
break; break;
case 15: case 15:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gMain.state++; gMain.state++;
break; break;
case 16: case 16:
src/naming_screen.c
+3 -2
View File
@@ -27,6 +27,7 @@
#include "text_window.h" #include "text_window.h"
#include "overworld.h" #include "overworld.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/rgb.h"
EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL; EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL;
extern u16 gKeyRepeatStartDelay; extern u16 gKeyRepeatStartDelay;
@@ -463,7 +464,7 @@ static bool8 MainState_BeginFadeIn(void)
CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(2);
CopyBgTilemapBufferToVram(3); CopyBgTilemapBufferToVram(3);
BlendPalettes(-1, 16, 0); BlendPalettes(-1, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
gNamingScreenData->state++; gNamingScreenData->state++;
return FALSE; return FALSE;
} }
@@ -517,7 +518,7 @@ static bool8 MainState_6(void)
static bool8 MainState_BeginFadeInOut(void) static bool8 MainState_BeginFadeInOut(void)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gNamingScreenData->state++; gNamingScreenData->state++;
return FALSE; return FALSE;
} }
src/option_menu.c
+3 -2
View File
@@ -14,6 +14,7 @@
#include "international_string_util.h" #include "international_string_util.h"
#include "strings.h" #include "strings.h"
#include "gba/m4a_internal.h" #include "gba/m4a_internal.h"
#include "constants/rgb.h"
// Task data // Task data
enum enum
@@ -250,7 +251,7 @@ void CB2_InitOptionMenu(void)
break; break;
} }
case 11: case 11:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
SetVBlankCallback(VBlankCB); SetVBlankCallback(VBlankCB);
SetMainCallback2(MainCB2); SetMainCallback2(MainCB2);
return; return;
@@ -359,7 +360,7 @@ static void Task_OptionMenuSave(u8 taskId)
gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE]; gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE];
gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE]; 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; gTasks[taskId].func = Task_OptionMenuFadeOut;
} }
src/overworld.c
+2 -2
View File
@@ -1874,7 +1874,7 @@ static bool32 map_loading_iteration_3(u8 *state)
case 11: case 11:
if (gWirelessCommType != 0) if (gWirelessCommType != 0)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
(*state)++; (*state)++;
@@ -2046,7 +2046,7 @@ static bool32 map_loading_iteration_2_link(u8 *state)
case 11: case 11:
if (gWirelessCommType != 0) if (gWirelessCommType != 0)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
(*state)++; (*state)++;
src/pokeblock.c
+3 -2
View File
@@ -32,6 +32,7 @@
#include "text_window.h" #include "text_window.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/rgb.h"
#define POKEBLOCK_MAX_FEEL 99 #define POKEBLOCK_MAX_FEEL 99
#define FIELD_E75_COUNT 7 #define FIELD_E75_COUNT 7
@@ -585,7 +586,7 @@ static bool8 InitPokeblockMenu(void)
gMain.state++; gMain.state++;
break; break;
case 18: case 18:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = 0; gPaletteFade.bufferTransferDisabled = 0;
gMain.state++; gMain.state++;
break; break;
@@ -948,7 +949,7 @@ static void sub_8136470(struct Sprite *sprite)
static void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId) static void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_FreeDataAndExitPokeblockCase; gTasks[taskId].func = Task_FreeDataAndExitPokeblockCase;
} }
src/pokeblock_feed.c
+3 -2
View File
@@ -23,6 +23,7 @@
#include "text_window.h" #include "text_window.h"
#include "trig.h" #include "trig.h"
#include "util.h" #include "util.h"
#include "constants/rgb.h"
struct PokeblockFeedStruct struct PokeblockFeedStruct
{ {
@@ -591,7 +592,7 @@ static bool8 TransitionToPokeblockFeedScene(void)
gMain.state++; gMain.state++;
break; break;
case 13: case 13:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = 0; gPaletteFade.bufferTransferDisabled = 0;
gMain.state++; gMain.state++;
break; break;
@@ -805,7 +806,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId)
static void Task_PaletteFadeToReturn(u8 taskId) static void Task_PaletteFadeToReturn(u8 taskId)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_ReturnAfterPaletteFade; gTasks[taskId].func = Task_ReturnAfterPaletteFade;
} }
src/pokedex.c
+1 -1
View File
@@ -2969,7 +2969,7 @@ void sub_80BEA24(u8 taskId)
r3 = 0x14; r3 = 0x14;
if (gTasks[taskId].data[1] != 0) if (gTasks[taskId].data[1] != 0)
r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16)); r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16));
BeginNormalPaletteFade(~r3, 0, 16, 0, 0); BeginNormalPaletteFade(~r3, 0, 16, 0, RGB_BLACK);
SetVBlankCallback(gUnknown_030060B4); SetVBlankCallback(gUnknown_030060B4);
gMain.state++; gMain.state++;
} }
src/rayquaza_scene.c
+10 -10
View File
@@ -1563,7 +1563,7 @@ static void Task_DuoFightAnim(u8 taskId)
} }
BlendPalettes(-1, 0x10, 0); BlendPalettes(-1, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
SetVBlankCallback(VBlankCB_DuoFight); SetVBlankCallback(VBlankCB_DuoFight);
PlaySE(SE_T_OOAME); PlaySE(SE_T_OOAME);
} }
@@ -1715,7 +1715,7 @@ static void sub_81D752C(u8 taskId)
static void DuoFightEnd(u8 taskId, s8 palDelay) static void DuoFightEnd(u8 taskId, s8 palDelay)
{ {
PlaySE(SE_T_OOAME_E); PlaySE(SE_T_OOAME_E);
BeginNormalPaletteFade(0xFFFFFFFF, palDelay, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, palDelay, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_DuoFightEnd; gTasks[taskId].func = Task_DuoFightEnd;
} }
@@ -1971,7 +1971,7 @@ static void Task_HandleRayTakesFlight(u8 taskId)
case 0: case 0:
if (data[1] == 8) if (data[1] == 8)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
data[2] = 0; data[2] = 0;
data[3] = 30; data[3] = 30;
data[4] = 0; data[4] = 0;
@@ -2012,7 +2012,7 @@ static void Task_HandleRayTakesFlight(u8 taskId)
if (data[1] > 295) if (data[1] > 295)
{ {
data[0]++; data[0]++;
BeginNormalPaletteFade(0xFFFFFFFF, 6, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 6, 0, 0x10, RGB_BLACK);
} }
} }
break; break;
@@ -2174,7 +2174,7 @@ static void Task_HandleRayDescends(u8 taskId)
case 0: case 0:
if (data[1] == 8) if (data[1] == 8)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
data[1] = 0; data[1] = 0;
data[0]++; data[0]++;
} }
@@ -2219,7 +2219,7 @@ static void Task_HandleRayDescends(u8 taskId)
} }
break; break;
case 4: case 4:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_RayDescendsEnd; gTasks[taskId].func = Task_RayDescendsEnd;
break; break;
} }
@@ -2366,7 +2366,7 @@ static void Task_HandleRayCharges(u8 taskId)
case 0: case 0:
if (data[1] == 8) if (data[1] == 8)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
data[1] = 0; data[1] = 0;
data[0]++; data[0]++;
} }
@@ -2399,7 +2399,7 @@ static void Task_HandleRayCharges(u8 taskId)
} }
break; break;
case 3: case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_RayChargesEnd; gTasks[taskId].func = Task_RayChargesEnd;
break; break;
} }
@@ -2532,7 +2532,7 @@ static void Task_HandleRayChasesAway(u8 taskId)
if (data[1] == 8) if (data[1] == 8)
{ {
sub_81D90A8(taskId); sub_81D90A8(taskId);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
data[1] = 0; data[1] = 0;
data[0]++; data[0]++;
} }
@@ -2574,7 +2574,7 @@ static void Task_HandleRayChasesAway(u8 taskId)
} }
break; break;
case 3: case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_RayChasesAwayEnd; gTasks[taskId].func = Task_RayChasesAwayEnd;
break; break;
} }
src/recorded_battle.c
+2 -1
View File
@@ -17,6 +17,7 @@
#include "battle_setup.h" #include "battle_setup.h"
#include "frontier_util.h" #include "frontier_util.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/rgb.h"
#define BATTLER_RECORD_SIZE 664 #define BATTLER_RECORD_SIZE 664
#define ILLEGAL_BATTLE_TYPES ((BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FIRST_BATTLE \ #define ILLEGAL_BATTLE_TYPES ((BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FIRST_BATTLE \
@@ -220,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId)
{ {
gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah
ResetPaletteFadeControl(); ResetPaletteFadeControl();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
SetMainCallback2(CB2_QuitRecordedBattle); SetMainCallback2(CB2_QuitRecordedBattle);
return 0xFF; return 0xFF;
} }
src/region_map.c
+3 -2
View File
@@ -26,6 +26,7 @@
#include "heal_location.h" #include "heal_location.h"
#include "constants/heal_locations.h" #include "constants/heal_locations.h"
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/rgb.h"
#define MAP_WIDTH 28 #define MAP_WIDTH 28
#define MAP_HEIGHT 15 #define MAP_HEIGHT 15
@@ -1941,7 +1942,7 @@ static void sub_8124D14(void)
switch (sFlyMap->unk_004) switch (sFlyMap->unk_004)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
sFlyMap->unk_004++; sFlyMap->unk_004++;
break; break;
case 1: case 1:
@@ -1988,7 +1989,7 @@ static void sub_8124E0C(void)
switch (sFlyMap->unk_004) switch (sFlyMap->unk_004)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
sFlyMap->unk_004++; sFlyMap->unk_004++;
break; break;
case 1: case 1:
src/reset_rtc_screen.c
+3 -2
View File
@@ -17,6 +17,7 @@
#include "bg.h" #include "bg.h"
#include "window.h" #include "window.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "constants/rgb.h"
struct ResetRtcStruct struct ResetRtcStruct
{ {
@@ -552,7 +553,7 @@ static void Task_ResetRtcScreen(u8 taskId)
switch (data[0]) switch (data[0])
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF); BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, RGB_WHITEALPHA);
data[0] = 1; data[0] = 1;
break; break;
case 1: case 1:
@@ -621,7 +622,7 @@ static void Task_ResetRtcScreen(u8 taskId)
case 5: case 5:
if (gMain.newKeys & A_BUTTON) if (gMain.newKeys & A_BUTTON)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, 0xFFFF); BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, RGB_WHITEALPHA);
data[0] = 6; data[0] = 6;
} }
else else
src/reshow_battle_screen.c
+1 -1
View File
@@ -154,7 +154,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
if (gWirelessCommType != 0 && gReceivedRemoteLinkPlayers != 0) if (gWirelessCommType != 0 && gReceivedRemoteLinkPlayers != 0)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
} }
src/save_failed_screen.c
+1 -1
View File
@@ -321,7 +321,7 @@ static void CB2_FadeAndReturnToTitleScreen(void)
if (gMain.newKeys & A_BUTTON) if (gMain.newKeys & A_BUTTON)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
SetVBlankCallback(VBlankCB); SetVBlankCallback(VBlankCB);
SetMainCallback2(CB2_ReturnToTitleScreen); SetMainCallback2(CB2_ReturnToTitleScreen);
} }
src/script_pokemon_util_80F87D8.c
+1 -1
View File
@@ -477,7 +477,7 @@ void sub_80F90DC(void)
{ {
if (gReceivedRemoteLinkPlayers) if (gReceivedRemoteLinkPlayers)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(8, 8); CreateWirelessStatusIndicatorSprite(8, 8);
} }
} }
src/shop.c
+1 -1
View File
@@ -1154,7 +1154,7 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
static void ExitBuyMenu(u8 taskId) static void ExitBuyMenu(u8 taskId)
{ {
gFieldCallback = MapPostLoadHook_ReturnToShopMenu; gFieldCallback = MapPostLoadHook_ReturnToShopMenu;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_ExitBuyMenu; gTasks[taskId].func = Task_ExitBuyMenu;
} }
src/slot_machine.c
+2 -2
View File
@@ -658,7 +658,7 @@ static void Task_FadeToSlotMachine(u8 taskId)
switch (gTasks[taskId].tState) switch (gTasks[taskId].tState)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].tState++; gTasks[taskId].tState++;
break; break;
case 1: case 1:
@@ -718,7 +718,7 @@ static void CB2_SlotMachineSetup(void)
gMain.state++; gMain.state++;
break; break;
case 7: case 7:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); BeginNormalPaletteFade(-1, 0, 0x10, 0, RGB_BLACK);
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
ShowBg(2); ShowBg(2);
src/start_menu.c
+3 -2
View File
@@ -45,6 +45,7 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "rom_8011DC0.h" #include "rom_8011DC0.h"
#include "union_room.h" #include "union_room.h"
#include "constants/rgb.h"
// Menu actions // Menu actions
enum enum
@@ -1237,7 +1238,7 @@ static void sub_80A0550(u8 taskId)
DrawTextBorderOuter(0, 8, 14); DrawTextBorderOuter(0, 8, 14);
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, 3); CopyWindowToVram(0, 3);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
if (gWirelessCommType != 0 && InUnionRoom()) if (gWirelessCommType != 0 && InUnionRoom())
{ {
@@ -1270,7 +1271,7 @@ static void sub_80A0550(u8 taskId)
} }
break; break;
case 3: case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
*step = 4; *step = 4;
break; break;
case 4: case 4:
src/starter_choose.c
+2 -1
View File
@@ -22,6 +22,7 @@
#include "window.h" #include "window.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/rgb.h"
#define STARTER_MON_COUNT 3 #define STARTER_MON_COUNT 3
@@ -429,7 +430,7 @@ void CB2_ChooseStarter(void)
LoadCompressedSpriteSheet(&gUnknown_085B1ED8[0]); LoadCompressedSpriteSheet(&gUnknown_085B1ED8[0]);
LoadCompressedSpriteSheet(&gUnknown_085B1EE8[0]); LoadCompressedSpriteSheet(&gUnknown_085B1EE8[0]);
LoadSpritePalettes(gUnknown_085B1EF8); LoadSpritePalettes(gUnknown_085B1EF8);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
EnableInterrupts(DISPSTAT_VBLANK); EnableInterrupts(DISPSTAT_VBLANK);
SetVBlankCallback(VblankCB_StarterChoose); SetVBlankCallback(VblankCB_StarterChoose);
src/title_screen.c
+5 -5
View File
@@ -575,7 +575,7 @@ void CB2_InitTitleScreen(void)
break; break;
} }
case 3: case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF); BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, RGB_WHITEALPHA);
SetVBlankCallback(VBlankCB); SetVBlankCallback(VBlankCB);
gMain.state = 4; gMain.state = 4;
break; break;
@@ -725,7 +725,7 @@ static void Task_TitleScreenPhase3(u8 taskId)
if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & START_BUTTON)) if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & START_BUTTON))
{ {
FadeOutBGM(4); FadeOutBGM(4);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITEALPHA);
SetMainCallback2(CB2_GoToMainMenu); SetMainCallback2(CB2_GoToMainMenu);
} }
else if ((gMain.heldKeys & CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO) else if ((gMain.heldKeys & CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO)
@@ -736,13 +736,13 @@ static void Task_TitleScreenPhase3(u8 taskId)
&& CanResetRTC() == TRUE) && CanResetRTC() == TRUE)
{ {
FadeOutBGM(4); FadeOutBGM(4);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
SetMainCallback2(CB2_GoToResetRtcScreen); SetMainCallback2(CB2_GoToResetRtcScreen);
} }
else if ((gMain.heldKeys & BERRY_UPDATE_BUTTON_COMBO) == BERRY_UPDATE_BUTTON_COMBO) else if ((gMain.heldKeys & BERRY_UPDATE_BUTTON_COMBO) == BERRY_UPDATE_BUTTON_COMBO)
{ {
FadeOutBGM(4); FadeOutBGM(4);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
SetMainCallback2(CB2_GoToBerryFixScreen); SetMainCallback2(CB2_GoToBerryFixScreen);
} }
else else
@@ -759,7 +759,7 @@ static void Task_TitleScreenPhase3(u8 taskId)
UpdateLegendaryMarkingColor(gTasks[taskId].tCounter); UpdateLegendaryMarkingColor(gTasks[taskId].tCounter);
if ((gMPlayInfo_BGM.status & 0xFFFF) == 0) if ((gMPlayInfo_BGM.status & 0xFFFF) == 0)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITEALPHA);
SetMainCallback2(CB2_GoToCopyrightScreen); SetMainCallback2(CB2_GoToCopyrightScreen);
} }
} }
src/trade.c
+3 -3
View File
@@ -1626,7 +1626,7 @@ static void sub_80773D0(void)
if (sub_8010500()) if (sub_8010500())
{ {
gMain.state++; gMain.state++;
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
} }
@@ -1820,7 +1820,7 @@ static void sub_8077B74(void)
case 5: case 5:
if (gWirelessCommType) if (gWirelessCommType)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
gMain.state++; gMain.state++;
@@ -4246,7 +4246,7 @@ void sub_807AE50(void)
{ {
if (gWirelessCommType) if (gWirelessCommType)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
} }
SetMainCallback2(sub_807EA2C); SetMainCallback2(sub_807EA2C);
src/trainer_card.c
+2 -1
View File
@@ -30,6 +30,7 @@
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/rgb.h"
enum enum
{ {
@@ -381,7 +382,7 @@ static void sub_80C2760(u8 taskId)
case 7: case 7:
if (gWirelessCommType == 1 && gReceivedRemoteLinkPlayers == TRUE) if (gWirelessCommType == 1 && gReceivedRemoteLinkPlayers == TRUE)
{ {
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(230, 150); CreateWirelessStatusIndicatorSprite(230, 150);
} }
BlendPalettes(0xFFFFFFFF, 16, sData->var_52C); BlendPalettes(0xFFFFFFFF, 16, sData->var_52C);
src/union_room.c
+6 -6
View File
@@ -1406,7 +1406,7 @@ void sub_8012780(u8 taskId)
switch (sub_80170B8(&data->textState, sub_801064C(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName))) switch (sub_80170B8(&data->textState, sub_801064C(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName)))
{ {
case 0: case 0:
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
data->field_19 = 5; data->field_19 = 5;
sub_8010688(5, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); sub_8010688(5, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName);
@@ -2132,7 +2132,7 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id)
void sub_8013BD8(struct UnkStruct_Group *data, s32 id) void sub_8013BD8(struct UnkStruct_Group *data, s32 id)
{ {
data->field_F = id; data->field_F = id;
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
RedrawListMenu(data->listTaskId); RedrawListMenu(data->listTaskId);
sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]);
@@ -2784,7 +2784,7 @@ void sub_8014A40(u8 taskId)
switch (mevent_message_print_and_prompt_yes_no(&data->textState, &data->field_14, 0, gStringVar4)) switch (mevent_message_print_and_prompt_yes_no(&data->textState, &data->field_14, 0, gStringVar4))
{ {
case 0: case 0:
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
data->field_0->arr[data->field_13].field_1B = 0; data->field_0->arr[data->field_13].field_1B = 0;
RedrawListMenu(data->listTaskId); RedrawListMenu(data->listTaskId);
@@ -2987,7 +2987,7 @@ void sub_8014F48(u8 taskId)
if (data->field_0->arr[id].field_1A_0 == 1 && !data->field_0->arr[id].unk.field_0.unk_0a_7) if (data->field_0->arr[id].field_1A_0 == 1 && !data->field_0->arr[id].unk.field_0.unk_0a_7)
{ {
data->field_F = id; data->field_F = id;
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
RedrawListMenu(data->listTaskId); RedrawListMenu(data->listTaskId);
sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]);
@@ -3150,7 +3150,7 @@ void sub_80152F4(u8 taskId)
{ {
data->field_F = 0; data->field_F = 0;
data->field_14 = 0; data->field_14 = 0;
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0); CreateWirelessStatusIndicatorSprite(0, 0);
sub_8011FC8(data->field_0->arr[0].unk.playerName, ReadAsU16(data->field_0->arr[0].unk.field_0.unk_00.playerTrainerId)); sub_8011FC8(data->field_0->arr[0].unk.playerName, ReadAsU16(data->field_0->arr[0].unk.field_0.unk_00.playerTrainerId));
PlaySE(SE_PN_ON); PlaySE(SE_PN_ON);
@@ -3907,7 +3907,7 @@ void sub_80156E0(u8 taskId)
} }
break; break;
case 53: case 53:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK);
data->state = 54; data->state = 54;
break; break;
case 54: case 54:
src/union_room_chat.c
+1 -1
View File
@@ -281,7 +281,7 @@ static void c2_081284E0(void)
SetMainCallback2(sub_801DF38); SetMainCallback2(sub_801DF38);
gUnknown_02022C84->unkE = CreateTask(sub_801DF54, 8); gUnknown_02022C84->unkE = CreateTask(sub_801DF54, 8);
gUnknown_02022C84->unkF = CreateTask(sub_801F2B4, 7); gUnknown_02022C84->unkF = CreateTask(sub_801F2B4, 7);
LoadWirelessStatusIndicatorSprite(); LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(232, 150); CreateWirelessStatusIndicatorSprite(232, 150);
} }
break; break;
src/unk_transition.c
+2 -1
View File
@@ -8,6 +8,7 @@
#include "trig.h" #include "trig.h"
#include "bg.h" #include "bg.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "constants/rgb.h"
typedef bool8 (*TransitionStateFunc)(struct Task *task); typedef bool8 (*TransitionStateFunc)(struct Task *task);
@@ -361,7 +362,7 @@ static bool8 sub_81DAB4C(struct Task *task)
{ {
if (task->data[3] == 31) if (task->data[3] == 31)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_BLACK);
task->tState++; task->tState++;
} }
else else
src/wallclock.c
+4 -3
View File
@@ -18,6 +18,7 @@
#include "trig.h" #include "trig.h"
#include "wallclock.h" #include "wallclock.h"
#include "window.h" #include "window.h"
#include "constants/rgb.h"
#include "constants/songs.h" #include "constants/songs.h"
// static declarations // static declarations
@@ -671,7 +672,7 @@ static void LoadWallClockGraphics(void)
static void WallClockInit(void) static void WallClockInit(void)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
EnableInterrupts(INTR_FLAG_VBLANK); EnableInterrupts(INTR_FLAG_VBLANK);
SetVBlankCallback(WallClockVblankCallback); SetVBlankCallback(WallClockVblankCallback);
SetMainCallback2(WallClockMainCallback); SetMainCallback2(WallClockMainCallback);
@@ -864,7 +865,7 @@ static void Task_SetClock4(u8 taskId)
static void Task_SetClock5(u8 taskId) static void Task_SetClock5(u8 taskId)
{ {
RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes); RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_SetClock6; gTasks[taskId].func = Task_SetClock6;
} }
@@ -896,7 +897,7 @@ static void Task_ViewClock2(u8 taskId)
static void Task_ViewClock3(u8 taskId) static void Task_ViewClock3(u8 taskId)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_ViewClock4; gTasks[taskId].func = Task_ViewClock4;
} }