RGB Constants

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
+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)))
{
case 0:
LoadWirelessStatusIndicatorSprite();
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
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);
@@ -2132,7 +2132,7 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id)
void sub_8013BD8(struct UnkStruct_Group *data, s32 id)
{
data->field_F = id;
LoadWirelessStatusIndicatorSprite();
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
RedrawListMenu(data->listTaskId);
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))
{
case 0:
LoadWirelessStatusIndicatorSprite();
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
data->field_0->arr[data->field_13].field_1B = 0;
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)
{
data->field_F = id;
LoadWirelessStatusIndicatorSprite();
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
RedrawListMenu(data->listTaskId);
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_14 = 0;
LoadWirelessStatusIndicatorSprite();
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
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);
@@ -3907,7 +3907,7 @@ void sub_80156E0(u8 taskId)
}
break;
case 53:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK);
data->state = 54;
break;
case 54: