ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add berry tree id constants

Browse Source
This commit is contained in:
GriffinR 2021-02-05 15:25:12 -05:00
parent 2b5f7fe151
commit 0851c34bac
29 changed files with 267 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/map_events.s
View File

@ -10,6 +10,7 @@
#include "constants/weather.h" #include "constants/weather.h"
#include "constants/trainer_hill.h" #include "constants/trainer_hill.h"
#include "constants/trainer_types.h" #include "constants/trainer_types.h"
#include "constants/berry.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"

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

@ -112,7 +112,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_PECHA",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -125,7 +125,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_ORAN",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -112,7 +112,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "5", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_CHERI_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -125,7 +125,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "6", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_LEPPA",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -138,7 +138,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "7", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_CHERI_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -156,7 +156,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "8", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_CHERI_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -169,7 +169,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "9", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -182,7 +182,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "10", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_LEPPA",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -195,7 +195,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "11", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_ORAN_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -208,7 +208,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "12", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -221,7 +221,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "13", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_PECHA",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -247,7 +247,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -260,7 +260,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "4", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_ORAN_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -273,7 +273,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "75", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_4",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -286,7 +286,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "76", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_CHERI_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -234,7 +234,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "16", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -247,7 +247,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "17", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -260,7 +260,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "18", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -104,7 +104,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "19", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_RAZZ_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -117,7 +117,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "20", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_RAZZ_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -273,7 +273,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "80", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_ORAN_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -286,7 +286,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "81", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_ORAN_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -117,7 +117,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "24", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_RAWST_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -130,7 +130,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "23", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_PECHA_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -143,7 +143,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "22", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_PECHA_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -156,7 +156,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "21", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_RAWST_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -34,7 +34,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "77", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -47,7 +47,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "78", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -125,7 +125,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "68", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -73,7 +73,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "69", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -86,7 +86,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "70", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -99,7 +99,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "71", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -190,7 +190,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "55", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_BLUK_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -203,7 +203,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "56", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_BLUK_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -34,7 +34,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "25", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_PINAP_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -47,7 +47,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "26", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_CHESTO_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -138,7 +138,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "66", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_CHESTO_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -151,7 +151,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "67", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_PINAP_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -164,7 +164,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "29", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -177,7 +177,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "28", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -190,7 +190,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "27", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -39,7 +39,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "31", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SITRUS_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -52,7 +52,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "32", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SOIL",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -65,7 +65,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "33", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SITRUS_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -34,7 +34,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "34", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -47,7 +47,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "35", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -60,7 +60,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "36", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -372,7 +372,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "83", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_HONDEW_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -385,7 +385,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "84", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_HONDEW_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -398,7 +398,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "85", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_SITRUS",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -411,7 +411,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "86", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_LEPPA",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -34,7 +34,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "46", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_WEPEAR",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -47,7 +47,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "45", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PINAP",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -60,7 +60,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "44", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_NANAB",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -73,7 +73,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "43", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_RAZZ",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -86,7 +86,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "37", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -99,7 +99,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "38", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -112,7 +112,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "39", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -125,7 +125,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "40", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -138,7 +138,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "41", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -151,7 +151,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "42", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -52,7 +52,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "47", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_PERSIM",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -65,7 +65,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "48", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_ASPEAR",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -78,7 +78,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "49", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_RAWST",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -91,7 +91,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "50", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_CHESTO",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -104,7 +104,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "51", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_SOIL_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -117,7 +117,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "52", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_NANAB_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -130,7 +130,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "53", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_NANAB_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -143,7 +143,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "54", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_SOIL_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -34,7 +34,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "58", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -47,7 +47,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "59", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_4",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -60,7 +60,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "60", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -73,7 +73,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "61", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -86,7 +86,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "62", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_LEPPA_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -99,7 +99,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "63", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_SOIL",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -112,7 +112,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "64", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_LEPPA_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -151,7 +151,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "65", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -164,7 +164,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "72", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_4",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -177,7 +177,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "73", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -190,7 +190,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "74", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_3",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -203,7 +203,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "79", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_4",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -216,7 +216,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "14", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -229,7 +229,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "15", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_1",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -242,7 +242,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "30", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_2",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -320,7 +320,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "87", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_PECHA",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -333,7 +333,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "88", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_SITRUS",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },
@ -346,7 +346,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "89", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_RAWST",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

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

@ -60,7 +60,7 @@
"movement_range_x": 0, "movement_range_x": 0,
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "82", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_130_LIECHI",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "FLAG_TEMP_11" "flag": "FLAG_TEMP_11"
}, },

160
data/scripts/new_game.inc
View File

@ -1,115 +1,115 @@
EventScript_ResetAllBerries:: @ 827149D EventScript_ResetAllBerries:: @ 827149D
@ Route 102 @ Route 102
setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_102_PECHA, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_102_ORAN, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
@ Route 104 @ Route 104
setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_104_ORAN_2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_104_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_104_ORAN_1, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_104_CHERI_2, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_104_CHERI_1, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_104_LEPPA, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
@ Route 116 @ Route 116
setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_116_PINAP_1, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_116_CHESTO_1, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_116_CHESTO_2, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_116_PINAP_2, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
@ Route 115 @ Route 115
setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_115_KELPSY_1, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_115_KELPSY_2, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_115_KELPSY_3, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_115_BLUK_1, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_115_BLUK_2, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
@ Route 103 @ Route 103
setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_103_CHERI_1, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_103_LEPPA, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_103_CHERI_2, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
@ Route 110 @ Route 110
setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_110_NANAB_1, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_110_NANAB_2, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_110_NANAB_3, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
@ Route 117 @ Route 117
setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_117_WEPEAR_3, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_117_WEPEAR_2, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_117_WEPEAR_1, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
@ Route 112 @ Route 112
setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_112_RAWST_2, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_112_PECHA_2, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_112_PECHA_1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_112_RAWST_1, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
@ Route 111 @ Route 111
setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_111_RAZZ_1, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_111_RAZZ_2, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_111_ORAN_1, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_111_ORAN_2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
@ Route 114 @ Route 114
setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_114_PERSIM_2, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_114_PERSIM_3, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_114_PERSIM_1, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
@ Route 118 @ Route 118
setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_118_SITRUS_1, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_118_SITRUS_2, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
@ Route 119 @ Route 119
setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_119_POMEG_1, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_119_POMEG_2, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_119_POMEG_3, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_119_HONDEW_1, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_119_HONDEW_2, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_119_SITRUS, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_119_LEPPA, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
@ Route 120 @ Route 120
setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_ASPEAR_1, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_ASPEAR_2, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_ASPEAR_3, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_PECHA_1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_PECHA_2, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_PECHA_3, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_WEPEAR, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_PINAP, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_NANAB, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_120_RAZZ, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
@ Route 121 @ Route 121
setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_121_PERSIM, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_121_ASPEAR, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_121_RAWST, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_121_CHESTO, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_121_NANAB_1, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_121_NANAB_2, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
@ Route 123 @ Route 123
setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_LEPPA_1, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_LEPPA_2, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_POMEG_3, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_POMEG_4, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_GREPA_1, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_GREPA_2, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_QUALOT_4, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_QUALOT_1, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_POMEG_1, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_POMEG_2, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_GREPA_3, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_GREPA_4, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_QUALOT_2, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_QUALOT_3, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_SITRUS, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_123_RAWST, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
@ Mirage Island @ Mirage Island
setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES setberrytree BERRY_TREE_ROUTE_130_LIECHI, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
return return
EventScript_ResetAllMapFlags:: @ 82715DE EventScript_ResetAllMapFlags:: @ 82715DE

2
include/berry.h
View File

@ -1,8 +1,6 @@
#ifndef GUARD_BERRY_H #ifndef GUARD_BERRY_H
#define GUARD_BERRY_H #define GUARD_BERRY_H
#include "constants/berry.h"
void ClearEnigmaBerries(void); void ClearEnigmaBerries(void);
void SetEnigmaBerry(u8 *src); void SetEnigmaBerry(u8 *src);
bool32 IsEnigmaBerryValid(void); bool32 IsEnigmaBerryValid(void);

97
include/constants/berry.h
View File

@ -32,4 +32,101 @@
// - BERRY_STAGE_FLOWERING // - BERRY_STAGE_FLOWERING
#define NUM_WATER_STAGES 4 #define NUM_WATER_STAGES 4
// IDs for berry tree objects, indexes into berryTrees in SaveBlock1
// Named for whatever berry is initially planted there on a new game
// Those with no initial berry are named "soil"
#define BERRY_TREE_ROUTE_102_ORAN 1
#define BERRY_TREE_ROUTE_102_PECHA 2
#define BERRY_TREE_ROUTE_104_SOIL_1 3
#define BERRY_TREE_ROUTE_104_ORAN_1 4
#define BERRY_TREE_ROUTE_103_CHERI_1 5
#define BERRY_TREE_ROUTE_103_LEPPA 6
#define BERRY_TREE_ROUTE_103_CHERI_2 7
#define BERRY_TREE_ROUTE_104_CHERI_1 8
#define BERRY_TREE_ROUTE_104_SOIL_2 9
#define BERRY_TREE_ROUTE_104_LEPPA 10
#define BERRY_TREE_ROUTE_104_ORAN_2 11
#define BERRY_TREE_ROUTE_104_SOIL_3 12
#define BERRY_TREE_ROUTE_104_PECHA 13
#define BERRY_TREE_ROUTE_123_QUALOT_1 14
#define BERRY_TREE_ROUTE_123_POMEG_1 15
#define BERRY_TREE_ROUTE_110_NANAB_1 16
#define BERRY_TREE_ROUTE_110_NANAB_2 17
#define BERRY_TREE_ROUTE_110_NANAB_3 18
#define BERRY_TREE_ROUTE_111_RAZZ_1 19
#define BERRY_TREE_ROUTE_111_RAZZ_2 20
#define BERRY_TREE_ROUTE_112_RAWST_1 21
#define BERRY_TREE_ROUTE_112_PECHA_1 22
#define BERRY_TREE_ROUTE_112_PECHA_2 23
#define BERRY_TREE_ROUTE_112_RAWST_2 24
#define BERRY_TREE_ROUTE_116_PINAP_1 25
#define BERRY_TREE_ROUTE_116_CHESTO_1 26
#define BERRY_TREE_ROUTE_117_WEPEAR_1 27
#define BERRY_TREE_ROUTE_117_WEPEAR_2 28
#define BERRY_TREE_ROUTE_117_WEPEAR_3 29
#define BERRY_TREE_ROUTE_123_POMEG_2 30
#define BERRY_TREE_ROUTE_118_SITRUS_1 31
#define BERRY_TREE_ROUTE_118_SOIL 32
#define BERRY_TREE_ROUTE_118_SITRUS_2 33
#define BERRY_TREE_ROUTE_119_POMEG_1 34
#define BERRY_TREE_ROUTE_119_POMEG_2 35
#define BERRY_TREE_ROUTE_119_POMEG_3 36
#define BERRY_TREE_ROUTE_120_ASPEAR_1 37
#define BERRY_TREE_ROUTE_120_ASPEAR_2 38
#define BERRY_TREE_ROUTE_120_ASPEAR_3 39
#define BERRY_TREE_ROUTE_120_PECHA_1 40
#define BERRY_TREE_ROUTE_120_PECHA_2 41
#define BERRY_TREE_ROUTE_120_PECHA_3 42
#define BERRY_TREE_ROUTE_120_RAZZ 43
#define BERRY_TREE_ROUTE_120_NANAB 44
#define BERRY_TREE_ROUTE_120_PINAP 45
#define BERRY_TREE_ROUTE_120_WEPEAR 46
#define BERRY_TREE_ROUTE_121_PERSIM 47
#define BERRY_TREE_ROUTE_121_ASPEAR 48
#define BERRY_TREE_ROUTE_121_RAWST 49
#define BERRY_TREE_ROUTE_121_CHESTO 50
#define BERRY_TREE_ROUTE_121_SOIL_1 51
#define BERRY_TREE_ROUTE_121_NANAB_1 52
#define BERRY_TREE_ROUTE_121_NANAB_2 53
#define BERRY_TREE_ROUTE_121_SOIL_2 54
#define BERRY_TREE_ROUTE_115_BLUK_1 55
#define BERRY_TREE_ROUTE_115_BLUK_2 56
#define BERRY_TREE_UNUSED 57
#define BERRY_TREE_ROUTE_123_POMEG_3 58
#define BERRY_TREE_ROUTE_123_POMEG_4 59
#define BERRY_TREE_ROUTE_123_GREPA_1 60
#define BERRY_TREE_ROUTE_123_GREPA_2 61
#define BERRY_TREE_ROUTE_123_LEPPA_1 62
#define BERRY_TREE_ROUTE_123_SOIL 63
#define BERRY_TREE_ROUTE_123_LEPPA_2 64
#define BERRY_TREE_ROUTE_123_GREPA_3 65
#define BERRY_TREE_ROUTE_116_CHESTO_2 66
#define BERRY_TREE_ROUTE_116_PINAP_2 67
#define BERRY_TREE_ROUTE_114_PERSIM_1 68
#define BERRY_TREE_ROUTE_115_KELPSY_1 69
#define BERRY_TREE_ROUTE_115_KELPSY_2 70
#define BERRY_TREE_ROUTE_115_KELPSY_3 71
#define BERRY_TREE_ROUTE_123_GREPA_4 72
#define BERRY_TREE_ROUTE_123_QUALOT_2 73
#define BERRY_TREE_ROUTE_123_QUALOT_3 74
#define BERRY_TREE_ROUTE_104_SOIL_4 75
#define BERRY_TREE_ROUTE_104_CHERI_2 76
#define BERRY_TREE_ROUTE_114_PERSIM_2 77
#define BERRY_TREE_ROUTE_114_PERSIM_3 78
#define BERRY_TREE_ROUTE_123_QUALOT_4 79
#define BERRY_TREE_ROUTE_111_ORAN_1 80
#define BERRY_TREE_ROUTE_111_ORAN_2 81
#define BERRY_TREE_ROUTE_130_LIECHI 82
#define BERRY_TREE_ROUTE_119_HONDEW_1 83
#define BERRY_TREE_ROUTE_119_HONDEW_2 84
#define BERRY_TREE_ROUTE_119_SITRUS 85
#define BERRY_TREE_ROUTE_119_LEPPA 86
#define BERRY_TREE_ROUTE_123_PECHA 87
#define BERRY_TREE_ROUTE_123_SITRUS 88
#define BERRY_TREE_ROUTE_123_RAWST 89
// Remainder are unused
#define BERRY_TREES_COUNT 128
#endif // GUARD_CONSTANTS_BERRY_H #endif // GUARD_CONSTANTS_BERRY_H

1
include/constants/global.h
View File

@ -33,7 +33,6 @@
#define DAYCARE_MON_COUNT 2 #define DAYCARE_MON_COUNT 2
#define POKEBLOCKS_COUNT 40 #define POKEBLOCKS_COUNT 40
#define OBJECT_EVENTS_COUNT 16 #define OBJECT_EVENTS_COUNT 16
#define BERRY_TREES_COUNT 128
#define MAIL_COUNT 16 #define MAIL_COUNT 16
#define SECRET_BASES_COUNT 20 #define SECRET_BASES_COUNT 20
#define TV_SHOWS_COUNT 25 #define TV_SHOWS_COUNT 25

1
include/global.h
View File

@ -9,6 +9,7 @@
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/vars.h" #include "constants/vars.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/berry.h"
// Prevent cross-jump optimization. // Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm(""); #define BLOCK_CROSS_JUMP asm("");

1
src/battle_message.c
View File

@ -21,7 +21,6 @@
#include "window.h" #include "window.h"
#include "constants/battle_dome.h" #include "constants/battle_dome.h"
#include "constants/battle_string_ids.h" #include "constants/battle_string_ids.h"
#include "constants/berry.h"
#include "constants/frontier_util.h" #include "constants/frontier_util.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/moves.h" #include "constants/moves.h"

1
src/battle_util.c
View File

@ -29,7 +29,6 @@
#include "constants/battle_move_effects.h" #include "constants/battle_move_effects.h"
#include "constants/battle_script_commands.h" #include "constants/battle_script_commands.h"
#include "constants/battle_string_ids.h" #include "constants/battle_string_ids.h"
#include "constants/berry.h"
#include "constants/hold_effects.h" #include "constants/hold_effects.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/moves.h" #include "constants/moves.h"

1
src/berry.c
View File

@ -11,7 +11,6 @@
#include "random.h" #include "random.h"
#include "string_util.h" #include "string_util.h"
#include "text.h" #include "text.h"
#include "constants/berry.h"
#include "constants/event_object_movement.h" #include "constants/event_object_movement.h"
#include "constants/items.h" #include "constants/items.h"

1
src/berry_blender.c
View File

@ -34,7 +34,6 @@
#include "new_game.h" #include "new_game.h"
#include "save.h" #include "save.h"
#include "strings.h" #include "strings.h"
#include "constants/berry.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/rgb.h" #include "constants/rgb.h"

1
src/berry_tag_screen.c
View File

@ -26,7 +26,6 @@
#include "item_menu_icons.h" #include "item_menu_icons.h"
#include "decompress.h" #include "decompress.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "constants/berry.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/songs.h" #include "constants/songs.h"

1
src/menu_specialized.c
View File

@ -23,7 +23,6 @@
#include "text_window.h" #include "text_window.h"
#include "trig.h" #include "trig.h"
#include "window.h" #include "window.h"
#include "constants/berry.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "gba/io_reg.h" #include "gba/io_reg.h"

1
src/pokeblock.c
View File

@ -29,7 +29,6 @@
#include "task.h" #include "task.h"
#include "text.h" #include "text.h"
#include "text_window.h" #include "text_window.h"
#include "constants/berry.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/rgb.h" #include "constants/rgb.h"