Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions data/games/frlg/maps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,12 @@ A collision-free `MB_COUNTER` (PewterCity_Museum_1F (11, 5)) is floor: the
counter only lets the player talk across it.

NPCs and pickups keep source event, script and optional local-ID provenance.
Every object keeps its source movement as `movement`: the pret `movement_type`
and `[movement_range_x, movement_range_y]`. A person who walks on their own
(wanders, walks back and forth, or walks a sequence of directions) has a
`wander` box, their start tile +- range kept inside the map
(`IsCoordOutsideObjectEventMovementRange()`); back-and-forth walkers and
`*_UP_AND_DOWN`/`*_LEFT_AND_RIGHT` wanderers keep to their axis.
`source_event` is a zero-based source array index, not an in-game object ID.
An item ball's `item` and `quantity` come from the pinned catalog
(`data/maps/item-identities.json`) or, for a map it doesn't list, from the
Expand Down
43 changes: 39 additions & 4 deletions data/games/frlg/maps/base/CeladonCity.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
{
"name": "rocket_m",
"coord": [48, 15],
"movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]},
"wander": {"min": [44, 15], "max": [52, 15]},
"hide_flag": "FLAG_HIDE_CELADON_ROCKETS",
"source_event": 0,
Expand All @@ -156,44 +157,69 @@
{
"name": "fat_man",
"coord": [38, 14],
"movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]},
"source_event": 1,
"source_script": "CeladonCity_EventScript_FatMan",
"source_local_id": "LOCALID_CELADON_FAT_MAN"
},
{
"name": "poliwrath",
"coord": [36, 14],
"movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]},
"source_event": 2,
"source_script": "CeladonCity_EventScript_Poliwrath",
"source_local_id": "LOCALID_CELADON_POLIWRATH"
},
{"name": "little_girl", "coord": [11, 18], "source_event": 3, "source_script": "CeladonCity_EventScript_LittleGirl"},
{
"name": "little_girl",
"coord": [11, 18],
"movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "range": [4, 4]},
"wander": {"min": [7, 14], "max": [15, 22]},
"source_event": 3,
"source_script": "CeladonCity_EventScript_LittleGirl"
},
{
"name": "woman_2",
"coord": [18, 22],
"movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 5]},
"wander": {"min": [16, 17], "max": [20, 27]},
"source_event": 4,
"source_script": "CeladonCity_EventScript_Woman"
},
{"name": "old_man_1", "coord": [30, 24], "source_event": 5, "source_script": "CeladonCity_EventScript_OldMan2"},
{
"name": "old_man_1",
"coord": [30, 24],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"source_event": 5,
"source_script": "CeladonCity_EventScript_OldMan2"
},
{
"name": "old_man_2",
"coord": [26, 19],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"source_event": 6,
"source_script": "CeladonCity_EventScript_SoftboiledTutor"
},
{
"name": "rocket_m",
"coord": [38, 31],
"movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [5, 1]},
"wander": {"min": [33, 31], "max": [43, 31]},
"hide_flag": "FLAG_HIDE_CELADON_ROCKETS",
"source_event": 7,
"source_script": "CeladonCity_EventScript_RocketGrunt2"
},
{"name": "old_man_1", "coord": [9, 30], "source_event": 8, "source_script": "CeladonCity_EventScript_OldMan1"},
{
"name": "old_man_1",
"coord": [9, 30],
"movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]},
"source_event": 8,
"source_script": "CeladonCity_EventScript_OldMan1"
},
{
"name": "cut_tree",
"coord": [52, 22],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"hide_flag": "FLAG_TEMP_14",
"source_event": 9,
"source_script": "EventScript_CutTree",
Expand All @@ -202,14 +228,22 @@
{
"name": "cut_tree",
"coord": [40, 35],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"hide_flag": "FLAG_TEMP_13",
"source_event": 10,
"source_script": "EventScript_CutTree"
},
{"name": "boy", "coord": [25, 10], "source_event": 11, "source_script": "CeladonCity_EventScript_Boy"},
{
"name": "boy",
"coord": [25, 10],
"movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]},
"source_event": 11,
"source_script": "CeladonCity_EventScript_Boy"
},
{
"name": "scientist",
"coord": [47, 24],
"movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]},
"hide_flag": "FLAG_HIDE_CELADON_ROCKETS",
"source_event": 14,
"source_script": "CeladonCity_EventScript_SilphCoScientist"
Expand All @@ -220,6 +254,7 @@
"name": "item_ball",
"coord": [5, 3],
"source_event": 13,
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"hide_flag": "FLAG_HIDE_CELADON_CITY_ETHER",
"source_script": "CeladonCity_EventScript_ItemEther",
"item": "ether"
Expand Down
4 changes: 4 additions & 0 deletions data/games/frlg/maps/base/CeladonCity_Condominiums_1F.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,30 @@
{
"name": "meowth",
"coord": [1, 9],
"movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]},
"source_event": 0,
"source_script": "CeladonCity_Condominiums_1F_EventScript_Meowth"
},
{
"name": "clefairy",
"coord": [5, 13],
"movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]},
"wander": {"min": [4, 13], "max": [6, 13]},
"source_event": 1,
"source_script": "CeladonCity_Condominiums_1F_EventScript_Clefairy"
},
{
"name": "nidoran_f",
"coord": [5, 8],
"movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 1]},
"wander": {"min": [3, 7], "max": [7, 9]},
"source_event": 2,
"source_script": "CeladonCity_Condominiums_1F_EventScript_Nidoran"
},
{
"name": "old_woman",
"coord": [2, 9],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"source_event": 3,
"source_script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman"
}
Expand Down
2 changes: 2 additions & 0 deletions data/games/frlg/maps/base/CeladonCity_Condominiums_2F.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,15 @@
{
"name": "0",
"coord": [6, 6],
"movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]},
"hide_flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS",
"source_event": 0,
"source_script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika"
},
{
"name": "0",
"coord": [5, 6],
"movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]},
"hide_flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS",
"source_event": 1,
"source_script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika"
Expand Down
4 changes: 4 additions & 0 deletions data/games/frlg/maps/base/CeladonCity_Condominiums_3F.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,28 @@
{
"name": "rocker",
"coord": [0, 10],
"movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]},
"source_event": 0,
"source_script": "CeladonCity_Condominiums_3F_EventScript_Programmer"
},
{
"name": "man",
"coord": [3, 8],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"source_event": 1,
"source_script": "CeladonCity_Condominiums_3F_EventScript_Designer"
},
{
"name": "poke_maniac",
"coord": [4, 10],
"movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]},
"source_event": 2,
"source_script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist"
},
{
"name": "fat_man",
"coord": [0, 13],
"movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]},
"source_event": 3,
"source_script": "CeladonCity_Condominiums_3F_EventScript_Writer"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
{
"name": "black_belt",
"coord": [3, 5],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"source_event": 0,
"source_script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt"
}
Expand All @@ -52,6 +53,7 @@
"name": "item_ball",
"coord": [7, 3],
"source_event": 1,
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"hide_flag": "FLAG_HIDE_EEVEE_BALL",
"source_script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall",
"source_local_id": "LOCALID_EEVEE_POKEBALL",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
{
"name": "worker_f",
"coord": [6, 10],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"source_event": 0,
"source_script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist"
}
Expand Down
4 changes: 4 additions & 0 deletions data/games/frlg/maps/base/CeladonCity_DepartmentStore_5F.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,30 @@
{
"name": "gentleman",
"coord": [11, 6],
"movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]},
"wander": {"min": [10, 6], "max": [12, 6]},
"source_event": 0,
"source_script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman"
},
{
"name": "sailor",
"coord": [6, 8],
"movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]},
"wander": {"min": [5, 7], "max": [7, 9]},
"source_event": 1,
"source_script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor"
},
{
"name": "clerk",
"coord": [1, 7],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [2, 1]},
"source_event": 2,
"source_script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems"
},
{
"name": "clerk",
"coord": [1, 6],
"movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [2, 1]},
"source_event": 3,
"source_script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins"
}
Expand Down
18 changes: 17 additions & 1 deletion data/games/frlg/maps/base/CeladonCity_GameCorner.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,61 +124,77 @@
{
"name": "worker_f",
"coord": [4, 2],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"source_event": 0,
"source_script": "CeladonCity_GameCorner_EventScript_InfoClerk"
},
{
"name": "worker_m",
"coord": [6, 2],
"movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]},
"source_event": 1,
"source_script": "CeladonCity_GameCorner_EventScript_CoinsClerk"
},
{
"name": "balding_man",
"coord": [1, 6],
"movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]},
"source_event": 2,
"source_script": "CeladonCity_GameCorner_EventScript_BaldingMan"
},
{
"name": "woman_2",
"coord": [1, 8],
"movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]},
"source_event": 3,
"source_script": "CeladonCity_GameCorner_EventScript_Woman1"
},
{"name": "fisher", "coord": [4, 7], "source_event": 4, "source_script": "CeladonCity_GameCorner_EventScript_Fisher"},
{
"name": "fisher",
"coord": [4, 7],
"movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]},
"source_event": 4,
"source_script": "CeladonCity_GameCorner_EventScript_Fisher"
},
{
"name": "gym_guy",
"coord": [7, 10],
"movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]},
"source_event": 5,
"source_script": "CeladonCity_GameCorner_EventScript_GymGuy"
},
{
"name": "woman_1",
"coord": [7, 8],
"movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]},
"source_event": 6,
"source_script": "CeladonCity_GameCorner_EventScript_Woman2"
},
{
"name": "old_man_2",
"coord": [10, 9],
"movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]},
"source_event": 7,
"source_script": "CeladonCity_GameCorner_EventScript_OldMan"
},
{
"name": "scientist",
"coord": [13, 7],
"movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]},
"source_event": 8,
"source_script": "CeladonCity_GameCorner_EventScript_Scientist"
},
{
"name": "gentleman",
"coord": [16, 10],
"movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]},
"source_event": 9,
"source_script": "CeladonCity_GameCorner_EventScript_Gentleman"
},
{
"name": "rocket_m",
"coord": [11, 2],
"movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]},
"hide_flag": "FLAG_HIDE_GAME_CORNER_ROCKET",
"source_event": 10,
"source_script": "CeladonCity_GameCorner_EventScript_RocketGrunt",
Expand Down
Loading
Loading