summaryrefslogtreecommitdiff
path: root/src/union_room.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-04-10 12:48:58 -0400
committerGitHub <noreply@github.com>2020-04-10 12:48:58 -0400
commit2880cf2a51ea36fa36f00d9ecf07177e5955c882 (patch)
tree331837d61614da6f73e983a7230796ace13c9ea6 /src/union_room.c
parenta81edaba1d5e0f84336fd8a57a48b2a970171ba4 (diff)
parent5f7ed93363db01da8667aadf47d78cb6515bb450 (diff)
Merge pull request #323 from PikalaxALT/various_documentation
Document various parts of the source tree
Diffstat (limited to 'src/union_room.c')
-rw-r--r--src/union_room.c4
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.