atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed fly callback logic.

Browse source
This commit is contained in:
Ariel Antonitis 2020-06-16 22:05:52 -04:00
parent 69ae5b18c0
commit acdeb438a8
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/overworld.c
View file

@ -1604,9 +1604,6 @@ static void CB2_LoadMapOnReturnToFieldCableClub(void)
void CB2_ReturnToField(void) void CB2_ReturnToField(void)
{ {
if (gFieldCallback == FieldCallback_Fly) { // Destroy follower if flying away
RemoveFollowingPokemon();
}
if (IsUpdateLinkStateCBActive() == TRUE) if (IsUpdateLinkStateCBActive() == TRUE)
{ {
SetMainCallback2(CB2_ReturnToFieldLink); SetMainCallback2(CB2_ReturnToFieldLink);
@ -1950,7 +1947,11 @@ static bool32 ReturnToFieldLocal(u8 *state)
sub_80867D8(); sub_80867D8();
ResumeMap(FALSE); ResumeMap(FALSE);
sub_8086A68(); sub_8086A68();
UpdateFollowingPokemon(); // TODO: Update all dynamic graphicsIds if (gFieldCallback == FieldCallback_Fly) {
RemoveFollowingPokemon();
} else {
UpdateFollowingPokemon(); // TODO: Update all dynamic graphicsIds
}
SetCameraToTrackPlayer(); SetCameraToTrackPlayer();
(*state)++; (*state)++;
break; break;