dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve review comments, 2

Browse Source
This commit is contained in:
PikalaxALT
2020-01-22 16:04:23 -05:00
parent 390d7975b3
commit 84a93f8037
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/union_room.c
+1 -1
View File
@@ -2538,7 +2538,7 @@ static void sub_81186E0(u8 taskId)
{ {
u32 id = 0; u32 id = 0;
s32 var5 = 0; s32 var5 = 0;
s32 playerGender = 0; s32 playerGender = MALE;
struct UnkStruct_URoom * data = sUnionRoomMain.uRoom; struct UnkStruct_URoom * data = sUnionRoomMain.uRoom;
s16 *taskData = gTasks[taskId].data; s16 *taskData = gTasks[taskId].data;
src/union_room_battle.c
+5 -5
View File
@@ -51,7 +51,7 @@ static void sub_811C04C(void)
{ {
gEnemyParty[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1]; gEnemyParty[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1];
} }
for (i = 0; i < 6; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
ZeroMonData(&gPlayerParty[i]); ZeroMonData(&gPlayerParty[i]);
} }
@@ -121,8 +121,8 @@ void sub_811C1C8(void)
} }
DeactivateAllTextPrinters(); DeactivateAllTextPrinters();
ClearWindowTilemap(0); ClearWindowTilemap(0);
FillWindowPixelBuffer(0, 0x00); FillWindowPixelBuffer(0, PIXEL_FILL(0));
FillWindowPixelBuffer(0, 0x11); FillWindowPixelBuffer(0, PIXEL_FILL(1));
FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF); FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF);
TextWindow_SetStdFrame0_WithPal(0, 1, 0xD0); TextWindow_SetStdFrame0_WithPal(0, 1, 0xD0);
Menu_LoadStdPal(); Menu_LoadStdPal();
@@ -136,7 +136,7 @@ void sub_811C1C8(void)
} }
break; break;
case 2: case 2:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
ShowBg(0); ShowBg(0);
gMain.state++; gMain.state++;
break; break;
@@ -161,7 +161,7 @@ void sub_811C1C8(void)
{ {
if (gBlockRecvBuffer[0][0] == 0x51 && gBlockRecvBuffer[1][0] == 0x51) if (gBlockRecvBuffer[0][0] == 0x51 && gBlockRecvBuffer[1][0] == 0x51)
{ {
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gMain.state = 50; gMain.state = 50;
} }
else else