diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-14 09:52:56 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-14 09:52:56 -0400 |
| commit | a252140f3b462efbeaec392030479e9e12999f23 (patch) | |
| tree | bb85cfb66bc0aa970e9b27eedaa7d9894e83666f /src/new_game.c | |
| parent | 1112af4e1905135a7bc2dd53353b52762ff7d49a (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into mail
Diffstat (limited to 'src/new_game.c')
| -rw-r--r-- | src/new_game.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/new_game.c b/src/new_game.c index d01aa69d4..d0666dd71 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -29,7 +29,7 @@ extern u8 gUnknown_030060B0; // TODO: replace those declarations with file headers extern u16 GetGeneratedTrainerIdLower(void); extern void ClearContestWinnerPicsInContestHall(void); -extern void warp1_set(s8 mapBank, s8 mapNo, s8 warpNo, s8 xPos, s8 yPos); +extern void Overworld_SetWarpDestination(s8 mapBank, s8 mapNo, s8 warpNo, s8 xPos, s8 yPos); extern void warp_in(void); extern void sub_80BB358(void); extern void ResetBagScrollPositions(void); @@ -131,7 +131,7 @@ void sub_8084400(void) void WarpToTruck(void) { - warp1_set(25, 40, -1, -1, -1); // inside of truck + Overworld_SetWarpDestination(25, 40, -1, -1, -1); // inside of truck warp_in(); } |