Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)

Browse Source 
* Emptied out item_ball_scripts
Added GetObjectEventTrainerRangeFromTemplate
Added Common_EventScript_FindItem

* Replaced trainer_sight_or_berry_tree_id with item constant
Replaced scripts with Common_EventScript_FindItem

* Renamed to GetItemBallIdAndAmountFromTemplate
Moved to item_ball.c

* Updated ObjectEventTemplate

* Updated inc files to support plural item names

* Refactored CopyItemNameHandlePlural to handle all items

* Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT

* Converted spaces to tabs
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130

* Added warning on object_event macro to prevent silent failure
Reverted global.fieldmap to original state, per feedback

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
This commit is contained in:
psf 2024-01-14 12:35:45 -08:00 committed by GitHub
parent 80ffaa5e2c
commit bf8b09b1b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
94 changed files with 409 additions and 995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/map.inc
View File

@ -28,6 +28,10 @@
.2byte \x, \y
.byte \elevation
.byte \movement_type
.if \x_radius > 15
@ This warning is relevant for GetItemBallIdAndAmountFromTemplate
.error "movementRangeX has a bitfield of 4 bytes, so values over 15 will overflow. Use a custom script for item balls that should give the player more than 15 items."
.endif
.byte ((\y_radius << 4) | \x_radius)
.space 1 @ Padding
.2byte \trainer_type

4
data/event_scripts.s
View File

@ -947,6 +947,10 @@ gText_PlayerFoundOneTMHM::
.string "{PLAYER} found one {STR_VAR_1}\n"
.string "{STR_VAR_2}!$"
gText_PlayerFoundTMHMs::
.string "{PLAYER} found {STR_VAR_3} {STR_VAR_1}\n"
.string "{STR_VAR_2}!$"
gText_Sudowoodo_Attacked::
.string "The weird tree doesn't like the\n"
.string "WAILMER PAIL!\p"

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
"trainer_sight_or_berry_tree_id": "ITEM_STORAGE_KEY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
"trainer_sight_or_berry_tree_id": "ITEM_LUXURY_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
"trainer_sight_or_berry_tree_id": "ITEM_SCANNER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER"
},
{
@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance",
"trainer_sight_or_berry_tree_id": "ITEM_TM_RAIN_DANCE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_RAIN_DANCE"
},
{
@ -62,8 +62,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
"trainer_sight_or_berry_tree_id": "ITEM_WATER_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam",
"trainer_sight_or_berry_tree_id": "ITEM_TM_ICE_BEAM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_ICE_BEAM"
}
],

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

@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
},
{

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
"trainer_sight_or_berry_tree_id": "ITEM_DIVE_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
}
],

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
"trainer_sight_or_berry_tree_id": "ITEM_HARBOR_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
},
{

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
"trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
}
],

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

@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_ItemMaxElixir",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
},
{
@ -75,8 +75,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_ItemMasterBall",
"trainer_sight_or_berry_tree_id": "ITEM_MASTER_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
},
{
@ -101,8 +101,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
},
{

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

@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B2F_EventScript_ItemNestBall",
"trainer_sight_or_berry_tree_id": "ITEM_NEST_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
},
{

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_1F_EventScript_ItemCarbos",
"trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_B1F_EventScript_ItemHPUp",
"trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_ItemTMToxic",
"trainer_sight_or_berry_tree_id": "ITEM_TM_TOXIC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_FIERY_PATH_TM_TOXIC"
},
{
@ -114,8 +114,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_ItemFireStone",
"trainer_sight_or_berry_tree_id": "ITEM_FIRE_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
}
],

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

@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_1F_EventScript_ItemEscapeRope",
"trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B1F_EventScript_ItemPokeBall",
"trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_ItemRepel",
"trainer_sight_or_berry_tree_id": "ITEM_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
},
{

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

@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "JaggedPass_EventScript_ItemBurnHeal",
"trainer_sight_or_berry_tree_id": "ITEM_BURN_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
},
{

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

@ -164,8 +164,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_EventScript_ItemMaxRepel",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
},
{

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
},
{

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

@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_ItemMaxElixir",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
},
{
@ -88,8 +88,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_ItemFullRestore",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_RESTORE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
}
],

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

@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_1R_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
}
],

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_2R_EventScript_ItemPPMax",
"trainer_sight_or_berry_tree_id": "ITEM_PP_MAX",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_3R_EventScript_ItemEscapeRope",
"trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
}
],

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

@ -114,8 +114,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_4F_EventScript_ItemMaxRevive",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
}
],

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

@ -148,8 +148,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_ItemXSpeed",
"trainer_sight_or_berry_tree_id": "ITEM_X_SPEED",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
},
{

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

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemTMIronTail",
"trainer_sight_or_berry_tree_id": "ITEM_TM_IRON_TAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_IRON_TAIL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemMoonStone",
"trainer_sight_or_berry_tree_id": "ITEM_MOON_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
},
{
@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemFullHeal",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
},
{
@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemPPUP",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
},
{

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_B1F_2R_EventScript_ItemTMDragonClaw",
"trainer_sight_or_berry_tree_id": "ITEM_TM_DRAGON_CLAW",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_DRAGON_CLAW"
}
],

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

@ -104,8 +104,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_EventScript_ItemNetBall",
"trainer_sight_or_berry_tree_id": "ITEM_NET_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL"
},
{

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_2F_EventScript_ItemUltraBall",
"trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL"
},
{

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

@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_3F_EventScript_ItemSuperRepel",
"trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL"
},
{

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_4F_EventScript_ItemSeaIncense",
"trainer_sight_or_berry_tree_id": "ITEM_SEA_INCENSE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE"
}
],

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_5F_EventScript_ItemLaxIncense",
"trainer_sight_or_berry_tree_id": "ITEM_LAX_INCENSE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
}
],

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

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_6F_EventScript_ItemTMShadowBall",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SHADOW_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_6F_TM_SHADOW_BALL"
},
{

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

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_ItemMaxPotion",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_ItemTMSkillSwap",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SKILL_SWAP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_SKILL_SWAP"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemUltraBall",
"trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemEscapeRope",
"trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE"
},
{
@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemThunderStone",
"trainer_sight_or_berry_tree_id": "ITEM_THUNDER_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE"
},
{
@ -62,8 +62,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemFullHeal",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL"
},
{
@ -75,8 +75,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemParalyzeHeal",
"trainer_sight_or_berry_tree_id": "ITEM_PARALYZE_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
},
{

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

@ -99,8 +99,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_ItemMaxRevive",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE"
},
{
@ -112,8 +112,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_ItemEther",
"trainer_sight_or_berry_tree_id": "ITEM_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
},
{

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

@ -75,8 +75,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_ItemGreatBall",
"trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
},
{
@ -88,8 +88,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_ItemXAttack",
"trainer_sight_or_berry_tree_id": "ITEM_X_ATTACK",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
},
{
@ -101,8 +101,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_ItemEther",
"trainer_sight_or_berry_tree_id": "ITEM_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
},
{
@ -166,8 +166,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_ItemParalyzeHeal",
"trainer_sight_or_berry_tree_id": "ITEM_PARALYZE_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_WOODS_PARALYZE_HEAL"
},
{

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

@ -99,8 +99,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route102_EventScript_ItemPotion",
"trainer_sight_or_berry_tree_id": "ITEM_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_102_POTION"
},
{

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

@ -190,8 +190,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_ItemGuardSpec",
"trainer_sight_or_berry_tree_id": "ITEM_GUARD_SPEC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
},
{
@ -281,8 +281,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_103_PP_UP"
}
],

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

@ -299,8 +299,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_104_PP_UP"
},
{
@ -377,8 +377,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_ItemPokeBall",
"trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
},
{
@ -403,8 +403,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_ItemXAccuracy",
"trainer_sight_or_berry_tree_id": "ITEM_X_ACCURACY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
},
{
@ -429,8 +429,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_ItemPotion",
"trainer_sight_or_berry_tree_id": "ITEM_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_104_POTION"
},
{

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

@ -91,8 +91,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route105_EventScript_ItemIron",
"trainer_sight_or_berry_tree_id": "ITEM_IRON",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_105_IRON"
},
{

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

@ -86,8 +86,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route106_EventScript_ItemProtein",
"trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_106_PROTEIN"
}
],

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

@ -112,8 +112,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route108_EventScript_ItemStarPiece",
"trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE"
}
],

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

@ -151,8 +151,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route109_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_109_PP_UP"
},
{
@ -320,8 +320,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route109_EventScript_ItemPotion",
"trainer_sight_or_berry_tree_id": "ITEM_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_109_POTION"
},
{

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

@ -273,8 +273,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_ItemDireHit",
"trainer_sight_or_berry_tree_id": "ITEM_DIRE_HIT",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT"
},
{
@ -286,8 +286,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_110_RARE_CANDY"
},
{
@ -481,8 +481,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_ItemElixir",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_110_ELIXIR"
},
{

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

@ -179,8 +179,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail",
"trainer_sight_or_berry_tree_id": "ITEM_ORANGE_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL"
},
{

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

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_ItemWaveMail",
"trainer_sight_or_berry_tree_id": "ITEM_WAVE_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL"
},
{
@ -75,8 +75,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_ItemHarborMail",
"trainer_sight_or_berry_tree_id": "ITEM_HARBOR_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL"
}
],

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

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_ItemWoodMail",
"trainer_sight_or_berry_tree_id": "ITEM_WOOD_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL"
},
{
@ -75,8 +75,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_ItemShadowMail",
"trainer_sight_or_berry_tree_id": "ITEM_SHADOW_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL"
},
{

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

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_ItemMechMail",
"trainer_sight_or_berry_tree_id": "ITEM_MECH_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL"
},
{

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

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail",
"trainer_sight_or_berry_tree_id": "ITEM_GLITTER_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL"
}
],

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

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle7_EventScript_ItemTropicMail",
"trainer_sight_or_berry_tree_id": "ITEM_TROPIC_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL"
},
{

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

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail",
"trainer_sight_or_berry_tree_id": "ITEM_BEAD_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL"
}
],

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

@ -260,8 +260,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemTMSandstorm",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SANDSTORM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_111_TM_SANDSTORM"
},
{
@ -351,8 +351,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemStardust",
"trainer_sight_or_berry_tree_id": "ITEM_STARDUST",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_111_STARDUST"
},
{
@ -364,8 +364,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemHPUp",
"trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_111_HP_UP"
},
{
@ -572,8 +572,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemElixir",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
},
{

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

@ -182,8 +182,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route112_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_112_NUGGET"
},
{

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

@ -104,8 +104,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_ItemMaxEther",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
},
{
@ -117,8 +117,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_ItemSuperRepel",
"trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
},
{
@ -182,8 +182,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_ItemHyperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
},
{

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

@ -138,8 +138,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY"
},
{
@ -151,8 +151,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_ItemProtein",
"trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_114_PROTEIN"
},
{
@ -359,8 +359,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_ItemEnergyPowder",
"trainer_sight_or_berry_tree_id": "ITEM_ENERGY_POWDER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER"
},
{

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

@ -151,8 +151,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemSuperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_SUPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
},
{
@ -164,8 +164,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemTMFocusPunch",
"trainer_sight_or_berry_tree_id": "ITEM_TM_FOCUS_PUNCH",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_TM_FOCUS_PUNCH"
},
{
@ -177,8 +177,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemIron",
"trainer_sight_or_berry_tree_id": "ITEM_IRON",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_IRON"
},
{
@ -229,8 +229,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemGreatBall",
"trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
},
{
@ -307,8 +307,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_PP_UP"
},
{
@ -320,8 +320,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemHealPowder",
"trainer_sight_or_berry_tree_id": "ITEM_HEAL_POWDER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"
}
],

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

@ -112,8 +112,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemEther",
"trainer_sight_or_berry_tree_id": "ITEM_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_ETHER"
},
{
@ -125,8 +125,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemRepel",
"trainer_sight_or_berry_tree_id": "ITEM_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_REPEL"
},
{
@ -216,8 +216,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemHPUp",
"trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_HP_UP"
},
{
@ -281,8 +281,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemXSpecial",
"trainer_sight_or_berry_tree_id": "ITEM_X_SPECIAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL"
},
{
@ -346,8 +346,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemPotion",
"trainer_sight_or_berry_tree_id": "ITEM_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_POTION"
},
{

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

@ -203,8 +203,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_ItemGreatBall",
"trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL"
},
{
@ -229,8 +229,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_ItemRevive",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_117_REVIVE"
},
{

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

@ -286,8 +286,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_ItemHyperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
},
{

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

@ -242,8 +242,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemSuperRepel",
"trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL"
},
{
@ -255,8 +255,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemZinc",
"trainer_sight_or_berry_tree_id": "ITEM_ZINC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_ZINC"
},
{
@ -268,8 +268,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemElixir",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1"
},
{
@ -281,8 +281,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemLeafStone",
"trainer_sight_or_berry_tree_id": "ITEM_LEAF_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE"
},
{
@ -294,8 +294,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY"
},
{
@ -307,8 +307,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemHyperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1"
},
{
@ -437,8 +437,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemHyperPotion2",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2"
},
{
@ -554,8 +554,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_NUGGET"
},
{
@ -567,8 +567,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemElixir2",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2"
},
{

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

@ -229,8 +229,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_NUGGET"
},
{
@ -307,8 +307,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemFullHeal",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
},
{
@ -385,8 +385,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemNestBall",
"trainer_sight_or_berry_tree_id": "ITEM_NEST_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
},
{
@ -398,8 +398,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemHyperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
},
{
@ -593,8 +593,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemRevive",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_REVIVE"
}
],

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

@ -299,8 +299,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_ItemCarbos",
"trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_121_CARBOS"
},
{
@ -390,8 +390,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_ItemRevive",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_121_REVIVE"
},
{
@ -403,8 +403,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_ItemZinc",
"trainer_sight_or_berry_tree_id": "ITEM_ZINC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_121_ZINC"
}
],

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

@ -294,8 +294,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemCalcium",
"trainer_sight_or_berry_tree_id": "ITEM_CALCIUM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_CALCIUM"
},
{
@ -437,8 +437,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemUltraBall",
"trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL"
},
{
@ -450,8 +450,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemElixir",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_ELIXIR"
},
{
@ -541,8 +541,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_PP_UP"
},
{
@ -580,8 +580,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemRevivalHerb",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVAL_HERB",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB"
}
],

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

@ -114,8 +114,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_ItemRedShard",
"trainer_sight_or_berry_tree_id": "ITEM_RED_SHARD",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
},
{
@ -127,8 +127,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_ItemBlueShard",
"trainer_sight_or_berry_tree_id": "ITEM_BLUE_SHARD",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
},
{
@ -140,8 +140,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_ItemYellowShard",
"trainer_sight_or_berry_tree_id": "ITEM_YELLOW_SHARD",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
},
{

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

@ -156,8 +156,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route125_EventScript_ItemBigPearl",
"trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL"
}
],

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

@ -91,8 +91,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route126_EventScript_ItemGreenShard",
"trainer_sight_or_berry_tree_id": "ITEM_GREEN_SHARD",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD"
},
{

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

@ -70,8 +70,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_ItemZinc",
"trainer_sight_or_berry_tree_id": "ITEM_ZINC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_127_ZINC"
},
{
@ -83,8 +83,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_ItemCarbos",
"trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_127_CARBOS"
},
{
@ -174,8 +174,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
}
],

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

@ -60,8 +60,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route132_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY"
},
{
@ -151,8 +151,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route132_EventScript_ItemProtein",
"trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_132_PROTEIN"
}
],

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

@ -73,8 +73,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_ItemBigPearl",
"trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL"
},
{
@ -86,8 +86,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_ItemStarPiece",
"trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE"
},
{
@ -151,8 +151,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_ItemMaxRevive",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE"
}
],

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

@ -151,8 +151,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route134_EventScript_ItemCarbos",
"trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_134_CARBOS"
},
{
@ -164,8 +164,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route134_EventScript_ItemStarPiece",
"trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
}
],

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

@ -182,8 +182,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_EventScript_ItemXDefend",
"trainer_sight_or_berry_tree_id": "ITEM_X_DEFEND",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
},
{

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

@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_ItemPokeBall",
"trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL"
},
{
@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_ItemMaxEther",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER"
},
{

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

@ -143,8 +143,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_ItemCalcium",
"trainer_sight_or_berry_tree_id": "ITEM_CALCIUM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM"
}
],

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

@ -138,8 +138,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northeast_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET"
}
],

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

@ -47,8 +47,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northwest_EventScript_ItemTMSolarBeam",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SOLAR_BEAM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_SOLAR_BEAM"
}
],

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

@ -73,8 +73,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Southeast_EventScript_ItemBigPearl",
"trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL"
},
{

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

@ -47,8 +47,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Southwest_EventScript_ItemMaxRevive",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ScorchedSlab_EventScript_ItemTMSunnyDay",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SUNNY_DAY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SCORCHED_SLAB_TM_SUNNY_DAY"
}
],

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

@ -88,8 +88,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room9_EventScript_ItemTMEarthquake",
"trainer_sight_or_berry_tree_id": "ITEM_TM_EARTHQUAKE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_EARTHQUAKE"
},
{

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl",
"trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL"
},
{

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideIceRoom_EventScript_ItemTMHail",
"trainer_sight_or_berry_tree_id": "ITEM_TM_HAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_HAIL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce",
"trainer_sight_or_berry_tree_id": "ITEM_NEVER_MELT_ICE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY"
}
],

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

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal",
"trainer_sight_or_berry_tree_id": "ITEM_ICE_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL"
}
],

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

@ -75,8 +75,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_1F_EventScript_ItemMaxElixir",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR"
},
{
@ -88,8 +88,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_1F_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP"
},
{

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

@ -244,8 +244,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_ItemTMPsychic",
"trainer_sight_or_berry_tree_id": "ITEM_TM_PSYCHIC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_PSYCHIC"
},
{
@ -257,8 +257,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_ItemFullRestore",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_RESTORE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE"
},
{

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

@ -75,8 +75,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B2F_EventScript_ItemFullHeal",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL"
},
{

661
data/scripts/item_ball_scripts.inc
View File

@ -1,659 +1,4 @@
Route102_EventScript_ItemPotion::
finditem ITEM_POTION
end
Route103_EventScript_ItemGuardSpec::
finditem ITEM_GUARD_SPEC
end
Route103_EventScript_ItemPPUp::
finditem ITEM_PP_UP
end
Route104_EventScript_ItemPPUp::
finditem ITEM_PP_UP
end
Route104_EventScript_ItemPokeBall::
finditem ITEM_POKE_BALL
end
Route104_EventScript_ItemXAccuracy::
finditem ITEM_X_ACCURACY
end
Route104_EventScript_ItemPotion::
finditem ITEM_POTION
end
Route105_EventScript_ItemIron::
finditem ITEM_IRON
end
Route106_EventScript_ItemProtein::
finditem ITEM_PROTEIN
end
Route108_EventScript_ItemStarPiece::
finditem ITEM_STAR_PIECE
end
Route109_EventScript_ItemPPUp::
finditem ITEM_PP_UP
end
Route109_EventScript_ItemPotion::
finditem ITEM_POTION
end
Route110_EventScript_ItemRareCandy::
finditem ITEM_RARE_CANDY
end
Route110_EventScript_ItemDireHit::
finditem ITEM_DIRE_HIT
end
Route110_EventScript_ItemElixir::
finditem ITEM_ELIXIR
end
Route111_EventScript_ItemTMSandstorm::
finditem ITEM_TM_SANDSTORM
end
Route111_EventScript_ItemStardust::
finditem ITEM_STARDUST
end
Route111_EventScript_ItemHPUp::
finditem ITEM_HP_UP
end
Route111_EventScript_ItemElixir::
finditem ITEM_ELIXIR
end
Route112_EventScript_ItemNugget::
finditem ITEM_NUGGET
end
Route113_EventScript_ItemMaxEther::
finditem ITEM_MAX_ETHER
end
Route113_EventScript_ItemSuperRepel::
finditem ITEM_SUPER_REPEL
end
Route113_EventScript_ItemHyperPotion::
finditem ITEM_HYPER_POTION
end
Route114_EventScript_ItemRareCandy::
finditem ITEM_RARE_CANDY
end
Route114_EventScript_ItemProtein::
finditem ITEM_PROTEIN
end
Route114_EventScript_ItemEnergyPowder::
finditem ITEM_ENERGY_POWDER
end
Route115_EventScript_ItemSuperPotion::
finditem ITEM_SUPER_POTION
end
Route115_EventScript_ItemTMFocusPunch::
finditem ITEM_TM_FOCUS_PUNCH
end
Route115_EventScript_ItemIron::
finditem ITEM_IRON
end
Route115_EventScript_ItemGreatBall::
finditem ITEM_GREAT_BALL
end
Route115_EventScript_ItemHealPowder::
finditem ITEM_HEAL_POWDER
end
Route115_EventScript_ItemPPUp::
finditem ITEM_PP_UP
end
Route116_EventScript_ItemXSpecial::
finditem ITEM_X_SP_ATK
end
Route116_EventScript_ItemEther::
finditem ITEM_ETHER
end
Route116_EventScript_ItemRepel::
finditem ITEM_REPEL
end
Route116_EventScript_ItemHPUp::
finditem ITEM_HP_UP
end
Route116_EventScript_ItemPotion::
finditem ITEM_POTION
end
Route117_EventScript_ItemGreatBall::
finditem ITEM_GREAT_BALL
end
Route117_EventScript_ItemRevive::
finditem ITEM_REVIVE
end
Route118_EventScript_ItemHyperPotion::
finditem ITEM_HYPER_POTION
end
Route119_EventScript_ItemSuperRepel::
finditem ITEM_SUPER_REPEL
end
Route119_EventScript_ItemZinc::
finditem ITEM_ZINC
end
Route119_EventScript_ItemElixir::
finditem ITEM_ELIXIR
end
Route119_EventScript_ItemLeafStone::
finditem ITEM_LEAF_STONE
end
Route119_EventScript_ItemRareCandy::
finditem ITEM_RARE_CANDY
end
Route119_EventScript_ItemHyperPotion::
finditem ITEM_HYPER_POTION
end
Route119_EventScript_ItemHyperPotion2::
finditem ITEM_HYPER_POTION
end
Route119_EventScript_ItemElixir2::
finditem ITEM_ELIXIR
end
Route120_EventScript_ItemNugget::
finditem ITEM_NUGGET
end
Route120_EventScript_ItemFullHeal::
finditem ITEM_FULL_HEAL
end
Route120_EventScript_ItemHyperPotion::
finditem ITEM_HYPER_POTION
end
Route120_EventScript_ItemNestBall::
finditem ITEM_NEST_BALL
end
Route120_EventScript_ItemRevive::
finditem ITEM_REVIVE
end
Route121_EventScript_ItemCarbos::
finditem ITEM_CARBOS
end
Route121_EventScript_ItemRevive::
finditem ITEM_REVIVE
end
Route121_EventScript_ItemZinc::
finditem ITEM_ZINC
end
Route123_EventScript_ItemCalcium::
finditem ITEM_CALCIUM
end
Route123_EventScript_ItemUltraBall::
finditem ITEM_ULTRA_BALL
end
Route123_EventScript_ItemElixir::
finditem ITEM_ELIXIR
end
Route123_EventScript_ItemPPUp::
finditem ITEM_PP_UP
end
Route123_EventScript_ItemRevivalHerb::
finditem ITEM_REVIVAL_HERB
end
Route124_EventScript_ItemRedShard::
finditem ITEM_RED_SHARD
end
Route124_EventScript_ItemBlueShard::
finditem ITEM_BLUE_SHARD
end
Route124_EventScript_ItemYellowShard::
finditem ITEM_YELLOW_SHARD
end
Route125_EventScript_ItemBigPearl::
finditem ITEM_BIG_PEARL
end
Route126_EventScript_ItemGreenShard::
finditem ITEM_GREEN_SHARD
end
Route127_EventScript_ItemZinc::
finditem ITEM_ZINC
end
Route127_EventScript_ItemCarbos::
finditem ITEM_CARBOS
end
Route127_EventScript_ItemRareCandy::
finditem ITEM_RARE_CANDY
end
Route132_EventScript_ItemRareCandy::
finditem ITEM_RARE_CANDY
end
Route132_EventScript_ItemProtein::
finditem ITEM_PROTEIN
end
Route133_EventScript_ItemBigPearl::
finditem ITEM_BIG_PEARL
end
Route133_EventScript_ItemStarPiece::
finditem ITEM_STAR_PIECE
end
Route133_EventScript_ItemMaxRevive::
finditem ITEM_MAX_REVIVE
end
Route134_EventScript_ItemCarbos::
finditem ITEM_CARBOS
end
Route134_EventScript_ItemStarPiece::
finditem ITEM_STAR_PIECE
end
PetalburgCity_EventScript_ItemMaxRevive::
finditem ITEM_MAX_REVIVE
end
PetalburgCity_EventScript_ItemEther::
finditem ITEM_ETHER
end
MauvilleCity_EventScript_ItemXSpeed::
finditem ITEM_X_SPEED
end
RustboroCity_EventScript_ItemXDefend::
finditem ITEM_X_DEFENSE
end
LilycoveCity_EventScript_ItemMaxRepel::
finditem ITEM_MAX_REPEL
end
MossdeepCity_EventScript_ItemNetBall::
finditem ITEM_NET_BALL
end
PetalburgWoods_EventScript_ItemXAttack::
finditem ITEM_X_ATTACK
end
PetalburgWoods_EventScript_ItemGreatBall::
finditem ITEM_GREAT_BALL
end
PetalburgWoods_EventScript_ItemEther::
finditem ITEM_ETHER
end
PetalburgWoods_EventScript_ItemParalyzeHeal::
finditem ITEM_PARALYZE_HEAL
end
RusturfTunnel_EventScript_ItemPokeBall::
finditem ITEM_POKE_BALL
end
RusturfTunnel_EventScript_ItemMaxEther::
finditem ITEM_MAX_ETHER
end
GraniteCave_1F_EventScript_ItemEscapeRope::
finditem ITEM_ESCAPE_ROPE
end
GraniteCave_B1F_EventScript_ItemPokeBall::
finditem ITEM_POKE_BALL
end
GraniteCave_B2F_EventScript_ItemRepel::
finditem ITEM_REPEL
end
GraniteCave_B2F_EventScript_ItemRareCandy::
finditem ITEM_RARE_CANDY
end
JaggedPass_EventScript_ItemBurnHeal::
finditem ITEM_BURN_HEAL
end
FieryPath_EventScript_ItemFireStone::
finditem ITEM_FIRE_STONE
end
FieryPath_EventScript_ItemTMToxic::
finditem ITEM_TM_TOXIC
end
MeteorFalls_1F_1R_EventScript_ItemTMIronTail::
finditem ITEM_TM_IRON_TAIL
end
MeteorFalls_1F_1R_EventScript_ItemFullHeal::
finditem ITEM_FULL_HEAL
end
MeteorFalls_1F_1R_EventScript_ItemMoonStone::
finditem ITEM_MOON_STONE
end
MeteorFalls_1F_1R_EventScript_ItemPPUP::
finditem ITEM_PP_UP
end
MeteorFalls_B1F_2R_EventScript_ItemTMDragonClaw::
finditem ITEM_TM_DRAGON_CLAW
end
NewMauville_Inside_EventScript_ItemUltraBall::
finditem ITEM_ULTRA_BALL
end
NewMauville_Inside_EventScript_ItemEscapeRope::
finditem ITEM_ESCAPE_ROPE
end
NewMauville_Inside_EventScript_ItemThunderStone::
finditem ITEM_THUNDER_STONE
end
NewMauville_Inside_EventScript_ItemFullHeal::
finditem ITEM_FULL_HEAL
end
NewMauville_Inside_EventScript_ItemParalyzeHeal::
finditem ITEM_PARALYZE_HEAL
end
AbandonedShip_Rooms_1F_EventScript_ItemHarborMail::
finditem ITEM_HARBOR_MAIL
end
AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope::
finditem ITEM_ESCAPE_ROPE
end
AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall::
finditem ITEM_DIVE_BALL
end
AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam::
finditem ITEM_TM_ICE_BEAM
end
AbandonedShip_Rooms2_1F_EventScript_ItemRevive::
finditem ITEM_REVIVE
end
AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey::
finditem ITEM_STORAGE_KEY
end
AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall::
finditem ITEM_LUXURY_BALL
end
AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner::
finditem ITEM_SCANNER
end
AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone::
finditem ITEM_WATER_STONE
end
AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance::
finditem ITEM_TM_RAIN_DANCE
end
ScorchedSlab_EventScript_ItemTMSunnyDay::
finditem ITEM_TM_SUNNY_DAY
end
SafariZone_Northwest_EventScript_ItemTMSolarBeam::
finditem ITEM_TM_SOLAR_BEAM
end
SafariZone_North_EventScript_ItemCalcium::
finditem ITEM_CALCIUM
end
SafariZone_Southwest_EventScript_ItemMaxRevive::
finditem ITEM_MAX_REVIVE
end
SafariZone_Northeast_EventScript_ItemNugget::
finditem ITEM_NUGGET
end
SafariZone_Southeast_EventScript_ItemBigPearl::
finditem ITEM_BIG_PEARL
end
MtPyre_2F_EventScript_ItemUltraBall::
finditem ITEM_ULTRA_BALL
end
MtPyre_3F_EventScript_ItemSuperRepel::
finditem ITEM_SUPER_REPEL
end
MtPyre_4F_EventScript_ItemSeaIncense::
finditem ITEM_SEA_INCENSE
end
MtPyre_5F_EventScript_ItemLaxIncense::
finditem ITEM_LAX_INCENSE
end
MtPyre_6F_EventScript_ItemTMShadowBall::
finditem ITEM_TM_SHADOW_BALL
end
MtPyre_Exterior_EventScript_ItemMaxPotion::
finditem ITEM_MAX_POTION
end
MtPyre_Exterior_EventScript_ItemTMSkillSwap::
finditem ITEM_TM_SKILL_SWAP
end
AquaHideout_B1F_EventScript_ItemMasterBall::
finditem ITEM_MASTER_BALL
end
AquaHideout_B1F_EventScript_ItemNugget::
finditem ITEM_NUGGET
end
AquaHideout_B1F_EventScript_ItemMaxElixir::
finditem ITEM_MAX_ELIXIR
end
AquaHideout_B2F_EventScript_ItemNestBall::
finditem ITEM_NEST_BALL
end
AquaHideout_B2F_EventScript_ItemMasterBall::
finditem ITEM_MASTER_BALL // Unused
end
Route119_EventScript_ItemNugget::
finditem ITEM_NUGGET
end
Route119_EventScript_ItemMaxElixir::
finditem ITEM_MAX_ELIXIR
end
Route119_EventScript_ItemNestBall::
finditem ITEM_NEST_BALL
end
ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl::
finditem ITEM_BIG_PEARL
end
ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy::
finditem ITEM_RARE_CANDY
end
ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal::
finditem ITEM_ICE_HEAL
end
ShoalCave_LowTideIceRoom_EventScript_ItemTMHail::
finditem ITEM_TM_HAIL
end
ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce::
finditem ITEM_NEVER_MELT_ICE
end
SeafloorCavern_Room9_EventScript_ItemTMEarthquake::
finditem ITEM_TM_EARTHQUAKE
end
Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail::
finditem ITEM_ORANGE_MAIL
end
Route110_TrickHousePuzzle2_EventScript_ItemHarborMail::
finditem ITEM_HARBOR_MAIL
end
Route110_TrickHousePuzzle2_EventScript_ItemWaveMail::
finditem ITEM_WAVE_MAIL
end
Route110_TrickHousePuzzle3_EventScript_ItemShadowMail::
finditem ITEM_SHADOW_MAIL
end
Route110_TrickHousePuzzle3_EventScript_ItemWoodMail::
finditem ITEM_WOOD_MAIL
end
Route110_TrickHousePuzzle4_EventScript_ItemMechMail::
finditem ITEM_MECH_MAIL
end
Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail::
finditem ITEM_GLITTER_MAIL
end
Route110_TrickHousePuzzle7_EventScript_ItemTropicMail::
finditem ITEM_TROPIC_MAIL
end
Route110_TrickHousePuzzle8_EventScript_ItemBeadMail::
finditem ITEM_BEAD_MAIL
end
VictoryRoad_1F_EventScript_ItemMaxElixir::
finditem ITEM_MAX_ELIXIR
end
VictoryRoad_1F_EventScript_ItemPPUp::
finditem ITEM_PP_UP
end
VictoryRoad_B1F_EventScript_ItemTMPsychic::
finditem ITEM_TM_PSYCHIC
end
VictoryRoad_B1F_EventScript_ItemFullRestore::
finditem ITEM_FULL_RESTORE
end
VictoryRoad_B2F_EventScript_ItemFullHeal::
finditem ITEM_FULL_HEAL
end
ArtisanCave_B1F_EventScript_ItemHPUp::
finditem ITEM_HP_UP
end
ArtisanCave_1F_EventScript_ItemCarbos::
finditem ITEM_CARBOS
end
MagmaHideout_1F_EventScript_ItemRareCandy::
finditem ITEM_RARE_CANDY
end
MagmaHideout_2F_2R_EventScript_ItemMaxElixir::
finditem ITEM_MAX_ELIXIR
end
MagmaHideout_2F_2R_EventScript_ItemFullRestore::
finditem ITEM_FULL_RESTORE
end
MagmaHideout_3F_1R_EventScript_ItemNugget::
finditem ITEM_NUGGET
end
MagmaHideout_3F_2R_EventScript_ItemPPMax::
finditem ITEM_PP_MAX
end
MagmaHideout_4F_EventScript_ItemMaxRevive::
finditem ITEM_MAX_REVIVE
end
MagmaHideout_3F_3R_EventScript_ItemEscapeRope::
finditem ITEM_ESCAPE_ROPE
Common_EventScript_FindItem::
callnative GetItemBallIdAndAmountFromTemplate
finditem VAR_RESULT VAR_0x8009
end

20
data/scripts/obtain_item.inc
View File

@ -50,7 +50,14 @@ EventScript_BufferBerriesPocket::
return
EventScript_ObtainedItem::
compare VAR_0x8001, TRUE
goto_if_eq EventScript_ObtainedItemMessage
buffernumberstring 0, VAR_0x8001
message gText_ObtainedTheItems
goto EventScript_ContinueObtainedItem
EventScript_ObtainedItemMessage:
message gText_ObtainedTheItem
EventScript_ContinueObtainedItem:
waitfanfare
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
setvar VAR_RESULT, TRUE
@ -129,10 +136,23 @@ EventScript_PutBattlePyramidItemInBag::
EventScript_FoundTMHM::
bufferitemnameplural STR_VAR_1, VAR_0x8004, VAR_0x8005
compare VAR_0x8005, 2
goto_if_lt EventScript_FoundTMHMMessage
buffernumberstring STR_VAR_3, VAR_0x8005
message gText_PlayerFoundTMHMs
goto EventScript_BufferTMHMsPocket
return
EventScript_FoundTMHMMessage::
message gText_PlayerFoundOneTMHM
return
EventScript_FoundItem::
compare VAR_0x8001, TRUE
goto_if_eq EventScript_FoundItemMessage
buffernumberstring 0, VAR_0x8001
message gText_PlayerFoundItems
return
EventScript_FoundItemMessage::
message gText_PlayerFoundOneItem
return

6
data/text/obtain_item.inc
View File

@ -29,3 +29,9 @@ gText_NoRoomLeftForAnother::
gText_TheDecorWasTransferredToThePC::
.string "The {STR_VAR_2} was transferred\n"
.string "to the PC.$"
gText_ObtainedTheItems::
.string "Obtained {STR_VAR_1} {STR_VAR_2}!$"
gText_PlayerFoundItems::
.string "{PLAYER} found {STR_VAR_1} {STR_VAR_2}!$"

6
include/item_ball.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef GUARD_ITEM_BALL_H
#define GUARD_ITEM_BALL_H
void GetItemBallIdAndAmountFromTemplate(void);
#endif //GUARD_ITEM_BALL_H

23
src/item.c
View File

@ -84,22 +84,19 @@ void CopyItemName(u16 itemId, u8 *dst)
StringCopy(dst, ItemId_GetName(itemId));
}
const u8 sText_s[] =_("s");
void CopyItemNameHandlePlural(u16 itemId, u8 *dst, u32 quantity)
{
if (itemId == ITEM_POKE_BALL)
{
if (quantity < 2)
StringCopy(dst, ItemId_GetName(ITEM_POKE_BALL));
else
StringCopy(dst, gText_PokeBalls);
}
u8 *end = StringCopy(dst, ItemId_GetName(itemId)) - 1;
if (quantity < 2)
return;
if (ItemId_GetPocket(itemId) == POCKET_BERRIES)
GetBerryCountString(dst, gBerries[itemId - FIRST_BERRY_INDEX].name, quantity);
else
{
if (itemId >= FIRST_BERRY_INDEX && itemId <= LAST_BERRY_INDEX)
GetBerryCountString(dst, gBerries[itemId - FIRST_BERRY_INDEX].name, quantity);
else
StringCopy(dst, ItemId_GetName(itemId));
}
StringAppend(end, sText_s);
}
void GetBerryCountString(u8 *dst, const u8 *berryName, u32 quantity)

32
src/item_ball.c Normal file
View File

@ -0,0 +1,32 @@
#include "global.h"
#include "item_ball.h"
#include "event_data.h"
#include "constants/event_objects.h"
#include "constants/items.h"
static u32 GetItemBallAmountFromTemplate(u32);
static u32 GetItemBallIdFromTemplate(u32);
static u32 GetItemBallAmountFromTemplate(u32 itemBallId)
{
u32 amount = gMapHeader.events->objectEvents[itemBallId].movementRangeX;
if (amount > MAX_BAG_ITEM_CAPACITY)
return MAX_BAG_ITEM_CAPACITY;
return (amount == 0) ? 1 : amount;
}
static u32 GetItemBallIdFromTemplate(u32 itemBallId)
{
u32 itemId = gMapHeader.events->objectEvents[itemBallId].trainerRange_berryTreeId;
return (itemId >= ITEMS_COUNT) ? (ITEM_NONE + 1) : itemId;
}
void GetItemBallIdAndAmountFromTemplate(void)
{
u32 itemBallId = (gSpecialVar_LastTalked - 1);
gSpecialVar_Result = GetItemBallIdFromTemplate(itemBallId);
gSpecialVar_0x8009 = GetItemBallAmountFromTemplate(itemBallId);
}