diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 21:05:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 21:06:07 -0400 |
| commit | 22c795304d6c1edb568dfde9c6de2091d9470785 (patch) | |
| tree | a8649b3252b5838f5edf0468f7645ae078fcb057 /src/fieldmap.c | |
| parent | 8bbb75fba0d8dc81be6cfc88a4d7fd932efa900e (diff) | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 0e0ec246c..3ad190a4b 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -1,7 +1,7 @@ #include "global.h" #include "fieldmap.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "secret_base.h" #include "tv.h" @@ -31,7 +31,7 @@ static const struct ConnectionFlags sDummyConnectionFlags = {0}; struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection) { - return get_mapheader_by_bank_and_number(connection->mapGroup, connection->mapNum); + return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum); } void not_trainer_hill_battle_pyramid(void) |