Reverse engineered many of the multiplayer events

Some corrections to the way events are handled and identified.
2019-02-10 20:42:50 -05:00
parent f2f1b1978b
commit e75f45dbcf
32 changed files with 412 additions and 350 deletions
--- a/src/trade.c
+++ b/src/trade.c
@@ -1507,13 +1507,13 @@ static void sub_80773D0(void)
        }
        break;
    case 3:
-        if (GetLinkPlayerCount_2() >= sub_800AA48())
+        if (GetLinkPlayerCount_2() >= GetSavedPlayerCount())
        {
            if (IsLinkMaster())
            {
                if (++gUnknown_0203229C->unk_A8 > 30)
                {
-                    sub_800A620();
+                    CheckShouldAdvanceLinkState();
                    gMain.state++;
                }
            }
@@ -4099,11 +4099,11 @@ void sub_807AE50(void)
        case 3:
            if (IsLinkMaster())
            {
-                if (GetLinkPlayerCount_2() >= sub_800AA48())
+                if (GetLinkPlayerCount_2() >= GetSavedPlayerCount())
                {
                    if (++gUnknown_020322A0->timer > 30)
                    {
-                        sub_800A620();
+                        CheckShouldAdvanceLinkState();
                        gMain.state++;
                    }
                }