Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ static uint64_t magikarp_fixed_duration(Language language){
if (language == Language::French){
duration -= 1500;
}
if (language == Language::Japanese){
duration += 1500;
}
return duration;
}

Expand Down Expand Up @@ -184,6 +187,9 @@ void collect_magikarp_after_delay(ProControllerContext& context, uint64_t ingame
if (language != Language::French){
pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
}
if (language == Language::Japanese){
pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
}
pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - magikarp_fixed_duration(language)));
// Finish dialogue (hits the target advance)
pbf_press_button(context, BUTTON_A, 200ms, 3800ms);
Expand Down
Loading