ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Document landmark setting and item balls

Browse Source
This commit is contained in:
Fontbane 2019-04-03 14:13:11 -04:00 committed by huderlem
parent 704f025a00
commit 90e32f4ec5
107 changed files with 366 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/battle_script.inc
View File

@ -1124,7 +1124,7 @@
.byte 0xdd .byte 0xdd
.endm .endm
.macro asistattackselect param0:req .macro assistattackselect param0:req
.byte 0xde .byte 0xde
.4byte \param0 .4byte \param0
.endm .endm

2
data/battle_scripts_1.s
View File

@ -2384,7 +2384,7 @@ BattleScript_EffectWish::
BattleScript_EffectAssist:: BattleScript_EffectAssist::
attackcanceler attackcanceler
attackstring attackstring
asistattackselect BattleScript_ButItFailedPpReduce assistattackselect BattleScript_ButItFailedPpReduce
attackanimation attackanimation
waitanimation waitanimation
setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TURN, 0x0

2
data/maps/AbandonedShip_CaptainsOffice/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_29126E", "script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY" "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
} }
], ],

4
data/maps/AbandonedShip_Deck/scripts.inc
View File

@ -1,8 +1,8 @@
AbandonedShip_Deck_MapScripts:: @ 823799A AbandonedShip_Deck_MapScripts:: @ 823799A
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0 map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_SetLandmark
.byte 0 .byte 0
AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 AbandonedShip_Deck_MapScript1_SetLandmark: @ 82379A0
setflag FLAG_LANDMARK_ABANDONED_SHIP setflag FLAG_LANDMARK_ABANDONED_SHIP
end end

8
data/maps/AbandonedShip_HiddenFloorRooms/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B", "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_291288", "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
}, },
{ {
@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2", "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
}, },
{ {
@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_291295", "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
} }
], ],

2
data/maps/AbandonedShip_Room_B1F/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_291254", "script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
} }
], ],

2
data/maps/AbandonedShip_Rooms2_1F/map.json
View File

@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_1F_EventScript_291261", "script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
}, },
{ {

2
data/maps/AbandonedShip_Rooms2_B1F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_B1F_EventScript_291247", "script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
} }
], ],

2
data/maps/AbandonedShip_Rooms_1F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_1F_EventScript_29122D", "script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
}, },
{ {

2
data/maps/AbandonedShip_Rooms_B1F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_B1F_EventScript_29123A", "script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
} }
], ],

4
data/maps/AlteringCave/scripts.inc
View File

@ -1,8 +1,8 @@
AlteringCave_MapScripts:: @ 823B177 AlteringCave_MapScripts:: @ 823B177
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_SetLandmark
.byte 0 .byte 0
AlteringCave_MapScript1_23B17D: @ 823B17D AlteringCave_MapScript1_SetLandmark: @ 823B17D
setflag FLAG_LANDMARK_ALTERING_CAVE setflag FLAG_LANDMARK_ALTERING_CAVE
end end

6
data/maps/AquaHideout_B1F/map.json
View File

@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291372", "script": "AquaHideout_B1F_EventScript_ItemMaxElixir",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR" "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
}, },
{ {
@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291358", "script": "AquaHideout_B1F_EventScript_ItemMasterBall",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL" "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
}, },
{ {
@ -102,7 +102,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291365", "script": "AquaHideout_B1F_EventScript_ItemNugget",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET" "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
}, },
{ {

2
data/maps/AquaHideout_B2F/map.json
View File

@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B2F_EventScript_29137F", "script": "AquaHideout_B2F_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
}, },
{ {

2
data/maps/ArtisanCave_1F/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_1F_EventScript_2914D1", "script": "ArtisanCave_1F_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS" "flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
} }
], ],

2
data/maps/ArtisanCave_B1F/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_B1F_EventScript_2914C4", "script": "ArtisanCave_B1F_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP" "flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
} }
], ],

4
data/maps/ArtisanCave_B1F/scripts.inc
View File

@ -1,8 +1,8 @@
ArtisanCave_B1F_MapScripts:: @ 823AFAD ArtisanCave_B1F_MapScripts:: @ 823AFAD
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3 map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_SetLandmark
.byte 0 .byte 0
ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3 ArtisanCave_B1F_MapScript1_SetLandmark: @ 823AFB3
setflag FLAG_LANDMARK_ARTISAN_CAVE setflag FLAG_LANDMARK_ARTISAN_CAVE
end end

4
data/maps/BattleFrontier_ReceptionGate/scripts.inc
View File

@ -1,9 +1,9 @@
BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5 map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_SetLandmark
.byte 0 .byte 0
BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 BattleFrontier_ReceptionGate_MapScript1_SetLandmark: @ 82661E5
setflag FLAG_LANDMARK_BATTLE_FRONTIER setflag FLAG_LANDMARK_BATTLE_FRONTIER
end end

4
data/maps/DesertUnderpass/scripts.inc
View File

@ -1,8 +1,8 @@
DesertUnderpass_MapScripts:: @ 823AF37 DesertUnderpass_MapScripts:: @ 823AF37
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_SetLandmark
.byte 0 .byte 0
DesertUnderpass_MapScript1_23AF3D: @ 823AF3D DesertUnderpass_MapScript1_SetLandmark: @ 823AF3D
setflag FLAG_LANDMARK_DESERT_UNDERPASS setflag FLAG_LANDMARK_DESERT_UNDERPASS
end end

4
data/maps/FieryPath/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_29119E", "script": "FieryPath_EventScript_ItemTM06",
"flag": "FLAG_ITEM_FIERY_PATH_TM06" "flag": "FLAG_ITEM_FIERY_PATH_TM06"
}, },
{ {
@ -115,7 +115,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_291191", "script": "FieryPath_EventScript_ItemFireStone",
"flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE" "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
} }
], ],

2
data/maps/GraniteCave_1F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_1F_EventScript_291150", "script": "GraniteCave_1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE" "flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
} }
], ],

2
data/maps/GraniteCave_B1F/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B1F_EventScript_29115D", "script": "GraniteCave_B1F_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL" "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
} }
], ],

4
data/maps/GraniteCave_B2F/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_29116A", "script": "GraniteCave_B2F_EventScript_ItemRepel",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL" "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_291177", "script": "GraniteCave_B2F_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY" "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
}, },
{ {

2
data/maps/JaggedPass/map.json
View File

@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "JaggedPass_EventScript_291184", "script": "JaggedPass_EventScript_ItemBurnHeal",
"flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL" "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
}, },
{ {

2
data/maps/LilycoveCity/map.json
View File

@ -165,7 +165,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_EventScript_2910E8", "script": "LilycoveCity_EventScript_ItemMaxRepel",
"flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL" "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
}, },
{ {

2
data/maps/MagmaHideout_1F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2914DE", "script": "MagmaHideout_1F_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY" "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
}, },
{ {

4
data/maps/MagmaHideout_2F_2R/map.json
View File

@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_2914EB", "script": "MagmaHideout_2F_2R_EventScript_MaxElixir",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR" "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
}, },
{ {
@ -89,7 +89,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_2914F8", "script": "MagmaHideout_2F_2R_EventScript_ItemFullRestore",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE" "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
} }
], ],

2
data/maps/MagmaHideout_3F_1R/map.json
View File

@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_1R_EventScript_291505", "script": "MagmaHideout_3F_1R_EventScript_ItemNugget",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET" "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
} }
], ],

2
data/maps/MagmaHideout_3F_2R/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_2R_EventScript_291512", "script": "MagmaHideout_3F_2R_EventScript_ItemPPMax",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX" "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
} }
], ],

2
data/maps/MagmaHideout_3F_3R/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_3R_EventScript_29152C", "script": "MagmaHideout_3F_3R_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE" "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
} }
], ],

2
data/maps/MagmaHideout_4F/map.json
View File

@ -115,7 +115,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_4F_EventScript_29151F", "script": "MagmaHideout_4F_EventScript_MaxRevive",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE" "flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
} }
], ],

2
data/maps/MauvilleCity/map.json
View File

@ -149,7 +149,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_2910CE", "script": "MauvilleCity_EventScript_ItemXSpeed",
"flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
}, },
{ {

8
data/maps/MeteorFalls_1F_1R/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911AB", "script": "MeteorFalls_1F_1R_EventScript_ItemTM23",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911C5", "script": "MeteorFalls_1F_1R_EventScript_ItemMoonStone",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE" "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
}, },
{ {
@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911B8", "script": "MeteorFalls_1F_1R_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL" "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
}, },
{ {
@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911D2", "script": "MeteorFalls_1F_1R_EventScript_ItemPPUP",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
}, },
{ {

2
data/maps/MeteorFalls_B1F_2R/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_B1F_2R_EventScript_2911DF", "script": "MeteorFalls_B1F_2R_EventScript_ItemTM02",
"flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02" "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02"
} }
], ],

2
data/maps/MossdeepCity/map.json
View File

@ -105,7 +105,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_EventScript_2910F5", "script": "MossdeepCity_EventScript_ItemNetBall",
"flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL" "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL"
}, },
{ {

2
data/maps/MtPyre_2F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_2F_EventScript_2912FD", "script": "MtPyre_2F_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL" "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL"
}, },
{ {

2
data/maps/MtPyre_3F/map.json
View File

@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_3F_EventScript_29130A", "script": "MtPyre_3F_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL" "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL"
}, },
{ {

2
data/maps/MtPyre_4F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_4F_EventScript_291317", "script": "MtPyre_4F_EventScript_ItemSeaIncense",
"flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE" "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE"
} }
], ],

2
data/maps/MtPyre_5F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_5F_EventScript_291324", "script": "MtPyre_5F_EventScript_ItemLaxIncense",
"flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE" "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
} }
], ],

2
data/maps/MtPyre_6F/map.json
View File

@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_6F_EventScript_291331", "script": "MtPyre_6F_EventScript_ItemTM30",
"flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30"
}, },
{ {

4
data/maps/MtPyre_Exterior/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_29133E", "script": "MtPyre_Exterior_EventScript_ItemMaxPotion",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION" "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_29134B", "script": "MtPyre_Exterior_EventScript_ItemTM48",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48" "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48"
} }
], ],

4
data/maps/NewMauville_Entrance/scripts.inc
View File

@ -1,6 +1,6 @@
NewMauville_Entrance_MapScripts:: @ 82372AD NewMauville_Entrance_MapScripts:: @ 82372AD
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8 map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_SetLandmark
.byte 0 .byte 0
NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
@ -17,7 +17,7 @@ NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
setmetatile 5, 1, 798, 1 setmetatile 5, 1, 798, 1
return return
NewMauville_Entrance_MapScript1_2372FB: @ 82372FB NewMauville_Entrance_MapScript1_SetLandmark: @ 82372FB
setflag FLAG_LANDMARK_NEW_MAUVILLE setflag FLAG_LANDMARK_NEW_MAUVILLE
end end

10
data/maps/NewMauville_Inside/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_2911EC", "script": "NewMauville_Inside_EventScript_ItemUltraRope",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_2911F9", "script": "NewMauville_Inside_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE" "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE"
}, },
{ {
@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_291206", "script": "NewMauville_Inside_EventScript_ItemThunderStone",
"flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE" "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE"
}, },
{ {
@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_291213", "script": "NewMauville_Inside_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL" "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL"
}, },
{ {
@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_291220", "script": "NewMauville_Inside_EventScript_ItemParalyzeHeal",
"flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL" "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
}, },
{ {

4
data/maps/PetalburgCity/map.json
View File

@ -100,7 +100,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_2910B4", "script": "PetalburgCity_EventScript_ItemMaxRevive",
"flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE"
}, },
{ {
@ -113,7 +113,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_2910C1", "script": "PetalburgCity_EventScript_ItemEther",
"flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
}, },
{ {

8
data/maps/PetalburgWoods/map.json
View File

@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_29110F", "script": "PetalburgWoods_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL" "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
}, },
{ {
@ -89,7 +89,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_291102", "script": "PetalburgWoods_EventScript_ItemXAttack",
"flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK" "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
}, },
{ {
@ -102,7 +102,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_29111C", "script": "PetalburgWoods_EventScript_ItemEther",
"flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER" "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
}, },
{ {
@ -167,7 +167,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_291129", "script": "PetalburgWoods_EventScript_ItemParalyzeHeal",
"flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL" "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL"
}, },
{ {

2
data/maps/Route102/map.json
View File

@ -100,7 +100,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route102_EventScript_290CD8", "script": "Route102_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_102_POTION" "flag": "FLAG_ITEM_ROUTE_102_POTION"
}, },
{ {

4
data/maps/Route103/map.json
View File

@ -191,7 +191,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_290CE5", "script": "Route103_EventScript_ItemGuardSpec",
"flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
}, },
{ {
@ -282,7 +282,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_290CF2", "script": "Route103_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_103_PP_UP" "flag": "FLAG_ITEM_ROUTE_103_PP_UP"
} }
], ],

8
data/maps/Route104/map.json
View File

@ -300,7 +300,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_290CFF", "script": "Route104_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_104_PP_UP" "flag": "FLAG_ITEM_ROUTE_104_PP_UP"
}, },
{ {
@ -378,7 +378,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_290D0C", "script": "Route104_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
}, },
{ {
@ -404,7 +404,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_290D19", "script": "Route104_EventScript_ItemXAccuracy",
"flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
}, },
{ {
@ -430,7 +430,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_290D26", "script": "Route104_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_104_POTION" "flag": "FLAG_ITEM_ROUTE_104_POTION"
}, },
{ {

2
data/maps/Route105/map.json
View File

@ -92,7 +92,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route105_EventScript_290D33", "script": "Route105_EventScript_ItemIron",
"flag": "FLAG_ITEM_ROUTE_105_IRON" "flag": "FLAG_ITEM_ROUTE_105_IRON"
}, },
{ {

2
data/maps/Route106/map.json
View File

@ -87,7 +87,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route106_EventScript_290D40", "script": "Route106_EventScript_ItemProtein",
"flag": "FLAG_ITEM_ROUTE_106_PROTEIN" "flag": "FLAG_ITEM_ROUTE_106_PROTEIN"
} }
], ],

2
data/maps/Route108/map.json
View File

@ -113,7 +113,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route108_EventScript_290D4D", "script": "Route108_EventScript_ItemStarPiece",
"flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE" "flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE"
} }
], ],

4
data/maps/Route109/map.json
View File

@ -152,7 +152,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route109_EventScript_290D5A", "script": "Route109_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_109_PP_UP" "flag": "FLAG_ITEM_ROUTE_109_PP_UP"
}, },
{ {
@ -321,7 +321,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route109_EventScript_290D67", "script": "Route109_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_109_POTION" "flag": "FLAG_ITEM_ROUTE_109_POTION"
}, },
{ {

4
data/maps/Route109_SeashoreHouse/scripts.inc
View File

@ -1,8 +1,8 @@
Route109_SeashoreHouse_MapScripts:: @ 82693F4 Route109_SeashoreHouse_MapScripts:: @ 82693F4
map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_SetLandmark
.byte 0 .byte 0
Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA Route109_SeashoreHouse_MapScript1_SetLandmark: @ 82693FA
setflag FLAG_LANDMARK_SEASHORE_HOUSE setflag FLAG_LANDMARK_SEASHORE_HOUSE
end end

6
data/maps/Route110/map.json
View File

@ -274,7 +274,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_290D81", "script": "Route110_EventScript_ItemDireHit",
"flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT" "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT"
}, },
{ {
@ -287,7 +287,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_290D74", "script": "Route110_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY" "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY"
}, },
{ {
@ -482,7 +482,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_290D8E", "script": "Route110_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_110_ELIXIR" "flag": "FLAG_ITEM_ROUTE_110_ELIXIR"
}, },
{ {

2
data/maps/Route110_TrickHousePuzzle1/map.json
View File

@ -180,7 +180,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_29140E", "script": "Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL"
}, },
{ {

4
data/maps/Route110_TrickHousePuzzle2/map.json
View File

@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_291428", "script": "Route110_TrickHousePuzzle2_EventScript_ItemWaveMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL"
}, },
{ {
@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_29141B", "script": "Route110_TrickHousePuzzle2_EventScript_ItemHarborMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL"
} }
], ],

4
data/maps/Route110_TrickHousePuzzle3/map.json
View File

@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_291442", "script": "Route110_TrickHousePuzzle3_EventScript_ItemWoodMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL"
}, },
{ {
@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_291435", "script": "Route110_TrickHousePuzzle3_EventScript_ItemShadowMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL"
}, },
{ {

2
data/maps/Route110_TrickHousePuzzle4/map.json
View File

@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_29144F", "script": "Route110_TrickHousePuzzle4_EventScript_ItemMechMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL"
}, },
{ {

2
data/maps/Route110_TrickHousePuzzle6/map.json
View File

@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle6_EventScript_29145C", "script": "Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL"
} }
], ],

2
data/maps/Route110_TrickHousePuzzle7/map.json
View File

@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle7_EventScript_291469", "script": "Route110_TrickHousePuzzle7_EventScript_ItemTropicMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL"
}, },
{ {

2
data/maps/Route110_TrickHousePuzzle8/map.json
View File

@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle8_EventScript_291476", "script": "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL" "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL"
} }
], ],

8
data/maps/Route111/map.json
View File

@ -261,7 +261,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_290D9B", "script": "Route111_EventScript_ItemTM37",
"flag": "FLAG_ITEM_ROUTE_111_TM_37" "flag": "FLAG_ITEM_ROUTE_111_TM_37"
}, },
{ {
@ -352,7 +352,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_290DA8", "script": "Route111_EventScript_ItemStardust",
"flag": "FLAG_ITEM_ROUTE_111_STARDUST" "flag": "FLAG_ITEM_ROUTE_111_STARDUST"
}, },
{ {
@ -365,7 +365,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_290DB5", "script": "Route111_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ROUTE_111_HP_UP" "flag": "FLAG_ITEM_ROUTE_111_HP_UP"
}, },
{ {
@ -573,7 +573,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_290DC2", "script": "Route111_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_111_ELIXIR" "flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
}, },
{ {

4
data/maps/Route111_OldLadysRestStop/scripts.inc
View File

@ -1,8 +1,8 @@
Route111_OldLadysRestStop_MapScripts:: @ 822A916 Route111_OldLadysRestStop_MapScripts:: @ 822A916
map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_SetLandmark
.byte 0 .byte 0
Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C Route111_OldLadysRestStop_MapScript1_SetLandmark: @ 822A91C
setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
end end

2
data/maps/Route112/map.json
View File

@ -183,7 +183,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route112_EventScript_290DCF", "script": "Route112_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_112_NUGGET" "flag": "FLAG_ITEM_ROUTE_112_NUGGET"
}, },
{ {

6
data/maps/Route113/map.json
View File

@ -105,7 +105,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_290DDC", "script": "Route113_EventScript_ItemMaxEther",
"flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
}, },
{ {
@ -118,7 +118,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_290DE9", "script": "Route113_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
}, },
{ {
@ -183,7 +183,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_290DF6", "script": "Route113_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
}, },
{ {

6
data/maps/Route114/map.json
View File

@ -139,7 +139,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_290E03", "script": "Route114_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY"
}, },
{ {
@ -152,7 +152,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_290E10", "script": "Route114_EventScript_ItemProtein",
"flag": "FLAG_ITEM_ROUTE_114_PROTEIN" "flag": "FLAG_ITEM_ROUTE_114_PROTEIN"
}, },
{ {
@ -360,7 +360,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_290E1D", "script": "Route114_EventScript_ItemEnergyPowder",
"flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER"
}, },
{ {

4
data/maps/Route114_FossilManiacsHouse/scripts.inc
View File

@ -1,8 +1,8 @@
Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 Route114_FossilManiacsHouse_MapScripts:: @ 822AD30
map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36 map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_SetLandmark
.byte 0 .byte 0
Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 Route114_FossilManiacsHouse_MapScript1_SetLandmark: @ 822AD36
setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
end end

4
data/maps/Route114_LanettesHouse/scripts.inc
View File

@ -1,8 +1,8 @@
Route114_LanettesHouse_MapScripts:: @ 822B2C8 Route114_LanettesHouse_MapScripts:: @ 822B2C8
map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_SetLandmark
.byte 0 .byte 0
Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE Route114_LanettesHouse_MapScript1_SetLandmark: @ 822B2CE
setflag FLAG_LANDMARK_LANETTES_HOUSE setflag FLAG_LANDMARK_LANETTES_HOUSE
end end

12
data/maps/Route115/map.json
View File

@ -152,7 +152,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E2A", "script": "Route115_EventScript_ItemSuperPotion",
"flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION" "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
}, },
{ {
@ -165,7 +165,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E37", "script": "Route115_EventScript_ItemTM01",
"flag": "FLAG_ITEM_ROUTE_115_TM_01" "flag": "FLAG_ITEM_ROUTE_115_TM_01"
}, },
{ {
@ -178,7 +178,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E44", "script": "Route115_EventScript_ItemIron",
"flag": "FLAG_ITEM_ROUTE_115_IRON" "flag": "FLAG_ITEM_ROUTE_115_IRON"
}, },
{ {
@ -230,7 +230,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E51", "script": "Route115_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL" "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
}, },
{ {
@ -308,7 +308,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E6B", "script": "Route115_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_115_PP_UP" "flag": "FLAG_ITEM_ROUTE_115_PP_UP"
}, },
{ {
@ -321,7 +321,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E5E", "script": "Route115_EventScript_ItemHealPowder",
"flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER" "flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"
} }
], ],

10
data/maps/Route116/map.json
View File

@ -113,7 +113,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290E85", "script": "Route116_EventScript_ItemEther",
"flag": "FLAG_ITEM_ROUTE_116_ETHER" "flag": "FLAG_ITEM_ROUTE_116_ETHER"
}, },
{ {
@ -126,7 +126,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290E92", "script": "Route116_EventScript_ItemRepel",
"flag": "FLAG_ITEM_ROUTE_116_REPEL" "flag": "FLAG_ITEM_ROUTE_116_REPEL"
}, },
{ {
@ -217,7 +217,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290E9F", "script": "Route116_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ROUTE_116_HP_UP" "flag": "FLAG_ITEM_ROUTE_116_HP_UP"
}, },
{ {
@ -282,7 +282,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290E78", "script": "Route116_EventScript_ItemXSpecial",
"flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL"
}, },
{ {
@ -347,7 +347,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290EAC", "script": "Route116_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_116_POTION" "flag": "FLAG_ITEM_ROUTE_116_POTION"
}, },
{ {

4
data/maps/Route116_TunnelersRestHouse/scripts.inc
View File

@ -1,8 +1,8 @@
Route116_TunnelersRestHouse_MapScripts:: @ 822B850 Route116_TunnelersRestHouse_MapScripts:: @ 822B850
map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856 map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_SetLandmark
.byte 0 .byte 0
Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 Route116_TunnelersRestHouse_MapScript1_SetLandmark: @ 822B856
setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
end end

4
data/maps/Route117/map.json
View File

@ -204,7 +204,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_290EB9", "script": "Route117_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL" "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL"
}, },
{ {
@ -230,7 +230,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_290EC6", "script": "Route117_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_117_REVIVE" "flag": "FLAG_ITEM_ROUTE_117_REVIVE"
}, },
{ {

4
data/maps/Route117_PokemonDayCare/scripts.inc
View File

@ -1,8 +1,8 @@
Route117_PokemonDayCare_MapScripts:: @ 822BBB1 Route117_PokemonDayCare_MapScripts:: @ 822BBB1
map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7 map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_SetLandmark
.byte 0 .byte 0
Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 Route117_PokemonDayCare_MapScript1_SetLandmark: @ 822BBB7
setflag FLAG_LANDMARK_POKEMON_DAYCARE setflag FLAG_LANDMARK_POKEMON_DAYCARE
end end

2
data/maps/Route118/map.json
View File

@ -287,7 +287,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_290ED3", "script": "Route118_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION" "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
}, },
{ {

18
data/maps/Route119/map.json
View File

@ -243,7 +243,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EE0", "script": "Route119_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL" "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL"
}, },
{ {
@ -256,7 +256,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EED", "script": "Route119_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_119_ZINC" "flag": "FLAG_ITEM_ROUTE_119_ZINC"
}, },
{ {
@ -269,7 +269,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EFA", "script": "Route119_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1" "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1"
}, },
{ {
@ -282,7 +282,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F07", "script": "Route119_EventScript_ItemLeafStone",
"flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE" "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE"
}, },
{ {
@ -295,7 +295,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F14", "script": "Route119_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY" "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY"
}, },
{ {
@ -308,7 +308,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F21", "script": "Route119_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1" "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1"
}, },
{ {
@ -438,7 +438,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F2E", "script": "Route119_EventScript_ItemHyperPotion2",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2" "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2"
}, },
{ {
@ -555,7 +555,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_291399", "script": "Route119_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_119_NUGGET" "flag": "FLAG_ITEM_ROUTE_119_NUGGET"
}, },
{ {
@ -568,7 +568,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F3B", "script": "Route119_EventScript_ItemElixir2",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2"
}, },
{ {

10
data/maps/Route120/map.json
View File

@ -230,7 +230,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F48", "script": "Route120_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_120_NUGGET" "flag": "FLAG_ITEM_ROUTE_120_NUGGET"
}, },
{ {
@ -308,7 +308,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F55", "script": "Route120_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL" "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
}, },
{ {
@ -386,7 +386,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F6F", "script": "Route120_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_ROUTE_120_NEST_BALL" "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
}, },
{ {
@ -399,7 +399,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F62", "script": "Route120_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
}, },
{ {
@ -594,7 +594,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F7C", "script": "Route120_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_120_REVIVE" "flag": "FLAG_ITEM_ROUTE_120_REVIVE"
} }
], ],

6
data/maps/Route121/map.json
View File

@ -300,7 +300,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290F89", "script": "Route121_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ROUTE_121_CARBOS" "flag": "FLAG_ITEM_ROUTE_121_CARBOS"
}, },
{ {
@ -391,7 +391,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290F96", "script": "Route121_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_121_REVIVE" "flag": "FLAG_ITEM_ROUTE_121_REVIVE"
}, },
{ {
@ -404,7 +404,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290FA3", "script": "Route121_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_121_ZINC" "flag": "FLAG_ITEM_ROUTE_121_ZINC"
} }
], ],

10
data/maps/Route123/map.json
View File

@ -295,7 +295,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FB0", "script": "Route123_EventScript_ItemCalcium",
"flag": "FLAG_ITEM_ROUTE_123_CALCIUM" "flag": "FLAG_ITEM_ROUTE_123_CALCIUM"
}, },
{ {
@ -438,7 +438,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FBD", "script": "Route123_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL" "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL"
}, },
{ {
@ -451,7 +451,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FCA", "script": "Route123_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_123_ELIXIR" "flag": "FLAG_ITEM_ROUTE_123_ELIXIR"
}, },
{ {
@ -542,7 +542,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FD7", "script": "Route123_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_123_PP_UP" "flag": "FLAG_ITEM_ROUTE_123_PP_UP"
}, },
{ {
@ -581,7 +581,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FE4", "script": "Route123_EventScript_ItemRevivalHerb",
"flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB" "flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB"
} }
], ],

4
data/maps/Route123_BerryMastersHouse/scripts.inc
View File

@ -1,8 +1,8 @@
Route123_BerryMastersHouse_MapScripts:: @ 826F83B Route123_BerryMastersHouse_MapScripts:: @ 826F83B
map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841 map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_SetLandmark
.byte 0 .byte 0
Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 Route123_BerryMastersHouse_MapScript1_SetLandmark: @ 826F841
setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
end end

6
data/maps/Route124/map.json
View File

@ -115,7 +115,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_290FF1", "script": "Route124_EventScript_ItemRedShard",
"flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
}, },
{ {
@ -128,7 +128,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_290FFE", "script": "Route124_EventScript_ItemBlueShard",
"flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
}, },
{ {
@ -141,7 +141,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_29100B", "script": "Route124_EventScript_ItemYellowShard",
"flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
}, },
{ {

4
data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
View File

@ -1,8 +1,8 @@
Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28
map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_SetLandmark
.byte 0 .byte 0
Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E Route124_DivingTreasureHuntersHouse_MapScript1_SetLandmark: @ 8270A2E
setflag FLAG_LANDMARK_HUNTERS_HOUSE setflag FLAG_LANDMARK_HUNTERS_HOUSE
end end

2
data/maps/Route125/map.json
View File

@ -157,7 +157,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route125_EventScript_291018", "script": "Route125_EventScript_ItemBigPearl",
"flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL" "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL"
} }
], ],

2
data/maps/Route126/map.json
View File

@ -92,7 +92,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route126_EventScript_291025", "script": "Route126_EventScript_ItemGreenShard",
"flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD" "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD"
}, },
{ {

6
data/maps/Route127/map.json
View File

@ -71,7 +71,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_291032", "script": "Route127_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_127_ZINC" "flag": "FLAG_ITEM_ROUTE_127_ZINC"
}, },
{ {
@ -84,7 +84,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_29103F", "script": "Route127_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ROUTE_127_CARBOS" "flag": "FLAG_ITEM_ROUTE_127_CARBOS"
}, },
{ {
@ -175,7 +175,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_29104C", "script": "Route127_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY" "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
} }
], ],

4
data/maps/Route132/map.json
View File

@ -61,7 +61,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route132_EventScript_291059", "script": "Route132_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY" "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY"
}, },
{ {
@ -152,7 +152,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route132_EventScript_291066", "script": "Route132_EventScript_ItemProtein",
"flag": "FLAG_ITEM_ROUTE_132_PROTEIN" "flag": "FLAG_ITEM_ROUTE_132_PROTEIN"
} }
], ],

6
data/maps/Route133/map.json
View File

@ -74,7 +74,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_291073", "script": "Route133_EventScript_ItemBigPearl",
"flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL" "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL"
}, },
{ {
@ -87,7 +87,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_291080", "script": "Route133_EventScript_ItemStarPiece",
"flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE" "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE"
}, },
{ {
@ -152,7 +152,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_29108D", "script": "Route133_EventScript_ItemMaxRevive",
"flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE" "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE"
} }
], ],

4
data/maps/Route134/map.json
View File

@ -152,7 +152,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route134_EventScript_29109A", "script": "Route134_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ROUTE_134_CARBOS" "flag": "FLAG_ITEM_ROUTE_134_CARBOS"
}, },
{ {
@ -165,7 +165,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route134_EventScript_2910A7", "script": "Route134_EventScript_ItemStarPiece",
"flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE" "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
} }
], ],

2
data/maps/RustboroCity/map.json
View File

@ -183,7 +183,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_EventScript_2910DB", "script": "RustboroCity_EventScript_ItemXDefend",
"flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
}, },
{ {

4
data/maps/RusturfTunnel/map.json
View File

@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_291136", "script": "RusturfTunnel_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL" "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL"
}, },
{ {
@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_291143", "script": "RusturfTunnel_EventScript_ItemMaxEther",
"flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER"
}, },
{ {

2
data/maps/SafariZone_North/map.json
View File

@ -144,7 +144,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_2912C9", "script": "SafariZone_North_EventScript_ItemCalcium",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM" "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM"
} }
], ],

2
data/maps/SafariZone_Northeast/map.json
View File

@ -139,7 +139,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northeast_EventScript_2912E3", "script": "SafariZone_Northeast_EventScript_ItemNugget",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET" "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET"
} }
], ],

2
data/maps/SafariZone_Northwest/map.json
View File

@ -48,7 +48,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northwest_EventScript_2912BC", "script": "SafariZone_Northwest_EventScript_ItemTM22",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22" "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22"
} }
], ],

2
data/maps/SafariZone_Southeast/map.json
View File

@ -74,7 +74,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Southeast_EventScript_2912F0", "script": "SafariZone_Southeast_EventScript_ItemBigPearl",
"flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL" "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL"
}, },
{ {

2
data/maps/SafariZone_Southwest/map.json
View File

@ -48,7 +48,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Southwest_EventScript_2912D6", "script": "SafariZone_Southwest_EventScript_ItemMaxRevive",
"flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE" "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE"
} }
], ],

2
data/maps/ScorchedSlab/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ScorchedSlab_EventScript_2912AF", "script": "ScorchedSlab_EventScript_ItemTM11",
"flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11" "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11"
} }
], ],

4
data/maps/ScorchedSlab/scripts.inc
View File

@ -1,8 +1,8 @@
ScorchedSlab_MapScripts:: @ 8239291 ScorchedSlab_MapScripts:: @ 8239291
map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_239297 map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_SetLandmark
.byte 0 .byte 0
ScorchedSlab_MapScript1_239297: @ 8239297 ScorchedSlab_MapScript1_SetLandmark: @ 8239297
setflag FLAG_LANDMARK_SCORCHED_SLAB setflag FLAG_LANDMARK_SCORCHED_SLAB
end end

2
data/maps/SeafloorCavern_Room9/map.json
View File

@ -89,7 +89,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room9_EventScript_291401", "script": "SeafloorCavern_Room9_EventScript_ItemTM26",
"flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26"
}, },
{ {

4
data/maps/SealedChamber_OuterRoom/scripts.inc
View File

@ -1,6 +1,6 @@
SealedChamber_OuterRoom_MapScripts:: @ 8239106 SealedChamber_OuterRoom_MapScripts:: @ 8239106
map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116 map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116
map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_239127 map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_SetLandmark
map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B
.byte 0 .byte 0
@ -9,7 +9,7 @@ SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
end end
SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 SealedChamber_OuterRoom_MapScript1_SetLandmark: @ 8239127
setflag FLAG_LANDMARK_SEALED_CHAMBER setflag FLAG_LANDMARK_SEALED_CHAMBER
end end

2
data/maps/ShoalCave_LowTideEntranceRoom/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideEntranceRoom_EventScript_2913C0", "script": "ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl",
"flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL" "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL"
}, },
{ {

4
data/maps/ShoalCave_LowTideIceRoom/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideIceRoom_EventScript_2913E7", "script": "ShoalCave_LowTideIceRoom_EventScript_ItemTM07",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideIceRoom_EventScript_2913F4", "script": "ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE" "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE"
} }
], ],

2
data/maps/ShoalCave_LowTideInnerRoom/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideInnerRoom_EventScript_2913CD", "script": "ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY" "flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY"
} }
], ],

Some files were not shown because too many files have changed in this diff Show More