diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-13 14:25:52 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-13 14:25:52 -0400 |
| commit | 23c07589f5c515cbf16db08881142b6ae76dc5ee (patch) | |
| tree | e014266f2a4007fc05cecd79c7d2558d5b40978c /src/overworld.c | |
| parent | aa202b06245aa4c65f10379ecf9dc8c440a049ed (diff) | |
| parent | 3dce3407d5f9bca69d61b1cf1b314fb1e921d572 (diff) | |
Merge remote-tracking branch 'origin/master' into sync_bery_crush
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/overworld.c b/src/overworld.c index 47b629817..a330ace3e 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -151,7 +151,7 @@ static void InitOverworldGraphicsRegisters(void); static void sub_8057024(bool32 a0); static void sub_8057074(void); static void mli4_mapscripts_and_other(void); -static void sub_8057100(void); +static void ReloadObjectsAndRunReturnToFieldMapScript(void); static void sub_8057114(void); static void SetCameraToTrackGuestPlayer(void); static void SetCameraToTrackGuestPlayer_2(void); @@ -1933,7 +1933,7 @@ static bool32 sub_8056CD8(u8 *state) InitOverworldBgs(); QuestLog_InitPalettesBackup(); sub_8057024(FALSE); - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); sub_8057114(); (*state)++; break; @@ -1971,7 +1971,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) break; case 2: CreateLinkPlayerSprites(); - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); SetCameraToTrackGuestPlayer_2(); SetHelpContextForMap(); (*state)++; @@ -2141,9 +2141,9 @@ static void mli4_mapscripts_and_other(void) TryRunOnWarpIntoMapScript(); } -static void sub_8057100(void) +static void ReloadObjectsAndRunReturnToFieldMapScript(void) { - sub_805EDF0(0, 0); + ReloadMapObjectsWithOffset(0, 0); RunOnReturnToFieldMapScript(); } @@ -2267,7 +2267,7 @@ static bool32 LoadMap_QLPlayback(u8 *state) (*state)++; break; case 3: - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); sub_8057114(); (*state)++; break; |