diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/union_room.c | 2 | ||||
| -rw-r--r-- | src/union_room_battle.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/union_room.c b/src/union_room.c index 40da25d2f..efb05d7ca 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -2538,7 +2538,7 @@ static void sub_81186E0(u8 taskId) { u32 id = 0; s32 var5 = 0; - s32 playerGender = 0; + s32 playerGender = MALE; struct UnkStruct_URoom * data = sUnionRoomMain.uRoom; s16 *taskData = gTasks[taskId].data; diff --git a/src/union_room_battle.c b/src/union_room_battle.c index 449aa8d57..b75cc086d 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -51,7 +51,7 @@ static void sub_811C04C(void) { gEnemyParty[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1]; } - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { ZeroMonData(&gPlayerParty[i]); } @@ -121,8 +121,8 @@ void sub_811C1C8(void) } DeactivateAllTextPrinters(); ClearWindowTilemap(0); - FillWindowPixelBuffer(0, 0x00); - FillWindowPixelBuffer(0, 0x11); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); + FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF); TextWindow_SetStdFrame0_WithPal(0, 1, 0xD0); Menu_LoadStdPal(); @@ -136,7 +136,7 @@ void sub_811C1C8(void) } break; case 2: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); ShowBg(0); gMain.state++; break; @@ -161,7 +161,7 @@ void sub_811C1C8(void) { 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; } else |