diff options
| -rw-r--r-- | data/maps/Route102/map.json | 4 | ||||
| -rw-r--r-- | data/scripts/new_game.inc | 4 | ||||
| -rw-r--r-- | include/constants/berry.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 609c90079..aaa63b11f 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -112,7 +112,7 @@ "movement_range_x": 0, "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_PECHA", + "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_ORAN", "script": "BerryTreeScript", "flag": "0" }, @@ -125,7 +125,7 @@ "movement_range_x": 0, "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_ORAN", + "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_PECHA", "script": "BerryTreeScript", "flag": "0" }, diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index 75a3eda95..7b3bace70 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -1,7 +1,7 @@ EventScript_ResetAllBerries:: @ 827149D @ Route 102 - setberrytree BERRY_TREE_ROUTE_102_PECHA, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree BERRY_TREE_ROUTE_102_ORAN, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree BERRY_TREE_ROUTE_102_ORAN, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree BERRY_TREE_ROUTE_102_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES @ Route 104 setberrytree BERRY_TREE_ROUTE_104_ORAN_2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES diff --git a/include/constants/berry.h b/include/constants/berry.h index fee1ee5f1..3ba59c0f5 100644 --- a/include/constants/berry.h +++ b/include/constants/berry.h @@ -35,8 +35,8 @@ // 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_102_PECHA 1 +#define BERRY_TREE_ROUTE_102_ORAN 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 |