Skip to content

Commit 542acea

Browse files
author
Ericchi
committed
A little balance change
1 parent e297c73 commit 542acea

File tree

7 files changed

+131
-163
lines changed

7 files changed

+131
-163
lines changed

‎data/layouts/Route106/map.bin

0 Bytes
Binary file not shown.

‎data/maps/MagmaHideout_2F_3R/map.json

+37-34
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
{
2-
"id": "MAP_MAGMA_HIDEOUT_2F_3R",
3-
"name": "MagmaHideout_2F_3R",
4-
"layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R",
5-
"music": "MUS_AJITO",
6-
"region_map_section": "MAPSEC_MAGMA_HIDEOUT",
7-
"requires_flash": false,
8-
"weather": "WEATHER_NONE",
9-
"map_type": "MAP_TYPE_UNDERGROUND",
10-
"allow_bike": true,
11-
"allow_escape_rope": true,
12-
"allow_running": true,
13-
"show_map_name": true,
14-
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
15-
"connections": null,
16-
"object_events": [],
17-
"warp_events": [
18-
{
19-
"x": 16,
20-
"y": 1,
21-
"elevation": 0,
22-
"dest_map": "MAP_MAGMA_HIDEOUT_1F",
23-
"dest_warp_id": 3
24-
},
25-
{
26-
"x": 16,
27-
"y": 13,
28-
"elevation": 0,
29-
"dest_map": "MAP_MAGMA_HIDEOUT_3F_3R",
30-
"dest_warp_id": 0
31-
}
32-
],
33-
"coord_events": [],
34-
"bg_events": []
35-
}
2+
"allow_bike": true,
3+
"allow_escape_rope": true,
4+
"allow_running": true,
5+
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
6+
"bg_events": [
7+
],
8+
"connections": null,
9+
"coord_events": [
10+
],
11+
"id": "MAP_MAGMA_HIDEOUT_2F_3R",
12+
"layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R",
13+
"map_type": "MAP_TYPE_UNDERGROUND",
14+
"music": "MUS_AJITO",
15+
"name": "MagmaHideout_2F_3R",
16+
"object_events": [
17+
],
18+
"region_map_section": "MAPSEC_MAGMA_HIDEOUT",
19+
"requires_flash": false,
20+
"show_map_name": true,
21+
"warp_events": [
22+
{
23+
"dest_map": "MAP_MAGMA_HIDEOUT_1F",
24+
"dest_warp_id": 3,
25+
"elevation": 0,
26+
"x": 16,
27+
"y": 1
28+
},
29+
{
30+
"dest_map": "MAP_MAGMA_HIDEOUT_3F_3R",
31+
"dest_warp_id": 0,
32+
"elevation": 0,
33+
"x": 16,
34+
"y": 13
35+
}
36+
],
37+
"weather": "WEATHER_NONE"
38+
}

‎data/maps/MossdeepCity/map.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
},
542542
{
543543
"elevation": 3,
544-
"flag": "0",
544+
"flag": "FLAG_SYS_WEATHER_CTRL",
545545
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
546546
"movement_range_x": 0,
547547
"movement_range_y": 0,
@@ -554,7 +554,7 @@
554554
},
555555
{
556556
"elevation": 3,
557-
"flag": "0",
557+
"flag": "FLAG_SYS_WEATHER_CTRL",
558558
"graphics_id": "EVENT_OBJ_GFX_LASS",
559559
"movement_range_x": 0,
560560
"movement_range_y": 0,
@@ -567,7 +567,7 @@
567567
},
568568
{
569569
"elevation": 3,
570-
"flag": "0",
570+
"flag": "FLAG_SYS_WEATHER_CTRL",
571571
"graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
572572
"movement_range_x": 0,
573573
"movement_range_y": 0,

‎data/maps/Route106/map.json

-39
Original file line numberDiff line numberDiff line change
@@ -121,45 +121,6 @@
121121
"trainer_type": "0",
122122
"x": 29,
123123
"y": 14
124-
},
125-
{
126-
"elevation": 3,
127-
"flag": "0",
128-
"graphics_id": "EVENT_OBJ_GFX_LASS",
129-
"movement_range_x": 0,
130-
"movement_range_y": 0,
131-
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
132-
"script": "Route106_TrainerTrio_Tessa",
133-
"trainer_sight_or_berry_tree_id": "0",
134-
"trainer_type": "0",
135-
"x": 63,
136-
"y": 14
137-
},
138-
{
139-
"elevation": 3,
140-
"flag": "0",
141-
"graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
142-
"movement_range_x": 0,
143-
"movement_range_y": 0,
144-
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
145-
"script": "Route106_TrainerTrio_Theo",
146-
"trainer_sight_or_berry_tree_id": "0",
147-
"trainer_type": "0",
148-
"x": 68,
149-
"y": 14
150-
},
151-
{
152-
"elevation": 3,
153-
"flag": "0",
154-
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
155-
"movement_range_x": 0,
156-
"movement_range_y": 0,
157-
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
158-
"script": "Route106_TrainerTrio_Tyler",
159-
"trainer_sight_or_berry_tree_id": "0",
160-
"trainer_type": "0",
161-
"x": 65,
162-
"y": 13
163124
}
164125
],
165126
"region_map_section": "MAPSEC_ROUTE_106",

‎data/maps/TerraCave_End/map.json

+52-51
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,53 @@
11
{
2-
"id": "MAP_TERRA_CAVE_END",
3-
"name": "TerraCave_End",
4-
"layout": "LAYOUT_TERRA_CAVE_END",
5-
"music": "MUS_DAN01",
6-
"region_map_section": "MAPSEC_TERRA_CAVE",
7-
"requires_flash": false,
8-
"weather": "WEATHER_FOG_1",
9-
"map_type": "MAP_TYPE_UNDERGROUND",
10-
"allow_bike": false,
11-
"allow_escape_rope": true,
12-
"allow_running": true,
13-
"show_map_name": true,
14-
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
15-
"connections": null,
16-
"object_events": [
17-
{
18-
"graphics_id": "EVENT_OBJ_GFX_GROUDON_1",
19-
"x": 17,
20-
"y": 22,
21-
"elevation": 1,
22-
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
23-
"movement_range_x": 1,
24-
"movement_range_y": 1,
25-
"trainer_type": "0",
26-
"trainer_sight_or_berry_tree_id": "0",
27-
"script": "0x0",
28-
"flag": "FLAG_HIDE_TERRA_CAVE_GROUDON"
29-
}
30-
],
31-
"warp_events": [
32-
{
33-
"x": 5,
34-
"y": 4,
35-
"elevation": 3,
36-
"dest_map": "MAP_TERRA_CAVE_ENTRANCE",
37-
"dest_warp_id": 1
38-
}
39-
],
40-
"coord_events": [
41-
{
42-
"type": "trigger",
43-
"x": 17,
44-
"y": 26,
45-
"elevation": 3,
46-
"var": "VAR_TEMP_1",
47-
"var_value": "1",
48-
"script": "TerraCave_End_EventScript_23B0EC"
49-
}
50-
],
51-
"bg_events": []
52-
}
2+
"allow_bike": false,
3+
"allow_escape_rope": true,
4+
"allow_running": true,
5+
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
6+
"bg_events": [
7+
],
8+
"connections": null,
9+
"coord_events": [
10+
{
11+
"elevation": 3,
12+
"script": "TerraCave_End_EventScript_23B0EC",
13+
"type": "trigger",
14+
"var": "VAR_TEMP_1",
15+
"var_value": "1",
16+
"x": 17,
17+
"y": 26
18+
}
19+
],
20+
"id": "MAP_TERRA_CAVE_END",
21+
"layout": "LAYOUT_TERRA_CAVE_END",
22+
"map_type": "MAP_TYPE_UNDERGROUND",
23+
"music": "MUS_DAN01",
24+
"name": "TerraCave_End",
25+
"object_events": [
26+
{
27+
"elevation": 1,
28+
"flag": "FLAG_HIDE_TERRA_CAVE_GROUDON",
29+
"graphics_id": "EVENT_OBJ_GFX_GROUDON_1",
30+
"movement_range_x": 1,
31+
"movement_range_y": 1,
32+
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
33+
"script": "0x0",
34+
"trainer_sight_or_berry_tree_id": "0",
35+
"trainer_type": "0",
36+
"x": 17,
37+
"y": 22
38+
}
39+
],
40+
"region_map_section": "MAPSEC_TERRA_CAVE",
41+
"requires_flash": false,
42+
"show_map_name": true,
43+
"warp_events": [
44+
{
45+
"dest_map": "MAP_TERRA_CAVE_ENTRANCE",
46+
"dest_warp_id": 1,
47+
"elevation": 3,
48+
"x": 5,
49+
"y": 4
50+
}
51+
],
52+
"weather": "WEATHER_FOG_1"
53+
}

‎data/maps/Underwater_SootopolisCity/map.json

+37-34
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
{
2-
"id": "MAP_UNDERWATER_SOOTOPOLIS_CITY",
3-
"name": "Underwater_SootopolisCity",
4-
"layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY",
5-
"music": "MUS_DEEPDEEP",
6-
"region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS",
7-
"requires_flash": false,
8-
"weather": "WEATHER_BUBBLES",
9-
"map_type": "MAP_TYPE_UNDERWATER",
10-
"allow_bike": true,
11-
"allow_escape_rope": false,
12-
"allow_running": true,
13-
"show_map_name": true,
14-
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
15-
"connections": null,
16-
"object_events": [],
17-
"warp_events": [
18-
{
19-
"x": 9,
20-
"y": 8,
21-
"elevation": 0,
22-
"dest_map": "MAP_UNDERWATER2",
23-
"dest_warp_id": 0
24-
},
25-
{
26-
"x": 10,
27-
"y": 8,
28-
"elevation": 0,
29-
"dest_map": "MAP_UNDERWATER2",
30-
"dest_warp_id": 0
31-
}
32-
],
33-
"coord_events": [],
34-
"bg_events": []
35-
}
2+
"allow_bike": true,
3+
"allow_escape_rope": false,
4+
"allow_running": true,
5+
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
6+
"bg_events": [
7+
],
8+
"connections": null,
9+
"coord_events": [
10+
],
11+
"id": "MAP_UNDERWATER_SOOTOPOLIS_CITY",
12+
"layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY",
13+
"map_type": "MAP_TYPE_UNDERWATER",
14+
"music": "MUS_DEEPDEEP",
15+
"name": "Underwater_SootopolisCity",
16+
"object_events": [
17+
],
18+
"region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS",
19+
"requires_flash": false,
20+
"show_map_name": true,
21+
"warp_events": [
22+
{
23+
"dest_map": "MAP_UNDERWATER2",
24+
"dest_warp_id": 0,
25+
"elevation": 0,
26+
"x": 9,
27+
"y": 8
28+
},
29+
{
30+
"dest_map": "MAP_UNDERWATER2",
31+
"dest_warp_id": 0,
32+
"elevation": 0,
33+
"x": 10,
34+
"y": 8
35+
}
36+
],
37+
"weather": "WEATHER_BUBBLES"
38+
}

‎src/data/trainer_parties.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -12604,11 +12604,11 @@ static const struct TrainerMonNoItemDefaultMoves sParty_TrainerTrio_Theo_Badge8[
1260412604
{
1260512605
.iv = 50,
1260612606
.lvl = 45,
12607-
.species = SPECIES_SNORLAX,
12607+
.species = SPECIES_LAPRAS,
1260812608
},
1260912609
{
1261012610
.iv = 50,
1261112611
.lvl = 45,
12612-
.species = SPECIES_LAPRAS,
12612+
.species = SPECIES_SNORLAX,
1261312613
}
1261412614
};

0 commit comments

Comments
 (0)