diff options
| author | huderlem <huderlem@gmail.com> | 2019-03-01 08:43:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 08:43:55 -0600 |
| commit | 3b04cfa437b093a21cdc5021843b5f52a124861e (patch) | |
| tree | 1e1e832d7852953a68d0d949dcb9fba61164e37c /src/rom_8011DC0.c | |
| parent | da0687987d8d4f6cb9a331f30553ffb806e74165 (diff) | |
| parent | 459fd93b59795c0c9c888584d38e82577e07c056 (diff) | |
Merge pull request #551 from Phlosioneer/multiplayer-stuff
Document overworld.c and link stuff in general
Diffstat (limited to 'src/rom_8011DC0.c')
| -rw-r--r-- | src/rom_8011DC0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index c8adfbe0b..27472b6e3 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -188,7 +188,7 @@ extern u8 gUnknown_02022C3E; extern u16 gUnknown_02022C3C; extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; -extern u8 gUnknown_03005DB4; +extern u8 gLocalLinkPlayerId; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; @@ -1641,7 +1641,7 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) gSpecialVar_0x8004 = arg4; VarSet(VAR_CABLE_CLUB_STATE, arg4); gFieldLinkPlayerCount = GetLinkPlayerCount(); - gUnknown_03005DB4 = GetMultiplayerId(); + gLocalLinkPlayerId = GetMultiplayerId(); SetCableClubWarp(); SetWarpDestination(mapGroup, mapNum, -1, x, y); WarpIntoMap(); @@ -1697,7 +1697,7 @@ void sub_801440C(u8 taskId) case 81: CleanupOverworldWindowsAndTilemaps(); gMain.savedCallback = sub_801AC54; - sub_81B8518(3); + InitChooseHalfPartyForBattle(3); break; case 1: CleanupOverworldWindowsAndTilemaps(); |