Fixed type-resisting berries trying to be consumed twice when triggered by a move called by another move, fixed bad old phone data conversion, fixed events of even sizes moving endlessly when approaching the player

This commit is contained in:
Maruno17
2024-02-15 21:16:15 +00:00
parent 86c92e7657
commit 3e167b9357
3 changed files with 16 additions and 7 deletions

View File

@@ -364,13 +364,13 @@ SaveData.register_conversion(:v21_replace_phone_data) do
@phoneNumbers.each do |contact|
if contact.length > 4
# Trainer
Phone.add_silent(contact[6], contact[7], contact[1], contact[2], contact[5], 0)
new_contact = Phone.get(contact[1], contact[2], 0)
@phone.add_silent(contact[6], contact[7], contact[1], contact[2], contact[5], 0)
new_contact = @phone.get(contact[1], contact[2], 0)
new_contact.visible = contact[0]
new_contact.rematch_flag = [contact[4] - 1, 0].max
else
# Non-trainer
Phone.add_silent(contact[3], contact[2], contact[1])
@phone.add_silent(contact[3], contact[2], contact[1])
end
end
@phoneNumbers = nil