Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d0bb65b
FRLG maps: Cerulean's Mart and Gym, Route 25 and Bill's Sea Cottage
dayfine Nov 3, 2026
db245ba
FRLG AutoStory: 00.14 to Cerulean, 00.15 the rival, 00.16 Nugget Bridge
dayfine Nov 3, 2026
d5589b7
FRLG OverworldSim: Route 4 to Cerulean, and Nugget Bridge's trainers
dayfine Nov 3, 2026
fa1cbba
Merge frlg/mt-moon-story into frlg/cerulean-story
dayfine Nov 3, 2026
b515f75
FRLG AutoStory 00.14: hop Route 4's ledge to reach Cerulean by land
dayfine Nov 3, 2026
8e783a3
Merge frlg/mt-moon-story into frlg/cerulean-story
dayfine Nov 3, 2026
2e35eda
FRLG AutoStory 00.15: Potions at Cerulean's Mart and a GRIND to Lv22 …
dayfine Nov 3, 2026
e038ee5
Merge frlg/mt-moon-story into frlg/cerulean-story
dayfine Nov 3, 2026
6ced810
Merge frlg/mt-moon-story (battle loop: end on the overworld after RUN…
dayfine Nov 3, 2026
ca88ead
Merge frlg/mt-moon-story (walker: a battle's black after any leg, or …
dayfine Nov 3, 2026
8833fa6
Merge frlg/mt-moon-story (sim tests: Mt. Moon B2F's black after "east…
dayfine Nov 3, 2026
0171acf
Merge frlg/mt-moon-story (a cave's floor closed on one side is wild) …
dayfine Nov 3, 2026
ed45ffc
Merge frlg/mt-moon-story (the B2F sim test's leg forced unmarked) int…
dayfine Nov 3, 2026
3265167
Merge frlg/mt-moon-story (a disabled move, and a move list that never…
dayfine Nov 3, 2026
6b2137d
FRLG 00.14: into Cerulean by legs to walls, not an open leg on
dayfine Nov 3, 2026
2b3c426
Merge frlg/autostory-mvp (matchup attacks in every battle) into frlg/…
dayfine Nov 3, 2026
6ae3af9
Merge frlg/mt-moon-story (HP bar share, nurse for yellow HP, move pro…
dayfine Nov 3, 2026
5d86cc9
Merge frlg/mt-moon-story (79265c8ce: verify mode from #122) into frlg…
dayfine Nov 3, 2026
bdf777b
FRLG AutoStory: 00.15b, the rival in Cerulean as its own checkpoint
dayfine Nov 3, 2026
c6f6e7e
Merge frlg/mt-moon-story (6ec171b84: battle sim from #120) into frlg/…
dayfine Nov 3, 2026
ddb0dc6
Merge frlg/mt-moon-story into frlg/cerulean-story
dayfine Nov 3, 2026
2cb05a3
Merge frlg/mt-moon-story (the console's TEACH through the TM CASE) in…
dayfine Nov 3, 2026
cf7e173
FRLG AutoStory: test that 00.15b first teaches Water Pulse if it isn'…
dayfine Nov 3, 2026
278fb46
FRLG AutoStory: 00.15b teaches Water Pulse over Tail Whip first, if n…
dayfine Nov 3, 2026
22e4788
Merge frlg/mt-moon-story (GRIND until the boss is winnable; TEACH ski…
dayfine Nov 3, 2026
cd6d4e6
FRLG AutoStory 00.15: Water Pulse first, then GRIND until the rival i…
dayfine Nov 3, 2026
ac7104e
Merge frlg/mt-moon-story (GRIND/CAPTURE missed flash, TEACH after-for…
dayfine Nov 3, 2026
62ef840
Merge frlg/mt-moon-story (bag rows below an item the reader can't nam…
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 @@ -70,6 +70,7 @@ class PlaceNameMatcher : public OCR::SmallDictionaryMatcher{
{"route-2", "Route 2"},
{"route-3", "Route 3"},
{"route-4", "Route 4"},
{"cerulean-city", "Cerulean City"},
}){
JsonArray names;
names.push_back(name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
*
* Reads where the game would be saved: the place name in blue at the top
* of the card the START menu's SAVE shows ("PALLET TOWN" over PLAYER,
* BADGES and TIME). It knows the places from a new game to Route 4, in
* English only so far: in another language nothing is read. Route 3 and
* Route 4 have no test capture yet.
* BADGES and TIME). It knows the places from a new game to Route 4, and
* Cerulean City, in English only so far: in another language nothing is
* read. Route 3, Route 4 and Cerulean City have no test capture yet.
*
*/

Expand All @@ -31,7 +31,7 @@ namespace PokemonFRLG{
ImageFloatBox save_card_title_box();

// The place on the save card: "pallet-town", "viridian-city",
// "viridian-forest", "pewter-city", "route-1" to "route-4"; empty if it
// "viridian-forest", "pewter-city", "route-1" to "route-4", "cerulean-city"; empty if it
// can't be read, as in a language the reader has no names for.
std::string read_save_card_location(Logger& logger, Language language, const ImageViewRGB32& screen);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
],
"points": {
"warp_3": [22, 19],
"warp_4": [31, 21],
"warp_6": [29, 28],
"warp_7": [1, 12]
},
"warps": [
Expand Down Expand Up @@ -119,7 +121,9 @@
{
"x": 31,
"y": 21,
"enter": "walk_into"
"enter": "walk_into",
"to_map": "CeruleanCity_Gym",
"to_point": "warp_1"
},
{
"x": 13,
Expand All @@ -129,7 +133,9 @@
{
"x": 29,
"y": 28,
"enter": "walk_into"
"enter": "walk_into",
"to_map": "CeruleanCity_Mart",
"to_point": "warp_1"
},
{
"x": 1,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
{
"name": "CeruleanCity_Gym",
"source": {
"decomp_file": "data/maps/CeruleanCity_Gym/map.json",
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"#################",
"#####w#w.w#w#####",
"#################",
"#...............#",
"#......www......#",
"#.wwwwwwwwwwwww.#",
"#.wwwww...wwwww.#",
"#.ww.........ww.#",
"#.wwwww...ww.ww.#",
"#.wwwwwwwwww.ww.#",
"#.ww.........ww.#",
"#.ww.wwww.wwwww.#",
"#.ww.wwww.wwwww.#",
"#.ww......wwwww.#",
"#.wwwwwww.wwwww.#",
"#.wwwwwww.wwwww.#",
"#.wwww.....wwww.#",
"#.wwwwS...Swwww.#",
"#...............#",
"#################"
],
"elevation": [
"00000000000000000",
"00000000000000000",
"00000000000000000",
"03333333333333330",
"03333331113333330",
"03111111111111130",
"03111113331111130",
"03113333333331130",
"03111113331131130",
"03111111111131130",
"03113333333331130",
"03113111131111130",
"03113111130111130",
"03113333331111130",
"03111111131111130",
"03111111131111130",
"03111133333111130",
"03111103330111130",
"03333333333333330",
"00000000000000000"
],
"points": {
"misty_front": [8, 7],
"warp_1": [8, 18]
},
"warps": [
{
"x": 7,
"y": 18,
"enter": "walk_into",
"to_map": "CeruleanCity",
"to_point": "warp_4"
},
{
"x": 8,
"y": 18,
"enter": "walk_south",
"to_map": "CeruleanCity",
"to_point": "warp_4"
},
{
"x": 9,
"y": 18,
"enter": "walk_into",
"to_map": "CeruleanCity",
"to_point": "warp_4"
}
],
"objects": [
{
"name": "swimmer_m_water",
"kind": "npc",
"x": 10,
"y": 12,
"facing": "west",
"trainer": {
"sight": 1
}
},
{
"name": "picnicker",
"kind": "npc",
"x": 4,
"y": 7,
"facing": "east",
"trainer": {
"sight": 4
}
},
{
"name": "misty",
"kind": "npc",
"x": 8,
"y": 6
},
{
"name": "gym_guy",
"kind": "npc",
"x": 7,
"y": 16
}
],
"flag_sets": {},
"connections": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"name": "CeruleanCity_Mart",
"source": {
"decomp_file": "data/maps/CeruleanCity_Mart/map.json",
"revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982",
"date": "2026-10-31"
},
"allow_running": false,
"tiles": [
"###########",
"###########",
"##.#......#",
"...#.......",
"####...##.#",
".......##.#",
".##....##.#",
"...........",
"###########"
],
"elevation": [
"00000000000",
"00000000000",
"00303333330",
"33003333333",
"00003330030",
"33333330030",
"30033330030",
"33333333333",
"00000000000"
],
"points": {
"clerk_front": [4, 3],
"warp_1": [4, 7]
},
"warps": [
{
"x": 3,
"y": 7,
"enter": "walk_into",
"to_map": "CeruleanCity",
"to_point": "warp_6"
},
{
"x": 4,
"y": 7,
"enter": "walk_south",
"to_map": "CeruleanCity",
"to_point": "warp_6"
},
{
"x": 5,
"y": 7,
"enter": "walk_into",
"to_map": "CeruleanCity",
"to_point": "warp_6"
}
],
"objects": [
{
"name": "clerk",
"kind": "npc",
"x": 2,
"y": 3
},
{
"name": "woman_1",
"kind": "npc",
"x": 9,
"y": 2,
"wander": {
"x0": 5,
"y0": 2,
"x1": 10,
"y1": 2
}
},
{
"name": "youngster",
"kind": "npc",
"x": 1,
"y": 7
}
],
"flag_sets": {},
"connections": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@
"side": "south",
"to_map": "CeruleanCity",
"offset": -12
},
{
"side": "east",
"to_map": "Route25",
"offset": 0
}
]
}
Loading
Loading