diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-25 21:07:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-25 21:07:18 -0500 |
| commit | 78864c88bb4f1e2f7a1894528db3714913cc84ca (patch) | |
| tree | 7d9e646e984522e7eb9b3d0752e8277c34070eb6 /src/union_room.c | |
| parent | a09e66b53f61027d8805e5d6bb4df3d679693485 (diff) | |
| parent | 52fbc43d73995977aa8f6c45405a91c68d515061 (diff) | |
Merge pull request #240 from PikalaxALT/union_room_chat
Union room chat
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 4e3428cc6..f942fb7d3 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1852,7 +1852,7 @@ static void sub_81175BC(u8 taskId) sub_80F8D14(); SetHostRFUtgtGname(69, 0, 1); } - sub_8128420(); + EnterUnionRoomChat(); break; case 8: case 72: @@ -3385,7 +3385,7 @@ static void sub_81199FC(u8 taskId) case 2: if (sUnionRoomPlayerName[0] == EOS) { - for (i = 0; i < PLAYER_NAME_LENGTH; i++) + for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) { if (structPtr->field_0->arr[i].field_1A_0 == 1) { |