Skip to content

Commit c3c2c62

Browse files
unfoldingdevunfoldingdev
committed
movements, balancing
1 parent 00b4ab1 commit c3c2c62

30 files changed

Lines changed: 207 additions & 207 deletions

File tree

‎data/maps/MansionFloor1Hallway1/map.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"x": 9,
2020
"y": 12,
2121
"elevation": 0,
22-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
22+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
2323
"movement_range_x": 0,
2424
"movement_range_y": 0,
25-
"trainer_type": "TRAINER_TYPE_NONE",
26-
"trainer_sight_or_berry_tree_id": "0",
25+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
26+
"trainer_sight_or_berry_tree_id": "1",
2727
"script": "EventScript_DoMansionBattle",
2828
"flag": "FLAG_H1_ENEMYA"
2929
},
@@ -32,11 +32,11 @@
3232
"x": 11,
3333
"y": 12,
3434
"elevation": 0,
35-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
35+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
3636
"movement_range_x": 0,
3737
"movement_range_y": 0,
38-
"trainer_type": "TRAINER_TYPE_NONE",
39-
"trainer_sight_or_berry_tree_id": "0",
38+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
39+
"trainer_sight_or_berry_tree_id": "1",
4040
"script": "EventScript_DoMansionBattle",
4141
"flag": "FLAG_H1_ENEMYB"
4242
},
@@ -58,11 +58,11 @@
5858
"x": 11,
5959
"y": 13,
6060
"elevation": 0,
61-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
61+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION_FASTER3",
6262
"movement_range_x": 0,
6363
"movement_range_y": 0,
64-
"trainer_type": "TRAINER_TYPE_NONE",
65-
"trainer_sight_or_berry_tree_id": "0",
64+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
65+
"trainer_sight_or_berry_tree_id": "1",
6666
"script": "EventScript_DoMansionBattle",
6767
"flag": "FLAG_H1_ENEMYD"
6868
}

‎data/maps/MansionFloor1Hallway2/map.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
"x": 11,
5959
"y": 13,
6060
"elevation": 0,
61-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
61+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION_FASTER3",
6262
"movement_range_x": 0,
6363
"movement_range_y": 0,
64-
"trainer_type": "TRAINER_TYPE_NONE",
65-
"trainer_sight_or_berry_tree_id": "0",
64+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
65+
"trainer_sight_or_berry_tree_id": "1",
6666
"script": "EventScript_DoMansionBattle",
6767
"flag": "FLAG_H2_ENEMYD"
6868
}

‎data/maps/MansionFloor1Room1/map.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"x": 10,
2020
"y": 13,
2121
"elevation": 0,
22-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
22+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
2323
"movement_range_x": 5,
2424
"movement_range_y": 5,
2525
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
@@ -32,7 +32,7 @@
3232
"x": 9,
3333
"y": 14,
3434
"elevation": 0,
35-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
35+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
3636
"movement_range_x": 4,
3737
"movement_range_y": 4,
3838
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
@@ -45,7 +45,7 @@
4545
"x": 11,
4646
"y": 14,
4747
"elevation": 0,
48-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
48+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
4949
"movement_range_x": 3,
5050
"movement_range_y": 3,
5151
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",

‎data/maps/MansionFloor1Room2/map.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"x": 10,
2020
"y": 13,
2121
"elevation": 0,
22-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
22+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
2323
"movement_range_x": 0,
2424
"movement_range_y": 0,
25-
"trainer_type": "TRAINER_TYPE_NONE",
26-
"trainer_sight_or_berry_tree_id": "0",
25+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
26+
"trainer_sight_or_berry_tree_id": "1",
2727
"script": "EventScript_DoMansionBattle",
2828
"flag": "FLAG_4R2_ENEMYA"
2929
},
@@ -45,11 +45,11 @@
4545
"x": 11,
4646
"y": 14,
4747
"elevation": 0,
48-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
48+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
4949
"movement_range_x": 0,
5050
"movement_range_y": 0,
51-
"trainer_type": "TRAINER_TYPE_NONE",
52-
"trainer_sight_or_berry_tree_id": "0",
51+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
52+
"trainer_sight_or_berry_tree_id": "1",
5353
"script": "EventScript_DoMansionBattle",
5454
"flag": "FLAG_4R2_ENEMYC"
5555
},

‎data/maps/MansionFloor1Room3/map.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{
1818
"graphics_id": "OBJ_EVENT_GFX_SPECIES(MINCCINO)",
1919
"x": 9,
20-
"y": 11,
20+
"y": 12,
2121
"elevation": 0,
2222
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
2323
"movement_range_x": 0,
@@ -32,11 +32,11 @@
3232
"x": 10,
3333
"y": 11,
3434
"elevation": 0,
35-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
35+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION_FASTER3",
3636
"movement_range_x": 0,
3737
"movement_range_y": 0,
38-
"trainer_type": "TRAINER_TYPE_NONE",
39-
"trainer_sight_or_berry_tree_id": "0",
38+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
39+
"trainer_sight_or_berry_tree_id": "1",
4040
"script": "EventScript_DoMansionBattle",
4141
"flag": "FLAG_4R3_ENEMYB"
4242
},
@@ -45,11 +45,11 @@
4545
"x": 11,
4646
"y": 11,
4747
"elevation": 0,
48-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
48+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
4949
"movement_range_x": 0,
5050
"movement_range_y": 0,
51-
"trainer_type": "TRAINER_TYPE_NONE",
52-
"trainer_sight_or_berry_tree_id": "0",
51+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
52+
"trainer_sight_or_berry_tree_id": "1",
5353
"script": "EventScript_DoMansionBattle",
5454
"flag": "FLAG_4R3_ENEMYC"
5555
},

‎data/maps/MansionFloor1RoomBoss/scripts.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@ MansionFloor1RoomBoss_EventScript_SweetSquadScene2::
231231
applymovement LOCALID_VANILLITE, MansionFloor1RoomBoss_AttackMove
232232
waitmovement 0
233233
special RemoveCameraObject
234-
setwildbattle SPECIES_FIDOUGH, 10, ITEM_ORAN_BERRY, SPECIES_APPLIN, 10, ITEM_ORAN_BERRY
234+
setwildbattle SPECIES_FIDOUGH, 9, ITEM_ORAN_BERRY, SPECIES_APPLIN, 10, ITEM_ORAN_BERRY
235235
@setflag FLAG_SYS_CTRL_OBJ_DELETE
236236
dowildbattle
237-
setwildbattle SPECIES_SINISTEA, 12, ITEM_ORAN_BERRY, SPECIES_VANILLITE, 12, ITEM_ORAN_BERRY
237+
setwildbattle SPECIES_SINISTEA, 11, ITEM_ORAN_BERRY, SPECIES_VANILLITE, 12, ITEM_ORAN_BERRY
238238
dowildbattle
239239
@clearflag FLAG_SYS_CTRL_OBJ_DELETE
240240
specialvar VAR_RESULT, GetBattleOutcome
@@ -304,7 +304,7 @@ MansionFloor1RoomBoss_EventScript_SavorySquadScene1::
304304
applymovement LOCALID_FARFETCHD, MansionFloor1RoomBoss_AttackMove
305305
applymovement LOCALID_NACLI, MansionFloor1RoomBoss_AttackMove
306306
waitmovement 0
307-
setwildbattle SPECIES_SMOLIV, 7, ITEM_ORAN_BERRY, SPECIES_FARFETCHD, 11, ITEM_ORAN_BERRY
307+
setwildbattle SPECIES_SMOLIV, 8, ITEM_ORAN_BERRY, SPECIES_FARFETCHD, 9, ITEM_ORAN_BERRY
308308
@setflag FLAG_SYS_CTRL_OBJ_DELETE
309309
dowildbattle
310310
setwildbattle SPECIES_NACLI, 10, ITEM_ORAN_BERRY, SPECIES_TATSUGIRI, 14, ITEM_ORAN_BERRY
@@ -382,7 +382,7 @@ MansionFloor1RoomBoss_EventScript_SavorySquadScene2::
382382
applymovement LOCALID_FARFETCHD, MansionFloor1RoomBoss_AttackMove
383383
applymovement LOCALID_NACLI, MansionFloor1RoomBoss_AttackMove
384384
waitmovement 0
385-
setwildbattle SPECIES_SMOLIV, 7, ITEM_ORAN_BERRY, SPECIES_FARFETCHD, 8, ITEM_ORAN_BERRY
385+
setwildbattle SPECIES_SMOLIV, 8, ITEM_ORAN_BERRY, SPECIES_FARFETCHD, 9, ITEM_ORAN_BERRY
386386
@setflag FLAG_SYS_CTRL_OBJ_DELETE
387387
dowildbattle
388388
setwildbattle SPECIES_NACLI, 10, ITEM_ORAN_BERRY, SPECIES_TATSUGIRI, 14, ITEM_ORAN_BERRY

‎data/maps/MansionFloor1TreasureDown/map.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"x": 9,
2020
"y": 13,
2121
"elevation": 0,
22-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
22+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
2323
"movement_range_x": 0,
2424
"movement_range_y": 0,
25-
"trainer_type": "TRAINER_TYPE_NONE",
26-
"trainer_sight_or_berry_tree_id": "0",
25+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
26+
"trainer_sight_or_berry_tree_id": "1",
2727
"script": "EventScript_DoMansionDoubleBattle",
2828
"flag": "FLAG_T1_ENEMYA"
2929
},
@@ -32,11 +32,11 @@
3232
"x": 11,
3333
"y": 13,
3434
"elevation": 0,
35-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
35+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
3636
"movement_range_x": 0,
3737
"movement_range_y": 0,
38-
"trainer_type": "TRAINER_TYPE_NONE",
39-
"trainer_sight_or_berry_tree_id": "0",
38+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
39+
"trainer_sight_or_berry_tree_id": "1",
4040
"script": "EventScript_DoMansionDoubleBattle",
4141
"flag": "FLAG_T1_ENEMYB"
4242
},

‎data/maps/MansionFloor1TreasureLeft/map.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
"object_events": [
1717
{
1818
"graphics_id": "OBJ_EVENT_GFX_SPECIES(PHANPY)",
19-
"x": 8,
20-
"y": 14,
19+
"x": 9,
20+
"y": 13,
2121
"elevation": 0,
2222
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
2323
"movement_range_x": 0,
2424
"movement_range_y": 0,
25-
"trainer_type": "TRAINER_TYPE_NONE",
26-
"trainer_sight_or_berry_tree_id": "0",
25+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
26+
"trainer_sight_or_berry_tree_id": "1",
2727
"script": "EventScript_DoMansionDoubleBattle",
2828
"flag": "FLAG_T2_ENEMYA"
2929
},
3030
{
3131
"graphics_id": "OBJ_EVENT_GFX_SPECIES(STUNKY)",
32-
"x": 8,
33-
"y": 14,
32+
"x": 9,
33+
"y": 15,
3434
"elevation": 0,
3535
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
3636
"movement_range_x": 0,
@@ -42,21 +42,21 @@
4242
},
4343
{
4444
"graphics_id": "OBJ_EVENT_GFX_SPECIES(TIMBURR)",
45-
"x": 8,
46-
"y": 14,
45+
"x": 9,
46+
"y": 13,
4747
"elevation": 0,
4848
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
4949
"movement_range_x": 0,
5050
"movement_range_y": 0,
51-
"trainer_type": "TRAINER_TYPE_NONE",
52-
"trainer_sight_or_berry_tree_id": "0",
51+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
52+
"trainer_sight_or_berry_tree_id": "1",
5353
"script": "EventScript_DoMansionDoubleBattle",
5454
"flag": "FLAG_T2_ENEMYC"
5555
},
5656
{
5757
"graphics_id": "OBJ_EVENT_GFX_SPECIES(MINCCINO)",
58-
"x": 8,
59-
"y": 14,
58+
"x": 9,
59+
"y": 15,
6060
"elevation": 0,
6161
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
6262
"movement_range_x": 0,

‎data/maps/MansionFloor1TreasureRight/map.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
"x": 9,
3333
"y": 12,
3434
"elevation": 0,
35-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
35+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
3636
"movement_range_x": 0,
3737
"movement_range_y": 0,
38-
"trainer_type": "TRAINER_TYPE_NONE",
39-
"trainer_sight_or_berry_tree_id": "0",
38+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
39+
"trainer_sight_or_berry_tree_id": "1",
4040
"script": "EventScript_DoMansionDoubleBattle",
4141
"flag": "FLAG_T3_ENEMYA"
4242
},
@@ -45,11 +45,11 @@
4545
"x": 7,
4646
"y": 16,
4747
"elevation": 0,
48-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
48+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
4949
"movement_range_x": 0,
5050
"movement_range_y": 0,
51-
"trainer_type": "TRAINER_TYPE_NONE",
52-
"trainer_sight_or_berry_tree_id": "0",
51+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
52+
"trainer_sight_or_berry_tree_id": "1",
5353
"script": "EventScript_DoMansionDoubleBattle",
5454
"flag": "FLAG_T3_ENEMYC"
5555
},

‎data/maps/MansionFloor1TreasureUp/map.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"x": 11,
2020
"y": 13,
2121
"elevation": 0,
22-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
22+
"movement_type": "MOVEMENT_TYPE_IN_PLAYERS_DIRECTION",
2323
"movement_range_x": 0,
2424
"movement_range_y": 0,
25-
"trainer_type": "TRAINER_TYPE_NONE",
26-
"trainer_sight_or_berry_tree_id": "0",
25+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
26+
"trainer_sight_or_berry_tree_id": "1",
2727
"script": "EventScript_DoMansionDoubleBattle",
2828
"flag": "FLAG_T4_ENEMYA"
2929
},
@@ -35,8 +35,8 @@
3535
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
3636
"movement_range_x": 0,
3737
"movement_range_y": 0,
38-
"trainer_type": "TRAINER_TYPE_NONE",
39-
"trainer_sight_or_berry_tree_id": "0",
38+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
39+
"trainer_sight_or_berry_tree_id": "1",
4040
"script": "EventScript_DoMansionDoubleBattle",
4141
"flag": "FLAG_T4_ENEMYC"
4242
},
@@ -48,8 +48,8 @@
4848
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
4949
"movement_range_x": 0,
5050
"movement_range_y": 0,
51-
"trainer_type": "TRAINER_TYPE_NONE",
52-
"trainer_sight_or_berry_tree_id": "0",
51+
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
52+
"trainer_sight_or_berry_tree_id": "1",
5353
"script": "EventScript_DoMansionDoubleBattle",
5454
"flag": "FLAG_T4_ENEMYB"
5555
},

0 commit comments

Comments
 (0)