diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-09-09 20:30:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 20:30:41 +0200 |
| commit | e21b91cc2f48c4b6bf2cb2d8e97ea1d55c0163bb (patch) | |
| tree | 78530380aed8ddfdf706824bf2d557152ec8a94c /src/rom_8011DC0.c | |
| parent | 6454740587f9a97105c45d54bf4284015a20d6d1 (diff) | |
| parent | 135e98a82493b2538c030af9b327cb104e27a3dd (diff) | |
Merge pull request #12 from Slawter666/factory-data
Move battle factory data to C
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) |