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

Fix swapped route 102 berries

Browse Source
This commit is contained in:
GriffinR 2021-02-10 16:26:09 -05:00
parent 0851c34bac
commit 20b76c6071
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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": "BERRY_TREE_ROUTE_102_PECHA", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_ORAN",
"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": "BERRY_TREE_ROUTE_102_ORAN", "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_PECHA",
"script": "BerryTreeScript", "script": "BerryTreeScript",
"flag": "0" "flag": "0"
}, },

4
data/scripts/new_game.inc
View File

@ -1,7 +1,7 @@
EventScript_ResetAllBerries:: @ 827149D EventScript_ResetAllBerries:: @ 827149D
@ Route 102 @ 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_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_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
@ Route 104 @ Route 104
setberrytree BERRY_TREE_ROUTE_104_ORAN_2, 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

4
include/constants/berry.h
View File

@ -35,8 +35,8 @@
// IDs for berry tree objects, indexes into berryTrees in SaveBlock1 // IDs for berry tree objects, indexes into berryTrees in SaveBlock1
// Named for whatever berry is initially planted there on a new game // Named for whatever berry is initially planted there on a new game
// Those with no initial berry are named "soil" // Those with no initial berry are named "soil"
#define BERRY_TREE_ROUTE_102_ORAN 1 #define BERRY_TREE_ROUTE_102_PECHA 1
#define BERRY_TREE_ROUTE_102_PECHA 2 #define BERRY_TREE_ROUTE_102_ORAN 2
#define BERRY_TREE_ROUTE_104_SOIL_1 3 #define BERRY_TREE_ROUTE_104_SOIL_1 3
#define BERRY_TREE_ROUTE_104_ORAN_1 4 #define BERRY_TREE_ROUTE_104_ORAN_1 4
#define BERRY_TREE_ROUTE_103_CHERI_1 5 #define BERRY_TREE_ROUTE_103_CHERI_1 5