diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
| commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
| tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /src/new_game.c | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
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(); } |