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/union_room_player_avatar.c | |
| parent | a4a3c1c9e5a0026415330eab9bea2f8f3e83e0a3 (diff) | |
| parent | 1f39c34ca47e43b0afccaabe97d1df19e3f0b39b (diff) | |
Merge pull request #1512 from GriffinRichards/minor-constants
Add some misc constants/usage
Diffstat (limited to 'src/union_room_player_avatar.c')
| -rw-r--r-- | src/union_room_player_avatar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 4fe470422..225386165 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -137,14 +137,14 @@ static u8 GetUnionRoomPlayerGraphicsId(u32 gender, u32 id) static void GetUnionRoomPlayerCoords(u32 leaderId, u32 memberId, s32 * x, s32 * y) { - *x = sUnionRoomPlayerCoords[leaderId][0] + sUnionRoomGroupOffsets[memberId][0] + 7; - *y = sUnionRoomPlayerCoords[leaderId][1] + sUnionRoomGroupOffsets[memberId][1] + 7; + *x = sUnionRoomPlayerCoords[leaderId][0] + sUnionRoomGroupOffsets[memberId][0] + MAP_OFFSET; + *y = sUnionRoomPlayerCoords[leaderId][1] + sUnionRoomGroupOffsets[memberId][1] + MAP_OFFSET; } static bool32 IsUnionRoomPlayerAt(u32 leaderId, u32 memberId, s32 x, s32 y) { - if ((sUnionRoomPlayerCoords[leaderId][0] + sUnionRoomGroupOffsets[memberId][0] + 7 == x) - && (sUnionRoomPlayerCoords[leaderId][1] + sUnionRoomGroupOffsets[memberId][1] + 7 == y)) + if ((sUnionRoomPlayerCoords[leaderId][0] + sUnionRoomGroupOffsets[memberId][0] + MAP_OFFSET == x) + && (sUnionRoomPlayerCoords[leaderId][1] + sUnionRoomGroupOffsets[memberId][1] + MAP_OFFSET == y)) return TRUE; else return FALSE; |