Merge branch 'master' into clone-union
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
|
||||
"movement_range_x": 0,
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "66",
|
||||
"trainer_type": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1"
|
||||
@@ -38,7 +38,7 @@
|
||||
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
|
||||
"movement_range_x": 0,
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "67",
|
||||
"trainer_type": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "EventScript_StrengthBoulder",
|
||||
"flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2"
|
||||
|
||||
Reference in New Issue
Block a user