Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
This commit is contained in:
+3
-3
@@ -18,7 +18,7 @@ extern u8 sub_808B980(u8 direction);
|
||||
extern u8 sub_808B9BC(u8 direction);
|
||||
extern u8 sub_808B9A4(u8 direction);
|
||||
extern u8 sub_808C1B4(u8 direction);
|
||||
extern u8 npc_use_some_d2s(u8 direction);
|
||||
extern u8 sub_808B9D4(u8 direction);
|
||||
extern void Overworld_ClearSavedMusic(void);
|
||||
extern void Overworld_PlaySpecialMapMusic(void);
|
||||
|
||||
@@ -575,7 +575,7 @@ static void AcroBikeTransition_Moving(u8 direction)
|
||||
}
|
||||
else
|
||||
{
|
||||
PlayerGoSpeed3(direction);
|
||||
PlayerRideWaterCurrent(direction);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -768,7 +768,7 @@ static void AcroBikeTransition_WheelieLoweringMoving(u8 direction)
|
||||
PlayerEndWheelie(direction);
|
||||
return;
|
||||
}
|
||||
npc_use_some_d2s(direction);
|
||||
sub_808B9D4(direction);
|
||||
}
|
||||
|
||||
void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys)
|
||||
|
||||
Reference in New Issue
Block a user