diff --git a/src/union_room.c b/src/union_room.c index 4748f037d..71a4ed004 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -199,7 +199,6 @@ static EWRAM_DATA union struct WirelessLink_Group *group; struct WirelessLink_URoom *uRoom; } sWirelessLinkMain = {}; -static EWRAM_DATA u32 sUnused = 0; EWRAM_DATA struct RfuGameCompatibilityData gRfuPartnerCompatibilityData = {}; EWRAM_DATA u16 gUnionRoomOfferedSpecies = SPECIES_NONE; EWRAM_DATA u8 gUnionRoomRequestedMonType = TYPE_NORMAL; @@ -971,9 +970,6 @@ static void Task_TryJoinLinkGroup(u8 taskId) id = ListMenu_ProcessInput(data->listTaskId); if (JOY_NEW(A_BUTTON) && id != LIST_NOTHING_CHOSEN) { - // this unused variable along with the assignment is needed to match - u32 activity = data->playerList->players[id].rfu.data.activity; - if (data->playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_IN && !data->playerList->players[id].rfu.data.startedActivity) { u32 readyStatus = IsTryingToTradeAcrossVersionTooSoon(data, id); @@ -1641,7 +1637,6 @@ static void Task_StartActivity(u8 taskId) static void Task_RunScriptAndFadeToActivity(u8 taskId) { s16 *data = gTasks[taskId].data; - u16 *sendBuff = (u16 *)(gBlockSendBuffer); switch (data[0]) { @@ -1969,9 +1964,6 @@ static void Task_CardOrNewsWithFriend(u8 taskId) id = ListMenu_ProcessInput(data->listTaskId); if (JOY_NEW(A_BUTTON) && id != LIST_NOTHING_CHOSEN) { - // this unused variable along with the assignment is needed to match - u32 activity = data->playerList->players[id].rfu.data.activity; - if (data->playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_IN && !data->playerList->players[id].rfu.data.startedActivity) { data->leaderId = id; @@ -3892,7 +3884,7 @@ static s32 UnionRoomGetPlayerInteractionResponse(struct RfuPlayerList * list, bo { CopyAndTranslatePlayerName2(gStringVar1, *player); if (overrideGender) - playerGender = (player->rfu.data.compatibility.playerTrainerId[overrideGender + 1] >> 3) & 1; + playerGender = (player->rfu.data.compatibility.playerTrainerId[overrideGender - 1] >> 3) & 1; switch (player->rfu.data.activity & 0x3F) { diff --git a/src/union_room_chat_display.c b/src/union_room_chat_display.c index 9588fed93..25066f123 100644 --- a/src/union_room_chat_display.c +++ b/src/union_room_chat_display.c @@ -1268,7 +1268,7 @@ static void LoadUnionRoomChatPanelGfx(void) static void LoadLinkMiscMenuGfx(void) { - u8 *ptr; + u8 UNUSED *ptr; LoadPalette(gUnionRoomChat_Bg_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP); ptr = DecompressAndCopyTileDataToVram(2, gUnionRoomChat_Bg_Gfx, 0, 0, 0); diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 91136a51f..c112bbf5d 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -723,23 +723,11 @@ static void VsSeekerResetInBagStepCounter(void) gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00; } -static void VsSeekerSetStepCounterInBagFull(void) -{ - gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00; - gSaveBlock1Ptr->trainerRematchStepCounter |= 100; -} - static void VsSeekerResetChargingStepCounter(void) { gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF; } -static void VsSeekerSetStepCounterFullyCharged(void) -{ - gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF; - gSaveBlock1Ptr->trainerRematchStepCounter |= (100 << 8); -} - void Task_VsSeeker_0(u8 taskId) { u8 i;