Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync

This commit is contained in:
ultima-soul 2021-06-07 19:52:20 -07:00
commit f3f4d8e608
147 changed files with 914 additions and 500 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 783 B

After

Width:  |  Height:  |  Size: 744 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 324 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 430 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 343 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 427 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 552 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 552 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 502 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 519 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 361 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 422 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 595 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 422 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 352 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 359 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 838 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
56 40 112
32 16 72
16 16 16
224 40 184
240 136 208
248 248 248
168 40 72
224 48 48
56 16 184
96 88 192
248 136 136
248 80 80
248 176 176
248 216 216
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
104 32 104
72 16 64
16 16 16
224 40 184
240 136 208
248 248 248
168 40 72
224 48 48
168 24 168
208 48 232
248 136 136
248 80 80
248 176 176
248 216 216
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 441 B

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 453 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 427 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 703 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 718 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 428 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
0 56 104
136 96 40
232 200 88
240 248 136
24 120 192
0 88 152
80 152 192
152 208 224
16 16 16
224 160 40
248 248 248
48 48 40
96 96 96
72 72 72
248 248 248

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
0 64 112
136 40 56
232 88 144
248 136 176
0 200 200
8 160 168
0 96 160
16 120 192
16 16 16
224 160 40
248 248 248
152 152 168
240 248 248
192 200 208
96 96 96

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 636 B

After

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 153 210 164
36 39 43
173 228 247
16 16 16 16 16 16
56 56 64 123 157 160
56 80 96 156 166 173
168 224 240 57 62 66
120 152 160 60 84 96
32 32 40 104 111 119
16 24 32 23 29 33
128 96 0 0 197 255
248 208 24 0 106 189
152 160 168 255 212 25
104 104 112 132 99 0
224 224 216 71 78 89
64 72 88 230 230 222
48 48 56
0 0 0

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 153 210 164
36 39 43
173 228 247
16 16 16 16 16 16
56 56 48 122 147 201
56 56 96 96 128 108
192 200 240 57 62 66
120 144 200 58 58 96
40 40 32 48 80 56
24 24 16 23 29 33
128 32 104 64 248 64
232 64 176 40 108 40
88 120 104 240 64 180
40 72 56 130 40 108
224 224 216 32 56 40
24 48 40 230 230 222
48 48 56
0 0 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 876 B

After

Width:  |  Height:  |  Size: 828 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 153 210 164
120 152 160 173 228 247
123 157 160
255 255 255
16 16 16 16 16 16
120 104 96 156 166 173
168 224 240 71 78 89
248 248 248 104 111 119
192 176 168 60 84 96
64 72 88 230 74 66
248 208 24 148 41 33
56 80 96 198 181 169
152 160 168 122 109 101
104 104 112 255 173 99
0 0 0 255 212 25
0 0 0 255 222 58
0 0 0
0 0 0

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 153 210 164
120 144 200 196 203 240
122 147 200
255 255 255
16 16 16 16 16 16
96 96 112 90 115 128
192 200 240
248 248 248
168 160 208
32 48 56 32 48 56
232 88 184 48 75 81
56 56 96 58 58 96
88 112 120 230 74 66
48 72 80 148 41 33
0 0 0 198 181 169
0 0 0 103 99 119
0 0 0 255 173 99
0 0 0 237 90 188
255 222 58

Binary file not shown.

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 399 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 309 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 344 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 428 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 618 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 772 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
120 80 40
224 232 24
16 16 16
208 168 8
248 248 192
248 152 192
40 56 96
48 80 144
72 120 200
136 168 216
184 136 40
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
120 80 40
224 232 24
16 16 16
208 168 8
248 248 192
248 152 192
104 104 104
168 160 200
216 216 216
248 248 248
184 136 40
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 901 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
0 40 24
0 128 64
0 88 40
16 16 16
104 64 64
176 152 120
48 24 32
248 248 248
64 40 40
248 112 56
176 64 56
128 112 80
240 224 160
176 120 72
144 104 64

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
48 64 0
136 176 0
88 112 0
16 16 16
88 40 48
152 144 128
40 16 32
248 248 248
56 24 40
248 112 56
176 64 56
96 88 72
240 224 160
176 120 72
144 104 64

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B

Some files were not shown because too many files have changed in this diff Show More