diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2019-02-12 00:40:42 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2019-02-12 00:40:42 -0600 |
commit | dfb896356cf46fd1679814c7d5cf8f1e31e34dee (patch) | |
tree | 0c38e9dc94b1ef531b7a740cd1a08c4a2d5e091c /src/fieldmap.c | |
parent | 449fb25f2372c8d51fc156d0eeeffa4023ec38b8 (diff) | |
parent | 16eff049a14be4f826edb8bc07929e6d5e4e4e0d (diff) |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/fieldmap.c')
-rw-r--r-- | src/fieldmap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index f67f61ede..7d9d079fc 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle_pyramid.h" #include "bg.h" #include "fieldmap.h" #include "fldeff.h" @@ -15,8 +16,6 @@ #include "tv.h" #include "constants/rgb.h" -extern void sub_81AA078(u16*, u8); - struct ConnectionFlags { u8 south:1; @@ -67,10 +66,10 @@ void InitMapFromSavedGame(void) UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height); } -void InitBattlePyramidMap(u8 a0) +void InitBattlePyramidMap(bool8 setPlayerPosition) { CpuFastFill(0x03ff03ff, gBackupMapData, sizeof(gBackupMapData)); - sub_81AA078(gBackupMapData, a0); + GenerateBattlePyramidFloorLayout(gBackupMapData, setPlayerPosition); } void InitTrainerHillMap(void) |