diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-25 08:02:28 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 08:02:28 -0600 |
| commit | 84573f1774a710160af23f28ca436f6166f233c2 (patch) | |
| tree | bb4276827b6ba9019753f5dd477bda7693261b33 /src/rom_8011DC0.c | |
| parent | a5cf2b8090fb6638857b91f4f2a58c5584ca9335 (diff) | |
| parent | 4e5fae008625d236d98d4958594c938bc17f83da (diff) | |
Merge pull request #574 from Phlosioneer/event-vars
Event vars
Diffstat (limited to 'src/rom_8011DC0.c')
| -rw-r--r-- | src/rom_8011DC0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index baed26cf8..c8adfbe0b 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1630,7 +1630,7 @@ void sub_8014210(u16 battleFlags) void sub_8014290(u16 arg0, u16 x, u16 y) { - VarSet(VAR_0x4087, arg0); + VarSet(VAR_CABLE_CLUB_STATE, arg0); SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); SetDynamicWarpWithCoords(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); WarpIntoMap(); @@ -1639,7 +1639,7 @@ void sub_8014290(u16 arg0, u16 x, u16 y) void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) { gSpecialVar_0x8004 = arg4; - VarSet(VAR_0x4087, arg4); + VarSet(VAR_CABLE_CLUB_STATE, arg4); gFieldLinkPlayerCount = GetLinkPlayerCount(); gUnknown_03005DB4 = GetMultiplayerId(); SetCableClubWarp(); |