Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
dba2444
FRLG maps: Route 3, Route 4 and its Pokemon Center; walk where runnin…
dayfine Nov 3, 2026
5f6d7bd
Merge branch 'frlg/autostory-rng-loop' into frlg/maps-route3-route4
dayfine Nov 3, 2026
a281120
Merge branch 'frlg/autostory-rng-loop' into frlg/maps-route3-route4
dayfine Nov 3, 2026
c41f476
Merge branch 'frlg/autostory-rng-loop' into frlg/maps-route3-route4
dayfine Nov 3, 2026
5e2fb92
FRLG maps: test that no leg holds into Route 4's Pokemon Center escal…
dayfine Nov 3, 2026
18128ed
Merge frlg/autostory-rng-loop into frlg/maps-route3-route4
dayfine Nov 3, 2026
b434602
Merge frlg/autostory-rng-loop into frlg/maps-route3-route4
dayfine Nov 3, 2026
a7c1f08
Merge frlg/autostory-rng-loop into frlg/maps-route3-route4
dayfine Nov 3, 2026
81d4571
Merge frlg/autostory-rng-loop into frlg/maps-route3-route4
dayfine Nov 3, 2026
0a1203b
Merge frlg/autostory-rng-loop into frlg/maps-route3-route4
dayfine Nov 3, 2026
7aa96c9
Merge frlg/autostory-rng-loop into frlg/maps-route3-route4
dayfine Nov 3, 2026
b5c2e2b
FRLG maps tests: the player is found again on Route 3 and 4, and trai…
dayfine Nov 3, 2026
bbf1bb4
Merge remote-tracking branch 'origin/frlg/autostory-rng-loop' into HEAD
dayfine Nov 3, 2026
a7981f8
Merge frlg/autostory-rng-loop into frlg/maps-route3-route4
dayfine Nov 3, 2026
96a0225
Merge frlg/autostory-rng-loop (battle loop: end on the overworld afte…
dayfine Nov 3, 2026
3ae5c0d
Merge frlg/autostory-rng-loop (a disabled move, and a move list that …
dayfine Nov 3, 2026
4b26d97
Merge frlg/autostory-mvp (matchup attacks in every battle) into frlg/…
dayfine Nov 3, 2026
7d56dff
Merge frlg/autostory-mvp (HP bar share, nurse for yellow HP, move pro…
dayfine Nov 3, 2026
17ff939
Merge frlg/autostory-rng-loop (b401bab31: verify mode from #122) into…
dayfine Nov 3, 2026
ab0771f
Merge frlg/autostory-rng-loop (3961dd74f: battle sim from #120) into …
dayfine Nov 3, 2026
362a7ce
Merge frlg/autostory-rng-loop into frlg/maps-route3-route4
dayfine Nov 3, 2026
ffefa50
Merge frlg/autostory-rng-loop (TM moves in the summary reader) into f…
dayfine Nov 3, 2026
0e31773
Merge frlg/autostory-rng-loop (bag rows below an item the reader can'…
dayfine Nov 3, 2026
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 @@ -265,6 +265,11 @@
"side": "north",
"to_map": "Route24",
"offset": 12
},
{
"side": "west",
"to_map": "Route4",
"offset": 10
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"#.#############",
"###############",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"#############",
"#############",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"############",
"###########S",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"#############",
"######SS#####",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"#############",
"#############",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@
"side": "south",
"to_map": "Route2",
"offset": 12
},
{
"side": "east",
"to_map": "Route3",
"offset": 10
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"#############",
"####.....####",
Expand Down Expand Up @@ -61,7 +62,11 @@
"name": "camper",
"kind": "npc",
"x": 3,
"y": 8
"y": 8,
"facing": "east",
"trainer": {
"sight": 4
}
},
{
"name": "gym_guy",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"###########",
"###########",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"############################",
"############################",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"#.#############",
"###############",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,37 +103,61 @@
"name": "camper",
"kind": "npc",
"x": 12,
"y": 19
"y": 19,
"facing": "west",
"trainer": {
"sight": 2
}
},
{
"name": "lass",
"kind": "npc",
"x": 10,
"y": 22
"y": 22,
"facing": "east",
"trainer": {
"sight": 2
}
},
{
"name": "youngster",
"kind": "npc",
"x": 12,
"y": 25
"y": 25,
"facing": "west",
"trainer": {
"sight": 2
}
},
{
"name": "lass",
"kind": "npc",
"x": 10,
"y": 28
"y": 28,
"facing": "east",
"trainer": {
"sight": 2
}
},
{
"name": "bug_catcher",
"kind": "npc",
"x": 12,
"y": 31
"y": 31,
"facing": "west",
"trainer": {
"sight": 2
}
},
{
"name": "camper",
"kind": "npc",
"x": 5,
"y": 21
"y": 21,
"facing": "north",
"trainer": {
"sight": 5
}
},
{
"name": "item_ball",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
{
"name": "Route3",
"source": {
"decomp_file": "data/maps/Route3/map.json",
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"tiles": [
"####################################################################........########",
"####################################################################........########",
"####################################################################........########",
"#############......................#################################.......#########",
"###########..........................###############################.....###########",
"###########..........................######................#########.....###########",
"###########.........###.......##.....#####...................#######.....###########",
"###########vvv..vvvv###vvvvvvv##vvv..#####...................#######.....###########",
"#######.............###.......##.....#####vvvv..#######vvvvv.#######vvv..###########",
"....................###.......##................#######......#######.....###########",
"....................###.......###...............#######......#####.......~~~~#######",
".........###........###.......###~~~~~~~........#######...............##S~~~~~~#####",
"..##########vvvv..vv###vvvvvvv###~~~~~~~~~~~~~~########................~~~~~~~~#####",
"############........###.......###~~~~~~~~~~~~~~########................~~~~~~~~#####",
"############.................######~~~~~~~~~~~~########...............~~~~~~~~~#####",
"##############...............######~~~~~~~~~~~~##########.............~~~~~~~~~#####",
"#######################################~~~~~~~~##########.............~~~~~~########",
"####################################################################################",
"####################################################################################",
"####################################################################################"
],
"points": {},
"warps": [],
"objects": [
{
"name": "youngster",
"kind": "npc",
"x": 70,
"y": 13
},
{
"name": "lass",
"kind": "npc",
"x": 40,
"y": 11,
"wander": {
"x0": 40,
"y0": 10,
"x1": 40,
"y1": 12
},
"trainer": {
"sight": 3,
"looks": [
"north",
"south"
]
}
},
{
"name": "bug_catcher",
"kind": "npc",
"x": 32,
"y": 6,
"facing": "east",
"trainer": {
"sight": 4
}
},
{
"name": "lass",
"kind": "npc",
"x": 30,
"y": 3,
"facing": "west",
"trainer": {
"sight": 5
}
},
{
"name": "bug_catcher",
"kind": "npc",
"x": 25,
"y": 4,
"facing": "south",
"trainer": {
"sight": 2
}
},
{
"name": "youngster",
"kind": "npc",
"x": 29,
"y": 10,
"facing": "west",
"trainer": {
"sight": 5
}
},
{
"name": "lass",
"kind": "npc",
"x": 19,
"y": 9,
"facing": "west",
"trainer": {
"sight": 5
}
},
{
"name": "bug_catcher",
"kind": "npc",
"x": 12,
"y": 6,
"facing": "east",
"trainer": {
"sight": 3
}
},
{
"name": "youngster",
"kind": "npc",
"x": 17,
"y": 4,
"facing": "south",
"trainer": {
"sight": 2
}
}
],
"flag_sets": {},
"connections": [
{
"side": "north",
"to_map": "Route4",
"offset": 60
},
{
"side": "west",
"to_map": "PewterCity",
"offset": -10
}
]
}
Loading
Loading