Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion

graphics/pokemon/armarouge/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-147 50 48
-226 60 27
-255 119 178
-236 183 34
-237 230 62
-12 12 12
-84 40 41
-237 230 63
-54 52 52
-94 86 82
-150 91 14
-255 255 255
-226 60 28
-0 0 0
-0 0 0
+154 212 167
+148 46 44
+227 57 20
+242 131 165
+254 250 98
+241 163 41
+83 35 36
+18 25 27
+85 86 85
+53 46 43
+8 8 8
+253 251 0
+106 63 3
+255 252 199
+255 44 0
+198 120 27

graphics/pokemon/armarouge/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-147 50 48
-226 60 27
-255 119 178
-236 183 34
-237 230 62
-12 12 12
-84 40 41
-33 174 217
-54 52 52
-94 86 82
-150 91 14
-255 255 255
-33 174 217
-0 0 0
-0 0 0
+154 212 167
+148 46 44
+227 57 20
+242 131 165
+254 250 98
+241 163 41
+83 35 36
+18 25 27
+85 86 85
+53 46 43
+8 8 8
+171 248 252
+106 63 3
+255 252 199
+54 109 231
+198 120 27

graphics/pokemon/basculegion/female/normal.pal

@@ -1,19 +1,18 @@
 JASC-PAL
 0100
-16
-152 208 160
-98 98 98
-16 16 16
-46 92 120
-171 222 224
-230 230 230
-227 242 239
-164 164 164
-122 168 175
-32 49 57
-65 82 82
-55 140 89
-21 64 34
-34 96 61
-16 16 18
-99 62 41
+15
+153 211 165
+90 125 133
+29 29 29
+209 237 237
+58 56 54
+142 188 193
+91 130 104
+45 57 51
+101 114 120
+73 95 84
+151 170 174
+223 233 231
+255 255 255
+91 51 39
+233 245 245

graphics/pokemon/basculegion/female/shiny.pal

@@ -1,19 +1,18 @@
 JASC-PAL
 0100
-16
-152 208 160
-98 98 98
-16 16 16
-112 96 64
-216 208 112
-230 230 230
-248 236 160
-164 164 164
-160 152 72
-32 49 57
-64 80 80
-96 144 48
-21 64 34
-72 108 56
-16 16 18
-99 62 41
+15
+153 211 165
+157 114 49
+29 29 29
+255 239 106
+58 56 54
+213 179 74
+113 187 104
+45 57 51
+101 114 120
+71 120 74
+151 170 174
+223 233 231
+255 255 255
+91 51 39
+255 249 191

graphics/pokemon/basculegion/normal.pal

@@ -1,19 +1,18 @@
 JASC-PAL
 0100
-16
-152 208 160
-48 140 88
-192 52 80
-160 164 160
-16 64 32
-16 16 16
-120 24 24
-248 164 200
-96 60 40
-224 228 224
-64 80 80
-32 48 56
-32 96 56
-248 80 120
-96 96 96
-56 84 72
+15
+153 211 165
+107 33 60
+229 24 105
+167 50 91
+29 29 29
+58 56 54
+73 95 84
+91 130 104
+45 57 51
+101 114 120
+151 170 174
+223 233 231
+255 255 255
+94 36 46
+244 156 190

graphics/pokemon/basculegion/shiny.pal

@@ -1,19 +1,18 @@
 JASC-PAL
 0100
-16
-152 208 160
-96 144 48
-144 72 176
-160 164 160
-16 64 32
-16 16 16
-88 36 112
-224 176 240
-96 60 40
-224 228 224
-60 82 76
-32 48 56
-72 108 56
-184 84 232
-96 96 96
-56 84 72
+15
+153 211 165
+107 33 60
+190 42 234
+128 41 165
+29 29 29
+58 56 54
+71 120 74
+113 187 104
+45 57 51
+101 114 120
+151 170 174
+223 233 231
+255 255 255
+94 36 46
+221 143 243

graphics/pokemon/ceruledge/normal.pal

@@ -1,19 +1,18 @@
 JASC-PAL
 0100
-16
-153 210 164
-101 145 217
-201 134 218
-127 200 223
-169 160 226
-104 90 167
-49 49 105
-106 117 188
-38 32 35
-6 6 6
-52 105 191
-240 255 255
-67 67 140
-23 23 52
-70 59 65
-0 0 0
+15
+153 211 165
+198 90 222
+239 165 255
+132 156 222
+189 214 255
+57 99 189
+49 49 99
+66 66 140
+99 90 165
+57 49 41
+16 16 16
+82 82 82
+247 239 247
+24 24 49
+239 74 173

graphics/pokemon/ceruledge/shiny.pal

@@ -1,19 +1,18 @@
 JASC-PAL
 0100
-16
-153 210 164
-101 145 217
-201 134 218
-127 200 223
-169 160 226
-104 90 167
-49 49 105
-106 117 188
-38 32 35
-6 6 6
-52 105 191
-255 242 0
-67 67 140
-23 23 52
-70 59 65
-0 0 0
+15
+153 211 165
+198 90 222
+239 165 255
+132 156 222
+189 214 255
+57 99 189
+49 49 99
+66 66 140
+99 90 165
+57 49 41
+16 16 16
+82 82 82
+255 255 0
+24 24 49
+255 24 74

graphics/pokemon/crocalor/normal.pal

@@ -1,19 +1,17 @@
 JASC-PAL
 0100
-16
-153 210 164
-255 60 60
-255 211 35
-255 247 222
-242 162 25
-255 153 10
-53 53 53
-173 145 135
-204 49 49
-118 39 25
-109 82 58
-79 79 79
-255 60 60
-10 10 10
-238 125 82
-0 0 0
+14
+153 211 165
+248 48 40
+248 208 56
+248 152 32
+248 248 216
+16 16 16
+96 80 56
+184 169 154
+64 64 64
+160 56 48
+216 160 40
+104 40 32
+232 56 56
+40 40 40

graphics/pokemon/crocalor/shiny.pal

@@ -1,19 +1,17 @@
 JASC-PAL
 0100
-16
-153 210 164
-255 60 60
-255 211 35
-255 247 222
-242 162 25
-255 153 10
-104 33 45
-173 145 135
-204 51 135
-128 32 84
-109 82 58
-149 62 73
-255 64 168
-10 10 10
-238 125 82
-0 0 0
+14
+153 211 165
+248 48 40
+248 208 56
+248 152 32
+248 248 216
+16 16 16
+96 80 56
+184 169 154
+113 71 65
+164 108 135
+216 160 40
+114 71 91
+206 149 165
+80 50 55

graphics/pokemon/cyclizar/normal.pal

@@ -1,17 +1,19 @@
 JASC-PAL
 0100
-14
-64 100 181
-48 59 57
-33 37 33
-64 77 67
-93 121 106
-15 15 15
-230 112 62
-206 206 206
-127 167 133
-255 255 255
+16
+255 163 177
+56 74 53
+84 101 78
+28 41 22
+119 140 106
+16 16 16
+241 107 50
+185 183 179
+252 252 252
+96 125 109
+117 176 125
 34 35 40
 50 57 67
+52 69 61
 75 86 92
-93 121 107
+226 233 215

graphics/pokemon/cyclizar/shiny.pal

@@ -1,17 +1,19 @@
 JASC-PAL
 0100
-14
-64 100 181
-48 59 57
-33 37 33
+16
+255 163 177
+167 163 122
 248 238 187
-97 95 71
-15 15 15
+28 41 22
+255 254 232
+16 16 16
 85 215 253
-206 206 206
+185 183 179
+252 252 252
+97 95 71
 138 138 112
-255 255 255
 34 35 40
 50 57 67
+52 69 61
 75 86 92
-250 241 235
+226 233 215

graphics/pokemon/dipplin/normal.pal

@@ -1,19 +1,17 @@
 JASC-PAL
 0100
-16
-115 197 164
-119 103 74
-196 173 122
-249 229 150
-237 206 93
-79 107 71
-104 140 84
-181 206 80
-130 173 84
-51 76 54
-0 0 0
-250 250 250
-94 9 13
-167 29 38
-220 109 82
-214 59 52
+14
+0 183 239
+43 97 14
+164 216 74
+16 16 16
+95 171 29
+241 201 80
+198 169 83
+254 254 254
+101 16 12
+157 24 17
+222 81 69
+249 164 162
+36 77 28
+75 133 61

graphics/pokemon/dipplin/shiny.pal

@@ -1,19 +1,17 @@
 JASC-PAL
 0100
-16
-115 197 164
-119 103 74
-196 173 122
-249 229 150
-237 206 93
-79 107 71
-104 140 84
-181 206 80
-130 173 84
-51 76 54
-0 0 0
-250 250 250
-94 9 13
-198 113 15
-237 206 93
-250 173 35
+14
+0 183 239
+43 97 14
+164 216 74
+16 16 16
+95 171 29
+241 201 80
+198 169 83
+254 254 254
+194 80 3
+221 143 0
+255 212 22
+249 164 162
+185 77 49
+255 118 66

graphics/pokemon/duraludon/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-104 48 56
-184 104 104
+49 93 139
+98 133 172
+156 210 164
+106 52 57
 16 16 16
-128 112 128
-192 184 192
-224 224 240
-248 248 248
-168 144 168
-232 224 120
-128 120 96
-152 144 192
-80 80 160
-48 40 72
-64 64 104
-0 0 0
+123 129 148
+238 226 123
+131 125 98
+139 129 164
+180 182 205
+8 36 82
+255 255 255
+106 97 115
+189 105 106
+24 56 98
+222 226 246

graphics/pokemon/duraludon/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-104 96 104
-232 224 232
+67 119 184
+109 151 204
+156 210 164
+112 105 107
 16 16 16
-104 128 112
-176 192 184
-232 232 216
-248 248 248
-136 160 144
-248 160 48
-160 160 128
-120 144 192
-56 96 160
-32 32 72
-56 72 96
-0 0 0
+81 96 101
+226 157 109
+253 248 236
+118 138 154
+149 163 164
+8 36 82
+255 255 255
+80 95 107
+235 232 237
+40 74 130
+190 204 201

graphics/pokemon/espathra/normal.pal

@@ -1,15 +1,19 @@
 JASC-PAL
 0100
-12
+16
 153 211 165
-100 89 115
-249 249 249
-211 196 208
-15 15 15
-0 236 184
-170 144 162
-255 189 99
-197 138 82
-109 84 27
-188 166 20
-255 252 96
+96 88 112
+248 248 248
+192 176 184
+16 16 16
+80 232 184
+144 112 168
+184 160 224
+120 80 24
+192 136 80
+248 184 96
+214 192 175
+250 244 238
+248 248 96
+192 176 16
+192 176 112

graphics/pokemon/espathra/shiny.pal

@@ -1,15 +1,19 @@
 JASC-PAL
 0100
-12
+16
 153 211 165
-100 89 115
-249 249 249
-211 196 208
-15 15 15
-0 236 184
-170 144 162
-123 103 98
-106 86 81
-80 64 58
-123 103 98
-170 144 162
+96 88 112
+248 248 248
+192 176 184
+16 16 16
+80 232 184
+144 112 168
+184 160 224
+52 41 41
+87 68 68
+120 96 96
+98 99 95
+137 136 124
+192 152 136
+152 115 109
+192 176 112

graphics/pokemon/farigiraf/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 167
-36 34 36
-52 58 60
-68 54 28
-108 110 116
-108 86 52
-180 166 92
-8 8 8
-252 246 44
-252 254 252
-172 170 180
-236 118 116
-252 238 140
-204 86 68
-244 142 76
-244 170 116
+153 211 165
+48 48 64
+96 88 88
+16 16 16
+112 87 59
+86 60 39
+248 240 40
+252 253 148
+192 200 168
+191 179 110
+120 88 48
+248 248 248
+184 88 104
+240 144 152
+193 97 57
+254 137 71

graphics/pokemon/farigiraf/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 167
-36 34 36
-52 58 60
-68 54 28
-108 110 116
-108 86 52
-138 196 167
-8 8 8
-252 246 44
-252 254 252
-172 170 180
-85 160 224
-186 243 240
-204 86 68
-236 101 77
-236 101 77
+153 211 165
+48 48 64
+96 88 88
+16 16 16
+112 87 59
+86 60 39
+248 240 40
+229 229 229
+192 200 168
+183 196 200
+120 88 48
+248 248 248
+83 116 204
+128 176 240
+164 63 51
+232 96 72

graphics/pokemon/flittle/normal.pal

@@ -1,18 +1,19 @@
 JASC-PAL
 0100
-15
-153 210 164
-120 120 120
+16
+153 211 165
+123 132 140
 255 255 255
-183 185 186
-15 15 15
-141 121 50
-255 247 147
-210 187 104
-126 110 198
-159 120 0
-169 200 243
-192 85 122
-242 138 165
-138 54 90
-217 112 6
+198 206 214
+107 99 57
+255 247 140
+16 16 16
+198 173 90
+123 107 198
+132 206 231
+82 66 156
+115 33 107
+206 74 165
+239 99 206
+180 96 7
+252 127 0

graphics/pokemon/flittle/shiny.pal

@@ -1,18 +1,19 @@
 JASC-PAL
 0100
-15
-153 210 164
-120 120 120
+16
+153 211 165
+123 132 140
 255 255 255
-183 185 186
-15 15 15
-141 121 50
-255 247 147
-210 187 104
-126 110 198
-159 120 0
-169 200 243
-48 169 112
-73 224 149
-36 115 71
-126 92 72
+198 206 214
+107 99 57
+255 247 140
+16 16 16
+198 173 90
+123 107 198
+132 206 231
+82 66 156
+49 99 49
+74 189 99
+41 255 148
+57 57 57
+102 102 102

graphics/pokemon/meowscarada/normal.pal

@@ -1,19 +1,17 @@
 JASC-PAL
 0100
-16
-153 210 164
-40 65 48
+14
+153 211 165
+41 65 49
+99 126 95
 21 31 25
-68 93 64
-6 6 6
-0 112 30
-0 64 18
-0 154 44
-227 249 220
-170 57 88
-140 179 150
-255 80 126
-159 190 166
-101 25 45
-83 97 78
-255 139 171
+16 16 16
+69 93 65
+95 31 51
+242 94 141
+162 66 98
+1 113 37
+176 191 147
+1 155 53
+1 65 22
+232 242 215

graphics/pokemon/meowscarada/shiny.pal

@@ -1,19 +1,17 @@
 JASC-PAL
 0100
-16
-153 210 164
-40 65 48
+14
+153 211 165
+1 45 41
+6 102 71
 21 31 25
+16 16 16
 13 71 67
-6 6 6
-0 85 65
-0 64 18
-0 125 91
-227 249 220
-122 77 171
-140 179 150
+63 49 98
 159 105 205
-159 190 166
-101 25 45
-83 97 78
-191 167 212
+96 75 150
+27 99 97
+167 205 186
+1 143 104
+1 65 22
+228 250 236

graphics/pokemon/munkidori/normal.pal

@@ -1,14 +1,14 @@
 JASC-PAL
 0100
 13
-152 208 160
-45 45 45
-78 73 71
-26 29 28
+153 211 165
+36 37 45
+61 61 61
+20 22 24
 90 33 73
-202 103 162
 122 140 177
 174 201 233
+202 103 162
 146 57 119
 16 16 16
 64 74 104

graphics/pokemon/munkidori/shiny.pal

@@ -1,14 +1,14 @@
 JASC-PAL
 0100
 13
-152 208 160
-84 74 70
-116 110 108
-26 29 28
+153 211 165
+97 84 80
+145 129 114
+65 56 52
 90 33 73
-202 103 162
 122 140 177
 174 201 233
+202 103 162
 146 57 119
 16 16 16
 64 74 104

graphics/pokemon/quaquaval/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-0 120 112
-0 216 224
-0 0 0
-0 152 192
-40 56 144
-32 32 72
-232 248 248
-40 72 240
-96 56 16
-184 64 16
-248 64 0
-184 208 232
-248 168 32
-248 248 248
-224 120 24
+153 211 165
+39 96 120
+65 155 194
+85 219 230
+16 16 16
+255 255 255
+190 207 234
+40 42 77
+51 63 147
+57 75 238
+239 255 255
+102 50 43
+227 70 15
+148 69 46
+237 169 54
+203 126 41

graphics/pokemon/quaquaval/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-67 109 110
-173 224 225
-0 0 0
-107 197 199
-125 133 207
-71 75 118
-232 248 248
-156 162 222
-115 61 43
-200 88 40
-248 128 72
-184 208 232
-248 168 32
-248 248 248
-224 120 24
+153 211 165
+75 145 150
+122 183 188
+85 219 230
+16 16 16
+255 255 255
+190 207 234
+81 71 124
+135 125 181
+184 189 248
+239 255 255
+102 50 43
+241 116 33
+148 69 46
+249 216 104
+218 163 61

graphics/pokemon/quaxly/normal.pal

@@ -1,17 +1,17 @@
 JASC-PAL
 0100
 14
-153 210 164
-31 89 120
-54 134 177
-47 190 232
-132 215 255
-15 15 15
-246 251 252
-77 99 115
-190 205 228
-0 91 162
-121 153 189
-106 106 65
-172 164 98
-246 246 74
+153 211 165
+24 88 120
+49 132 161
+68 187 207
+83 232 239
+248 248 248
+16 16 16
+184 200 224
+120 152 184
+0 88 160
+72 96 112
+128 91 32
+255 219 79
+181 154 48

graphics/pokemon/quaxly/shiny.pal

@@ -1,17 +1,17 @@
 JASC-PAL
 0100
 14
-153 210 164
-31 89 120
-48 169 112
-73 224 149
-132 215 255
-15 15 15
-246 251 252
-77 99 115
-190 205 228
-0 91 162
-121 153 189
-106 106 65
-172 164 98
-246 246 74
+153 211 165
+54 100 105
+86 194 184
+166 253 234
+222 254 247
+248 248 248
+16 16 16
+184 200 224
+120 152 184
+0 88 160
+72 96 112
+128 91 32
+255 219 79
+181 154 48

graphics/pokemon/quaxwell/normal.pal

@@ -1,17 +1,17 @@
 JASC-PAL
 0100
 14
-120 208 152
-0 96 168
-0 48 88
-0 136 224
-0 80 56
-0 208 184
-0 0 0
-0 152 120
-200 152 0
-136 96 0
-248 216 80
-248 248 248
-80 128 152
-168 192 208
+153 211 165
+17 67 121
+30 124 211
+96 162 222
+33 96 162
+49 138 178
+74 210 230
+16 16 16
+98 103 133
+191 180 99
+252 252 253
+167 174 213
+255 243 107
+110 101 44

graphics/pokemon/quaxwell/shiny.pal

@@ -1,17 +1,17 @@
 JASC-PAL
 0100
 14
-120 208 152
-0 192 176
-0 48 88
-0 248 232
-0 80 56
-48 120 224
-0 0 0
-40 64 216
-200 152 0
-136 96 0
-248 216 80
-248 248 248
-80 128 152
-168 192 208
+153 211 165
+63 124 154
+166 253 244
+223 255 251
+95 209 222
+43 68 128
+43 85 198
+16 16 16
+98 103 133
+191 180 99
+252 252 253
+167 174 213
+255 243 107
+110 101 44

graphics/pokemon/rabsca/normal.pal

@@ -1,18 +1,19 @@
 JASC-PAL
 0100
-15
-153 210 164
-117 0 130
-171 14 171
-227 16 251
-194 36 97
-154 27 72
-247 57 131
-248 248 248
-152 151 157
-63 79 92
-76 133 164
-24 24 24
-107 192 221
-106 32 39
-201 76 90
+16
+153 211 165
+133 50 171
+207 73 219
+62 25 122
+222 61 117
+252 252 252
+193 47 98
+234 78 121
+245 94 125
+16 16 16
+22 83 133
+31 142 189
+80 223 240
+154 167 201
+163 41 85
+237 61 91

graphics/pokemon/rabsca/shiny.pal

@@ -1,18 +1,19 @@
 JASC-PAL
 0100
-15
-153 210 164
-117 0 130
-171 14 171
-227 16 251
-194 36 97
-154 27 72
-247 57 131
-248 248 248
-152 151 157
-63 79 92
-204 174 41
-24 24 24
-249 240 73
-106 32 39
-201 76 90
+16
+153 211 165
+133 50 171
+207 73 219
+62 25 122
+222 61 117
+252 252 252
+193 47 98
+234 78 121
+245 94 125
+16 16 16
+148 75 9
+214 137 12
+255 224 46
+207 185 149
+117 53 43
+178 97 65

graphics/pokemon/rellor/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-156 210 164
-246 242 246
-115 97 74
-180 68 148
-49 48 41
-148 198 156
-164 141 131
-197 182 172
-189 109 32
-0 0 0
-180 165 98
-156 133 98
-82 80 65
-123 125 106
-246 133 32
-90 76 49
+153 211 165
+91 77 55
+119 99 72
+197 180 170
+158 132 97
+55 51 43
+243 135 37
+87 82 68
+16 16 16
+119 116 99
+77 69 48
+176 167 102
+185 108 38
+162 142 134
+212 212 212
+183 70 149

graphics/pokemon/rellor/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-156 210 164
-246 242 246
-215 179 36
+153 211 165
+148 75 9
+214 137 12
+255 224 43
+255 224 46
+55 51 43
+255 224 48
+87 82 68
+16 16 16
+119 116 99
+212 204 164
+176 174 163
+214 138 14
+214 136 10
+212 212 212
 82 109 157
-49 48 41
-148 198 156
-214 179 36
-241 243 37
-214 179 36
-0 0 0
-180 165 98
-249 248 87
-82 80 65
-123 125 106
-241 243 37
-174 118 9

graphics/pokemon/sprigatito/normal.pal

@@ -1,19 +1,16 @@
 JASC-PAL
 0100
-16
-153 210 164
-0 101 49
-63 177 33
-6 6 6
-166 185 142
-0 129 52
-107 138 59
-204 232 185
-68 85 57
-171 211 86
-252 252 252
-220 48 126
-225 112 181
-45 45 45
-155 92 114
-229 142 166
+13
+0 183 239
+30 68 17
+85 197 37
+56 124 33
+16 16 16
+130 191 131
+199 243 197
+73 106 72
+248 248 248
+192 96 120
+232 128 168
+96 64 88
+160 56 64

graphics/pokemon/sprigatito/shiny.pal

@@ -1,19 +1,16 @@
 JASC-PAL
 0100
-16
-153 210 164
-0 101 49
-0 206 111
-6 6 6
-152 200 91
-12 144 89
-107 138 59
-211 252 128
-68 85 57
-171 211 86
-252 252 252
-151 80 211
-210 138 241
-45 45 45
-155 92 114
-229 142 166
+13
+0 183 239
+30 68 17
+49 174 112
+56 124 33
+16 16 16
+151 202 169
+223 249 232
+87 125 98
+248 248 248
+130 89 179
+185 121 213
+63 41 88
+106 62 117

graphics/pokemon/wyrdeer/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-152 104 56
-248 216 168
-120 72 64
-232 184 128
-0 0 0
-72 72 72
-224 152 88
-160 168 168
-120 120 120
-112 128 136
-240 240 240
-192 200 208
-56 64 64
-88 88 88
-64 72 80
+153 211 165
+140 83 39
+255 226 154
+222 151 63
+16 16 16
+74 74 74
+123 123 123
+85 91 112
+193 207 217
+141 150 163
+122 113 110
+252 252 252
+207 198 191
+148 90 83
+94 49 50
+178 125 112

graphics/pokemon/wyrdeer/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-152 104 56
-248 216 168
-120 72 64
-232 184 128
-0 0 0
-72 72 72
-224 152 88
-168 180 128
-120 140 80
-112 128 136
-232 236 208
-208 216 152
-56 64 64
-88 88 88
-64 72 80
+153 211 165
+140 83 39
+255 226 154
+222 151 63
+16 16 16
+74 74 74
+123 123 123
+85 91 112
+203 221 147
+151 165 103
+122 113 110
+209 233 211
+159 176 163
+148 90 83
+94 49 50
+178 125 112

src/data/pokemon_graphics/back_pic_coordinates.h

@@ -1009,13 +1009,13 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
 #if P_GEN_9_POKEMON == TRUE
     [SPECIES_SPRIGATITO]                        = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  7 },
     [SPECIES_FLORAGATO]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  6 },
-    [SPECIES_MEOWSCARADA]                       = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
+    [SPECIES_MEOWSCARADA]                       = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_FUECOCO]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  4 },
-    [SPECIES_CROCALOR]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
+    [SPECIES_CROCALOR]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  8 },
     [SPECIES_SKELEDIRGE]                        = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
-    [SPECIES_QUAXLY]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  7 },
+    [SPECIES_QUAXLY]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  9 },
     [SPECIES_QUAXWELL]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
-    [SPECIES_QUAQUAVAL]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
+    [SPECIES_QUAQUAVAL]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     [SPECIES_LECHONK]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  11 },
     [SPECIES_OINKOLOGNE_MALE]                   = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  8 },
     [SPECIES_OINKOLOGNE_FEMALE]                 = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  7 },
@@ -1043,7 +1043,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
     [SPECIES_GARGANACL]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
     [SPECIES_CHARCADET]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     [SPECIES_ARMAROUGE]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
-    [SPECIES_CERULEDGE]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  5 },
+    [SPECIES_CERULEDGE]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     [SPECIES_TADBULB]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  8 },
     [SPECIES_BELLIBOLT]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  10 },
     [SPECIES_WATTREL]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  14 },
@@ -1059,10 +1059,10 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
     [SPECIES_KLAWF]                             = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  20 },
     [SPECIES_CAPSAKID]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  12 },
     [SPECIES_SCOVILLAIN]                        = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  8 },
-    [SPECIES_RELLOR]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  15 },
-    [SPECIES_RABSCA]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
+    [SPECIES_RELLOR]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  11 },
+    [SPECIES_RABSCA]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  4 },
     [SPECIES_FLITTLE]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  9 },
-    [SPECIES_ESPATHRA]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  11 },
+    [SPECIES_ESPATHRA]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
     [SPECIES_TINKATINK]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  12 },
     [SPECIES_TINKATUFF]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
     [SPECIES_TINKATON]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  15 },
@@ -1074,7 +1074,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
     [SPECIES_PALAFIN_HERO]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
     [SPECIES_VAROOM]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  13 },
     [SPECIES_REVAVROOM]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  16 },
-    [SPECIES_CYCLIZAR]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  6 },
+    [SPECIES_CYCLIZAR]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  9 },
     [SPECIES_ORTHWORM]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_GLIMMET]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  14 },
     [SPECIES_GLIMMORA]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  11 },

src/data/pokemon_graphics/front_pic_coordinates.h

@@ -981,20 +981,20 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_WYRDEER]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_KLEAVOR]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_URSALUNA]                     = { .size = MON_COORDS_SIZE(56, 56), .y_offset =  2 },
-    [SPECIES_BASCULEGION_MALE]             = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  6 },
+    [SPECIES_BASCULEGION_MALE]             = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_SNEASLER]                     = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
     [SPECIES_OVERQWIL]                     = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
     [SPECIES_ENAMORUS_INCARNATE]           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
 #endif
 #if P_GEN_9_POKEMON == TRUE
-    [SPECIES_SPRIGATITO]                        = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
+    [SPECIES_SPRIGATITO]                        = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  8 },
     [SPECIES_FLORAGATO]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     [SPECIES_MEOWSCARADA]                       = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_FUECOCO]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  8 },
     [SPECIES_CROCALOR]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  7 },
     [SPECIES_SKELEDIRGE]                        = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  7 },
-    [SPECIES_QUAXLY]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  9 },
-    [SPECIES_QUAXWELL]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
+    [SPECIES_QUAXLY]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 },
+    [SPECIES_QUAXWELL]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     [SPECIES_QUAQUAVAL]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_LECHONK]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 },
     [SPECIES_OINKOLOGNE_MALE]                   = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  6 },
@@ -1022,7 +1022,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_NACLSTACK]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
     [SPECIES_GARGANACL]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
     [SPECIES_CHARCADET]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  5 },
-    [SPECIES_ARMAROUGE]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
+    [SPECIES_ARMAROUGE]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
     [SPECIES_CERULEDGE]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_TADBULB]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
     [SPECIES_BELLIBOLT]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  7 },
@@ -1039,10 +1039,10 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_KLAWF]                             = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 },
     [SPECIES_CAPSAKID]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 },
     [SPECIES_SCOVILLAIN]                        = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
-    [SPECIES_RELLOR]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
-    [SPECIES_RABSCA]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
+    [SPECIES_RELLOR]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 },
+    [SPECIES_RABSCA]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_FLITTLE]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 },
-    [SPECIES_ESPATHRA]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
+    [SPECIES_ESPATHRA]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
     [SPECIES_TINKATINK]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 },
     [SPECIES_TINKATUFF]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  4 },
     [SPECIES_TINKATON]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
@@ -1054,7 +1054,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_PALAFIN_HERO]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_VAROOM]                            = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 },
     [SPECIES_REVAVROOM]                         = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  8 },
-    [SPECIES_CYCLIZAR]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  1 },
+    [SPECIES_CYCLIZAR]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     [SPECIES_ORTHWORM]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     [SPECIES_GLIMMET]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
     [SPECIES_GLIMMORA]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
@@ -1102,7 +1102,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_MIRAIDON]                          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_WALKING_WAKE]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_IRON_LEAVES]                       = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
-    [SPECIES_DIPPLIN]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
+    [SPECIES_DIPPLIN]                           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  5 },
     [SPECIES_POLTCHAGEIST_COUNTERFEIT]          = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  7 },
     [SPECIES_POLTCHAGEIST_ARTISAN]              = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  7 },
     [SPECIES_SINISTCHA_UNREMARKABLE]            = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 },
@@ -1530,7 +1530,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     // Enamorus
     [SPECIES_ENAMORUS_THERIAN]             = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     // Basculegion
-    [SPECIES_BASCULEGION_FEMALE]           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  9 },
+    [SPECIES_BASCULEGION_FEMALE]           = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     // Gigantamax Forms
     [SPECIES_VENUSAUR_GIGANTAMAX]                    = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  5 },
     [SPECIES_CHARIZARD_GIGANTAMAX]                   = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },

src/party_menu.c

@@ -255,7 +255,9 @@ static void ExitPartyMenu(void);
 static bool8 AllocPartyMenuBg(void);
 static bool8 AllocPartyMenuBgGfx(void);
 static void InitPartyMenuWindows(u8);
+static void LoadPartyMenuWindows(void);
 static void InitPartyMenuBoxes(u8);
+static void LoadPartyMenuBoxes(u8);
 static void LoadPartyMenuPokeballGfx(void);
 static bool8 CreatePartyMonSpritesLoop(void);
 static bool8 RenderPartyMenuBoxes(void);
@@ -557,17 +559,10 @@ static void InitPartyMenu(u8 menuType, u8 layout, u8 partyAction, bool8 keepCurs
 static void RefreshPartyMenu(void) //Refreshes the party menu without restarting tasks
 {
     u16 i;
-
-    sPartyMenuInternal->exitCallback = NULL;
-    sPartyMenuInternal->lastSelectedSlot = 0;
-    sPartyMenuInternal->spriteIdConfirmPokeball = 0x7F;
-    sPartyMenuInternal->spriteIdCancelPokeball = 0x7F;
-
     for (i = 0; i < ARRAY_COUNT(sPartyMenuInternal->data); i++)
         sPartyMenuInternal->data[i] = 0;
     for (i = 0; i < ARRAY_COUNT(sPartyMenuInternal->windowId); i++)
         sPartyMenuInternal->windowId[i] = WINDOW_NONE;
-
     gTextFlags.autoScroll = 0;
     CalculatePlayerPartyCount();
     SetMainCallback2(CB2_ReloadPartyMenu);
@@ -762,77 +757,62 @@ static bool8 ReloadPartyMenu(void)
         gMain.state++;
         break;
     case 6:
-        if (!AllocPartyMenuBg())
-        {
-            ExitPartyMenu();
-            return TRUE;
-        }
-        else
-        {
-            sPartyMenuInternal->data[0] = 0;
-            gMain.state++;
-        }
-        break;
-    case 7:
-        if (AllocPartyMenuBgGfx())
-            gMain.state++;
-        break;
-    case 8:
-        InitPartyMenuWindows(gPartyMenu.layout);
-        gMain.state++;
-        break;
-    case 9:
-        InitPartyMenuBoxes(gPartyMenu.layout);
         sPartyMenuInternal->data[0] = 0;
         gMain.state++;
         break;
-    case 10:
+    case 7:
+        LoadPartyMenuWindows();
+        gMain.state++;
+        break;
+    case 8:
+        LoadPartyMenuBoxes(gPartyMenu.layout);
+        sPartyMenuInternal->data[0] = 0;
+        gMain.state++;
+        break;
+    case 9:
         LoadHeldItemIcons();
         gMain.state++;
         break;
-    case 11:
+    case 10:
         LoadPartyMenuPokeballGfx();
         gMain.state++;
         break;
-    case 12:
+    case 11:
         LoadPartyMenuAilmentGfx();
         gMain.state++;
         break;
-    case 13:
+    case 12:
         LoadMonIconPalettes();
         gMain.state++;
         break;
-    case 14:
+    case 13:
         if (CreatePartyMonSpritesLoop())
         {
             sPartyMenuInternal->data[0] = 0;
             gMain.state++;
         }
         break;
-    case 15:
+    case 14:
         if (RenderPartyMenuBoxes())
         {
             sPartyMenuInternal->data[0] = 0;
             gMain.state++;
         }
         break;
-    case 16:
+    case 15:
         CreateCancelConfirmPokeballSprites();
         gMain.state++;
         break;
-    case 17:
+    case 16:
         CreateCancelConfirmWindows(sPartyMenuInternal->chooseHalf);
         gMain.state++;
         break;
-    case 18:
-        gMain.state++;
-        break;
-    case 19:
+    case 17:
         BlendPalettes(PALETTES_ALL, 16, RGB_WHITEALPHA);
         gPaletteFade.bufferTransferDisabled = FALSE;
         gMain.state++;
         break;
-    case 20:
+    case 18:
         BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_WHITEALPHA);
         gMain.state++;
         break;
@@ -961,9 +941,13 @@ static void FreePartyPointers(void)
 
 static void InitPartyMenuBoxes(u8 layout)
 {
-    u8 i;
-
     sPartyMenuBoxes = Alloc(sizeof(struct PartyMenuBox[PARTY_SIZE]));
+    LoadPartyMenuBoxes(layout);
+}
+
+static void LoadPartyMenuBoxes(u8 layout)
+{
+    u32 i;
 
     for (i = 0; i < PARTY_SIZE; i++)
     {
@@ -2230,8 +2214,6 @@ static u8 CanTeachMove(struct Pokemon *mon, u16 move)
 
 static void InitPartyMenuWindows(u8 layout)
 {
-    u8 i;
-
     switch (layout)
     {
     case PARTY_LAYOUT_SINGLE:
@@ -2247,6 +2229,12 @@ static void InitPartyMenuWindows(u8 layout)
         InitWindows(sShowcaseMultiPartyMenuWindowTemplate);
         break;
     }
+    LoadPartyMenuWindows();
+}
+
+static void LoadPartyMenuWindows(void)
+{
+    u32 i;
     DeactivateAllTextPrinters();
     for (i = 0; i < PARTY_SIZE; i++)
         FillWindowPixelBuffer(i, PIXEL_FILL(0));