diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /src/fieldmap.c | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
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 b2b80a2df..21bbaa8f8 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -75,7 +75,7 @@ void InitBattlePyramidMap(bool8 setPlayerPosition) void InitTrainerHillMap(void) { CpuFastFill(0x03ff03ff, gBackupMapData, sizeof(gBackupMapData)); - sub_81D5FB4(gBackupMapData); + GenerateTrainerHillFloorLayout(gBackupMapData); } static void InitMapLayoutData(struct MapHeader *mapHeader) @@ -859,7 +859,7 @@ int sub_8088A4C(struct MapConnection *connection, int x, int y) return FALSE; } -struct MapConnection *sub_8088A8C(s16 x, s16 y) +struct MapConnection *GetConnectionAtCoords(s16 x, s16 y) { int count; struct MapConnection *connection; |