diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-04 23:31:37 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-04 23:31:37 +0100 |
| commit | 4c54212b1f559a110fc7f6fffebe3a54748f3fec (patch) | |
| tree | 9a15ec95345fdc22fd5d48580f0492695b8c036f /src/rom_8011DC0.c | |
| parent | 5c66b8a7eff886b72bb98e22b5b34421d1a601d2 (diff) | |
Bring labels for overworld.c over from pokeruby
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 b2bd2eb78..56c31f89f 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1637,7 +1637,7 @@ void sub_8014290(u16 arg0, u16 x, u16 y) VarSet(VAR_0x4087, arg0); Overworld_SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); saved_warp2_set_2(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); - warp_in(); + WarpIntoMap(); } void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) @@ -1648,7 +1648,7 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) gUnknown_03005DB4 = GetMultiplayerId(); sub_809D2BC(); Overworld_SetWarpDestination(mapGroup, mapNum, -1, x, y); - warp_in(); + WarpIntoMap(); } void sub_8014384(void) |