Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz committed 2019-11-19 10:26:40 +08:00
commit 1d3ae2fe78
188 files changed
+15683 -8215

No files matched your search

+1 -1
View File
@@ -1425,7 +1425,7 @@ static void sub_81120AC(u8 taskId)
break;
default:
if (gUnknown_203AE94.unk_0_6 == 1)
sub_8098110(1);
CreateMapNamePopupIfNotAlreadyRunning(1);
CpuCopy16(gUnknown_203AE90, gPlttBufferUnfaded, 0x400);
Free(gUnknown_203AE90);
gUnknown_203AE94 = (struct UnkStruct_203AE94){};