diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-05-11 16:05:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 16:05:04 -0400 |
| commit | 0ccdd940f728d533ffff43288314cb2a3693d183 (patch) | |
| tree | 9759375214d042e1aea2d0c8b09793f5314cd53d /src/overworld.c | |
| parent | 4767019e4f541a19577a9bfd09851a94b2e3c745 (diff) | |
| parent | c05af7f3941ab1aae6b45dfd0290b0d378a4aa72 (diff) | |
Merge pull request #429 from PikalaxALT/doc_field_effect_templates
Document field effect graphics
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 2083b7578..66ca5e336 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; |