diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-29 09:27:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 09:27:45 -0400 |
| commit | 75ae00beff77e166c4ae573300ed5cb31175e8ac (patch) | |
| tree | ec15c56d3b09c2cec74ac907110c9111e18e8729 /src/fieldmap.c | |
| parent | d8c9214e0a911882daf28dec07204de3c3c2df80 (diff) | |
| parent | 9cfc34f2ec26d45085d9c4006b21406f8f968ed6 (diff) | |
Merge pull request #315 from PikalaxALT/overworld
Overworld
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 53a97629f..60c6f3dae 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -370,7 +370,7 @@ union Block s32 xprime; \ s32 yprime; \ \ - struct MapLayout *mapLayout = gMapHeader.mapLayout; \ + const struct MapLayout *mapLayout = gMapHeader.mapLayout; \ \ xprime = x - 7; \ xprime += 8 * mapLayout->borderWidth; \ @@ -485,7 +485,7 @@ void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2) } } -u32 GetBehaviorByMetatileIdAndMapLayout(struct MapLayout *mapLayout, u16 metatile, u8 attr) +u32 GetBehaviorByMetatileIdAndMapLayout(const struct MapLayout *mapLayout, u16 metatile, u8 attr) { u32 * attributes; @@ -732,7 +732,7 @@ bool8 CameraMove(s32 x, s32 y) old_y = gSaveBlock1Ptr->pos.y; connection = sub_8059600(direction, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y); sub_80594AC(connection, direction, x, y); - sub_8055864(connection->mapGroup, connection->mapNum); + LoadMapFromCameraTransition(connection->mapGroup, connection->mapNum); gCamera.active = TRUE; gCamera.x = old_x - gSaveBlock1Ptr->pos.x; gCamera.y = old_y - gSaveBlock1Ptr->pos.y; |