diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/union_room.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/union_room.c b/src/union_room.c index 7bace05ef..ea9b213ab 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1789,7 +1789,7 @@ static void Task_ExchangeCards(u8 taskId) { case 0: if (GetMultiplayerId() == 0) - sub_800A474(2); + Link_PrepareCmd0xCCCC_Rfu0xA100(2); gTasks[taskId].data[0]++; break; case 1: @@ -3461,7 +3461,7 @@ void InitUnionRoom(void) struct UnkStruct_URoom * ptr; sUnionRoomPlayerName[0] = EOS; - if (gQuestLogState == 2 || gQuestLogState == 3) + if (QL_IS_PLAYBACK_STATE) return; CreateTask(Task_InitUnionRoom, 0); sUnionRoomMain.uRoom = sUnionRoomMain.uRoom; // Needed to match. |