Skip to content

Commit 646c65f

Browse files
author
Gin
committed
fix Wild Zone 20 after DLC
1 parent eba2645 commit 646c65f

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,16 @@ void move_map_cursor_from_entrance_to_zone(ConsoleHandle& console, ProController
297297
case WildZone::WILD_ZONE_19:
298298
pbf_move_left_joystick(context, 80, 255, 100ms, 0ms);
299299
break;
300-
case WildZone::WILD_ZONE_20:
300+
case WildZone::WILD_ZONE_20_NO_DISTORTION:
301301
pbf_move_left_joystick(context, 0, 90, 140ms, 0ms);
302302
break;
303+
case WildZone::WILD_ZONE_20_WITH_DISTORTION:
304+
// During the distortion happening on top of Lumiose Tower as part
305+
// of the Mega Dimension DLC story, the wild zone 20 fast travel
306+
// symbol on the map is moved to the entrance gate. So we only
307+
// need a tiny left joystick push.
308+
pbf_move_left_joystick(context, 100, 100, 100ms, 0ms);
309+
break;
303310
}
304311
pbf_wait(context, 300ms);
305312
}

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_Locations.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ enum class WildZone{
3131
WILD_ZONE_17,
3232
WILD_ZONE_18,
3333
WILD_ZONE_19,
34-
WILD_ZONE_20,
34+
WILD_ZONE_20_NO_DISTORTION,
35+
WILD_ZONE_20_WITH_DISTORTION,
3536
};
3637

3738
enum class WildZoneCafe{

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ WildZoneOption::WildZoneOption()
5656
{WildZone::WILD_ZONE_17, "wild-zone-17", "Wild Zone 17"},
5757
{WildZone::WILD_ZONE_18, "wild-zone-18", "Wild Zone 18"},
5858
{WildZone::WILD_ZONE_19, "wild-zone-19", "Wild Zone 19"},
59-
{WildZone::WILD_ZONE_20, "wild-zone-20", "Wild Zone 20"},
59+
{WildZone::WILD_ZONE_20_NO_DISTORTION, "wild-zone-20", "Wild Zone 20 No Distortion"},
60+
{WildZone::WILD_ZONE_20_WITH_DISTORTION, "wild-zone-20-distortion", "Wild Zone 20 With Distortion"},
6061
},
6162
LockMode::LOCK_WHILE_RUNNING,
6263
WildZone::WILD_ZONE_1

0 commit comments

Comments
 (0)