diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-17 11:32:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-17 11:32:30 -0400 |
| commit | 164590e37d67a385bf6479aafcbe5b351891bc0b (patch) | |
| tree | c3d4cac1627512d166440ead47d9f2285c8b4044 /src/overworld.c | |
| parent | a4a3c1c9e5a0026415330eab9bea2f8f3e83e0a3 (diff) | |
| parent | 1f39c34ca47e43b0afccaabe97d1df19e3f0b39b (diff) | |
Merge pull request #1512 from GriffinRichards/minor-constants
Add some misc constants/usage
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 8347c67a6..a8d9a4a83 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -683,7 +683,7 @@ void UpdateEscapeWarp(s16 x, s16 y) u8 currMapType = GetCurrentMapType(); u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum); if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE) - SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 6); + SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - MAP_OFFSET, y - MAP_OFFSET + 1); } void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) @@ -957,7 +957,7 @@ static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStr static u16 GetCenterScreenMetatileBehavior(void) { - return MapGridGetMetatileBehaviorAt(gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7); + return MapGridGetMetatileBehaviorAt(gSaveBlock1Ptr->pos.x + MAP_OFFSET, gSaveBlock1Ptr->pos.y + MAP_OFFSET); } bool32 Overworld_IsBikingAllowed(void) |