diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-18 13:09:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 13:09:19 -0600 |
| commit | e8415c51d199dd19ed122fef57ff5d09971cc5ea (patch) | |
| tree | ab117a11b93c66c0c333300b2e053a77275bae8e /src/overworld.c | |
| parent | 032dd251e628debd1ec7774fa42b6e7d39b3d83b (diff) | |
| parent | f2d3babd30c51b79c48d065f809273a10929a2ee (diff) | |
Merge pull request #387 from DizzyEggg/battle_pyramid
Battle pyramid
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/overworld.c b/src/overworld.c index 69ac9c822..5c0a06f38 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1,5 +1,6 @@ #include "global.h" #include "overworld.h" +#include "battle_pyramid.h" #include "battle_setup.h" #include "berry.h" #include "bg.h" @@ -113,7 +114,6 @@ extern void ShowMapNamePopup(void); extern bool32 InTrainerHill(void); extern bool32 sub_808651C(void); extern bool8 sub_80AF6A4(void); -extern bool8 sub_81A9E6C(void); extern bool8 sub_80E909C(void); extern void sub_81AA1D8(void); extern void c2_change_map(void); @@ -1808,7 +1808,7 @@ static void InitCurrentFlashLevelScanlineEffect(void) { u8 flashLevel; - if (sub_81A9E6C()) + if (InBattlePyramid_()) { door_upload_tiles(); ScanlineEffect_SetParams(sFlashEffectParams); |