Merge branch 'upcoming' into overworldsnow
@ -23,8 +23,9 @@ body:
|
||||
label: Version
|
||||
description: What version of pokeemerald-expansion are you using as a base?
|
||||
options:
|
||||
- 1.5.2 (Default)
|
||||
- 1.5.3 (Default)
|
||||
- upcoming (Edge)
|
||||
- 1.5.2
|
||||
- 1.5.1
|
||||
- 1.5.0
|
||||
- 1.4.3
|
||||
|
@ -23,8 +23,9 @@ body:
|
||||
label: Version
|
||||
description: What version of pokeemerald-expansion are you using as a base?
|
||||
options:
|
||||
- 1.5.2 (Default)
|
||||
- 1.5.3 (Default)
|
||||
- upcoming (Edge)
|
||||
- 1.5.2
|
||||
- 1.5.1
|
||||
- 1.5.0
|
||||
- 1.4.3
|
||||
|
3
.github/ISSUE_TEMPLATE/04_other_errors.yaml
vendored
@ -23,8 +23,9 @@ body:
|
||||
label: Version
|
||||
description: What version of pokeemerald-expansion are you using as a base?
|
||||
options:
|
||||
- 1.5.2 (Default)
|
||||
- 1.5.3 (Default)
|
||||
- upcoming (Edge)
|
||||
- 1.5.2
|
||||
- 1.5.1
|
||||
- 1.5.0
|
||||
- 1.4.3
|
||||
|
BIN
graphics/battle_interface/last_used_ball_l_cycle.png
Normal file
After Width: | Height: | Size: 335 B |
BIN
graphics/battle_interface/last_used_ball_r_cycle.png
Normal file
After Width: | Height: | Size: 344 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 819 B After Width: | Height: | Size: 834 B |
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 393 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 455 B After Width: | Height: | Size: 417 B |
Before Width: | Height: | Size: 948 B After Width: | Height: | Size: 1017 B |
Before Width: | Height: | Size: 610 B After Width: | Height: | Size: 672 B |
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 368 B |
@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
88 56 8
|
||||
120 96 24
|
||||
255 230 41
|
||||
90 57 8
|
||||
205 189 32
|
||||
246 246 164
|
||||
168 136 24
|
||||
255 0 255
|
||||
255 0 255
|
||||
255 0 255
|
||||
213 180 82
|
||||
172 131 41
|
||||
16 16 16
|
||||
131 98 8
|
||||
208 176 80
|
||||
176 160 152
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
90 57 0
|
||||
255 0 255
|
||||
246 246 164
|
||||
255 230 41
|
||||
205 189 32
|
||||
172 139 24
|
||||
131 90 16
|
||||
90 57 8
|
||||
16 16 16
|
||||
|
@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
136 80 24
|
||||
168 104 40
|
||||
248 240 128
|
||||
88 48 56
|
||||
232 200 48
|
||||
248 240 216
|
||||
200 152 32
|
||||
184 136 144
|
||||
255 0 255
|
||||
255 0 255
|
||||
255 0 255
|
||||
222 180 189
|
||||
189 139 148
|
||||
139 98 106
|
||||
90 49 57
|
||||
255 0 255
|
||||
255 246 222
|
||||
255 246 131
|
||||
238 205 49
|
||||
205 156 32
|
||||
172 106 41
|
||||
139 82 24
|
||||
16 16 16
|
||||
136 96 104
|
||||
208 176 80
|
||||
216 176 184
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
|
Before Width: | Height: | Size: 637 B After Width: | Height: | Size: 647 B |
Before Width: | Height: | Size: 919 B After Width: | Height: | Size: 931 B |
Before Width: | Height: | Size: 1019 B After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 466 B After Width: | Height: | Size: 435 B |
Before Width: | Height: | Size: 981 B After Width: | Height: | Size: 950 B |
Before Width: | Height: | Size: 779 B After Width: | Height: | Size: 788 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 569 B After Width: | Height: | Size: 582 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 549 B After Width: | Height: | Size: 560 B |
Before Width: | Height: | Size: 452 B After Width: | Height: | Size: 518 B |
Before Width: | Height: | Size: 484 B After Width: | Height: | Size: 451 B |
Before Width: | Height: | Size: 565 B After Width: | Height: | Size: 580 B |
Before Width: | Height: | Size: 700 B After Width: | Height: | Size: 715 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 488 B After Width: | Height: | Size: 449 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 765 B After Width: | Height: | Size: 779 B |
Before Width: | Height: | Size: 767 B After Width: | Height: | Size: 779 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 511 B After Width: | Height: | Size: 479 B |
Before Width: | Height: | Size: 741 B After Width: | Height: | Size: 754 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 796 B After Width: | Height: | Size: 855 B |
Before Width: | Height: | Size: 734 B After Width: | Height: | Size: 834 B |
Before Width: | Height: | Size: 915 B After Width: | Height: | Size: 934 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 535 B After Width: | Height: | Size: 497 B |
@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
112 88 8
|
||||
255 238 41
|
||||
213 189 16
|
||||
16 16 16
|
||||
255 246 172
|
||||
131 98 8
|
||||
82 49 8
|
||||
255 255 255
|
||||
222 222 222
|
||||
180 180 180
|
||||
90 90 90
|
||||
213 180 82
|
||||
180 131 41
|
||||
88 88 88
|
||||
248 248 248
|
||||
176 176 168
|
||||
216 216 216
|
||||
96 96 88
|
||||
80 48 8
|
||||
120 88 8
|
||||
82 49 8
|
||||
104 80 8
|
||||
152 112 0
|
||||
255 246 172
|
||||
255 238 24
|
||||
200 176 16
|
||||
112 88 8
|
||||
16 16 16
|
||||
|
@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
160 104 0
|
||||
240 208 32
|
||||
200 144 24
|
||||
255 255 255
|
||||
222 222 222
|
||||
180 180 180
|
||||
90 90 90
|
||||
255 148 230
|
||||
222 74 172
|
||||
172 41 115
|
||||
115 16 82
|
||||
104 64 8
|
||||
152 104 0
|
||||
255 238 131
|
||||
255 213 0
|
||||
213 148 8
|
||||
164 106 0
|
||||
16 16 16
|
||||
248 232 128
|
||||
152 48 112
|
||||
112 16 80
|
||||
248 144 224
|
||||
200 88 160
|
||||
88 88 88
|
||||
248 248 248
|
||||
176 176 176
|
||||
216 216 216
|
||||
88 88 88
|
||||
112 88 8
|
||||
|
Before Width: | Height: | Size: 677 B After Width: | Height: | Size: 689 B |
Before Width: | Height: | Size: 677 B After Width: | Height: | Size: 688 B |
Before Width: | Height: | Size: 737 B After Width: | Height: | Size: 745 B |
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 677 B After Width: | Height: | Size: 688 B |
Before Width: | Height: | Size: 677 B After Width: | Height: | Size: 688 B |
Before Width: | Height: | Size: 760 B After Width: | Height: | Size: 769 B |
Before Width: | Height: | Size: 682 B After Width: | Height: | Size: 693 B |
Before Width: | Height: | Size: 679 B After Width: | Height: | Size: 691 B |
Before Width: | Height: | Size: 744 B After Width: | Height: | Size: 753 B |
Before Width: | Height: | Size: 676 B After Width: | Height: | Size: 688 B |
Before Width: | Height: | Size: 858 B After Width: | Height: | Size: 842 B |
Before Width: | Height: | Size: 635 B After Width: | Height: | Size: 646 B |
Before Width: | Height: | Size: 328 B After Width: | Height: | Size: 288 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 738 B After Width: | Height: | Size: 752 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 534 B After Width: | Height: | Size: 502 B |
Before Width: | Height: | Size: 771 B After Width: | Height: | Size: 773 B |
Before Width: | Height: | Size: 512 B After Width: | Height: | Size: 498 B |
Before Width: | Height: | Size: 414 B After Width: | Height: | Size: 377 B |
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 451 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 597 B After Width: | Height: | Size: 611 B |
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 364 B |
Before Width: | Height: | Size: 863 B After Width: | Height: | Size: 878 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 455 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 587 B After Width: | Height: | Size: 596 B |
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 392 B |
Before Width: | Height: | Size: 737 B After Width: | Height: | Size: 750 B |
Before Width: | Height: | Size: 427 B After Width: | Height: | Size: 409 B |
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 476 B |
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 331 B |
Before Width: | Height: | Size: 667 B After Width: | Height: | Size: 679 B |
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 411 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 494 B After Width: | Height: | Size: 561 B |
Before Width: | Height: | Size: 445 B After Width: | Height: | Size: 406 B |
@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
16 16 16
|
||||
164 131 197
|
||||
197 164 238
|
||||
123 98 172
|
||||
82 57 123
|
||||
197 197 197
|
||||
255 255 255
|
||||
156 16 0
|
||||
197 65 24
|
||||
156 16 0
|
||||
255 172 131
|
||||
197 180 0
|
||||
246 115 74
|
||||
197 65 24
|
||||
246 115 74
|
||||
197 180 0
|
||||
120 96 168
|
||||
0 0 0
|
||||
197 65 24
|
||||
156 16 0
|
||||
16 16 16
|
||||
197 164 238
|
||||
164 131 197
|
||||
123 98 172
|
||||
82 57 123
|
||||
156 16 0
|
||||
197 197 197
|
||||
255 255 255
|
||||
|
@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
255 172 131
|
||||
238 222 24
|
||||
240 112 72
|
||||
192 64 24
|
||||
90 164 255
|
||||
24 98 197
|
||||
0 49 148
|
||||
16 16 16
|
||||
208 184 56
|
||||
224 224 144
|
||||
160 120 56
|
||||
104 80 24
|
||||
192 192 192
|
||||
248 248 248
|
||||
56 104 160
|
||||
120 160 208
|
||||
32 64 128
|
||||
48 112 184
|
||||
152 184 224
|
||||
232 216 56
|
||||
160 120 48
|
||||
0 0 0
|
||||
222 222 90
|
||||
213 180 32
|
||||
164 123 32
|
||||
131 90 0
|
||||
152 16 0
|
||||
197 197 197
|
||||
255 255 255
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 835 B After Width: | Height: | Size: 920 B |
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 427 B |
Before Width: | Height: | Size: 507 B After Width: | Height: | Size: 475 B |
@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
148 98 32
|
||||
16 16 16
|
||||
255 255 246
|
||||
222 222 213
|
||||
131 106 98
|
||||
255 98 65
|
||||
197 49 32
|
||||
193 147 73
|
||||
255 255 197
|
||||
255 246 148
|
||||
238 197 115
|
||||
98 16 0
|
||||
148 98 32
|
||||
255 156 106
|
||||
238 115 49
|
||||
197 82 90
|
||||
216 216 208
|
||||
248 248 240
|
||||
88 104 112
|
||||
255 156 106
|
||||
168 48 16
|
||||
148 98 32
|
||||
0 0 0
|
||||
0 0 0
|
||||
98 16 0
|
||||
16 16 16
|
||||
|
@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
120 112 56
|
||||
255 255 246
|
||||
222 222 213
|
||||
131 106 98
|
||||
255 98 65
|
||||
197 49 32
|
||||
160 136 112
|
||||
255 238 230
|
||||
246 230 189
|
||||
213 189 148
|
||||
104 88 80
|
||||
246 255 123
|
||||
230 213 41
|
||||
180 156 0
|
||||
88 72 16
|
||||
16 16 16
|
||||
240 240 176
|
||||
208 192 120
|
||||
88 72 32
|
||||
216 200 56
|
||||
168 152 32
|
||||
216 216 208
|
||||
248 248 240
|
||||
128 104 96
|
||||
240 240 144
|
||||
181 78 66
|
||||
176 144 64
|
||||
0 0 0
|
||||
0 0 0
|
||||
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 744 B |
Before Width: | Height: | Size: 1022 B After Width: | Height: | Size: 995 B |
Before Width: | Height: | Size: 564 B After Width: | Height: | Size: 574 B |
Before Width: | Height: | Size: 410 B After Width: | Height: | Size: 372 B |