rebasing still difficult in 2021
This commit is contained in:
parent
2debc015b7
commit
e2c54986f7
@ -266,14 +266,6 @@ pub struct PlayerDonatedPB {
|
|||||||
recipient: u32,
|
recipient: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
#[pso_message(0x37)]
|
|
||||||
pub struct PlayerInitiatedPB {
|
|
||||||
pb_amount: u8,
|
|
||||||
unknown1: [u8; 4],
|
|
||||||
}
|
|
||||||
=======
|
|
||||||
>>>>>>> 799a9e68804633c24b47b759c75269f7106918cc
|
|
||||||
#[pso_message(0x39)]
|
#[pso_message(0x39)]
|
||||||
pub struct PlayerPBReady {
|
pub struct PlayerPBReady {
|
||||||
player: u16,
|
player: u16,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user