diff options
| author | Garak <thomastaps194@comcast.net> | 2018-06-24 13:45:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 13:45:15 -0400 |
| commit | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (patch) | |
| tree | 594590b12dc14049b9c17587d8b602686a4c57fa /src/overworld.c | |
| parent | ac636ec14e896214b549025e671fc6ae7f6fd045 (diff) | |
| parent | 4313b2f49d22f4e5a6db3c45f9f3a434079a7c1f (diff) | |
Merge pull request #1 from pret/master
upstream merge
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/overworld.c b/src/overworld.c index d993d6cac..f6dea1271 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1805,7 +1805,7 @@ void sub_8054D4C(u32 a1) ScanlineEffect_Clear(); ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); - sub_805C7C4(0); + InitEventObjectPalettes(0); FieldEffectActiveListClear(); InitFieldMessageBox(); StartWeather(); @@ -1819,7 +1819,7 @@ void sub_8054D90(void) { gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - sub_805AA98(); + ResetEventObjects(); TrySpawnEventObjects(0, 0); mapheader_run_first_tag4_script_list_match(); } @@ -1830,7 +1830,7 @@ void mli4_mapscripts_and_other(void) struct InitialPlayerAvatarState *initialPlayerAvatarState; gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - sub_805AA98(); + ResetEventObjects(); sav1_camera_get_focus_coords(&x, &y); initialPlayerAvatarState = GetInitialPlayerAvatarState(); InitPlayerAvatar(x, y, initialPlayerAvatarState->direction, gSaveBlock2.playerGender); |