diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
| commit | 7b8b5b5c8c02156d7cdaa76212ad68f01b1600c9 (patch) | |
| tree | 32b1c3ce14f272708fdc4b5b944a8dc9c14d07e3 /src/overworld.c | |
| parent | 27aae9da9a570b6787171e33fa29c43c507187c1 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into gflib
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/overworld.c b/src/overworld.c index 2f6898ee5..e32024c77 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1759,7 +1759,7 @@ void CB2_ContinueSavedGame(void) static void FieldClearVBlankHBlankCallbacks(void) { - if (warp0_in_pokecenter() == TRUE) + if (UsedPokemonCenterWarp() == TRUE) CloseLink(); if (gWirelessCommType != 0) @@ -2435,7 +2435,7 @@ static void UpdateAllLinkPlayers(u16 *keys, s32 selfId) struct TradeRoomPlayer trainer; s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < MAX_LINK_PLAYERS; i++) { u8 key = keys[i]; u16 setFacing = FACING_NONE; @@ -3026,7 +3026,7 @@ static s32 sub_80878E4(u8 linkPlayerId) static u8 GetLinkPlayerIdAt(s16 x, s16 y) { u8 i; - for (i = 0; i < 4; i++) + for (i = 0; i < MAX_LINK_PLAYERS; i++) { if (gLinkPlayerEventObjects[i].active && (gLinkPlayerEventObjects[i].movementMode == 0 || gLinkPlayerEventObjects[i].movementMode == 2)) |