diff --git a/graphics/pokemon/annihilape/overworld.png b/graphics/pokemon/annihilape/overworld.png
new file mode 100644
index 0000000000..22fad9680e
Binary files /dev/null and b/graphics/pokemon/annihilape/overworld.png differ
diff --git a/graphics/pokemon/annihilape/overworld_normal.pal b/graphics/pokemon/annihilape/overworld_normal.pal
new file mode 100644
index 0000000000..73d9ee2e4e
--- /dev/null
+++ b/graphics/pokemon/annihilape/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+78 82 106
+252 252 253
+0 0 0
+196 199 216
+118 120 134
+163 165 177
+52 55 73
+129 45 84
+255 144 196
+140 20 41
+196 85 137
+215 27 60
+113 113 118
+78 82 106
+27 33 45
diff --git a/graphics/pokemon/annihilape/overworld_shiny.pal b/graphics/pokemon/annihilape/overworld_shiny.pal
new file mode 100644
index 0000000000..1458a2779c
--- /dev/null
+++ b/graphics/pokemon/annihilape/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+78 82 106
+238 235 242
+0 0 0
+170 175 201
+93 108 175
+131 145 176
+36 79 29
+129 45 84
+255 144 196
+140 20 41
+196 85 137
+215 27 60
+78 82 106
+49 74 117
+25 18 61
diff --git a/graphics/pokemon/arboliva/overworld.png b/graphics/pokemon/arboliva/overworld.png
new file mode 100644
index 0000000000..80f5ca4352
Binary files /dev/null and b/graphics/pokemon/arboliva/overworld.png differ
diff --git a/graphics/pokemon/arboliva/overworld_normal.pal b/graphics/pokemon/arboliva/overworld_normal.pal
new file mode 100644
index 0000000000..e8420d615a
--- /dev/null
+++ b/graphics/pokemon/arboliva/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+101 201 58
+61 130 49
+34 62 30
+190 194 173
+253 255 244
+83 97 78
+153 224 73
+55 19 30
+206 131 81
+95 37 58
+140 60 80
+169 79 52
+83 44 34
+0 0 0
diff --git a/graphics/pokemon/arboliva/overworld_shiny.pal b/graphics/pokemon/arboliva/overworld_shiny.pal
new file mode 100644
index 0000000000..38ecac52f4
--- /dev/null
+++ b/graphics/pokemon/arboliva/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+44 141 56
+45 103 45
+22 49 17
+198 201 130
+251 255 178
+116 114 76
+184 230 77
+21 22 32
+195 157 84
+43 36 53
+67 56 84
+155 117 55
+95 71 33
+0 0 0
diff --git a/graphics/pokemon/archaludon/overworld.png b/graphics/pokemon/archaludon/overworld.png
new file mode 100644
index 0000000000..d3409dae4d
Binary files /dev/null and b/graphics/pokemon/archaludon/overworld.png differ
diff --git a/graphics/pokemon/archaludon/overworld_normal.pal b/graphics/pokemon/archaludon/overworld_normal.pal
new file mode 100644
index 0000000000..ed77ca1798
--- /dev/null
+++ b/graphics/pokemon/archaludon/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+149 49 49
+228 76 77
+181 59 59
+80 76 78
+243 242 244
+239 239 134
+78 75 174
+30 29 70
+189 188 186
+193 178 99
+52 50 114
+99 108 39
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/archaludon/overworld_shiny.pal b/graphics/pokemon/archaludon/overworld_shiny.pal
new file mode 100644
index 0000000000..4983eea061
--- /dev/null
+++ b/graphics/pokemon/archaludon/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+147 146 142
+222 219 225
+243 242 244
+43 51 60
+140 155 166
+255 193 125
+37 184 233
+26 99 136
+103 121 140
+255 153 40
+30 152 187
+104 54 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/arctibax/overworld.png b/graphics/pokemon/arctibax/overworld.png
new file mode 100644
index 0000000000..f1f466e6af
Binary files /dev/null and b/graphics/pokemon/arctibax/overworld.png differ
diff --git a/graphics/pokemon/arctibax/overworld_normal.pal b/graphics/pokemon/arctibax/overworld_normal.pal
new file mode 100644
index 0000000000..5ebb6d4058
--- /dev/null
+++ b/graphics/pokemon/arctibax/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+65 69 90
+102 149 227
+75 122 154
+0 0 0
+188 239 248
+91 111 138
+218 145 35
+125 166 166
+125 166 166
+255 209 74
+92 131 133
+255 194 11
+182 120 29
+144 144 144
+0 0 0
diff --git a/graphics/pokemon/arctibax/overworld_shiny.pal b/graphics/pokemon/arctibax/overworld_shiny.pal
new file mode 100644
index 0000000000..ffaa78ff3f
--- /dev/null
+++ b/graphics/pokemon/arctibax/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+68 95 116
+134 249 249
+67 194 175
+0 0 0
+188 239 248
+91 111 138
+218 145 35
+125 166 166
+188 239 248
+255 209 74
+92 131 133
+252 142 179
+201 100 144
+144 144 144
+0 0 0
diff --git a/graphics/pokemon/armarouge/overworld.png b/graphics/pokemon/armarouge/overworld.png
new file mode 100644
index 0000000000..6b39af4e83
Binary files /dev/null and b/graphics/pokemon/armarouge/overworld.png differ
diff --git a/graphics/pokemon/armarouge/overworld_normal.pal b/graphics/pokemon/armarouge/overworld_normal.pal
new file mode 100644
index 0000000000..181cf1e217
--- /dev/null
+++ b/graphics/pokemon/armarouge/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+124 42 41
+228 34 18
+232 83 44
+239 228 48
+230 140 184
+221 183 7
+0 0 0
+52 51 50
+95 86 83
+221 183 7
+27 33 34
+189 28 15
+232 232 248
+239 228 48
+117 97 4
diff --git a/graphics/pokemon/armarouge/overworld_shiny.pal b/graphics/pokemon/armarouge/overworld_shiny.pal
new file mode 100644
index 0000000000..4f93fc5250
--- /dev/null
+++ b/graphics/pokemon/armarouge/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+124 42 41
+228 34 18
+232 83 44
+239 228 48
+230 140 184
+221 183 7
+0 0 0
+52 51 50
+95 86 83
+146 173 218
+27 33 34
+189 28 15
+232 232 248
+177 196 229
+117 97 4
diff --git a/graphics/pokemon/baxcalibur/overworld.png b/graphics/pokemon/baxcalibur/overworld.png
new file mode 100644
index 0000000000..48791f9f08
Binary files /dev/null and b/graphics/pokemon/baxcalibur/overworld.png differ
diff --git a/graphics/pokemon/baxcalibur/overworld_normal.pal b/graphics/pokemon/baxcalibur/overworld_normal.pal
new file mode 100644
index 0000000000..c031cec49d
--- /dev/null
+++ b/graphics/pokemon/baxcalibur/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+29 36 44
+85 185 157
+67 91 92
+57 115 90
+163 225 231
+110 140 166
+0 0 0
+247 198 0
+126 108 37
+60 56 57
+101 20 32
+101 20 32
+249 57 57
+160 184 200
+232 232 248
diff --git a/graphics/pokemon/baxcalibur/overworld_shiny.pal b/graphics/pokemon/baxcalibur/overworld_shiny.pal
new file mode 100644
index 0000000000..fc9345f2a6
--- /dev/null
+++ b/graphics/pokemon/baxcalibur/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+12 17 16
+187 230 226
+64 109 121
+46 95 110
+100 192 198
+87 128 130
+0 0 0
+247 198 0
+126 108 37
+46 48 48
+200 28 139
+231 82 179
+231 82 179
+152 183 185
+232 232 248
diff --git a/graphics/pokemon/bellibolt/overworld.png b/graphics/pokemon/bellibolt/overworld.png
new file mode 100644
index 0000000000..eeae01c050
Binary files /dev/null and b/graphics/pokemon/bellibolt/overworld.png differ
diff --git a/graphics/pokemon/bellibolt/overworld_normal.pal b/graphics/pokemon/bellibolt/overworld_normal.pal
new file mode 100644
index 0000000000..a7125b80db
--- /dev/null
+++ b/graphics/pokemon/bellibolt/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+6 84 64
+150 150 192
+164 110 65
+228 167 83
+242 229 85
+232 232 248
+176 176 208
+27 171 141
+0 0 0
+242 229 85
+33 115 101
+91 83 77
+128 119 106
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/bellibolt/overworld_shiny.pal b/graphics/pokemon/bellibolt/overworld_shiny.pal
new file mode 100644
index 0000000000..97f5f3c3cd
--- /dev/null
+++ b/graphics/pokemon/bellibolt/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+105 91 35
+150 150 192
+171 75 73
+255 127 109
+242 229 85
+232 232 248
+176 176 208
+251 253 78
+0 0 0
+255 127 109
+170 155 51
+91 83 77
+128 119 106
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/bombirdier/overworld.png b/graphics/pokemon/bombirdier/overworld.png
new file mode 100644
index 0000000000..ca655b7a95
Binary files /dev/null and b/graphics/pokemon/bombirdier/overworld.png differ
diff --git a/graphics/pokemon/bombirdier/overworld_normal.pal b/graphics/pokemon/bombirdier/overworld_normal.pal
new file mode 100644
index 0000000000..fa558344ee
--- /dev/null
+++ b/graphics/pokemon/bombirdier/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+15 15 15
+69 60 65
+80 29 37
+102 91 96
+239 227 225
+185 170 175
+147 125 133
+123 130 123
+255 251 255
+198 198 204
+77 74 75
+80 29 37
+153 62 73
+232 232 248
+230 76 98
diff --git a/graphics/pokemon/bombirdier/overworld_shiny.pal b/graphics/pokemon/bombirdier/overworld_shiny.pal
new file mode 100644
index 0000000000..d20304edc0
--- /dev/null
+++ b/graphics/pokemon/bombirdier/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+15 15 15
+74 57 66
+52 41 48
+102 91 96
+239 227 225
+185 170 175
+147 125 133
+123 130 123
+255 251 255
+198 198 204
+160 74 85
+84 81 81
+136 134 133
+232 232 248
+171 167 168
diff --git a/graphics/pokemon/brambleghast/overworld.png b/graphics/pokemon/brambleghast/overworld.png
new file mode 100644
index 0000000000..652f7523f4
Binary files /dev/null and b/graphics/pokemon/brambleghast/overworld.png differ
diff --git a/graphics/pokemon/brambleghast/overworld_normal.pal b/graphics/pokemon/brambleghast/overworld_normal.pal
new file mode 100644
index 0000000000..a2f87081e7
--- /dev/null
+++ b/graphics/pokemon/brambleghast/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+91 79 91
+134 108 134
+192 159 186
+0 0 0
+66 43 32
+203 178 107
+156 125 85
+103 44 48
+173 105 66
+132 73 55
+21 21 21
+255 79 34
+156 125 85
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/brambleghast/overworld_shiny.pal b/graphics/pokemon/brambleghast/overworld_shiny.pal
new file mode 100644
index 0000000000..8250de6ec1
--- /dev/null
+++ b/graphics/pokemon/brambleghast/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+91 79 91
+134 108 134
+192 159 186
+0 0 0
+91 88 68
+219 216 181
+160 155 126
+71 58 39
+186 160 105
+129 111 73
+21 21 21
+243 179 139
+0 0 0
+71 58 39
+0 0 0
diff --git a/graphics/pokemon/bramblin/overworld.png b/graphics/pokemon/bramblin/overworld.png
new file mode 100644
index 0000000000..92a340427a
Binary files /dev/null and b/graphics/pokemon/bramblin/overworld.png differ
diff --git a/graphics/pokemon/bramblin/overworld_normal.pal b/graphics/pokemon/bramblin/overworld_normal.pal
new file mode 100644
index 0000000000..7e830e339e
--- /dev/null
+++ b/graphics/pokemon/bramblin/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+97 68 39
+204 164 102
+176 140 85
+21 21 21
+210 117 83
+191 89 60
+126 58 39
+75 58 52
+107 83 75
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/bramblin/overworld_shiny.pal b/graphics/pokemon/bramblin/overworld_shiny.pal
new file mode 100644
index 0000000000..c37c547ffb
--- /dev/null
+++ b/graphics/pokemon/bramblin/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+121 118 77
+214 209 157
+159 155 104
+21 21 21
+210 117 83
+191 89 60
+126 58 39
+87 96 60
+113 125 76
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/brute_bonnet/overworld.png b/graphics/pokemon/brute_bonnet/overworld.png
new file mode 100644
index 0000000000..14fe5e2f3c
Binary files /dev/null and b/graphics/pokemon/brute_bonnet/overworld.png differ
diff --git a/graphics/pokemon/brute_bonnet/overworld_normal.pal b/graphics/pokemon/brute_bonnet/overworld_normal.pal
new file mode 100644
index 0000000000..64d07618a9
--- /dev/null
+++ b/graphics/pokemon/brute_bonnet/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+107 70 62
+218 225 208
+94 98 87
+132 41 42
+227 63 70
+190 197 184
+178 49 55
+95 134 103
+130 212 128
+219 217 113
+255 172 205
+178 49 55
+222 139 164
+136 149 125
diff --git a/graphics/pokemon/brute_bonnet/overworld_shiny.pal b/graphics/pokemon/brute_bonnet/overworld_shiny.pal
new file mode 100644
index 0000000000..1e229eb10b
--- /dev/null
+++ b/graphics/pokemon/brute_bonnet/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+64 60 56
+208 200 168
+136 112 88
+56 48 104
+112 80 216
+160 152 120
+80 64 160
+95 134 103
+130 212 128
+219 217 113
+216 80 136
+178 49 55
+178 49 55
+136 149 125
diff --git a/graphics/pokemon/capsakid/overworld.png b/graphics/pokemon/capsakid/overworld.png
new file mode 100644
index 0000000000..9cf563f6a0
Binary files /dev/null and b/graphics/pokemon/capsakid/overworld.png differ
diff --git a/graphics/pokemon/capsakid/overworld_normal.pal b/graphics/pokemon/capsakid/overworld_normal.pal
new file mode 100644
index 0000000000..90f5ea334d
--- /dev/null
+++ b/graphics/pokemon/capsakid/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+36 72 40
+15 15 15
+240 251 227
+0 0 0
+166 180 150
+113 131 92
+77 145 79
+121 185 123
+62 117 63
+46 48 47
+255 145 21
+63 154 95
+47 104 60
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/capsakid/overworld_shiny.pal b/graphics/pokemon/capsakid/overworld_shiny.pal
new file mode 100644
index 0000000000..aeaff8b7ff
--- /dev/null
+++ b/graphics/pokemon/capsakid/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+49 58 89
+15 15 15
+240 251 227
+0 0 0
+166 180 150
+113 131 92
+166 152 70
+236 240 79
+85 71 21
+46 48 47
+255 145 21
+99 161 158
+73 107 134
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/ceruledge/overworld.png b/graphics/pokemon/ceruledge/overworld.png
new file mode 100644
index 0000000000..831b380fcc
Binary files /dev/null and b/graphics/pokemon/ceruledge/overworld.png differ
diff --git a/graphics/pokemon/ceruledge/overworld_normal.pal b/graphics/pokemon/ceruledge/overworld_normal.pal
new file mode 100644
index 0000000000..afec9a2dd4
--- /dev/null
+++ b/graphics/pokemon/ceruledge/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+19 59 113
+146 173 218
+177 196 229
+100 137 198
+0 0 0
+104 111 176
+37 37 75
+14 23 39
+81 73 133
+177 119 176
+27 33 34
+177 196 229
+232 232 248
+52 51 50
+0 0 0
diff --git a/graphics/pokemon/ceruledge/overworld_shiny.pal b/graphics/pokemon/ceruledge/overworld_shiny.pal
new file mode 100644
index 0000000000..86d05c4e5b
--- /dev/null
+++ b/graphics/pokemon/ceruledge/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+19 59 113
+146 173 218
+177 196 229
+100 137 198
+0 0 0
+104 111 176
+37 37 75
+14 23 39
+81 73 133
+177 119 176
+27 33 34
+239 228 48
+232 232 248
+52 51 50
+0 0 0
diff --git a/graphics/pokemon/cetitan/overworld.png b/graphics/pokemon/cetitan/overworld.png
new file mode 100644
index 0000000000..c2b72bdc4c
Binary files /dev/null and b/graphics/pokemon/cetitan/overworld.png differ
diff --git a/graphics/pokemon/cetitan/overworld_normal.pal b/graphics/pokemon/cetitan/overworld_normal.pal
new file mode 100644
index 0000000000..7d95a89e39
--- /dev/null
+++ b/graphics/pokemon/cetitan/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+16 16 16
+250 250 250
+216 215 211
+168 115 143
+223 160 187
+0 0 0
+139 139 141
+187 196 196
+96 95 94
+96 95 94
+139 139 141
+64 64 64
+215 215 215
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/cetitan/overworld_shiny.pal b/graphics/pokemon/cetitan/overworld_shiny.pal
new file mode 100644
index 0000000000..36b65af2b3
--- /dev/null
+++ b/graphics/pokemon/cetitan/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+16 16 16
+81 81 98
+62 62 74
+234 73 55
+249 141 115
+0 0 0
+43 43 51
+170 170 170
+43 43 51
+139 139 141
+216 215 211
+23 23 28
+250 250 250
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/cetoddle/overworld.png b/graphics/pokemon/cetoddle/overworld.png
new file mode 100644
index 0000000000..7f00f80008
Binary files /dev/null and b/graphics/pokemon/cetoddle/overworld.png differ
diff --git a/graphics/pokemon/cetoddle/overworld_normal.pal b/graphics/pokemon/cetoddle/overworld_normal.pal
new file mode 100644
index 0000000000..01c44975a9
--- /dev/null
+++ b/graphics/pokemon/cetoddle/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+139 139 141
+216 215 211
+0 0 0
+250 250 250
+223 160 187
+168 115 143
+250 250 250
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/cetoddle/overworld_shiny.pal b/graphics/pokemon/cetoddle/overworld_shiny.pal
new file mode 100644
index 0000000000..f9d80543eb
--- /dev/null
+++ b/graphics/pokemon/cetoddle/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+53 53 60
+132 141 147
+0 0 0
+183 188 191
+234 73 55
+192 53 37
+250 250 250
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/charcadet/overworld.png b/graphics/pokemon/charcadet/overworld.png
new file mode 100644
index 0000000000..11b455ae58
Binary files /dev/null and b/graphics/pokemon/charcadet/overworld.png differ
diff --git a/graphics/pokemon/charcadet/overworld_normal.pal b/graphics/pokemon/charcadet/overworld_normal.pal
new file mode 100644
index 0000000000..22b7585a72
--- /dev/null
+++ b/graphics/pokemon/charcadet/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+169 26 14
+71 11 5
+45 124 235
+232 83 44
+220 86 182
+228 34 18
+0 0 0
+134 55 55
+39 42 42
+179 74 75
+95 86 83
+230 136 11
+169 26 14
+232 232 248
+228 34 18
diff --git a/graphics/pokemon/charcadet/overworld_shiny.pal b/graphics/pokemon/charcadet/overworld_shiny.pal
new file mode 100644
index 0000000000..b0cd695305
--- /dev/null
+++ b/graphics/pokemon/charcadet/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+169 26 14
+71 11 5
+45 124 235
+232 83 44
+220 86 182
+228 34 18
+0 0 0
+134 55 55
+39 42 42
+179 74 75
+95 86 83
+230 136 11
+45 124 235
+232 232 248
+220 86 182
diff --git a/graphics/pokemon/chi_yu/overworld.png b/graphics/pokemon/chi_yu/overworld.png
new file mode 100644
index 0000000000..4a658f8c33
Binary files /dev/null and b/graphics/pokemon/chi_yu/overworld.png differ
diff --git a/graphics/pokemon/chi_yu/overworld_normal.pal b/graphics/pokemon/chi_yu/overworld_normal.pal
new file mode 100644
index 0000000000..6f4491d0c6
--- /dev/null
+++ b/graphics/pokemon/chi_yu/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+160 32 16
+0 0 0
+244 52 47
+243 94 56
+240 167 85
+121 23 13
+252 245 155
+28 64 33
+108 19 6
+91 152 90
+131 184 132
+215 232 215
+232 232 248
+241 248 241
+72 116 71
diff --git a/graphics/pokemon/chi_yu/overworld_shiny.pal b/graphics/pokemon/chi_yu/overworld_shiny.pal
new file mode 100644
index 0000000000..659d3fd812
--- /dev/null
+++ b/graphics/pokemon/chi_yu/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+69 67 68
+0 0 0
+94 94 94
+0 192 249
+119 236 233
+48 46 47
+186 254 253
+28 64 33
+27 24 26
+91 152 90
+131 184 132
+215 232 215
+232 232 248
+241 248 241
+72 116 71
diff --git a/graphics/pokemon/chien_pao/overworld.png b/graphics/pokemon/chien_pao/overworld.png
new file mode 100644
index 0000000000..4cead4f9bc
Binary files /dev/null and b/graphics/pokemon/chien_pao/overworld.png differ
diff --git a/graphics/pokemon/chien_pao/overworld_normal.pal b/graphics/pokemon/chien_pao/overworld_normal.pal
new file mode 100644
index 0000000000..0a2a27289d
--- /dev/null
+++ b/graphics/pokemon/chien_pao/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+80 78 80
+247 247 247
+173 210 228
+125 155 178
+147 140 155
+0 0 0
+190 186 190
+83 120 138
+74 142 239
+232 232 248
+33 41 50
+71 83 97
+60 108 107
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/chien_pao/overworld_shiny.pal b/graphics/pokemon/chien_pao/overworld_shiny.pal
new file mode 100644
index 0000000000..b688f15b6d
--- /dev/null
+++ b/graphics/pokemon/chien_pao/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+72 60 49
+162 143 126
+247 247 247
+190 186 190
+115 96 79
+0 0 0
+133 116 96
+147 140 155
+74 142 239
+232 232 248
+33 41 50
+71 83 97
+60 108 107
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/crocalor/overworld.png b/graphics/pokemon/crocalor/overworld.png
new file mode 100644
index 0000000000..7019b964b3
Binary files /dev/null and b/graphics/pokemon/crocalor/overworld.png differ
diff --git a/graphics/pokemon/crocalor/overworld_normal.pal b/graphics/pokemon/crocalor/overworld_normal.pal
new file mode 100644
index 0000000000..5a2611f996
--- /dev/null
+++ b/graphics/pokemon/crocalor/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+234 139 11
+234 202 72
+255 0 16
+245 239 220
+247 85 49
+0 0 0
+162 61 49
+66 23 19
+184 180 166
+222 85 66
+124 119 99
+99 36 29
+41 40 41
+74 73 74
+41 40 41
diff --git a/graphics/pokemon/crocalor/overworld_shiny.pal b/graphics/pokemon/crocalor/overworld_shiny.pal
new file mode 100644
index 0000000000..851a2e0687
--- /dev/null
+++ b/graphics/pokemon/crocalor/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+234 139 11
+236 208 91
+255 0 16
+251 247 226
+247 85 49
+0 0 0
+197 20 121
+106 21 70
+185 175 164
+236 66 164
+100 81 60
+106 21 70
+106 21 70
+130 64 74
+62 26 33
diff --git a/graphics/pokemon/cyclizar/overworld.png b/graphics/pokemon/cyclizar/overworld.png
new file mode 100644
index 0000000000..8367387e8b
Binary files /dev/null and b/graphics/pokemon/cyclizar/overworld.png differ
diff --git a/graphics/pokemon/cyclizar/overworld_normal.pal b/graphics/pokemon/cyclizar/overworld_normal.pal
new file mode 100644
index 0000000000..1724cd1ae0
--- /dev/null
+++ b/graphics/pokemon/cyclizar/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+69 82 72
+52 64 60
+16 16 16
+227 234 218
+129 171 133
+1 6 12
+81 111 89
+200 124 100
+217 104 64
+95 127 106
+70 70 78
+51 52 57
+40 43 47
+0 0 0
diff --git a/graphics/pokemon/cyclizar/overworld_shiny.pal b/graphics/pokemon/cyclizar/overworld_shiny.pal
new file mode 100644
index 0000000000..5bdb2b6c8d
--- /dev/null
+++ b/graphics/pokemon/cyclizar/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+248 238 187
+167 163 122
+16 16 16
+227 234 218
+138 138 112
+1 6 12
+97 95 71
+85 215 253
+3 177 228
+84 83 63
+70 70 78
+51 52 57
+40 43 47
+0 0 0
diff --git a/graphics/pokemon/dachsbun/overworld.png b/graphics/pokemon/dachsbun/overworld.png
new file mode 100644
index 0000000000..6c045409ac
Binary files /dev/null and b/graphics/pokemon/dachsbun/overworld.png differ
diff --git a/graphics/pokemon/dachsbun/overworld_normal.pal b/graphics/pokemon/dachsbun/overworld_normal.pal
new file mode 100644
index 0000000000..c81c373140
--- /dev/null
+++ b/graphics/pokemon/dachsbun/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+164 107 45
+255 219 99
+247 177 74
+209 162 90
+203 140 69
+0 0 0
+62 41 36
+110 53 33
+203 140 69
+140 65 33
+203 93 47
+247 177 74
+176 72 47
+176 72 47
+232 232 248
diff --git a/graphics/pokemon/dachsbun/overworld_shiny.pal b/graphics/pokemon/dachsbun/overworld_shiny.pal
new file mode 100644
index 0000000000..dc615d8801
--- /dev/null
+++ b/graphics/pokemon/dachsbun/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+85 58 45
+219 198 187
+219 198 187
+197 164 146
+197 164 146
+0 0 0
+62 41 36
+132 71 53
+226 187 154
+162 87 66
+223 151 125
+199 154 118
+175 119 100
+223 151 125
+232 232 248
diff --git a/graphics/pokemon/dipplin/overworld.png b/graphics/pokemon/dipplin/overworld.png
new file mode 100644
index 0000000000..c9979bd06b
Binary files /dev/null and b/graphics/pokemon/dipplin/overworld.png differ
diff --git a/graphics/pokemon/dipplin/overworld_normal.pal b/graphics/pokemon/dipplin/overworld_normal.pal
new file mode 100644
index 0000000000..7b2aec274b
--- /dev/null
+++ b/graphics/pokemon/dipplin/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+48 87 26
+144 205 109
+95 145 66
+94 80 2
+251 230 121
+217 185 6
+0 0 0
+17 17 17
+96 16 16
+149 32 32
+184 40 40
+224 72 64
+248 128 80
+30 54 16
+190 165 128
diff --git a/graphics/pokemon/dipplin/overworld_shiny.pal b/graphics/pokemon/dipplin/overworld_shiny.pal
new file mode 100644
index 0000000000..9bbb434349
--- /dev/null
+++ b/graphics/pokemon/dipplin/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+48 87 26
+144 205 109
+95 145 66
+94 80 2
+251 230 121
+217 185 6
+0 0 0
+17 17 17
+133 71 3
+213 137 2
+214 168 12
+253 204 23
+255 234 81
+172 44 21
+190 165 128
diff --git a/graphics/pokemon/dolliv/overworld.png b/graphics/pokemon/dolliv/overworld.png
new file mode 100644
index 0000000000..a59c4f3757
Binary files /dev/null and b/graphics/pokemon/dolliv/overworld.png differ
diff --git a/graphics/pokemon/dolliv/overworld_normal.pal b/graphics/pokemon/dolliv/overworld_normal.pal
new file mode 100644
index 0000000000..617ee34e0e
--- /dev/null
+++ b/graphics/pokemon/dolliv/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+34 62 30
+101 201 58
+84 111 45
+69 147 55
+191 209 63
+143 150 65
+153 224 73
+182 202 151
+83 97 78
+253 255 244
+15 15 15
+232 232 248
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/dolliv/overworld_shiny.pal b/graphics/pokemon/dolliv/overworld_shiny.pal
new file mode 100644
index 0000000000..7a07119831
--- /dev/null
+++ b/graphics/pokemon/dolliv/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+17 33 12
+47 83 39
+30 17 27
+32 65 23
+97 54 67
+56 33 50
+71 109 62
+177 182 86
+66 68 30
+198 201 130
+15 15 15
+232 232 248
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/dondozo/overworld.png b/graphics/pokemon/dondozo/overworld.png
new file mode 100644
index 0000000000..e2a80f514a
Binary files /dev/null and b/graphics/pokemon/dondozo/overworld.png differ
diff --git a/graphics/pokemon/dondozo/overworld_normal.pal b/graphics/pokemon/dondozo/overworld_normal.pal
new file mode 100644
index 0000000000..c29e5725ce
--- /dev/null
+++ b/graphics/pokemon/dondozo/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+16 125 189
+132 218 255
+83 92 106
+224 224 224
+192 181 189
+7 20 41
+19 177 250
+90 206 255
+0 0 0
+21 55 113
+224 224 224
+14 38 78
+28 73 149
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/dondozo/overworld_shiny.pal b/graphics/pokemon/dondozo/overworld_shiny.pal
new file mode 100644
index 0000000000..a0d5a789c8
--- /dev/null
+++ b/graphics/pokemon/dondozo/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+181 175 72
+255 253 115
+83 92 106
+224 224 224
+192 181 189
+7 20 41
+253 241 108
+255 247 138
+0 0 0
+172 172 172
+255 255 255
+109 109 109
+230 230 230
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/dudunsparce/overworld.png b/graphics/pokemon/dudunsparce/overworld.png
new file mode 100644
index 0000000000..98e582a527
Binary files /dev/null and b/graphics/pokemon/dudunsparce/overworld.png differ
diff --git a/graphics/pokemon/dudunsparce/overworld_normal.pal b/graphics/pokemon/dudunsparce/overworld_normal.pal
new file mode 100644
index 0000000000..6fed29243e
--- /dev/null
+++ b/graphics/pokemon/dudunsparce/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+24 56 72
+89 205 219
+49 143 157
+206 184 71
+84 61 31
+242 229 113
+192 168 0
+173 143 56
+90 98 115
+253 242 194
+246 255 255
+161 194 221
+202 216 236
+0 0 0
+229 185 119
diff --git a/graphics/pokemon/dudunsparce/overworld_shiny.pal b/graphics/pokemon/dudunsparce/overworld_shiny.pal
new file mode 100644
index 0000000000..ff0163cbdf
--- /dev/null
+++ b/graphics/pokemon/dudunsparce/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+73 28 61
+229 153 194
+215 78 164
+206 184 71
+84 61 31
+242 229 113
+192 168 0
+173 143 56
+90 98 115
+253 242 194
+246 255 255
+161 194 221
+202 216 236
+0 0 0
+229 185 119
diff --git a/graphics/pokemon/dudunsparce/three_segment/overworld.png b/graphics/pokemon/dudunsparce/three_segment/overworld.png
new file mode 100644
index 0000000000..9d84e7f338
Binary files /dev/null and b/graphics/pokemon/dudunsparce/three_segment/overworld.png differ
diff --git a/graphics/pokemon/dudunsparce/three_segment/overworld_normal.pal b/graphics/pokemon/dudunsparce/three_segment/overworld_normal.pal
new file mode 100644
index 0000000000..00ea281c13
--- /dev/null
+++ b/graphics/pokemon/dudunsparce/three_segment/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+24 56 72
+89 205 219
+49 143 157
+206 184 71
+84 61 31
+242 229 113
+192 168 0
+173 143 56
+253 242 194
+90 98 115
+246 255 255
+161 194 221
+202 216 236
+0 0 0
+229 185 119
diff --git a/graphics/pokemon/dudunsparce/three_segment/overworld_shiny.pal b/graphics/pokemon/dudunsparce/three_segment/overworld_shiny.pal
new file mode 100644
index 0000000000..201d38a15d
--- /dev/null
+++ b/graphics/pokemon/dudunsparce/three_segment/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+73 28 61
+229 153 194
+215 78 164
+206 184 71
+84 61 31
+242 229 113
+192 168 0
+173 143 56
+253 242 194
+90 98 115
+246 255 255
+161 194 221
+202 216 236
+0 0 0
+229 185 119
diff --git a/graphics/pokemon/espathra/overworld.png b/graphics/pokemon/espathra/overworld.png
new file mode 100644
index 0000000000..cd5feabf2a
Binary files /dev/null and b/graphics/pokemon/espathra/overworld.png differ
diff --git a/graphics/pokemon/espathra/overworld_normal.pal b/graphics/pokemon/espathra/overworld_normal.pal
new file mode 100644
index 0000000000..6607d0ee9a
--- /dev/null
+++ b/graphics/pokemon/espathra/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+74 69 79
+64 48 48
+249 249 249
+0 0 0
+227 227 227
+190 164 225
+82 233 187
+147 116 171
+197 138 82
+121 82 30
+207 174 150
+241 219 197
+196 183 21
+255 252 96
+196 183 21
diff --git a/graphics/pokemon/espathra/overworld_shiny.pal b/graphics/pokemon/espathra/overworld_shiny.pal
new file mode 100644
index 0000000000..5747724c55
--- /dev/null
+++ b/graphics/pokemon/espathra/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+76 73 79
+80 64 58
+249 249 249
+0 0 0
+227 227 227
+190 164 225
+82 233 187
+147 116 171
+106 86 81
+80 64 58
+137 120 106
+131 124 122
+143 116 90
+193 159 140
+192 181 118
diff --git a/graphics/pokemon/farigiraf/overworld.png b/graphics/pokemon/farigiraf/overworld.png
new file mode 100644
index 0000000000..4713be6488
Binary files /dev/null and b/graphics/pokemon/farigiraf/overworld.png differ
diff --git a/graphics/pokemon/farigiraf/overworld_normal.pal b/graphics/pokemon/farigiraf/overworld_normal.pal
new file mode 100644
index 0000000000..383f2d1641
--- /dev/null
+++ b/graphics/pokemon/farigiraf/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+44 44 43
+28 21 13
+0 0 0
+74 74 81
+76 68 75
+160 176 200
+243 239 154
+232 232 248
+203 196 123
+224 138 131
+243 239 154
+203 196 123
+145 85 90
+167 98 52
+244 142 81
diff --git a/graphics/pokemon/farigiraf/overworld_shiny.pal b/graphics/pokemon/farigiraf/overworld_shiny.pal
new file mode 100644
index 0000000000..1dff28acb1
--- /dev/null
+++ b/graphics/pokemon/farigiraf/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+40 43 46
+9 7 4
+0 0 0
+74 74 81
+40 38 36
+160 176 200
+243 239 154
+232 232 248
+203 196 123
+85 160 224
+186 243 240
+138 196 167
+34 119 189
+236 101 77
+236 101 77
diff --git a/graphics/pokemon/fezandipiti/overworld.png b/graphics/pokemon/fezandipiti/overworld.png
new file mode 100644
index 0000000000..7648eca4d8
Binary files /dev/null and b/graphics/pokemon/fezandipiti/overworld.png differ
diff --git a/graphics/pokemon/fezandipiti/overworld_normal.pal b/graphics/pokemon/fezandipiti/overworld_normal.pal
new file mode 100644
index 0000000000..dabbbc6f21
--- /dev/null
+++ b/graphics/pokemon/fezandipiti/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+203 170 16
+238 204 45
+0 0 0
+167 135 48
+61 59 58
+90 33 73
+146 57 119
+202 103 162
+118 61 41
+210 210 210
+192 78 22
+26 29 28
+254 254 254
+45 45 45
+69 37 29
diff --git a/graphics/pokemon/fezandipiti/overworld_shiny.pal b/graphics/pokemon/fezandipiti/overworld_shiny.pal
new file mode 100644
index 0000000000..9d018f0c61
--- /dev/null
+++ b/graphics/pokemon/fezandipiti/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+203 170 16
+238 204 45
+0 0 0
+167 135 48
+51 51 164
+90 33 73
+146 57 119
+202 103 162
+118 61 41
+210 210 210
+167 135 48
+23 24 47
+254 254 254
+56 56 56
+69 37 29
diff --git a/graphics/pokemon/fidough/overworld.png b/graphics/pokemon/fidough/overworld.png
new file mode 100644
index 0000000000..c9ee80352b
Binary files /dev/null and b/graphics/pokemon/fidough/overworld.png differ
diff --git a/graphics/pokemon/fidough/overworld_normal.pal b/graphics/pokemon/fidough/overworld_normal.pal
new file mode 100644
index 0000000000..cba45d45be
--- /dev/null
+++ b/graphics/pokemon/fidough/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+107 100 92
+247 226 117
+0 0 0
+205 182 70
+250 244 218
+225 219 171
+107 100 92
+232 232 248
+133 125 104
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/fidough/overworld_shiny.pal b/graphics/pokemon/fidough/overworld_shiny.pal
new file mode 100644
index 0000000000..f2998a4028
--- /dev/null
+++ b/graphics/pokemon/fidough/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+108 68 62
+243 210 54
+0 0 0
+202 176 53
+222 189 143
+167 130 101
+107 100 92
+232 232 248
+133 102 80
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/finizen/overworld.png b/graphics/pokemon/finizen/overworld.png
new file mode 100644
index 0000000000..97507c58a5
Binary files /dev/null and b/graphics/pokemon/finizen/overworld.png differ
diff --git a/graphics/pokemon/finizen/overworld_normal.pal b/graphics/pokemon/finizen/overworld_normal.pal
new file mode 100644
index 0000000000..86eb8f57e1
--- /dev/null
+++ b/graphics/pokemon/finizen/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+32 57 62
+82 202 219
+55 155 173
+0 0 0
+221 241 247
+33 97 107
+137 219 230
+163 179 182
+238 248 251
+66 178 255
+140 223 255
+65 132 146
+247 174 181
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/finizen/overworld_shiny.pal b/graphics/pokemon/finizen/overworld_shiny.pal
new file mode 100644
index 0000000000..fb37b68476
--- /dev/null
+++ b/graphics/pokemon/finizen/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+52 50 99
+169 171 239
+133 135 233
+0 0 0
+221 241 247
+91 93 155
+187 190 227
+163 179 182
+238 248 251
+66 178 255
+140 223 255
+65 132 146
+130 246 158
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/flamigo/overworld.png b/graphics/pokemon/flamigo/overworld.png
new file mode 100644
index 0000000000..6da6fc865b
Binary files /dev/null and b/graphics/pokemon/flamigo/overworld.png differ
diff --git a/graphics/pokemon/flamigo/overworld_normal.pal b/graphics/pokemon/flamigo/overworld_normal.pal
new file mode 100644
index 0000000000..7280ddcfb7
--- /dev/null
+++ b/graphics/pokemon/flamigo/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+142 68 92
+250 120 154
+252 144 173
+255 219 99
+251 242 244
+151 143 151
+98 40 52
+15 15 15
+77 66 69
+189 84 112
+146 125 65
+41 40 41
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/flamigo/overworld_shiny.pal b/graphics/pokemon/flamigo/overworld_shiny.pal
new file mode 100644
index 0000000000..84abb07a88
--- /dev/null
+++ b/graphics/pokemon/flamigo/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+119 95 98
+221 189 192
+240 206 211
+255 182 100
+251 242 244
+151 143 151
+102 66 87
+15 15 15
+77 66 69
+170 138 141
+147 99 64
+41 40 41
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/flittle/overworld.png b/graphics/pokemon/flittle/overworld.png
new file mode 100644
index 0000000000..43195e6437
Binary files /dev/null and b/graphics/pokemon/flittle/overworld.png differ
diff --git a/graphics/pokemon/flittle/overworld_normal.pal b/graphics/pokemon/flittle/overworld_normal.pal
new file mode 100644
index 0000000000..bc988d7a6c
--- /dev/null
+++ b/graphics/pokemon/flittle/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+166 181 187
+81 92 106
+71 51 10
+231 235 237
+15 15 15
+255 209 28
+180 162 37
+132 119 28
+126 110 198
+86 68 157
+64 121 179
+204 72 165
+236 100 202
+175 90 5
+217 112 6
diff --git a/graphics/pokemon/flittle/overworld_shiny.pal b/graphics/pokemon/flittle/overworld_shiny.pal
new file mode 100644
index 0000000000..bbc6af057a
--- /dev/null
+++ b/graphics/pokemon/flittle/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+166 181 187
+81 92 106
+71 51 10
+231 235 237
+15 15 15
+255 209 28
+180 162 37
+132 119 28
+126 110 198
+86 68 157
+64 121 179
+65 185 51
+130 245 90
+63 39 24
+109 67 41
diff --git a/graphics/pokemon/floragato/overworld.png b/graphics/pokemon/floragato/overworld.png
new file mode 100644
index 0000000000..9eb6c1dc0b
Binary files /dev/null and b/graphics/pokemon/floragato/overworld.png differ
diff --git a/graphics/pokemon/floragato/overworld_normal.pal b/graphics/pokemon/floragato/overworld_normal.pal
new file mode 100644
index 0000000000..c527ee749f
--- /dev/null
+++ b/graphics/pokemon/floragato/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+33 65 20
+79 151 57
+63 120 46
+214 239 192
+91 95 75
+167 171 148
+49 53 43
+41 97 47
+29 67 33
+232 232 248
+149 21 53
+211 56 103
+93 181 69
+16 37 18
diff --git a/graphics/pokemon/floragato/overworld_shiny.pal b/graphics/pokemon/floragato/overworld_shiny.pal
new file mode 100644
index 0000000000..95ca72f2d6
--- /dev/null
+++ b/graphics/pokemon/floragato/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+43 90 37
+93 181 69
+57 120 50
+221 245 146
+81 92 46
+154 191 85
+52 58 37
+52 85 74
+32 55 52
+232 232 248
+79 40 130
+125 85 193
+154 191 85
+27 39 36
diff --git a/graphics/pokemon/flutter_mane/overworld.png b/graphics/pokemon/flutter_mane/overworld.png
new file mode 100644
index 0000000000..41690f8600
Binary files /dev/null and b/graphics/pokemon/flutter_mane/overworld.png differ
diff --git a/graphics/pokemon/flutter_mane/overworld_normal.pal b/graphics/pokemon/flutter_mane/overworld_normal.pal
new file mode 100644
index 0000000000..a950f0bf67
--- /dev/null
+++ b/graphics/pokemon/flutter_mane/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+50 87 97
+79 138 153
+243 173 243
+0 0 0
+132 51 132
+79 138 153
+129 20 33
+115 185 175
+35 62 69
+197 62 82
+92 14 23
+31 30 31
+176 120 0
+224 176 40
+232 232 248
diff --git a/graphics/pokemon/flutter_mane/overworld_shiny.pal b/graphics/pokemon/flutter_mane/overworld_shiny.pal
new file mode 100644
index 0000000000..f3b7812423
--- /dev/null
+++ b/graphics/pokemon/flutter_mane/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+64 88 24
+156 176 84
+232 160 0
+0 0 0
+96 0 32
+159 159 159
+129 20 33
+191 191 191
+32 48 8
+197 62 82
+96 0 32
+31 30 31
+134 90 0
+224 176 40
+232 232 248
diff --git a/graphics/pokemon/frigibax/overworld.png b/graphics/pokemon/frigibax/overworld.png
new file mode 100644
index 0000000000..c35ca5d73b
Binary files /dev/null and b/graphics/pokemon/frigibax/overworld.png differ
diff --git a/graphics/pokemon/frigibax/overworld_normal.pal b/graphics/pokemon/frigibax/overworld_normal.pal
new file mode 100644
index 0000000000..98d280ca88
--- /dev/null
+++ b/graphics/pokemon/frigibax/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+56 75 75
+0 0 0
+150 185 190
+98 150 157
+170 177 183
+249 216 0
+34 49 60
+222 223 222
+65 93 113
+175 155 10
+114 118 114
+194 231 233
+249 216 0
+175 155 10
+118 152 148
diff --git a/graphics/pokemon/frigibax/overworld_shiny.pal b/graphics/pokemon/frigibax/overworld_shiny.pal
new file mode 100644
index 0000000000..4e67f23de1
--- /dev/null
+++ b/graphics/pokemon/frigibax/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+52 74 64
+0 0 0
+150 185 190
+98 150 157
+170 177 183
+249 216 0
+34 49 60
+222 223 222
+75 114 106
+175 155 10
+114 118 114
+194 231 233
+255 179 230
+143 103 130
+118 152 148
diff --git a/graphics/pokemon/fuecoco/overworld.png b/graphics/pokemon/fuecoco/overworld.png
new file mode 100644
index 0000000000..d478e0317f
Binary files /dev/null and b/graphics/pokemon/fuecoco/overworld.png differ
diff --git a/graphics/pokemon/fuecoco/overworld_normal.pal b/graphics/pokemon/fuecoco/overworld_normal.pal
new file mode 100644
index 0000000000..9136a16bb8
--- /dev/null
+++ b/graphics/pokemon/fuecoco/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+234 139 11
+236 230 100
+232 196 53
+0 0 0
+106 41 26
+239 79 61
+255 248 223
+137 55 31
+170 164 147
+0 0 0
+104 45 34
+81 88 103
+236 208 91
+55 60 70
+0 0 0
diff --git a/graphics/pokemon/fuecoco/overworld_shiny.pal b/graphics/pokemon/fuecoco/overworld_shiny.pal
new file mode 100644
index 0000000000..430dd10f26
--- /dev/null
+++ b/graphics/pokemon/fuecoco/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+234 139 11
+236 230 100
+232 196 53
+0 0 0
+142 28 94
+222 105 140
+255 248 223
+171 65 95
+170 164 147
+91 38 48
+106 21 70
+116 94 69
+236 208 91
+91 38 48
+0 0 0
diff --git a/graphics/pokemon/garganacl/overworld.png b/graphics/pokemon/garganacl/overworld.png
new file mode 100644
index 0000000000..4762150724
Binary files /dev/null and b/graphics/pokemon/garganacl/overworld.png differ
diff --git a/graphics/pokemon/garganacl/overworld_normal.pal b/graphics/pokemon/garganacl/overworld_normal.pal
new file mode 100644
index 0000000000..08dff16f42
--- /dev/null
+++ b/graphics/pokemon/garganacl/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+86 77 87
+191 180 186
+252 252 252
+153 134 148
+0 0 0
+195 146 123
+68 51 46
+150 103 90
+234 136 28
+246 226 26
+100 81 77
+138 115 103
+228 209 200
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/garganacl/overworld_shiny.pal b/graphics/pokemon/garganacl/overworld_shiny.pal
new file mode 100644
index 0000000000..1ddcf0c22e
--- /dev/null
+++ b/graphics/pokemon/garganacl/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+81 64 45
+190 149 109
+230 175 136
+123 96 67
+0 0 0
+195 146 123
+68 51 46
+150 103 90
+234 136 28
+246 226 26
+100 81 77
+138 115 103
+228 209 200
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/gholdengo/overworld.png b/graphics/pokemon/gholdengo/overworld.png
new file mode 100644
index 0000000000..68d32e136a
Binary files /dev/null and b/graphics/pokemon/gholdengo/overworld.png differ
diff --git a/graphics/pokemon/gholdengo/overworld_normal.pal b/graphics/pokemon/gholdengo/overworld_normal.pal
new file mode 100644
index 0000000000..723bc75ea0
--- /dev/null
+++ b/graphics/pokemon/gholdengo/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+79 62 21
+0 0 0
+255 219 166
+213 164 49
+213 164 49
+217 136 15
+255 213 45
+145 122 54
+50 52 55
+84 91 107
+180 164 94
+156 62 67
+118 37 52
+185 190 205
+138 143 159
diff --git a/graphics/pokemon/gholdengo/overworld_shiny.pal b/graphics/pokemon/gholdengo/overworld_shiny.pal
new file mode 100644
index 0000000000..6e2d0516cd
--- /dev/null
+++ b/graphics/pokemon/gholdengo/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+79 62 21
+0 0 0
+255 219 166
+213 164 49
+134 156 157
+107 121 126
+255 213 45
+145 122 54
+50 52 55
+107 121 126
+180 164 94
+156 62 67
+118 37 52
+185 190 205
+138 143 159
diff --git a/graphics/pokemon/gimmighoul/overworld.png b/graphics/pokemon/gimmighoul/overworld.png
new file mode 100644
index 0000000000..35c2bceddf
Binary files /dev/null and b/graphics/pokemon/gimmighoul/overworld.png differ
diff --git a/graphics/pokemon/gimmighoul/overworld_normal.pal b/graphics/pokemon/gimmighoul/overworld_normal.pal
new file mode 100644
index 0000000000..9c170b6fff
--- /dev/null
+++ b/graphics/pokemon/gimmighoul/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+145 131 68
+0 0 0
+35 38 44
+180 164 94
+118 37 52
+194 182 124
+156 62 67
+184 78 83
+94 111 143
+153 164 192
+94 111 143
+153 164 192
+228 191 0
+154 125 42
+0 0 0
diff --git a/graphics/pokemon/gimmighoul/overworld_shiny.pal b/graphics/pokemon/gimmighoul/overworld_shiny.pal
new file mode 100644
index 0000000000..f4865b061b
--- /dev/null
+++ b/graphics/pokemon/gimmighoul/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+145 131 68
+0 0 0
+35 38 44
+180 164 94
+118 37 52
+194 182 124
+156 62 67
+184 78 83
+94 111 143
+153 164 192
+138 149 166
+209 219 227
+228 191 0
+154 125 42
+0 0 0
diff --git a/graphics/pokemon/glimmet/overworld.png b/graphics/pokemon/glimmet/overworld.png
new file mode 100644
index 0000000000..5cf3260caa
Binary files /dev/null and b/graphics/pokemon/glimmet/overworld.png differ
diff --git a/graphics/pokemon/glimmet/overworld_normal.pal b/graphics/pokemon/glimmet/overworld_normal.pal
new file mode 100644
index 0000000000..47f6b38dfb
--- /dev/null
+++ b/graphics/pokemon/glimmet/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+8 48 144
+3 21 65
+52 168 225
+99 120 165
+212 226 235
+31 46 66
+255 255 49
+42 52 82
+153 167 196
+127 127 187
+153 153 203
+99 120 165
+201 196 226
+69 59 77
diff --git a/graphics/pokemon/glimmet/overworld_shiny.pal b/graphics/pokemon/glimmet/overworld_shiny.pal
new file mode 100644
index 0000000000..ffeb7a9376
--- /dev/null
+++ b/graphics/pokemon/glimmet/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+45 244 215
+23 104 96
+204 224 225
+99 120 165
+212 226 235
+24 36 52
+255 255 49
+39 49 88
+153 167 196
+85 115 184
+104 140 209
+60 83 143
+138 173 242
+69 59 77
diff --git a/graphics/pokemon/glimmora/overworld.png b/graphics/pokemon/glimmora/overworld.png
new file mode 100644
index 0000000000..e3a05b066f
Binary files /dev/null and b/graphics/pokemon/glimmora/overworld.png differ
diff --git a/graphics/pokemon/glimmora/overworld_normal.pal b/graphics/pokemon/glimmora/overworld_normal.pal
new file mode 100644
index 0000000000..e01a7da62f
--- /dev/null
+++ b/graphics/pokemon/glimmora/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+54 105 86
+0 0 0
+65 150 139
+93 224 170
+44 54 154
+50 83 214
+27 30 75
+48 48 99
+91 78 149
+141 123 206
+61 70 75
+90 134 156
+255 255 49
+77 96 118
+0 0 0
diff --git a/graphics/pokemon/glimmora/overworld_shiny.pal b/graphics/pokemon/glimmora/overworld_shiny.pal
new file mode 100644
index 0000000000..b2310cdcef
--- /dev/null
+++ b/graphics/pokemon/glimmora/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+61 152 182
+0 0 0
+132 209 223
+171 237 239
+27 190 170
+45 244 215
+16 69 53
+31 39 120
+40 52 153
+47 79 187
+61 70 75
+90 134 156
+255 255 49
+77 96 118
+0 0 0
diff --git a/graphics/pokemon/gouging_fire/overworld.png b/graphics/pokemon/gouging_fire/overworld.png
new file mode 100644
index 0000000000..b6b232b9d0
Binary files /dev/null and b/graphics/pokemon/gouging_fire/overworld.png differ
diff --git a/graphics/pokemon/gouging_fire/overworld_normal.pal b/graphics/pokemon/gouging_fire/overworld_normal.pal
new file mode 100644
index 0000000000..cc60ced1ee
--- /dev/null
+++ b/graphics/pokemon/gouging_fire/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+202 156 15
+120 97 44
+255 236 125
+192 25 22
+0 0 0
+136 17 14
+57 205 20
+192 136 24
+67 59 54
+123 129 133
+107 113 100
+198 204 191
+230 235 235
+198 204 191
+0 112 249
diff --git a/graphics/pokemon/gouging_fire/overworld_shiny.pal b/graphics/pokemon/gouging_fire/overworld_shiny.pal
new file mode 100644
index 0000000000..2d1a121559
--- /dev/null
+++ b/graphics/pokemon/gouging_fire/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+235 148 37
+199 100 36
+249 189 116
+93 92 92
+0 0 0
+51 50 50
+70 220 210
+152 96 57
+67 59 54
+123 129 133
+107 113 100
+198 204 191
+230 235 235
+93 92 92
+0 112 249
diff --git a/graphics/pokemon/grafaiai/overworld.png b/graphics/pokemon/grafaiai/overworld.png
new file mode 100644
index 0000000000..773a3b7989
Binary files /dev/null and b/graphics/pokemon/grafaiai/overworld.png differ
diff --git a/graphics/pokemon/grafaiai/overworld_normal.pal b/graphics/pokemon/grafaiai/overworld_normal.pal
new file mode 100644
index 0000000000..ad40b14cbc
--- /dev/null
+++ b/graphics/pokemon/grafaiai/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+112 101 101
+169 157 149
+112 101 101
+0 0 0
+63 63 76
+40 40 40
+70 66 84
+171 165 172
+230 227 227
+87 69 150
+138 194 162
+162 203 166
+48 148 179
+177 44 100
+215 56 118
diff --git a/graphics/pokemon/grafaiai/overworld_shiny.pal b/graphics/pokemon/grafaiai/overworld_shiny.pal
new file mode 100644
index 0000000000..16c8ac6f0f
--- /dev/null
+++ b/graphics/pokemon/grafaiai/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+112 101 101
+220 220 195
+172 166 153
+0 0 0
+101 112 102
+40 40 40
+64 34 100
+177 168 168
+230 227 227
+182 74 96
+169 169 226
+213 204 255
+255 234 86
+64 34 100
+148 97 222
diff --git a/graphics/pokemon/great_tusk/overworld.png b/graphics/pokemon/great_tusk/overworld.png
new file mode 100644
index 0000000000..eb3ee7abdf
Binary files /dev/null and b/graphics/pokemon/great_tusk/overworld.png differ
diff --git a/graphics/pokemon/great_tusk/overworld_normal.pal b/graphics/pokemon/great_tusk/overworld_normal.pal
new file mode 100644
index 0000000000..8ca822ba78
--- /dev/null
+++ b/graphics/pokemon/great_tusk/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+124 25 37
+113 27 51
+20 28 36
+69 66 104
+148 35 52
+72 64 72
+160 47 81
+103 99 156
+69 66 104
+120 120 128
+248 248 248
+152 152 160
+184 184 192
+88 8 8
+228 189 108
diff --git a/graphics/pokemon/great_tusk/overworld_shiny.pal b/graphics/pokemon/great_tusk/overworld_shiny.pal
new file mode 100644
index 0000000000..1848a8836d
--- /dev/null
+++ b/graphics/pokemon/great_tusk/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+116 37 41
+89 92 33
+16 16 16
+120 48 32
+220 169 104
+72 51 38
+144 158 35
+184 136 96
+128 136 96
+72 176 144
+248 248 248
+176 240 200
+184 184 192
+88 8 8
+220 169 104
diff --git a/graphics/pokemon/greavard/overworld.png b/graphics/pokemon/greavard/overworld.png
new file mode 100644
index 0000000000..491f91fbc4
Binary files /dev/null and b/graphics/pokemon/greavard/overworld.png differ
diff --git a/graphics/pokemon/greavard/overworld_normal.pal b/graphics/pokemon/greavard/overworld_normal.pal
new file mode 100644
index 0000000000..20de308b20
--- /dev/null
+++ b/graphics/pokemon/greavard/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+152 74 189
+183 129 209
+247 208 108
+201 160 220
+0 0 0
+232 235 239
+184 181 191
+85 96 113
+137 148 166
+180 196 211
+43 47 54
+48 48 64
+62 66 69
+48 48 64
+48 48 64
diff --git a/graphics/pokemon/greavard/overworld_shiny.pal b/graphics/pokemon/greavard/overworld_shiny.pal
new file mode 100644
index 0000000000..3a5079edd9
--- /dev/null
+++ b/graphics/pokemon/greavard/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+152 74 189
+183 129 209
+247 208 108
+201 160 220
+0 0 0
+232 235 239
+184 181 191
+126 95 48
+222 177 86
+255 233 104
+78 60 39
+92 70 46
+62 66 69
+48 48 64
+78 60 39
diff --git a/graphics/pokemon/houndstone/overworld.png b/graphics/pokemon/houndstone/overworld.png
new file mode 100644
index 0000000000..d415b7860b
Binary files /dev/null and b/graphics/pokemon/houndstone/overworld.png differ
diff --git a/graphics/pokemon/houndstone/overworld_normal.pal b/graphics/pokemon/houndstone/overworld_normal.pal
new file mode 100644
index 0000000000..ac1cea7e9c
--- /dev/null
+++ b/graphics/pokemon/houndstone/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+68 73 77
+122 122 122
+182 179 223
+78 78 82
+105 47 47
+0 0 0
+173 65 96
+204 199 231
+185 183 46
+185 189 196
+237 239 241
+15 15 15
+234 234 234
+203 203 203
+148 149 150
diff --git a/graphics/pokemon/houndstone/overworld_shiny.pal b/graphics/pokemon/houndstone/overworld_shiny.pal
new file mode 100644
index 0000000000..ccdf95276a
--- /dev/null
+++ b/graphics/pokemon/houndstone/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+68 73 77
+122 122 122
+161 138 111
+78 78 82
+105 47 47
+0 0 0
+173 65 96
+220 211 175
+185 183 46
+186 165 133
+220 211 175
+15 15 15
+234 234 234
+203 203 203
+148 149 150
diff --git a/graphics/pokemon/hydrapple/overworld.png b/graphics/pokemon/hydrapple/overworld.png
new file mode 100644
index 0000000000..2b2da7ff79
Binary files /dev/null and b/graphics/pokemon/hydrapple/overworld.png differ
diff --git a/graphics/pokemon/hydrapple/overworld_normal.pal b/graphics/pokemon/hydrapple/overworld_normal.pal
new file mode 100644
index 0000000000..0f8efb75ee
--- /dev/null
+++ b/graphics/pokemon/hydrapple/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+53 48 17
+120 92 77
+95 145 66
+176 152 115
+96 16 16
+0 0 0
+94 80 2
+184 40 40
+251 230 121
+217 185 6
+144 205 109
+96 16 16
+166 36 36
+224 72 64
+30 54 16
diff --git a/graphics/pokemon/hydrapple/overworld_shiny.pal b/graphics/pokemon/hydrapple/overworld_shiny.pal
new file mode 100644
index 0000000000..1fb8f281e6
--- /dev/null
+++ b/graphics/pokemon/hydrapple/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+53 48 17
+120 92 77
+95 145 66
+176 152 115
+95 145 66
+0 0 0
+94 80 2
+144 205 109
+251 230 121
+217 185 6
+144 205 109
+133 71 3
+235 194 14
+255 234 81
+172 44 21
diff --git a/graphics/pokemon/iron_boulder/overworld.png b/graphics/pokemon/iron_boulder/overworld.png
new file mode 100644
index 0000000000..ff9a212199
Binary files /dev/null and b/graphics/pokemon/iron_boulder/overworld.png differ
diff --git a/graphics/pokemon/iron_boulder/overworld_normal.pal b/graphics/pokemon/iron_boulder/overworld_normal.pal
new file mode 100644
index 0000000000..cf0d9da89a
--- /dev/null
+++ b/graphics/pokemon/iron_boulder/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+16 16 16
+109 80 69
+90 90 86
+146 144 125
+56 41 41
+182 178 167
+76 55 52
+184 123 33
+207 207 207
+223 169 57
+224 96 0
+234 201 132
+56 41 41
+122 90 75
+254 172 53
diff --git a/graphics/pokemon/iron_boulder/overworld_shiny.pal b/graphics/pokemon/iron_boulder/overworld_shiny.pal
new file mode 100644
index 0000000000..4b7b817858
--- /dev/null
+++ b/graphics/pokemon/iron_boulder/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+16 16 16
+173 173 173
+90 90 86
+138 142 138
+90 90 86
+173 173 173
+138 142 138
+184 123 33
+207 207 207
+223 169 57
+207 207 207
+234 201 132
+173 173 173
+207 207 207
+254 172 53
diff --git a/graphics/pokemon/iron_bundle/overworld.png b/graphics/pokemon/iron_bundle/overworld.png
new file mode 100644
index 0000000000..b8105c80b1
Binary files /dev/null and b/graphics/pokemon/iron_bundle/overworld.png differ
diff --git a/graphics/pokemon/iron_bundle/overworld_normal.pal b/graphics/pokemon/iron_bundle/overworld_normal.pal
new file mode 100644
index 0000000000..1bb4392801
--- /dev/null
+++ b/graphics/pokemon/iron_bundle/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+72 72 72
+0 0 0
+212 212 212
+88 8 8
+170 170 170
+200 24 24
+191 191 191
+152 8 8
+77 138 192
+90 192 255
+184 160 24
+248 216 88
+128 104 16
+212 212 212
+72 72 72
diff --git a/graphics/pokemon/iron_bundle/overworld_shiny.pal b/graphics/pokemon/iron_bundle/overworld_shiny.pal
new file mode 100644
index 0000000000..e92a25958c
--- /dev/null
+++ b/graphics/pokemon/iron_bundle/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+51 53 57
+0 0 0
+179 181 185
+51 53 57
+100 103 113
+145 148 155
+145 148 155
+100 103 113
+77 138 192
+90 192 255
+145 148 155
+179 181 185
+100 103 113
+212 212 212
+72 72 72
diff --git a/graphics/pokemon/iron_crown/overworld.png b/graphics/pokemon/iron_crown/overworld.png
new file mode 100644
index 0000000000..79ed13adca
Binary files /dev/null and b/graphics/pokemon/iron_crown/overworld.png differ
diff --git a/graphics/pokemon/iron_crown/overworld_normal.pal b/graphics/pokemon/iron_crown/overworld_normal.pal
new file mode 100644
index 0000000000..eec00f77b6
--- /dev/null
+++ b/graphics/pokemon/iron_crown/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+32 100 119
+96 72 8
+98 247 247
+248 208 80
+56 156 173
+22 61 67
+224 176 8
+18 32 11
+199 252 252
+64 64 88
+160 160 160
+200 200 216
+139 130 133
+99 99 99
+232 232 248
diff --git a/graphics/pokemon/iron_crown/overworld_shiny.pal b/graphics/pokemon/iron_crown/overworld_shiny.pal
new file mode 100644
index 0000000000..76e4a6f913
--- /dev/null
+++ b/graphics/pokemon/iron_crown/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+102 105 113
+92 94 101
+98 247 247
+167 169 175
+156 158 165
+51 53 57
+145 148 155
+18 32 11
+199 252 252
+82 84 90
+160 160 160
+200 200 216
+139 130 133
+99 99 99
+232 232 248
diff --git a/graphics/pokemon/iron_hands/overworld.png b/graphics/pokemon/iron_hands/overworld.png
new file mode 100644
index 0000000000..ecc23dd46a
Binary files /dev/null and b/graphics/pokemon/iron_hands/overworld.png differ
diff --git a/graphics/pokemon/iron_hands/overworld_normal.pal b/graphics/pokemon/iron_hands/overworld_normal.pal
new file mode 100644
index 0000000000..d48fe515f8
--- /dev/null
+++ b/graphics/pokemon/iron_hands/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+49 55 88
+25 32 49
+66 78 115
+82 80 80
+203 201 197
+208 167 19
+163 159 152
+41 38 41
+252 210 22
+88 74 41
+121 117 108
+58 54 55
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/iron_hands/overworld_shiny.pal b/graphics/pokemon/iron_hands/overworld_shiny.pal
new file mode 100644
index 0000000000..2dee14f755
--- /dev/null
+++ b/graphics/pokemon/iron_hands/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+100 103 113
+51 53 57
+145 148 155
+51 53 57
+145 148 155
+208 167 19
+100 103 113
+41 38 41
+252 210 22
+88 74 41
+80 82 90
+58 54 55
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/iron_jugulis/overworld.png b/graphics/pokemon/iron_jugulis/overworld.png
new file mode 100644
index 0000000000..3058959c13
Binary files /dev/null and b/graphics/pokemon/iron_jugulis/overworld.png differ
diff --git a/graphics/pokemon/iron_jugulis/overworld_normal.pal b/graphics/pokemon/iron_jugulis/overworld_normal.pal
new file mode 100644
index 0000000000..b591085630
--- /dev/null
+++ b/graphics/pokemon/iron_jugulis/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+16 12 16
+33 25 33
+225 0 157
+27 23 27
+71 71 71
+255 77 203
+140 0 98
+255 162 255
+19 52 128
+91 115 208
+134 171 240
+63 59 63
+0 47 123
+0 63 166
+30 98 223
diff --git a/graphics/pokemon/iron_jugulis/overworld_shiny.pal b/graphics/pokemon/iron_jugulis/overworld_shiny.pal
new file mode 100644
index 0000000000..f7a3680c80
--- /dev/null
+++ b/graphics/pokemon/iron_jugulis/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+16 12 16
+84 87 95
+225 0 157
+168 170 176
+213 213 213
+255 77 203
+140 0 98
+255 162 255
+38 57 134
+108 130 213
+134 171 240
+63 59 63
+100 103 113
+168 170 176
+213 213 213
diff --git a/graphics/pokemon/iron_leaves/overworld.png b/graphics/pokemon/iron_leaves/overworld.png
new file mode 100644
index 0000000000..01fc0a88c8
Binary files /dev/null and b/graphics/pokemon/iron_leaves/overworld.png differ
diff --git a/graphics/pokemon/iron_leaves/overworld_normal.pal b/graphics/pokemon/iron_leaves/overworld_normal.pal
new file mode 100644
index 0000000000..df4c2487e2
--- /dev/null
+++ b/graphics/pokemon/iron_leaves/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+30 60 34
+57 117 64
+87 173 96
+16 16 16
+170 66 60
+130 193 136
+224 120 136
+71 146 79
+0 0 0
+255 162 180
+193 84 79
+88 88 88
+189 189 185
+157 157 153
+100 105 108
diff --git a/graphics/pokemon/iron_leaves/overworld_shiny.pal b/graphics/pokemon/iron_leaves/overworld_shiny.pal
new file mode 100644
index 0000000000..e5a25e5230
--- /dev/null
+++ b/graphics/pokemon/iron_leaves/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+51 53 57
+82 84 90
+145 148 155
+16 16 16
+170 66 60
+167 169 175
+224 120 136
+102 105 113
+0 0 0
+255 162 180
+193 84 79
+88 88 88
+189 189 185
+157 157 153
+100 105 108
diff --git a/graphics/pokemon/iron_moth/overworld.png b/graphics/pokemon/iron_moth/overworld.png
new file mode 100644
index 0000000000..fa241747d0
Binary files /dev/null and b/graphics/pokemon/iron_moth/overworld.png differ
diff --git a/graphics/pokemon/iron_moth/overworld_normal.pal b/graphics/pokemon/iron_moth/overworld_normal.pal
new file mode 100644
index 0000000000..23350af658
--- /dev/null
+++ b/graphics/pokemon/iron_moth/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+206 117 41
+255 159 69
+77 74 73
+148 85 25
+16 16 16
+71 31 29
+230 65 58
+181 53 49
+49 47 47
+109 109 109
+195 195 195
+160 211 211
+206 243 247
+0 0 0
diff --git a/graphics/pokemon/iron_moth/overworld_shiny.pal b/graphics/pokemon/iron_moth/overworld_shiny.pal
new file mode 100644
index 0000000000..5b0f15c428
--- /dev/null
+++ b/graphics/pokemon/iron_moth/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+206 117 41
+255 159 69
+77 74 73
+148 85 25
+16 16 16
+91 94 102
+213 213 213
+142 142 142
+49 47 47
+109 109 109
+195 195 195
+142 142 142
+213 213 213
+0 0 0
diff --git a/graphics/pokemon/iron_thorns/overworld.png b/graphics/pokemon/iron_thorns/overworld.png
new file mode 100644
index 0000000000..d860a069ab
Binary files /dev/null and b/graphics/pokemon/iron_thorns/overworld.png differ
diff --git a/graphics/pokemon/iron_thorns/overworld_normal.pal b/graphics/pokemon/iron_thorns/overworld_normal.pal
new file mode 100644
index 0000000000..e0c871bd4c
--- /dev/null
+++ b/graphics/pokemon/iron_thorns/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+46 54 27
+46 54 27
+154 196 80
+0 0 0
+123 142 66
+96 111 55
+71 83 40
+25 142 107
+0 208 131
+80 74 74
+0 251 156
+63 59 58
+44 40 44
+66 142 33
+32 40 40
diff --git a/graphics/pokemon/iron_thorns/overworld_shiny.pal b/graphics/pokemon/iron_thorns/overworld_shiny.pal
new file mode 100644
index 0000000000..88ef2c21e3
--- /dev/null
+++ b/graphics/pokemon/iron_thorns/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+54 57 61
+46 54 27
+168 170 176
+0 0 0
+145 148 155
+123 126 134
+80 82 90
+25 142 107
+0 208 131
+80 74 74
+0 251 156
+63 59 58
+44 40 44
+100 103 113
+32 40 40
diff --git a/graphics/pokemon/iron_treads/overworld.png b/graphics/pokemon/iron_treads/overworld.png
new file mode 100644
index 0000000000..bdce3f5732
Binary files /dev/null and b/graphics/pokemon/iron_treads/overworld.png differ
diff --git a/graphics/pokemon/iron_treads/overworld_normal.pal b/graphics/pokemon/iron_treads/overworld_normal.pal
new file mode 100644
index 0000000000..413ca94437
--- /dev/null
+++ b/graphics/pokemon/iron_treads/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+24 23 22
+35 34 33
+88 8 8
+206 24 25
+136 24 24
+16 16 16
+47 44 43
+69 65 63
+120 120 128
+72 64 72
+16 16 16
+152 152 160
+47 44 43
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/iron_treads/overworld_shiny.pal b/graphics/pokemon/iron_treads/overworld_shiny.pal
new file mode 100644
index 0000000000..9cea8cd060
--- /dev/null
+++ b/graphics/pokemon/iron_treads/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+24 23 22
+68 68 74
+88 8 8
+206 24 25
+136 24 24
+28 28 30
+120 120 128
+152 152 160
+120 120 128
+72 64 72
+16 16 16
+152 152 160
+47 44 43
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/iron_valiant/overworld.png b/graphics/pokemon/iron_valiant/overworld.png
new file mode 100644
index 0000000000..e3b87e8bf9
Binary files /dev/null and b/graphics/pokemon/iron_valiant/overworld.png differ
diff --git a/graphics/pokemon/iron_valiant/overworld_normal.pal b/graphics/pokemon/iron_valiant/overworld_normal.pal
new file mode 100644
index 0000000000..b7498fe59b
--- /dev/null
+++ b/graphics/pokemon/iron_valiant/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+51 113 98
+0 0 0
+133 200 183
+38 62 46
+72 176 88
+72 176 88
+40 128 56
+76 76 80
+232 232 248
+128 128 144
+200 200 216
+168 168 176
+255 62 136
+255 62 136
+189 0 71
diff --git a/graphics/pokemon/iron_valiant/overworld_shiny.pal b/graphics/pokemon/iron_valiant/overworld_shiny.pal
new file mode 100644
index 0000000000..d35e973bca
--- /dev/null
+++ b/graphics/pokemon/iron_valiant/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+51 53 57
+0 0 0
+145 148 155
+55 56 58
+102 105 113
+156 158 165
+102 105 113
+83 82 83
+213 213 213
+127 127 127
+191 191 191
+168 168 176
+255 125 174
+255 62 136
+189 0 71
diff --git a/graphics/pokemon/kilowattrel/overworld.png b/graphics/pokemon/kilowattrel/overworld.png
new file mode 100644
index 0000000000..d8c14d239b
Binary files /dev/null and b/graphics/pokemon/kilowattrel/overworld.png differ
diff --git a/graphics/pokemon/kilowattrel/overworld_normal.pal b/graphics/pokemon/kilowattrel/overworld_normal.pal
new file mode 100644
index 0000000000..4f42bbd73a
--- /dev/null
+++ b/graphics/pokemon/kilowattrel/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+15 15 15
+98 74 32
+38 40 44
+52 57 63
+255 205 55
+170 126 36
+253 253 253
+43 23 23
+68 30 33
+115 187 191
+105 42 47
+38 40 44
+55 65 90
+79 92 130
diff --git a/graphics/pokemon/kilowattrel/overworld_shiny.pal b/graphics/pokemon/kilowattrel/overworld_shiny.pal
new file mode 100644
index 0000000000..a052d958d2
--- /dev/null
+++ b/graphics/pokemon/kilowattrel/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+61 31 39
+98 74 32
+102 53 66
+141 82 107
+255 205 55
+170 126 36
+253 253 253
+125 73 9
+206 119 13
+115 187 191
+244 161 59
+38 40 44
+69 70 71
+90 91 92
diff --git a/graphics/pokemon/kingambit/overworld.png b/graphics/pokemon/kingambit/overworld.png
new file mode 100644
index 0000000000..ed65110068
Binary files /dev/null and b/graphics/pokemon/kingambit/overworld.png differ
diff --git a/graphics/pokemon/kingambit/overworld_normal.pal b/graphics/pokemon/kingambit/overworld_normal.pal
new file mode 100644
index 0000000000..fc2af0f1cf
--- /dev/null
+++ b/graphics/pokemon/kingambit/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+120 98 31
+181 149 21
+0 0 0
+227 227 235
+172 164 180
+230 189 65
+47 15 16
+67 25 25
+232 48 43
+127 41 43
+35 29 10
+57 52 51
+88 35 35
+96 94 94
+142 56 58
diff --git a/graphics/pokemon/kingambit/overworld_shiny.pal b/graphics/pokemon/kingambit/overworld_shiny.pal
new file mode 100644
index 0000000000..80fa0d029e
--- /dev/null
+++ b/graphics/pokemon/kingambit/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+120 98 31
+181 149 21
+0 0 0
+227 227 235
+172 164 180
+230 189 65
+18 21 58
+38 45 123
+232 48 43
+49 57 156
+35 29 10
+57 52 51
+95 31 33
+96 94 94
+57 52 51
diff --git a/graphics/pokemon/klawf/overworld.png b/graphics/pokemon/klawf/overworld.png
new file mode 100644
index 0000000000..edec75755e
Binary files /dev/null and b/graphics/pokemon/klawf/overworld.png differ
diff --git a/graphics/pokemon/klawf/overworld_normal.pal b/graphics/pokemon/klawf/overworld_normal.pal
new file mode 100644
index 0000000000..d84569eb1f
--- /dev/null
+++ b/graphics/pokemon/klawf/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+69 34 27
+233 120 56
+146 71 56
+180 88 53
+56 55 49
+0 0 0
+200 200 238
+232 232 248
+126 119 89
+182 145 123
+88 89 55
+242 215 167
+195 95 90
+142 103 79
+195 95 90
diff --git a/graphics/pokemon/klawf/overworld_shiny.pal b/graphics/pokemon/klawf/overworld_shiny.pal
new file mode 100644
index 0000000000..625f90ff0d
--- /dev/null
+++ b/graphics/pokemon/klawf/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+40 88 128
+88 176 232
+47 84 146
+69 123 195
+148 148 148
+0 0 0
+200 200 238
+232 232 248
+230 231 207
+190 161 138
+235 237 194
+253 229 187
+116 171 200
+141 133 71
+232 128 104
diff --git a/graphics/pokemon/koraidon/overworld.png b/graphics/pokemon/koraidon/overworld.png
new file mode 100644
index 0000000000..6b35043046
Binary files /dev/null and b/graphics/pokemon/koraidon/overworld.png differ
diff --git a/graphics/pokemon/koraidon/overworld_normal.pal b/graphics/pokemon/koraidon/overworld_normal.pal
new file mode 100644
index 0000000000..5a116dcf2c
--- /dev/null
+++ b/graphics/pokemon/koraidon/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+236 234 228
+208 208 208
+104 97 106
+232 135 177
+227 77 150
+3 81 154
+43 52 133
+3 81 154
+234 74 61
+208 192 48
+171 63 63
+51 52 57
+137 52 53
+240 136 32
diff --git a/graphics/pokemon/koraidon/overworld_shiny.pal b/graphics/pokemon/koraidon/overworld_shiny.pal
new file mode 100644
index 0000000000..3b5256a30b
--- /dev/null
+++ b/graphics/pokemon/koraidon/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+236 234 228
+208 208 208
+104 97 106
+254 231 95
+241 190 14
+221 19 115
+81 26 40
+147 30 68
+83 84 111
+208 192 48
+65 66 86
+58 59 71
+38 39 53
+241 190 14
diff --git a/graphics/pokemon/lechonk/overworld.png b/graphics/pokemon/lechonk/overworld.png
new file mode 100644
index 0000000000..985cc22474
Binary files /dev/null and b/graphics/pokemon/lechonk/overworld.png differ
diff --git a/graphics/pokemon/lechonk/overworld_normal.pal b/graphics/pokemon/lechonk/overworld_normal.pal
new file mode 100644
index 0000000000..f8968afd93
--- /dev/null
+++ b/graphics/pokemon/lechonk/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+54 65 74
+77 88 92
+36 44 49
+70 58 55
+146 119 95
+120 98 78
+144 40 64
+200 96 112
+232 232 248
+232 136 160
+242 215 127
+242 215 127
+175 147 96
+0 0 0
diff --git a/graphics/pokemon/lechonk/overworld_shiny.pal b/graphics/pokemon/lechonk/overworld_shiny.pal
new file mode 100644
index 0000000000..6dc2976c31
--- /dev/null
+++ b/graphics/pokemon/lechonk/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+246 180 213
+255 213 246
+206 81 118
+140 93 72
+214 158 134
+186 128 106
+125 45 65
+206 81 118
+232 232 248
+249 123 146
+250 205 50
+242 215 127
+209 164 5
+0 0 0
diff --git a/graphics/pokemon/lokix/overworld.png b/graphics/pokemon/lokix/overworld.png
new file mode 100644
index 0000000000..c658f75b6b
Binary files /dev/null and b/graphics/pokemon/lokix/overworld.png differ
diff --git a/graphics/pokemon/lokix/overworld_normal.pal b/graphics/pokemon/lokix/overworld_normal.pal
new file mode 100644
index 0000000000..17b2bb2205
--- /dev/null
+++ b/graphics/pokemon/lokix/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+165 154 165
+80 80 80
+15 15 15
+41 40 41
+60 57 60
+96 115 129
+66 78 89
+232 232 248
+206 111 15
+247 166 49
+45 54 57
+15 15 15
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/lokix/overworld_shiny.pal b/graphics/pokemon/lokix/overworld_shiny.pal
new file mode 100644
index 0000000000..4457b5d3bf
--- /dev/null
+++ b/graphics/pokemon/lokix/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+165 154 165
+188 193 91
+66 68 26
+96 99 37
+141 146 54
+105 104 105
+71 70 71
+232 232 248
+206 111 15
+247 166 49
+37 37 37
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/mabosstiff/overworld.png b/graphics/pokemon/mabosstiff/overworld.png
new file mode 100644
index 0000000000..132d7f7fcd
Binary files /dev/null and b/graphics/pokemon/mabosstiff/overworld.png differ
diff --git a/graphics/pokemon/mabosstiff/overworld_normal.pal b/graphics/pokemon/mabosstiff/overworld_normal.pal
new file mode 100644
index 0000000000..38f2eb2739
--- /dev/null
+++ b/graphics/pokemon/mabosstiff/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+132 125 132
+189 188 189
+218 218 218
+46 40 39
+0 0 0
+69 65 63
+99 84 77
+44 43 44
+132 117 104
+53 46 43
+28 28 28
+211 182 90
+42 25 38
+255 178 74
+0 0 0
diff --git a/graphics/pokemon/mabosstiff/overworld_shiny.pal b/graphics/pokemon/mabosstiff/overworld_shiny.pal
new file mode 100644
index 0000000000..aaa8df0596
--- /dev/null
+++ b/graphics/pokemon/mabosstiff/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+132 125 132
+189 188 189
+218 218 218
+46 40 39
+0 0 0
+69 65 63
+110 99 119
+44 43 44
+164 146 176
+57 51 63
+28 28 28
+211 182 90
+42 25 38
+255 178 74
+0 0 0
diff --git a/graphics/pokemon/maschiff/overworld.png b/graphics/pokemon/maschiff/overworld.png
new file mode 100644
index 0000000000..9e4ada7b15
Binary files /dev/null and b/graphics/pokemon/maschiff/overworld.png differ
diff --git a/graphics/pokemon/maschiff/overworld_normal.pal b/graphics/pokemon/maschiff/overworld_normal.pal
new file mode 100644
index 0000000000..27c6224bc5
--- /dev/null
+++ b/graphics/pokemon/maschiff/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+141 59 19
+255 202 8
+0 0 0
+195 120 22
+89 32 41
+147 59 59
+206 113 104
+42 25 38
+88 67 80
+203 109 45
+255 255 255
+66 44 61
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/maschiff/overworld_shiny.pal b/graphics/pokemon/maschiff/overworld_shiny.pal
new file mode 100644
index 0000000000..0195e14cbc
--- /dev/null
+++ b/graphics/pokemon/maschiff/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+42 25 38
+88 67 80
+0 0 0
+66 44 61
+46 40 51
+102 92 114
+171 139 201
+42 25 38
+88 67 80
+203 109 45
+255 255 255
+66 44 61
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/maushold/four/overworld.png b/graphics/pokemon/maushold/four/overworld.png
new file mode 100644
index 0000000000..5154c16a34
Binary files /dev/null and b/graphics/pokemon/maushold/four/overworld.png differ
diff --git a/graphics/pokemon/maushold/four/overworld_normal.pal b/graphics/pokemon/maushold/four/overworld_normal.pal
new file mode 100644
index 0000000000..ef7e6cad7c
--- /dev/null
+++ b/graphics/pokemon/maushold/four/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+57 58 68
+216 216 216
+249 249 249
+86 87 101
+249 249 249
+184 204 222
+119 157 191
+136 139 151
+48 48 48
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/maushold/four/overworld_shiny.pal b/graphics/pokemon/maushold/four/overworld_shiny.pal
new file mode 100644
index 0000000000..9270b4e0ae
--- /dev/null
+++ b/graphics/pokemon/maushold/four/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+57 58 68
+216 216 216
+249 249 249
+86 87 101
+216 216 216
+225 210 181
+162 124 91
+136 139 151
+48 48 48
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/maushold/overworld.png b/graphics/pokemon/maushold/overworld.png
new file mode 100644
index 0000000000..d235af4221
Binary files /dev/null and b/graphics/pokemon/maushold/overworld.png differ
diff --git a/graphics/pokemon/maushold/overworld_normal.pal b/graphics/pokemon/maushold/overworld_normal.pal
new file mode 100644
index 0000000000..ef7e6cad7c
--- /dev/null
+++ b/graphics/pokemon/maushold/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+57 58 68
+216 216 216
+249 249 249
+86 87 101
+249 249 249
+184 204 222
+119 157 191
+136 139 151
+48 48 48
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/maushold/overworld_shiny.pal b/graphics/pokemon/maushold/overworld_shiny.pal
new file mode 100644
index 0000000000..9270b4e0ae
--- /dev/null
+++ b/graphics/pokemon/maushold/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+57 58 68
+216 216 216
+249 249 249
+86 87 101
+216 216 216
+225 210 181
+162 124 91
+136 139 151
+48 48 48
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/meowscarada/overworld.png b/graphics/pokemon/meowscarada/overworld.png
new file mode 100644
index 0000000000..91a3f57dbe
Binary files /dev/null and b/graphics/pokemon/meowscarada/overworld.png differ
diff --git a/graphics/pokemon/meowscarada/overworld_normal.pal b/graphics/pokemon/meowscarada/overworld_normal.pal
new file mode 100644
index 0000000000..591dc9f8c0
--- /dev/null
+++ b/graphics/pokemon/meowscarada/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+23 36 24
+41 55 38
+49 70 38
+151 177 150
+233 249 220
+96 126 95
+36 111 42
+40 153 57
+232 232 248
+141 71 85
+216 112 152
+236 138 168
+141 71 85
+227 81 124
diff --git a/graphics/pokemon/meowscarada/overworld_shiny.pal b/graphics/pokemon/meowscarada/overworld_shiny.pal
new file mode 100644
index 0000000000..668bfe2930
--- /dev/null
+++ b/graphics/pokemon/meowscarada/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+27 38 31
+26 48 45
+51 75 63
+151 177 150
+233 249 220
+96 126 95
+31 86 68
+49 124 93
+232 232 248
+111 78 167
+145 105 201
+145 105 201
+60 31 99
+111 78 167
diff --git a/graphics/pokemon/miraidon/overworld.png b/graphics/pokemon/miraidon/overworld.png
new file mode 100644
index 0000000000..2080c760bb
Binary files /dev/null and b/graphics/pokemon/miraidon/overworld.png differ
diff --git a/graphics/pokemon/miraidon/overworld_normal.pal b/graphics/pokemon/miraidon/overworld_normal.pal
new file mode 100644
index 0000000000..8a07fd2ac4
--- /dev/null
+++ b/graphics/pokemon/miraidon/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+86 169 217
+0 0 0
+133 124 188
+158 152 202
+126 93 144
+39 39 60
+198 190 110
+86 63 105
+246 236 130
+49 47 125
+78 67 150
+231 234 241
+193 189 223
+133 124 188
+133 124 188
diff --git a/graphics/pokemon/miraidon/overworld_shiny.pal b/graphics/pokemon/miraidon/overworld_shiny.pal
new file mode 100644
index 0000000000..4c43244656
--- /dev/null
+++ b/graphics/pokemon/miraidon/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+86 169 217
+0 0 0
+133 128 160
+161 158 183
+126 93 144
+53 54 59
+198 190 110
+86 63 105
+246 236 130
+133 133 133
+165 165 165
+231 234 241
+193 189 223
+246 236 130
+86 169 217
diff --git a/graphics/pokemon/munkidori/overworld.png b/graphics/pokemon/munkidori/overworld.png
new file mode 100644
index 0000000000..5213ff14ce
Binary files /dev/null and b/graphics/pokemon/munkidori/overworld.png differ
diff --git a/graphics/pokemon/munkidori/overworld_normal.pal b/graphics/pokemon/munkidori/overworld_normal.pal
new file mode 100644
index 0000000000..1a3e195ca0
--- /dev/null
+++ b/graphics/pokemon/munkidori/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+78 73 71
+23 23 23
+45 45 45
+90 33 73
+64 74 104
+122 140 177
+174 201 233
+146 57 119
+202 103 162
+254 208 27
+206 157 9
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/munkidori/overworld_shiny.pal b/graphics/pokemon/munkidori/overworld_shiny.pal
new file mode 100644
index 0000000000..14dd544d84
--- /dev/null
+++ b/graphics/pokemon/munkidori/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+124 111 99
+53 48 43
+101 90 80
+90 33 73
+64 74 104
+122 140 177
+174 201 233
+146 57 119
+202 103 162
+254 208 27
+206 157 9
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/nacli/overworld.png b/graphics/pokemon/nacli/overworld.png
new file mode 100644
index 0000000000..4ef41c54d6
Binary files /dev/null and b/graphics/pokemon/nacli/overworld.png differ
diff --git a/graphics/pokemon/nacli/overworld_normal.pal b/graphics/pokemon/nacli/overworld_normal.pal
new file mode 100644
index 0000000000..aaf398a7e2
--- /dev/null
+++ b/graphics/pokemon/nacli/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+86 77 87
+191 180 186
+153 134 148
+252 252 252
+71 39 39
+142 95 87
+192 147 124
+213 184 170
+227 208 199
+0 0 0
+238 172 49
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/nacli/overworld_shiny.pal b/graphics/pokemon/nacli/overworld_shiny.pal
new file mode 100644
index 0000000000..e6f359d021
--- /dev/null
+++ b/graphics/pokemon/nacli/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+120 67 14
+234 152 70
+197 109 22
+238 173 108
+71 39 39
+142 95 87
+192 147 124
+213 184 170
+227 208 199
+0 0 0
+255 134 53
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/naclstack/overworld.png b/graphics/pokemon/naclstack/overworld.png
new file mode 100644
index 0000000000..5698f25469
Binary files /dev/null and b/graphics/pokemon/naclstack/overworld.png differ
diff --git a/graphics/pokemon/naclstack/overworld_normal.pal b/graphics/pokemon/naclstack/overworld_normal.pal
new file mode 100644
index 0000000000..c718f0e1e7
--- /dev/null
+++ b/graphics/pokemon/naclstack/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+86 77 87
+68 51 46
+228 209 200
+195 146 123
+150 103 90
+15 15 15
+252 252 252
+100 81 77
+153 134 148
+123 101 96
+191 180 186
+234 136 28
+238 172 49
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/naclstack/overworld_shiny.pal b/graphics/pokemon/naclstack/overworld_shiny.pal
new file mode 100644
index 0000000000..3108cd887d
--- /dev/null
+++ b/graphics/pokemon/naclstack/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+123 73 49
+68 51 46
+228 209 200
+195 146 123
+150 103 90
+15 15 15
+233 184 148
+100 81 77
+154 91 61
+123 101 96
+196 134 104
+234 136 28
+238 172 49
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/nymble/overworld.png b/graphics/pokemon/nymble/overworld.png
new file mode 100644
index 0000000000..a47b53235d
Binary files /dev/null and b/graphics/pokemon/nymble/overworld.png differ
diff --git a/graphics/pokemon/nymble/overworld_normal.pal b/graphics/pokemon/nymble/overworld_normal.pal
new file mode 100644
index 0000000000..d214b03756
--- /dev/null
+++ b/graphics/pokemon/nymble/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+47 50 60
+75 88 112
+99 115 140
+192 189 192
+221 225 228
+255 198 8
+163 130 21
+176 172 176
+99 97 100
+99 115 140
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/nymble/overworld_shiny.pal b/graphics/pokemon/nymble/overworld_shiny.pal
new file mode 100644
index 0000000000..fbabea45b9
--- /dev/null
+++ b/graphics/pokemon/nymble/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+88 81 28
+188 179 94
+233 228 136
+192 189 192
+221 225 228
+255 198 8
+163 130 21
+176 172 176
+99 97 100
+99 115 140
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/ogerpon/cornerstone/overworld.png b/graphics/pokemon/ogerpon/cornerstone/overworld.png
new file mode 100644
index 0000000000..e691e22838
Binary files /dev/null and b/graphics/pokemon/ogerpon/cornerstone/overworld.png differ
diff --git a/graphics/pokemon/ogerpon/cornerstone/overworld_normal.pal b/graphics/pokemon/ogerpon/cornerstone/overworld_normal.pal
new file mode 100644
index 0000000000..a07f75d10c
--- /dev/null
+++ b/graphics/pokemon/ogerpon/cornerstone/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+7 7 7
+81 56 34
+51 51 51
+89 96 106
+87 70 62
+48 83 40
+148 152 151
+97 167 27
+74 139 39
+44 43 41
+75 76 76
+0 211 249
+0 150 176
+255 218 70
+253 253 253
diff --git a/graphics/pokemon/ogerpon/cornerstone/overworld_shiny.pal b/graphics/pokemon/ogerpon/cornerstone/overworld_shiny.pal
new file mode 100644
index 0000000000..a07f75d10c
--- /dev/null
+++ b/graphics/pokemon/ogerpon/cornerstone/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+7 7 7
+81 56 34
+51 51 51
+89 96 106
+87 70 62
+48 83 40
+148 152 151
+97 167 27
+74 139 39
+44 43 41
+75 76 76
+0 211 249
+0 150 176
+255 218 70
+253 253 253
diff --git a/graphics/pokemon/ogerpon/hearthflame/overworld.png b/graphics/pokemon/ogerpon/hearthflame/overworld.png
new file mode 100644
index 0000000000..782b969b22
Binary files /dev/null and b/graphics/pokemon/ogerpon/hearthflame/overworld.png differ
diff --git a/graphics/pokemon/ogerpon/hearthflame/overworld_normal.pal b/graphics/pokemon/ogerpon/hearthflame/overworld_normal.pal
new file mode 100644
index 0000000000..d1b98b69d4
--- /dev/null
+++ b/graphics/pokemon/ogerpon/hearthflame/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+81 56 34
+209 154 24
+87 70 62
+240 192 0
+48 83 40
+255 218 70
+74 139 39
+164 52 49
+44 43 41
+75 76 76
+255 213 213
+253 253 253
+0 211 249
+12 65 129
diff --git a/graphics/pokemon/ogerpon/hearthflame/overworld_shiny.pal b/graphics/pokemon/ogerpon/hearthflame/overworld_shiny.pal
new file mode 100644
index 0000000000..d1b98b69d4
--- /dev/null
+++ b/graphics/pokemon/ogerpon/hearthflame/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+81 56 34
+209 154 24
+87 70 62
+240 192 0
+48 83 40
+255 218 70
+74 139 39
+164 52 49
+44 43 41
+75 76 76
+255 213 213
+253 253 253
+0 211 249
+12 65 129
diff --git a/graphics/pokemon/ogerpon/overworld.png b/graphics/pokemon/ogerpon/overworld.png
new file mode 100644
index 0000000000..2492e2b1ef
Binary files /dev/null and b/graphics/pokemon/ogerpon/overworld.png differ
diff --git a/graphics/pokemon/ogerpon/overworld_normal.pal b/graphics/pokemon/ogerpon/overworld_normal.pal
new file mode 100644
index 0000000000..4731e3a6ac
--- /dev/null
+++ b/graphics/pokemon/ogerpon/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+4 83 79
+81 56 34
+9 164 156
+48 83 40
+97 167 27
+87 70 62
+0 0 0
+44 43 41
+75 76 76
+178 216 161
+253 253 253
+128 190 101
+186 114 41
+219 156 94
+255 218 70
diff --git a/graphics/pokemon/ogerpon/overworld_shiny.pal b/graphics/pokemon/ogerpon/overworld_shiny.pal
new file mode 100644
index 0000000000..4731e3a6ac
--- /dev/null
+++ b/graphics/pokemon/ogerpon/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+4 83 79
+81 56 34
+9 164 156
+48 83 40
+97 167 27
+87 70 62
+0 0 0
+44 43 41
+75 76 76
+178 216 161
+253 253 253
+128 190 101
+186 114 41
+219 156 94
+255 218 70
diff --git a/graphics/pokemon/ogerpon/wellspring/overworld.png b/graphics/pokemon/ogerpon/wellspring/overworld.png
new file mode 100644
index 0000000000..fc5c73af38
Binary files /dev/null and b/graphics/pokemon/ogerpon/wellspring/overworld.png differ
diff --git a/graphics/pokemon/ogerpon/wellspring/overworld_normal.pal b/graphics/pokemon/ogerpon/wellspring/overworld_normal.pal
new file mode 100644
index 0000000000..ac44883772
--- /dev/null
+++ b/graphics/pokemon/ogerpon/wellspring/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+48 83 40
+74 139 39
+97 167 27
+0 0 0
+81 56 34
+2 104 187
+44 43 41
+87 70 62
+75 76 76
+59 213 249
+12 65 129
+156 206 220
+206 221 255
+253 253 253
+255 218 70
diff --git a/graphics/pokemon/ogerpon/wellspring/overworld_shiny.pal b/graphics/pokemon/ogerpon/wellspring/overworld_shiny.pal
new file mode 100644
index 0000000000..ac44883772
--- /dev/null
+++ b/graphics/pokemon/ogerpon/wellspring/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+48 83 40
+74 139 39
+97 167 27
+0 0 0
+81 56 34
+2 104 187
+44 43 41
+87 70 62
+75 76 76
+59 213 249
+12 65 129
+156 206 220
+206 221 255
+253 253 253
+255 218 70
diff --git a/graphics/pokemon/oinkologne/female/overworld.png b/graphics/pokemon/oinkologne/female/overworld.png
new file mode 100644
index 0000000000..baaa8874c5
Binary files /dev/null and b/graphics/pokemon/oinkologne/female/overworld.png differ
diff --git a/graphics/pokemon/oinkologne/female/overworld_normal.pal b/graphics/pokemon/oinkologne/female/overworld_normal.pal
new file mode 100644
index 0000000000..f82149b8ba
--- /dev/null
+++ b/graphics/pokemon/oinkologne/female/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+38 30 31
+181 109 93
+132 89 82
+63 48 50
+90 69 74
+16 16 16
+125 45 65
+232 136 160
+200 96 112
+232 232 248
+175 147 96
+242 215 127
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/oinkologne/female/overworld_shiny.pal b/graphics/pokemon/oinkologne/female/overworld_shiny.pal
new file mode 100644
index 0000000000..e6e8a6ed5e
--- /dev/null
+++ b/graphics/pokemon/oinkologne/female/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+190 137 169
+255 244 247
+220 192 209
+240 132 186
+251 187 238
+16 16 16
+125 45 65
+232 136 160
+200 96 112
+232 232 248
+175 147 96
+242 215 127
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/oinkologne/overworld.png b/graphics/pokemon/oinkologne/overworld.png
new file mode 100644
index 0000000000..d1044b78c6
Binary files /dev/null and b/graphics/pokemon/oinkologne/overworld.png differ
diff --git a/graphics/pokemon/oinkologne/overworld_normal.pal b/graphics/pokemon/oinkologne/overworld_normal.pal
new file mode 100644
index 0000000000..e8ef3923f7
--- /dev/null
+++ b/graphics/pokemon/oinkologne/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+28 22 33
+66 54 78
+49 40 58
+64 64 80
+96 88 101
+16 16 16
+125 45 65
+232 136 160
+200 96 112
+175 147 96
+242 215 127
+232 232 248
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/oinkologne/overworld_shiny.pal b/graphics/pokemon/oinkologne/overworld_shiny.pal
new file mode 100644
index 0000000000..805883eed3
--- /dev/null
+++ b/graphics/pokemon/oinkologne/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+190 137 169
+255 244 247
+220 192 209
+240 132 186
+251 187 238
+16 16 16
+125 45 65
+232 136 160
+200 96 112
+175 147 96
+242 215 127
+232 232 248
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/okidogi/overworld.png b/graphics/pokemon/okidogi/overworld.png
new file mode 100644
index 0000000000..6bbcea7ab3
Binary files /dev/null and b/graphics/pokemon/okidogi/overworld.png differ
diff --git a/graphics/pokemon/okidogi/overworld_normal.pal b/graphics/pokemon/okidogi/overworld_normal.pal
new file mode 100644
index 0000000000..46d3fc547d
--- /dev/null
+++ b/graphics/pokemon/okidogi/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+90 33 73
+146 57 119
+16 18 17
+202 103 162
+78 73 71
+45 45 45
+0 0 0
+121 167 58
+84 117 53
+248 216 88
+29 57 21
+192 192 208
+232 232 248
+16 18 17
+0 0 0
diff --git a/graphics/pokemon/okidogi/overworld_shiny.pal b/graphics/pokemon/okidogi/overworld_shiny.pal
new file mode 100644
index 0000000000..947e5aacdb
--- /dev/null
+++ b/graphics/pokemon/okidogi/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+90 33 73
+146 57 119
+125 59 24
+202 103 162
+254 161 104
+180 102 61
+0 0 0
+121 167 58
+84 117 53
+248 216 88
+29 57 21
+192 192 208
+232 232 248
+16 18 17
+0 0 0
diff --git a/graphics/pokemon/orthworm/overworld.png b/graphics/pokemon/orthworm/overworld.png
new file mode 100644
index 0000000000..5bef2cc020
Binary files /dev/null and b/graphics/pokemon/orthworm/overworld.png differ
diff --git a/graphics/pokemon/orthworm/overworld_normal.pal b/graphics/pokemon/orthworm/overworld_normal.pal
new file mode 100644
index 0000000000..3146fa0d74
--- /dev/null
+++ b/graphics/pokemon/orthworm/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+82 88 92
+0 0 0
+209 209 218
+146 152 156
+247 154 148
+247 100 90
+189 73 74
+150 209 226
+150 209 226
+150 209 226
+73 41 39
+252 206 186
+189 146 140
+129 55 55
+0 0 0
diff --git a/graphics/pokemon/orthworm/overworld_shiny.pal b/graphics/pokemon/orthworm/overworld_shiny.pal
new file mode 100644
index 0000000000..16d023df87
--- /dev/null
+++ b/graphics/pokemon/orthworm/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+82 88 92
+0 0 0
+209 209 218
+146 152 156
+183 255 253
+124 219 233
+108 168 179
+52 83 104
+150 209 226
+184 223 235
+30 48 53
+231 217 207
+192 175 160
+79 125 134
+0 0 0
diff --git a/graphics/pokemon/palafin/hero/overworld.png b/graphics/pokemon/palafin/hero/overworld.png
new file mode 100644
index 0000000000..8d6d7e5c75
Binary files /dev/null and b/graphics/pokemon/palafin/hero/overworld.png differ
diff --git a/graphics/pokemon/palafin/hero/overworld_normal.pal b/graphics/pokemon/palafin/hero/overworld_normal.pal
new file mode 100644
index 0000000000..d3f497b16a
--- /dev/null
+++ b/graphics/pokemon/palafin/hero/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+7 85 107
+107 150 186
+0 0 0
+140 213 255
+41 134 222
+0 105 206
+6 74 142
+252 252 252
+16 45 82
+252 252 252
+175 163 175
+175 163 175
+132 45 74
+181 62 107
+171 192 212
diff --git a/graphics/pokemon/palafin/hero/overworld_shiny.pal b/graphics/pokemon/palafin/hero/overworld_shiny.pal
new file mode 100644
index 0000000000..1a59866ee0
--- /dev/null
+++ b/graphics/pokemon/palafin/hero/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+7 85 107
+107 150 186
+0 0 0
+140 213 255
+125 109 163
+96 80 126
+66 52 88
+252 252 252
+43 38 62
+55 80 231
+175 163 175
+45 61 161
+132 45 74
+181 62 107
+171 192 212
diff --git a/graphics/pokemon/palafin/overworld.png b/graphics/pokemon/palafin/overworld.png
new file mode 100644
index 0000000000..25b24ce33b
Binary files /dev/null and b/graphics/pokemon/palafin/overworld.png differ
diff --git a/graphics/pokemon/palafin/overworld_normal.pal b/graphics/pokemon/palafin/overworld_normal.pal
new file mode 100644
index 0000000000..d12a4a8845
--- /dev/null
+++ b/graphics/pokemon/palafin/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+32 57 62
+82 202 219
+55 155 173
+0 0 0
+221 241 247
+33 97 107
+137 219 230
+163 179 182
+238 248 251
+66 178 255
+140 223 255
+65 132 146
+247 174 181
+173 89 115
+0 0 0
diff --git a/graphics/pokemon/palafin/overworld_shiny.pal b/graphics/pokemon/palafin/overworld_shiny.pal
new file mode 100644
index 0000000000..dcd5b52e24
--- /dev/null
+++ b/graphics/pokemon/palafin/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+52 50 99
+169 171 239
+133 135 233
+0 0 0
+221 241 247
+91 93 155
+187 190 227
+163 179 182
+238 248 251
+66 178 255
+140 223 255
+65 132 146
+130 246 158
+173 89 115
+0 0 0
diff --git a/graphics/pokemon/pawmi/overworld.png b/graphics/pokemon/pawmi/overworld.png
new file mode 100644
index 0000000000..cc290c5df0
Binary files /dev/null and b/graphics/pokemon/pawmi/overworld.png differ
diff --git a/graphics/pokemon/pawmi/overworld_normal.pal b/graphics/pokemon/pawmi/overworld_normal.pal
new file mode 100644
index 0000000000..ba86a5077b
--- /dev/null
+++ b/graphics/pokemon/pawmi/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+173 97 39
+104 57 23
+0 0 0
+236 158 63
+232 138 36
+14 148 130
+0 108 92
+250 233 189
+185 167 132
+232 232 248
+101 74 74
+239 181 59
+245 213 86
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/pawmi/overworld_shiny.pal b/graphics/pokemon/pawmi/overworld_shiny.pal
new file mode 100644
index 0000000000..0d0ab2a95e
--- /dev/null
+++ b/graphics/pokemon/pawmi/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+220 58 50
+138 40 50
+0 0 0
+255 119 147
+237 82 82
+14 148 130
+0 108 92
+244 226 188
+228 167 137
+232 232 248
+101 74 74
+239 181 59
+245 213 86
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/pawmo/overworld.png b/graphics/pokemon/pawmo/overworld.png
new file mode 100644
index 0000000000..f2eb40bd17
Binary files /dev/null and b/graphics/pokemon/pawmo/overworld.png differ
diff --git a/graphics/pokemon/pawmo/overworld_normal.pal b/graphics/pokemon/pawmo/overworld_normal.pal
new file mode 100644
index 0000000000..57dacf0fad
--- /dev/null
+++ b/graphics/pokemon/pawmo/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+173 97 39
+104 57 23
+236 158 63
+232 138 36
+14 148 130
+0 108 92
+232 232 248
+250 233 189
+101 74 74
+239 181 59
+245 213 86
+185 167 132
+121 103 68
+0 0 0
diff --git a/graphics/pokemon/pawmo/overworld_shiny.pal b/graphics/pokemon/pawmo/overworld_shiny.pal
new file mode 100644
index 0000000000..06e78da0b5
--- /dev/null
+++ b/graphics/pokemon/pawmo/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+188 99 113
+125 40 47
+238 153 157
+211 118 120
+14 148 130
+0 108 92
+232 232 248
+250 233 189
+101 74 74
+214 177 67
+255 205 32
+185 167 132
+121 103 68
+0 0 0
diff --git a/graphics/pokemon/pawmot/overworld.png b/graphics/pokemon/pawmot/overworld.png
new file mode 100644
index 0000000000..a1901f38dc
Binary files /dev/null and b/graphics/pokemon/pawmot/overworld.png differ
diff --git a/graphics/pokemon/pawmot/overworld_normal.pal b/graphics/pokemon/pawmot/overworld_normal.pal
new file mode 100644
index 0000000000..a6f18aa8ec
--- /dev/null
+++ b/graphics/pokemon/pawmot/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+173 97 39
+104 57 23
+236 158 63
+0 0 0
+232 138 36
+14 148 130
+0 108 92
+232 232 248
+250 233 189
+101 74 74
+239 181 59
+245 213 86
+185 167 132
+121 103 68
+0 0 0
diff --git a/graphics/pokemon/pawmot/overworld_shiny.pal b/graphics/pokemon/pawmot/overworld_shiny.pal
new file mode 100644
index 0000000000..ab7f411a19
--- /dev/null
+++ b/graphics/pokemon/pawmot/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+191 62 74
+104 43 44
+236 128 133
+0 0 0
+218 88 98
+14 148 130
+0 108 92
+232 232 248
+250 233 189
+101 74 74
+223 173 0
+255 205 32
+185 167 132
+121 103 68
+0 0 0
diff --git a/graphics/pokemon/pecharunt/overworld.png b/graphics/pokemon/pecharunt/overworld.png
new file mode 100644
index 0000000000..18273d58a2
Binary files /dev/null and b/graphics/pokemon/pecharunt/overworld.png differ
diff --git a/graphics/pokemon/pecharunt/overworld_normal.pal b/graphics/pokemon/pecharunt/overworld_normal.pal
new file mode 100644
index 0000000000..729252d4e3
--- /dev/null
+++ b/graphics/pokemon/pecharunt/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+46 44 51
+0 0 0
+53 37 84
+97 71 146
+76 54 114
+227 69 184
+108 19 88
+55 53 61
+253 147 255
+73 73 73
+167 50 140
+239 239 239
+138 65 147
+179 41 147
+0 0 0
diff --git a/graphics/pokemon/pecharunt/overworld_shiny.pal b/graphics/pokemon/pecharunt/overworld_shiny.pal
new file mode 100644
index 0000000000..e5cad0c303
--- /dev/null
+++ b/graphics/pokemon/pecharunt/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+46 44 51
+0 0 0
+142 88 0
+236 170 47
+186 130 27
+227 69 184
+108 19 88
+55 53 61
+253 147 255
+73 73 73
+167 50 140
+239 239 239
+138 65 147
+179 41 147
+0 0 0
diff --git a/graphics/pokemon/poltchageist/overworld.png b/graphics/pokemon/poltchageist/overworld.png
new file mode 100644
index 0000000000..0c57bfda4e
Binary files /dev/null and b/graphics/pokemon/poltchageist/overworld.png differ
diff --git a/graphics/pokemon/poltchageist/overworld_normal.pal b/graphics/pokemon/poltchageist/overworld_normal.pal
new file mode 100644
index 0000000000..136dde5d08
--- /dev/null
+++ b/graphics/pokemon/poltchageist/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+159 153 130
+241 239 238
+208 210 193
+76 58 58
+167 186 114
+247 218 103
+66 122 46
+120 196 99
+93 158 74
+37 27 27
+105 68 27
+0 0 0
+204 195 116
+208 210 193
+160 151 80
diff --git a/graphics/pokemon/poltchageist/overworld_shiny.pal b/graphics/pokemon/poltchageist/overworld_shiny.pal
new file mode 100644
index 0000000000..97ed509130
--- /dev/null
+++ b/graphics/pokemon/poltchageist/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+159 153 130
+241 239 238
+208 210 193
+32 72 13
+167 186 114
+247 218 103
+66 122 46
+120 196 99
+93 158 74
+24 43 17
+153 160 88
+0 0 0
+204 195 116
+209 209 214
+153 160 88
diff --git a/graphics/pokemon/quaquaval/overworld.png b/graphics/pokemon/quaquaval/overworld.png
new file mode 100644
index 0000000000..33688d19dc
Binary files /dev/null and b/graphics/pokemon/quaquaval/overworld.png differ
diff --git a/graphics/pokemon/quaquaval/overworld_normal.pal b/graphics/pokemon/quaquaval/overworld_normal.pal
new file mode 100644
index 0000000000..0dcbae55dc
--- /dev/null
+++ b/graphics/pokemon/quaquaval/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+27 67 84
+85 219 230
+0 0 0
+51 63 147
+57 75 238
+65 155 194
+40 42 77
+213 228 240
+135 59 26
+227 70 15
+162 71 32
+247 249 250
+219 175 0
+219 175 0
+129 130 130
diff --git a/graphics/pokemon/quaquaval/overworld_shiny.pal b/graphics/pokemon/quaquaval/overworld_shiny.pal
new file mode 100644
index 0000000000..127e88a727
--- /dev/null
+++ b/graphics/pokemon/quaquaval/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+27 67 84
+85 219 230
+0 0 0
+125 128 176
+163 168 240
+65 155 194
+71 74 124
+213 228 240
+91 65 30
+225 131 80
+199 107 46
+247 249 250
+199 107 46
+237 169 54
+129 130 130
diff --git a/graphics/pokemon/quaxly/overworld.png b/graphics/pokemon/quaxly/overworld.png
new file mode 100644
index 0000000000..179e0eb60b
Binary files /dev/null and b/graphics/pokemon/quaxly/overworld.png differ
diff --git a/graphics/pokemon/quaxly/overworld_normal.pal b/graphics/pokemon/quaxly/overworld_normal.pal
new file mode 100644
index 0000000000..5cd13fb8aa
--- /dev/null
+++ b/graphics/pokemon/quaxly/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+76 190 204
+76 190 204
+109 203 214
+43 139 153
+177 197 224
+248 248 248
+33 109 120
+213 228 240
+129 130 130
+255 209 28
+246 251 252
+0 91 162
+219 175 0
+128 88 24
diff --git a/graphics/pokemon/quaxly/overworld_shiny.pal b/graphics/pokemon/quaxly/overworld_shiny.pal
new file mode 100644
index 0000000000..bcde7ef47b
--- /dev/null
+++ b/graphics/pokemon/quaxly/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+48 169 112
+37 218 128
+109 231 170
+36 115 71
+177 197 224
+248 248 248
+36 115 71
+213 228 240
+129 130 130
+255 209 28
+246 251 252
+0 91 162
+219 175 0
+128 88 24
diff --git a/graphics/pokemon/quaxwell/overworld.png b/graphics/pokemon/quaxwell/overworld.png
new file mode 100644
index 0000000000..2a6af6924c
Binary files /dev/null and b/graphics/pokemon/quaxwell/overworld.png differ
diff --git a/graphics/pokemon/quaxwell/overworld_normal.pal b/graphics/pokemon/quaxwell/overworld_normal.pal
new file mode 100644
index 0000000000..cd91098e63
--- /dev/null
+++ b/graphics/pokemon/quaxwell/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+29 123 210
+20 90 154
+59 145 222
+31 142 158
+74 202 221
+37 175 194
+213 228 240
+248 248 248
+219 175 0
+246 251 253
+255 209 28
+128 88 24
+129 130 130
+0 0 0
diff --git a/graphics/pokemon/quaxwell/overworld_shiny.pal b/graphics/pokemon/quaxwell/overworld_shiny.pal
new file mode 100644
index 0000000000..f799dbde39
--- /dev/null
+++ b/graphics/pokemon/quaxwell/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+111 198 179
+22 111 118
+121 255 232
+36 46 132
+82 125 226
+55 71 213
+213 228 240
+248 248 248
+219 175 0
+246 251 253
+255 209 28
+128 88 24
+129 130 130
+0 0 0
diff --git a/graphics/pokemon/rabsca/overworld.png b/graphics/pokemon/rabsca/overworld.png
new file mode 100644
index 0000000000..a9d99e1b49
Binary files /dev/null and b/graphics/pokemon/rabsca/overworld.png differ
diff --git a/graphics/pokemon/rabsca/overworld_normal.pal b/graphics/pokemon/rabsca/overworld_normal.pal
new file mode 100644
index 0000000000..673a41028a
--- /dev/null
+++ b/graphics/pokemon/rabsca/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+117 0 130
+227 16 251
+171 14 171
+174 31 84
+247 57 131
+249 98 158
+107 192 221
+63 79 92
+94 162 198
+247 57 131
+204 204 204
+248 248 248
+154 27 72
+152 151 157
diff --git a/graphics/pokemon/rabsca/overworld_shiny.pal b/graphics/pokemon/rabsca/overworld_shiny.pal
new file mode 100644
index 0000000000..ad8aa75f2d
--- /dev/null
+++ b/graphics/pokemon/rabsca/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+117 0 130
+227 16 251
+171 14 171
+174 31 84
+247 57 131
+249 98 158
+215 179 36
+152 118 39
+152 118 39
+84 66 22
+204 204 204
+248 248 248
+84 66 22
+152 151 157
diff --git a/graphics/pokemon/raging_bolt/overworld.png b/graphics/pokemon/raging_bolt/overworld.png
new file mode 100644
index 0000000000..b7faeef2e7
Binary files /dev/null and b/graphics/pokemon/raging_bolt/overworld.png differ
diff --git a/graphics/pokemon/raging_bolt/overworld_normal.pal b/graphics/pokemon/raging_bolt/overworld_normal.pal
new file mode 100644
index 0000000000..ee77a37aa2
--- /dev/null
+++ b/graphics/pokemon/raging_bolt/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+133 164 184
+232 232 248
+64 32 96
+0 0 0
+112 56 144
+160 88 184
+81 89 93
+88 64 40
+52 88 100
+117 30 30
+184 48 48
+112 56 144
+232 184 64
+184 120 16
+117 30 30
diff --git a/graphics/pokemon/raging_bolt/overworld_shiny.pal b/graphics/pokemon/raging_bolt/overworld_shiny.pal
new file mode 100644
index 0000000000..5498dc74b1
--- /dev/null
+++ b/graphics/pokemon/raging_bolt/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+133 164 184
+232 232 248
+133 71 3
+0 0 0
+214 168 12
+253 204 23
+81 89 93
+88 64 40
+52 88 100
+20 20 67
+51 51 164
+112 56 144
+247 159 53
+201 118 6
+51 51 164
diff --git a/graphics/pokemon/rellor/overworld.png b/graphics/pokemon/rellor/overworld.png
new file mode 100644
index 0000000000..013def8683
Binary files /dev/null and b/graphics/pokemon/rellor/overworld.png differ
diff --git a/graphics/pokemon/rellor/overworld_normal.pal b/graphics/pokemon/rellor/overworld_normal.pal
new file mode 100644
index 0000000000..27a0a57884
--- /dev/null
+++ b/graphics/pokemon/rellor/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+91 77 55
+243 135 37
+158 132 97
+197 180 170
+0 0 0
+119 99 72
+185 108 38
+162 142 134
+87 82 68
+119 116 99
+55 51 43
+162 142 134
+176 167 102
+197 180 170
+255 128 192
diff --git a/graphics/pokemon/rellor/overworld_shiny.pal b/graphics/pokemon/rellor/overworld_shiny.pal
new file mode 100644
index 0000000000..dcb4086a30
--- /dev/null
+++ b/graphics/pokemon/rellor/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+152 118 39
+222 222 7
+249 248 87
+222 222 7
+0 0 0
+215 179 36
+179 149 30
+179 149 30
+87 82 68
+119 116 99
+55 51 43
+162 142 134
+176 167 102
+197 180 170
+63 72 204
diff --git a/graphics/pokemon/revavroom/overworld.png b/graphics/pokemon/revavroom/overworld.png
new file mode 100644
index 0000000000..1a0925f858
Binary files /dev/null and b/graphics/pokemon/revavroom/overworld.png differ
diff --git a/graphics/pokemon/revavroom/overworld_normal.pal b/graphics/pokemon/revavroom/overworld_normal.pal
new file mode 100644
index 0000000000..0e83397e4e
--- /dev/null
+++ b/graphics/pokemon/revavroom/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+28 28 28
+79 40 79
+0 0 0
+66 61 67
+121 66 127
+195 193 195
+62 48 60
+131 121 134
+217 215 217
+85 73 90
+255 205 6
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/revavroom/overworld_shiny.pal b/graphics/pokemon/revavroom/overworld_shiny.pal
new file mode 100644
index 0000000000..0b40638c18
--- /dev/null
+++ b/graphics/pokemon/revavroom/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+28 28 28
+51 45 85
+0 0 0
+89 80 49
+77 61 150
+247 234 143
+62 48 60
+180 161 96
+250 241 184
+85 73 90
+237 142 178
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/roaring_moon/overworld.png b/graphics/pokemon/roaring_moon/overworld.png
new file mode 100644
index 0000000000..8ce7752709
Binary files /dev/null and b/graphics/pokemon/roaring_moon/overworld.png differ
diff --git a/graphics/pokemon/roaring_moon/overworld_normal.pal b/graphics/pokemon/roaring_moon/overworld_normal.pal
new file mode 100644
index 0000000000..c288efe676
--- /dev/null
+++ b/graphics/pokemon/roaring_moon/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+26 109 121
+55 201 208
+124 219 224
+204 84 108
+0 0 0
+96 32 32
+54 52 56
+160 64 64
+128 128 144
+63 140 167
+55 201 208
+41 76 90
+222 186 41
+36 35 36
+41 76 90
diff --git a/graphics/pokemon/roaring_moon/overworld_shiny.pal b/graphics/pokemon/roaring_moon/overworld_shiny.pal
new file mode 100644
index 0000000000..da16f77be5
--- /dev/null
+++ b/graphics/pokemon/roaring_moon/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+118 111 56
+222 186 41
+223 213 113
+216 88 120
+0 0 0
+96 32 32
+54 52 56
+160 64 64
+128 128 144
+48 168 64
+104 192 112
+40 88 40
+222 186 41
+36 35 36
+41 76 90
diff --git a/graphics/pokemon/sandy_shocks/overworld.png b/graphics/pokemon/sandy_shocks/overworld.png
new file mode 100644
index 0000000000..945f54e85c
Binary files /dev/null and b/graphics/pokemon/sandy_shocks/overworld.png differ
diff --git a/graphics/pokemon/sandy_shocks/overworld_normal.pal b/graphics/pokemon/sandy_shocks/overworld_normal.pal
new file mode 100644
index 0000000000..3d38ac9e7e
--- /dev/null
+++ b/graphics/pokemon/sandy_shocks/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+80 80 80
+56 56 56
+35 35 35
+139 180 164
+232 64 64
+176 176 184
+180 213 189
+213 246 222
+105 92 126
+254 234 98
+72 136 232
+112 112 120
+224 205 79
+0 0 0
diff --git a/graphics/pokemon/sandy_shocks/overworld_shiny.pal b/graphics/pokemon/sandy_shocks/overworld_shiny.pal
new file mode 100644
index 0000000000..151c472b17
--- /dev/null
+++ b/graphics/pokemon/sandy_shocks/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+80 80 80
+56 56 56
+35 35 35
+128 120 104
+112 112 120
+176 176 184
+168 160 136
+208 200 168
+80 80 80
+254 234 98
+112 112 120
+112 112 120
+224 205 79
+0 0 0
diff --git a/graphics/pokemon/scovillain/overworld.png b/graphics/pokemon/scovillain/overworld.png
new file mode 100644
index 0000000000..a0dcf40433
Binary files /dev/null and b/graphics/pokemon/scovillain/overworld.png differ
diff --git a/graphics/pokemon/scovillain/overworld_normal.pal b/graphics/pokemon/scovillain/overworld_normal.pal
new file mode 100644
index 0000000000..355e603188
--- /dev/null
+++ b/graphics/pokemon/scovillain/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+100 30 28
+247 107 50
+162 52 36
+37 48 36
+66 128 75
+81 196 68
+0 0 0
+105 171 123
+66 128 75
+240 251 227
+221 88 0
+41 78 37
+66 128 75
+60 80 66
+205 205 205
diff --git a/graphics/pokemon/scovillain/overworld_shiny.pal b/graphics/pokemon/scovillain/overworld_shiny.pal
new file mode 100644
index 0000000000..c9eea1f6f1
--- /dev/null
+++ b/graphics/pokemon/scovillain/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+100 30 28
+239 81 49
+162 52 36
+40 61 56
+63 129 71
+81 196 68
+0 0 0
+240 220 104
+223 204 96
+240 251 227
+221 88 0
+75 24 17
+87 150 213
+72 101 176
+205 205 205
diff --git a/graphics/pokemon/scream_tail/overworld.png b/graphics/pokemon/scream_tail/overworld.png
new file mode 100644
index 0000000000..d99bfcce5f
Binary files /dev/null and b/graphics/pokemon/scream_tail/overworld.png differ
diff --git a/graphics/pokemon/scream_tail/overworld_normal.pal b/graphics/pokemon/scream_tail/overworld_normal.pal
new file mode 100644
index 0000000000..3d3331c23c
--- /dev/null
+++ b/graphics/pokemon/scream_tail/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+116 80 88
+244 215 222
+116 80 88
+219 186 195
+172 128 142
+0 0 0
+255 125 148
+55 50 55
+192 89 110
+230 158 156
+232 232 248
+214 186 41
+181 150 8
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/scream_tail/overworld_shiny.pal b/graphics/pokemon/scream_tail/overworld_shiny.pal
new file mode 100644
index 0000000000..5cabe5af04
--- /dev/null
+++ b/graphics/pokemon/scream_tail/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+97 63 82
+255 223 237
+116 80 88
+242 198 222
+216 160 192
+0 0 0
+255 121 255
+55 50 55
+201 82 192
+230 158 156
+232 232 248
+242 132 132
+232 36 36
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/shroodle/overworld.png b/graphics/pokemon/shroodle/overworld.png
new file mode 100644
index 0000000000..b541795edf
Binary files /dev/null and b/graphics/pokemon/shroodle/overworld.png differ
diff --git a/graphics/pokemon/shroodle/overworld_normal.pal b/graphics/pokemon/shroodle/overworld_normal.pal
new file mode 100644
index 0000000000..6c76f5afcf
--- /dev/null
+++ b/graphics/pokemon/shroodle/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+112 101 101
+169 157 149
+134 120 120
+40 37 51
+51 63 77
+51 48 61
+70 66 84
+0 0 0
+74 84 100
+138 194 162
+162 203 166
+182 171 184
+230 227 227
+184 184 200
+87 69 150
diff --git a/graphics/pokemon/shroodle/overworld_shiny.pal b/graphics/pokemon/shroodle/overworld_shiny.pal
new file mode 100644
index 0000000000..057d2ac34b
--- /dev/null
+++ b/graphics/pokemon/shroodle/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+112 101 101
+169 157 149
+125 121 118
+39 37 43
+128 149 168
+72 68 65
+125 121 118
+0 0 0
+187 210 227
+189 142 215
+225 171 233
+182 171 184
+230 227 227
+184 184 200
+220 105 197
diff --git a/graphics/pokemon/sinistcha/overworld.png b/graphics/pokemon/sinistcha/overworld.png
new file mode 100644
index 0000000000..cce5218144
Binary files /dev/null and b/graphics/pokemon/sinistcha/overworld.png differ
diff --git a/graphics/pokemon/sinistcha/overworld_normal.pal b/graphics/pokemon/sinistcha/overworld_normal.pal
new file mode 100644
index 0000000000..810b8022a1
--- /dev/null
+++ b/graphics/pokemon/sinistcha/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+106 91 32
+160 151 80
+204 195 116
+0 0 0
+245 192 61
+93 158 74
+57 103 37
+249 212 121
+120 196 99
+37 27 27
+105 68 27
+76 58 58
+135 132 126
+193 185 174
+230 225 219
diff --git a/graphics/pokemon/sinistcha/overworld_shiny.pal b/graphics/pokemon/sinistcha/overworld_shiny.pal
new file mode 100644
index 0000000000..ab14c1b68a
--- /dev/null
+++ b/graphics/pokemon/sinistcha/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+106 91 32
+153 160 88
+204 195 116
+0 0 0
+245 192 61
+93 158 74
+57 103 37
+249 212 121
+120 196 99
+24 43 17
+153 160 88
+54 65 35
+135 132 126
+193 185 174
+230 225 219
diff --git a/graphics/pokemon/skeledirge/overworld.png b/graphics/pokemon/skeledirge/overworld.png
new file mode 100644
index 0000000000..cff42c4dde
Binary files /dev/null and b/graphics/pokemon/skeledirge/overworld.png differ
diff --git a/graphics/pokemon/skeledirge/overworld_normal.pal b/graphics/pokemon/skeledirge/overworld_normal.pal
new file mode 100644
index 0000000000..034baedc55
--- /dev/null
+++ b/graphics/pokemon/skeledirge/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+184 184 184
+230 230 230
+210 0 0
+31 37 33
+116 16 16
+186 50 39
+244 85 17
+255 74 60
+255 208 23
+163 52 216
+61 66 63
+88 16 16
+0 0 0
+255 208 23
+96 32 32
diff --git a/graphics/pokemon/skeledirge/overworld_shiny.pal b/graphics/pokemon/skeledirge/overworld_shiny.pal
new file mode 100644
index 0000000000..f008ae7817
--- /dev/null
+++ b/graphics/pokemon/skeledirge/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+184 184 184
+230 230 230
+210 0 0
+31 37 33
+124 35 84
+186 31 113
+244 85 17
+255 60 128
+255 208 23
+163 52 216
+72 72 72
+74 21 51
+0 0 0
+255 117 117
+96 32 32
diff --git a/graphics/pokemon/slither_wing/overworld.png b/graphics/pokemon/slither_wing/overworld.png
new file mode 100644
index 0000000000..240210358f
Binary files /dev/null and b/graphics/pokemon/slither_wing/overworld.png differ
diff --git a/graphics/pokemon/slither_wing/overworld_normal.pal b/graphics/pokemon/slither_wing/overworld_normal.pal
new file mode 100644
index 0000000000..3073896104
--- /dev/null
+++ b/graphics/pokemon/slither_wing/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+2 2 2
+239 209 101
+105 18 27
+235 165 61
+209 56 49
+210 255 118
+49 47 47
+214 216 222
+125 128 149
+14 16 48
+23 29 81
+209 56 49
+71 31 29
+50 137 124
+81 191 174
diff --git a/graphics/pokemon/slither_wing/overworld_shiny.pal b/graphics/pokemon/slither_wing/overworld_shiny.pal
new file mode 100644
index 0000000000..34b68f69cc
--- /dev/null
+++ b/graphics/pokemon/slither_wing/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+2 2 2
+249 235 153
+69 51 27
+235 165 61
+255 206 82
+209 56 49
+49 47 47
+214 216 222
+125 128 149
+14 16 48
+23 29 81
+209 56 49
+71 31 29
+63 64 101
+99 104 227
diff --git a/graphics/pokemon/smoliv/overworld.png b/graphics/pokemon/smoliv/overworld.png
new file mode 100644
index 0000000000..4d05b781d1
Binary files /dev/null and b/graphics/pokemon/smoliv/overworld.png differ
diff --git a/graphics/pokemon/smoliv/overworld_normal.pal b/graphics/pokemon/smoliv/overworld_normal.pal
new file mode 100644
index 0000000000..d197197d00
--- /dev/null
+++ b/graphics/pokemon/smoliv/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+231 225 140
+175 162 91
+96 144 66
+221 215 110
+120 182 67
+155 197 86
+190 208 96
+232 232 248
+151 159 84
+216 96 112
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/smoliv/overworld_shiny.pal b/graphics/pokemon/smoliv/overworld_shiny.pal
new file mode 100644
index 0000000000..a840789865
--- /dev/null
+++ b/graphics/pokemon/smoliv/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+97 54 67
+30 17 27
+62 87 34
+56 33 50
+92 120 65
+129 174 66
+220 214 96
+232 232 248
+190 183 41
+216 96 112
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/spidops/overworld.png b/graphics/pokemon/spidops/overworld.png
new file mode 100644
index 0000000000..5e19fe8a7e
Binary files /dev/null and b/graphics/pokemon/spidops/overworld.png differ
diff --git a/graphics/pokemon/spidops/overworld_normal.pal b/graphics/pokemon/spidops/overworld_normal.pal
new file mode 100644
index 0000000000..47121548cd
--- /dev/null
+++ b/graphics/pokemon/spidops/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+47 57 28
+106 148 40
+71 61 37
+150 124 67
+0 0 0
+68 91 28
+45 50 53
+29 46 47
+114 89 56
+230 227 222
+173 174 170
+230 227 222
+173 174 170
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/spidops/overworld_shiny.pal b/graphics/pokemon/spidops/overworld_shiny.pal
new file mode 100644
index 0000000000..85349c0c2b
--- /dev/null
+++ b/graphics/pokemon/spidops/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+116 61 87
+204 124 160
+54 69 82
+104 127 150
+0 0 0
+157 83 118
+45 50 53
+29 46 47
+82 101 116
+230 227 222
+173 174 170
+227 79 79
+171 58 52
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/sprigatito/overworld.png b/graphics/pokemon/sprigatito/overworld.png
new file mode 100644
index 0000000000..ac917eb140
Binary files /dev/null and b/graphics/pokemon/sprigatito/overworld.png differ
diff --git a/graphics/pokemon/sprigatito/overworld_normal.pal b/graphics/pokemon/sprigatito/overworld_normal.pal
new file mode 100644
index 0000000000..20e41599d8
--- /dev/null
+++ b/graphics/pokemon/sprigatito/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+133 160 90
+218 237 191
+114 136 77
+0 0 0
+179 218 124
+33 65 20
+66 129 41
+49 97 31
+179 218 124
+82 161 52
+216 112 152
+232 232 248
+141 71 85
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/sprigatito/overworld_shiny.pal b/graphics/pokemon/sprigatito/overworld_shiny.pal
new file mode 100644
index 0000000000..cd0636fb1f
--- /dev/null
+++ b/graphics/pokemon/sprigatito/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+116 137 67
+223 252 135
+81 103 48
+0 0 0
+166 199 99
+39 73 40
+82 143 92
+54 101 55
+179 218 124
+86 205 116
+192 137 237
+232 232 248
+134 81 206
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squawkabilly/blue_plumage/overworld.png b/graphics/pokemon/squawkabilly/blue_plumage/overworld.png
new file mode 100644
index 0000000000..ad152c8b1b
Binary files /dev/null and b/graphics/pokemon/squawkabilly/blue_plumage/overworld.png differ
diff --git a/graphics/pokemon/squawkabilly/blue_plumage/overworld_normal.pal b/graphics/pokemon/squawkabilly/blue_plumage/overworld_normal.pal
new file mode 100644
index 0000000000..8abe9ab02c
--- /dev/null
+++ b/graphics/pokemon/squawkabilly/blue_plumage/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+51 52 53
+77 78 79
+32 51 74
+52 89 152
+203 131 78
+252 252 252
+44 129 218
+253 194 72
+30 31 32
+77 78 79
+179 184 189
+105 70 39
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squawkabilly/blue_plumage/overworld_shiny.pal b/graphics/pokemon/squawkabilly/blue_plumage/overworld_shiny.pal
new file mode 100644
index 0000000000..f4018770cd
--- /dev/null
+++ b/graphics/pokemon/squawkabilly/blue_plumage/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+255 142 146
+255 185 187
+32 51 74
+52 89 152
+206 114 100
+252 252 252
+44 129 218
+225 156 147
+30 31 32
+77 78 79
+179 184 189
+170 69 64
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squawkabilly/overworld.png b/graphics/pokemon/squawkabilly/overworld.png
new file mode 100644
index 0000000000..f38929d020
Binary files /dev/null and b/graphics/pokemon/squawkabilly/overworld.png differ
diff --git a/graphics/pokemon/squawkabilly/overworld_normal.pal b/graphics/pokemon/squawkabilly/overworld_normal.pal
new file mode 100644
index 0000000000..2e9a2a7fb8
--- /dev/null
+++ b/graphics/pokemon/squawkabilly/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+51 52 53
+77 78 79
+44 74 32
+88 157 47
+203 131 78
+252 252 252
+100 218 44
+253 194 72
+30 31 32
+77 78 79
+179 184 189
+105 70 39
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squawkabilly/overworld_shiny.pal b/graphics/pokemon/squawkabilly/overworld_shiny.pal
new file mode 100644
index 0000000000..305f25614c
--- /dev/null
+++ b/graphics/pokemon/squawkabilly/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+255 142 146
+255 185 187
+44 74 32
+88 157 47
+206 114 100
+252 252 252
+100 218 44
+225 156 147
+30 31 32
+77 78 79
+179 184 189
+170 69 64
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squawkabilly/white_plumage/overworld.png b/graphics/pokemon/squawkabilly/white_plumage/overworld.png
new file mode 100644
index 0000000000..c416e4bfd1
Binary files /dev/null and b/graphics/pokemon/squawkabilly/white_plumage/overworld.png differ
diff --git a/graphics/pokemon/squawkabilly/white_plumage/overworld_normal.pal b/graphics/pokemon/squawkabilly/white_plumage/overworld_normal.pal
new file mode 100644
index 0000000000..ee7d256273
--- /dev/null
+++ b/graphics/pokemon/squawkabilly/white_plumage/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+51 52 53
+77 78 79
+91 94 94
+137 145 145
+203 131 78
+252 252 252
+193 202 202
+253 194 72
+30 31 32
+77 78 79
+179 184 189
+105 70 39
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squawkabilly/white_plumage/overworld_shiny.pal b/graphics/pokemon/squawkabilly/white_plumage/overworld_shiny.pal
new file mode 100644
index 0000000000..8642d6248d
--- /dev/null
+++ b/graphics/pokemon/squawkabilly/white_plumage/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+255 142 146
+255 185 187
+91 94 94
+137 145 145
+206 114 100
+252 252 252
+193 202 202
+225 156 147
+30 31 32
+77 78 79
+179 184 189
+170 69 64
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/overworld.png b/graphics/pokemon/squawkabilly/yellow_plumage/overworld.png
new file mode 100644
index 0000000000..7b744f5133
Binary files /dev/null and b/graphics/pokemon/squawkabilly/yellow_plumage/overworld.png differ
diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/overworld_normal.pal b/graphics/pokemon/squawkabilly/yellow_plumage/overworld_normal.pal
new file mode 100644
index 0000000000..3e57b393fb
--- /dev/null
+++ b/graphics/pokemon/squawkabilly/yellow_plumage/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+51 52 53
+77 78 79
+79 67 27
+169 148 35
+203 131 78
+252 252 252
+223 236 26
+253 194 72
+30 31 32
+77 78 79
+179 184 189
+105 70 39
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/overworld_shiny.pal b/graphics/pokemon/squawkabilly/yellow_plumage/overworld_shiny.pal
new file mode 100644
index 0000000000..2d432a3f8e
--- /dev/null
+++ b/graphics/pokemon/squawkabilly/yellow_plumage/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+255 142 146
+255 185 187
+79 67 27
+169 148 35
+206 114 100
+252 252 252
+223 236 26
+225 156 147
+30 31 32
+77 78 79
+179 184 189
+170 69 64
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tadbulb/overworld.png b/graphics/pokemon/tadbulb/overworld.png
new file mode 100644
index 0000000000..6937e10e7f
Binary files /dev/null and b/graphics/pokemon/tadbulb/overworld.png differ
diff --git a/graphics/pokemon/tadbulb/overworld_normal.pal b/graphics/pokemon/tadbulb/overworld_normal.pal
new file mode 100644
index 0000000000..251142b687
--- /dev/null
+++ b/graphics/pokemon/tadbulb/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+137 116 29
+188 154 18
+252 252 252
+255 223 40
+77 68 64
+126 115 109
+103 95 90
+172 102 72
+255 124 91
+104 69 37
+37 35 33
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tadbulb/overworld_shiny.pal b/graphics/pokemon/tadbulb/overworld_shiny.pal
new file mode 100644
index 0000000000..3364ba16f4
--- /dev/null
+++ b/graphics/pokemon/tadbulb/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+137 116 29
+188 154 18
+252 252 252
+255 223 40
+77 68 64
+126 115 109
+103 95 90
+171 75 73
+255 127 109
+125 26 15
+37 35 33
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tandemaus/overworld.png b/graphics/pokemon/tandemaus/overworld.png
new file mode 100644
index 0000000000..0f546d45d1
Binary files /dev/null and b/graphics/pokemon/tandemaus/overworld.png differ
diff --git a/graphics/pokemon/tandemaus/overworld_normal.pal b/graphics/pokemon/tandemaus/overworld_normal.pal
new file mode 100644
index 0000000000..ef7e6cad7c
--- /dev/null
+++ b/graphics/pokemon/tandemaus/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+57 58 68
+216 216 216
+249 249 249
+86 87 101
+249 249 249
+184 204 222
+119 157 191
+136 139 151
+48 48 48
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tandemaus/overworld_shiny.pal b/graphics/pokemon/tandemaus/overworld_shiny.pal
new file mode 100644
index 0000000000..9270b4e0ae
--- /dev/null
+++ b/graphics/pokemon/tandemaus/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+57 58 68
+216 216 216
+249 249 249
+86 87 101
+216 216 216
+225 210 181
+162 124 91
+136 139 151
+48 48 48
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tarountula/overworld.png b/graphics/pokemon/tarountula/overworld.png
new file mode 100644
index 0000000000..5b4ab67614
Binary files /dev/null and b/graphics/pokemon/tarountula/overworld.png differ
diff --git a/graphics/pokemon/tarountula/overworld_normal.pal b/graphics/pokemon/tarountula/overworld_normal.pal
new file mode 100644
index 0000000000..3829c7ce5a
--- /dev/null
+++ b/graphics/pokemon/tarountula/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+113 119 128
+173 162 170
+228 229 228
+193 191 193
+74 80 85
+0 0 0
+92 82 44
+162 145 40
+253 253 253
+228 216 55
+32 66 94
+193 191 193
+35 62 19
+62 109 22
+83 163 16
diff --git a/graphics/pokemon/tarountula/overworld_shiny.pal b/graphics/pokemon/tarountula/overworld_shiny.pal
new file mode 100644
index 0000000000..28ba758a6b
--- /dev/null
+++ b/graphics/pokemon/tarountula/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+148 50 39
+169 50 37
+216 89 75
+204 61 45
+104 32 28
+0 0 0
+64 72 94
+83 105 126
+253 253 253
+118 144 159
+32 66 94
+193 191 193
+82 50 62
+109 69 90
+149 77 118
diff --git a/graphics/pokemon/tatsugiri/droopy/overworld.png b/graphics/pokemon/tatsugiri/droopy/overworld.png
new file mode 100644
index 0000000000..d1ee2692a8
Binary files /dev/null and b/graphics/pokemon/tatsugiri/droopy/overworld.png differ
diff --git a/graphics/pokemon/tatsugiri/droopy/overworld_normal.pal b/graphics/pokemon/tatsugiri/droopy/overworld_normal.pal
new file mode 100644
index 0000000000..33de9fb9c7
--- /dev/null
+++ b/graphics/pokemon/tatsugiri/droopy/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+98 100 113
+252 252 252
+109 35 55
+194 65 101
+237 110 150
+232 232 248
+173 175 184
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tatsugiri/droopy/overworld_shiny.pal b/graphics/pokemon/tatsugiri/droopy/overworld_shiny.pal
new file mode 100644
index 0000000000..b031af3764
--- /dev/null
+++ b/graphics/pokemon/tatsugiri/droopy/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+98 100 113
+252 252 252
+98 100 113
+173 175 184
+252 252 252
+232 232 248
+173 175 184
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tatsugiri/overworld.png b/graphics/pokemon/tatsugiri/overworld.png
new file mode 100644
index 0000000000..4b22241884
Binary files /dev/null and b/graphics/pokemon/tatsugiri/overworld.png differ
diff --git a/graphics/pokemon/tatsugiri/overworld_normal.pal b/graphics/pokemon/tatsugiri/overworld_normal.pal
new file mode 100644
index 0000000000..fb0bb31bca
--- /dev/null
+++ b/graphics/pokemon/tatsugiri/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+118 39 31
+255 105 47
+179 80 51
+195 121 101
+232 232 248
+255 170 132
+140 74 55
+98 100 113
+173 175 184
+252 252 252
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tatsugiri/overworld_shiny.pal b/graphics/pokemon/tatsugiri/overworld_shiny.pal
new file mode 100644
index 0000000000..334f722c6b
--- /dev/null
+++ b/graphics/pokemon/tatsugiri/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+75 48 41
+175 103 80
+131 79 61
+205 90 56
+232 232 248
+220 122 84
+134 56 34
+98 100 113
+173 175 184
+252 252 252
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tatsugiri/stretchy/overworld.png b/graphics/pokemon/tatsugiri/stretchy/overworld.png
new file mode 100644
index 0000000000..24451d817f
Binary files /dev/null and b/graphics/pokemon/tatsugiri/stretchy/overworld.png differ
diff --git a/graphics/pokemon/tatsugiri/stretchy/overworld_normal.pal b/graphics/pokemon/tatsugiri/stretchy/overworld_normal.pal
new file mode 100644
index 0000000000..141ea45c87
--- /dev/null
+++ b/graphics/pokemon/tatsugiri/stretchy/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+87 66 15
+255 203 45
+206 155 36
+255 207 45
+232 232 248
+98 100 113
+173 175 184
+252 252 252
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tatsugiri/stretchy/overworld_shiny.pal b/graphics/pokemon/tatsugiri/stretchy/overworld_shiny.pal
new file mode 100644
index 0000000000..3094cbee44
--- /dev/null
+++ b/graphics/pokemon/tatsugiri/stretchy/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+79 45 30
+237 125 78
+176 81 45
+255 207 45
+232 232 248
+98 100 113
+173 175 184
+252 252 252
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/overworld.png b/graphics/pokemon/tauros/paldean_aqua_breed/overworld.png
new file mode 100644
index 0000000000..f5fe87e1da
Binary files /dev/null and b/graphics/pokemon/tauros/paldean_aqua_breed/overworld.png differ
diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/overworld_normal.pal b/graphics/pokemon/tauros/paldean_aqua_breed/overworld_normal.pal
new file mode 100644
index 0000000000..a025f63c81
--- /dev/null
+++ b/graphics/pokemon/tauros/paldean_aqua_breed/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+14 14 14
+26 26 26
+71 71 71
+60 60 60
+192 192 208
+144 144 144
+47 46 47
+92 92 92
+232 232 248
+58 120 154
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/overworld_shiny.pal b/graphics/pokemon/tauros/paldean_aqua_breed/overworld_shiny.pal
new file mode 100644
index 0000000000..627a88f0bc
--- /dev/null
+++ b/graphics/pokemon/tauros/paldean_aqua_breed/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+14 14 14
+26 26 26
+36 36 36
+24 24 24
+192 192 208
+144 144 144
+47 46 47
+53 51 53
+232 232 248
+58 120 154
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/overworld.png b/graphics/pokemon/tauros/paldean_blaze_breed/overworld.png
new file mode 100644
index 0000000000..aad59d0031
Binary files /dev/null and b/graphics/pokemon/tauros/paldean_blaze_breed/overworld.png differ
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/overworld_normal.pal b/graphics/pokemon/tauros/paldean_blaze_breed/overworld_normal.pal
new file mode 100644
index 0000000000..8b4a90c570
--- /dev/null
+++ b/graphics/pokemon/tauros/paldean_blaze_breed/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+14 14 14
+26 26 26
+71 71 71
+60 60 60
+192 192 208
+144 144 144
+181 0 0
+47 46 47
+138 0 0
+92 92 92
+232 232 248
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/overworld_shiny.pal b/graphics/pokemon/tauros/paldean_blaze_breed/overworld_shiny.pal
new file mode 100644
index 0000000000..478334cb90
--- /dev/null
+++ b/graphics/pokemon/tauros/paldean_blaze_breed/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+14 14 14
+26 26 26
+36 36 36
+24 24 24
+192 192 208
+144 144 144
+181 0 0
+47 46 47
+138 0 0
+53 51 53
+232 232 248
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tauros/paldean_combat_breed/overworld.png b/graphics/pokemon/tauros/paldean_combat_breed/overworld.png
new file mode 100644
index 0000000000..40206ce439
Binary files /dev/null and b/graphics/pokemon/tauros/paldean_combat_breed/overworld.png differ
diff --git a/graphics/pokemon/tauros/paldean_combat_breed/overworld_normal.pal b/graphics/pokemon/tauros/paldean_combat_breed/overworld_normal.pal
new file mode 100644
index 0000000000..37f2d7b366
--- /dev/null
+++ b/graphics/pokemon/tauros/paldean_combat_breed/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+14 14 14
+0 0 0
+71 71 71
+26 26 26
+60 60 60
+192 192 208
+144 144 144
+47 46 47
+92 92 92
+232 232 248
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/tauros/paldean_combat_breed/overworld_shiny.pal b/graphics/pokemon/tauros/paldean_combat_breed/overworld_shiny.pal
new file mode 100644
index 0000000000..a3fcf9a2f1
--- /dev/null
+++ b/graphics/pokemon/tauros/paldean_combat_breed/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+14 14 14
+0 0 0
+36 36 36
+26 26 26
+24 24 24
+192 192 208
+144 144 144
+47 46 47
+53 51 53
+232 232 248
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/terapagos/overworld.png b/graphics/pokemon/terapagos/overworld.png
new file mode 100644
index 0000000000..7c299289cc
Binary files /dev/null and b/graphics/pokemon/terapagos/overworld.png differ
diff --git a/graphics/pokemon/terapagos/overworld_normal.pal b/graphics/pokemon/terapagos/overworld_normal.pal
new file mode 100644
index 0000000000..4785d3471b
--- /dev/null
+++ b/graphics/pokemon/terapagos/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+197 104 232
+145 81 187
+98 98 210
+146 154 231
+58 115 124
+131 199 199
+23 22 48
+45 51 111
+64 72 170
+0 0 0
+154 228 186
+241 115 136
+43 149 206
+238 238 246
+23 22 48
diff --git a/graphics/pokemon/terapagos/overworld_shiny.pal b/graphics/pokemon/terapagos/overworld_shiny.pal
new file mode 100644
index 0000000000..80535e17d4
--- /dev/null
+++ b/graphics/pokemon/terapagos/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+197 104 232
+145 81 187
+98 98 210
+146 154 231
+58 115 124
+131 199 199
+5 73 99
+12 156 208
+1 229 255
+0 0 0
+154 228 186
+242 184 140
+227 16 108
+238 238 246
+58 115 124
diff --git a/graphics/pokemon/terapagos/terastal/overworld.png b/graphics/pokemon/terapagos/terastal/overworld.png
new file mode 100644
index 0000000000..e1ce155923
Binary files /dev/null and b/graphics/pokemon/terapagos/terastal/overworld.png differ
diff --git a/graphics/pokemon/terapagos/terastal/overworld_normal.pal b/graphics/pokemon/terapagos/terastal/overworld_normal.pal
new file mode 100644
index 0000000000..8fc9e7cf54
--- /dev/null
+++ b/graphics/pokemon/terapagos/terastal/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+83 128 134
+147 245 227
+209 209 219
+41 44 163
+28 27 59
+78 190 242
+234 118 148
+52 57 209
+216 81 88
+147 245 227
+128 120 112
+192 48 40
+248 208 48
+255 255 255
+43 149 206
diff --git a/graphics/pokemon/terapagos/terastal/overworld_shiny.pal b/graphics/pokemon/terapagos/terastal/overworld_shiny.pal
new file mode 100644
index 0000000000..809ff7a61b
--- /dev/null
+++ b/graphics/pokemon/terapagos/terastal/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+83 128 134
+147 245 227
+209 209 219
+84 215 251
+28 27 59
+78 190 242
+234 118 148
+52 57 209
+216 81 88
+147 245 227
+128 120 112
+192 48 40
+248 208 48
+255 255 255
+43 149 206
diff --git a/graphics/pokemon/ting_lu/overworld.png b/graphics/pokemon/ting_lu/overworld.png
new file mode 100644
index 0000000000..9df5a80931
Binary files /dev/null and b/graphics/pokemon/ting_lu/overworld.png differ
diff --git a/graphics/pokemon/ting_lu/overworld_normal.pal b/graphics/pokemon/ting_lu/overworld_normal.pal
new file mode 100644
index 0000000000..1a36fd21fc
--- /dev/null
+++ b/graphics/pokemon/ting_lu/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+28 28 25
+0 0 0
+72 104 99
+54 80 75
+71 49 42
+89 130 123
+132 104 85
+162 132 113
+85 70 60
+85 70 60
+129 18 18
+126 71 66
+224 176 8
+60 49 43
+132 104 85
diff --git a/graphics/pokemon/ting_lu/overworld_shiny.pal b/graphics/pokemon/ting_lu/overworld_shiny.pal
new file mode 100644
index 0000000000..9109b2f916
--- /dev/null
+++ b/graphics/pokemon/ting_lu/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+26 29 25
+0 0 0
+72 104 99
+54 80 75
+55 53 43
+89 130 123
+151 161 151
+99 113 105
+79 76 62
+109 125 116
+129 18 18
+54 80 75
+224 176 8
+25 40 37
+114 109 90
diff --git a/graphics/pokemon/tinkatink/overworld.png b/graphics/pokemon/tinkatink/overworld.png
new file mode 100644
index 0000000000..85e9bf94ee
Binary files /dev/null and b/graphics/pokemon/tinkatink/overworld.png differ
diff --git a/graphics/pokemon/tinkatink/overworld_normal.pal b/graphics/pokemon/tinkatink/overworld_normal.pal
new file mode 100644
index 0000000000..bbd228d958
--- /dev/null
+++ b/graphics/pokemon/tinkatink/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+45 26 38
+238 189 179
+255 223 225
+84 33 57
+255 157 199
+209 46 107
+255 86 160
+252 252 252
+93 99 158
+122 106 164
+108 41 107
+162 156 198
+100 79 155
+74 54 112
+0 0 0
diff --git a/graphics/pokemon/tinkatink/overworld_shiny.pal b/graphics/pokemon/tinkatink/overworld_shiny.pal
new file mode 100644
index 0000000000..7dbb32e1f3
--- /dev/null
+++ b/graphics/pokemon/tinkatink/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+45 26 38
+238 189 179
+255 223 225
+84 33 57
+255 157 199
+209 46 107
+255 86 160
+252 252 252
+93 99 158
+139 87 69
+108 41 107
+203 131 108
+106 52 67
+83 40 53
+0 0 0
diff --git a/graphics/pokemon/tinkaton/overworld.png b/graphics/pokemon/tinkaton/overworld.png
new file mode 100644
index 0000000000..d34001d5cb
Binary files /dev/null and b/graphics/pokemon/tinkaton/overworld.png differ
diff --git a/graphics/pokemon/tinkaton/overworld_normal.pal b/graphics/pokemon/tinkaton/overworld_normal.pal
new file mode 100644
index 0000000000..25367fffc9
--- /dev/null
+++ b/graphics/pokemon/tinkaton/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+54 32 57
+124 90 95
+0 0 0
+226 212 147
+170 146 93
+135 103 132
+252 252 252
+174 157 197
+229 187 189
+211 116 158
+84 33 57
+255 86 160
+252 252 252
+138 111 155
+150 44 80
diff --git a/graphics/pokemon/tinkaton/overworld_shiny.pal b/graphics/pokemon/tinkaton/overworld_shiny.pal
new file mode 100644
index 0000000000..385002d053
--- /dev/null
+++ b/graphics/pokemon/tinkaton/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+57 29 28
+107 86 90
+25 12 16
+196 192 177
+140 135 123
+158 90 55
+229 187 189
+203 131 108
+229 187 189
+211 116 158
+107 86 90
+255 86 160
+252 252 252
+120 124 196
+150 44 80
diff --git a/graphics/pokemon/tinkatuff/overworld.png b/graphics/pokemon/tinkatuff/overworld.png
new file mode 100644
index 0000000000..451d70e030
Binary files /dev/null and b/graphics/pokemon/tinkatuff/overworld.png differ
diff --git a/graphics/pokemon/tinkatuff/overworld_normal.pal b/graphics/pokemon/tinkatuff/overworld_normal.pal
new file mode 100644
index 0000000000..a590547acb
--- /dev/null
+++ b/graphics/pokemon/tinkatuff/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+79 44 74
+239 200 196
+132 95 109
+15 15 15
+15 15 15
+82 46 69
+231 141 180
+92 75 99
+174 157 197
+138 111 155
+255 86 160
+209 46 107
+252 252 252
+105 78 147
+105 78 147
diff --git a/graphics/pokemon/tinkatuff/overworld_shiny.pal b/graphics/pokemon/tinkatuff/overworld_shiny.pal
new file mode 100644
index 0000000000..673a93a40c
--- /dev/null
+++ b/graphics/pokemon/tinkatuff/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+93 41 64
+239 200 196
+113 69 98
+15 15 15
+113 69 98
+15 15 15
+231 141 180
+120 64 33
+203 131 108
+158 90 55
+255 86 160
+209 46 107
+252 252 252
+129 50 73
+93 99 158
diff --git a/graphics/pokemon/toedscool/overworld.png b/graphics/pokemon/toedscool/overworld.png
new file mode 100644
index 0000000000..7f73ce5fc1
Binary files /dev/null and b/graphics/pokemon/toedscool/overworld.png differ
diff --git a/graphics/pokemon/toedscool/overworld_normal.pal b/graphics/pokemon/toedscool/overworld_normal.pal
new file mode 100644
index 0000000000..4c86e2c2da
--- /dev/null
+++ b/graphics/pokemon/toedscool/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+175 80 56
+139 124 20
+227 134 111
+234 164 146
+0 0 0
+194 174 29
+238 225 134
+220 104 75
+229 209 79
+232 232 248
+64 64 64
+208 208 208
+77 100 98
+163 184 183
+222 231 230
diff --git a/graphics/pokemon/toedscool/overworld_shiny.pal b/graphics/pokemon/toedscool/overworld_shiny.pal
new file mode 100644
index 0000000000..edb94d0db5
--- /dev/null
+++ b/graphics/pokemon/toedscool/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+101 98 86
+126 129 58
+207 203 186
+219 218 206
+0 0 0
+193 182 125
+255 253 226
+168 164 149
+207 198 154
+232 232 248
+64 64 64
+208 208 208
+132 130 111
+167 165 150
+224 221 203
diff --git a/graphics/pokemon/toedscruel/overworld.png b/graphics/pokemon/toedscruel/overworld.png
new file mode 100644
index 0000000000..8ed361efed
Binary files /dev/null and b/graphics/pokemon/toedscruel/overworld.png differ
diff --git a/graphics/pokemon/toedscruel/overworld_normal.pal b/graphics/pokemon/toedscruel/overworld_normal.pal
new file mode 100644
index 0000000000..2c2be8c0da
--- /dev/null
+++ b/graphics/pokemon/toedscruel/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+21 21 21
+82 81 67
+175 80 56
+220 215 3
+136 133 2
+220 104 75
+234 164 146
+253 251 97
+227 134 111
+213 211 171
+150 147 107
+232 232 248
+168 168 168
+253 251 97
+220 215 3
diff --git a/graphics/pokemon/toedscruel/overworld_shiny.pal b/graphics/pokemon/toedscruel/overworld_shiny.pal
new file mode 100644
index 0000000000..13165729c8
--- /dev/null
+++ b/graphics/pokemon/toedscruel/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+21 21 21
+71 59 62
+109 105 109
+172 46 134
+172 46 134
+193 192 193
+252 252 252
+223 102 192
+232 231 233
+189 92 118
+92 46 56
+232 232 248
+168 168 168
+120 95 207
+88 55 177
diff --git a/graphics/pokemon/ursaluna/bloodmoon/overworld_shiny.pal b/graphics/pokemon/ursaluna/bloodmoon/overworld_shiny.pal
new file mode 100644
index 0000000000..6dbef8b071
--- /dev/null
+++ b/graphics/pokemon/ursaluna/bloodmoon/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+94 41 20
+230 131 90
+195 99 59
+131 67 39
+119 119 117
+81 71 71
+151 148 146
+255 153 174
+248 50 89
+195 99 59
+131 67 39
+232 232 248
+36 104 60
+192 192 208
diff --git a/graphics/pokemon/varoom/overworld.png b/graphics/pokemon/varoom/overworld.png
new file mode 100644
index 0000000000..a33b4821d3
Binary files /dev/null and b/graphics/pokemon/varoom/overworld.png differ
diff --git a/graphics/pokemon/varoom/overworld_normal.pal b/graphics/pokemon/varoom/overworld_normal.pal
new file mode 100644
index 0000000000..79ca1d15c1
--- /dev/null
+++ b/graphics/pokemon/varoom/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+85 73 90
+62 48 60
+131 121 134
+195 193 195
+217 215 217
+28 28 28
+66 61 67
+255 205 6
+79 40 79
+121 66 127
+79 40 79
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/varoom/overworld_shiny.pal b/graphics/pokemon/varoom/overworld_shiny.pal
new file mode 100644
index 0000000000..24b9e5677a
--- /dev/null
+++ b/graphics/pokemon/varoom/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+85 73 90
+62 48 60
+180 161 96
+247 234 143
+250 241 184
+28 28 28
+89 80 49
+224 114 152
+51 45 85
+77 61 150
+79 40 79
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/veluza/overworld.png b/graphics/pokemon/veluza/overworld.png
new file mode 100644
index 0000000000..0ee46d7616
Binary files /dev/null and b/graphics/pokemon/veluza/overworld.png differ
diff --git a/graphics/pokemon/veluza/overworld_normal.pal b/graphics/pokemon/veluza/overworld_normal.pal
new file mode 100644
index 0000000000..f55181bec5
--- /dev/null
+++ b/graphics/pokemon/veluza/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+122 44 122
+252 117 255
+179 64 179
+64 61 62
+0 0 0
+173 174 173
+191 194 196
+134 126 128
+105 106 108
+143 130 194
+253 253 253
+208 206 208
+195 108 89
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/veluza/overworld_shiny.pal b/graphics/pokemon/veluza/overworld_shiny.pal
new file mode 100644
index 0000000000..9fa8a8e3dd
--- /dev/null
+++ b/graphics/pokemon/veluza/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+27 103 24
+107 200 112
+67 139 77
+64 61 62
+0 0 0
+173 174 173
+191 194 196
+134 126 128
+105 106 108
+143 130 194
+253 253 253
+208 206 208
+195 108 89
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/walking_wake/overworld.png b/graphics/pokemon/walking_wake/overworld.png
new file mode 100644
index 0000000000..12ffb1bfd6
Binary files /dev/null and b/graphics/pokemon/walking_wake/overworld.png differ
diff --git a/graphics/pokemon/walking_wake/overworld_normal.pal b/graphics/pokemon/walking_wake/overworld_normal.pal
new file mode 100644
index 0000000000..a2580fab8d
--- /dev/null
+++ b/graphics/pokemon/walking_wake/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+43 21 64
+0 0 0
+160 96 176
+26 54 73
+59 112 140
+96 152 192
+152 40 40
+112 56 136
+80 80 96
+184 200 200
+232 232 248
+239 228 176
+24 56 88
+48 96 136
+251 155 60
diff --git a/graphics/pokemon/walking_wake/overworld_shiny.pal b/graphics/pokemon/walking_wake/overworld_shiny.pal
new file mode 100644
index 0000000000..06cefaba45
--- /dev/null
+++ b/graphics/pokemon/walking_wake/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+2 46 77
+0 0 0
+96 160 216
+18 67 58
+56 200 176
+144 200 232
+152 40 40
+8 88 152
+80 80 96
+184 200 200
+232 232 248
+239 228 176
+48 112 176
+96 160 216
+251 155 60
diff --git a/graphics/pokemon/wattrel/overworld.png b/graphics/pokemon/wattrel/overworld.png
new file mode 100644
index 0000000000..a73b63e0fb
Binary files /dev/null and b/graphics/pokemon/wattrel/overworld.png differ
diff --git a/graphics/pokemon/wattrel/overworld_normal.pal b/graphics/pokemon/wattrel/overworld_normal.pal
new file mode 100644
index 0000000000..00a331333a
--- /dev/null
+++ b/graphics/pokemon/wattrel/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+17 18 19
+55 57 65
+0 0 0
+255 205 55
+232 232 248
+194 119 65
+190 143 41
+115 187 191
+241 161 86
+168 168 176
+100 60 40
+130 100 38
+63 66 77
+145 165 195
+109 118 142
diff --git a/graphics/pokemon/wattrel/overworld_shiny.pal b/graphics/pokemon/wattrel/overworld_shiny.pal
new file mode 100644
index 0000000000..4b43c1a237
--- /dev/null
+++ b/graphics/pokemon/wattrel/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+80 47 43
+114 67 87
+0 0 0
+255 205 55
+232 232 248
+194 119 65
+190 143 41
+115 187 191
+241 161 86
+168 168 176
+100 60 40
+130 100 38
+67 72 84
+145 165 195
+109 118 142
diff --git a/graphics/pokemon/wiglett/overworld.png b/graphics/pokemon/wiglett/overworld.png
new file mode 100644
index 0000000000..510566c98c
Binary files /dev/null and b/graphics/pokemon/wiglett/overworld.png differ
diff --git a/graphics/pokemon/wiglett/overworld_normal.pal b/graphics/pokemon/wiglett/overworld_normal.pal
new file mode 100644
index 0000000000..d050ef424b
--- /dev/null
+++ b/graphics/pokemon/wiglett/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+115 107 120
+245 243 241
+210 207 210
+137 58 80
+182 184 207
+0 0 0
+233 95 116
+238 132 148
+87 92 132
+166 71 96
+102 143 125
+83 111 99
+154 186 172
+83 111 99
+179 203 192
diff --git a/graphics/pokemon/wiglett/overworld_shiny.pal b/graphics/pokemon/wiglett/overworld_shiny.pal
new file mode 100644
index 0000000000..b4787f3624
--- /dev/null
+++ b/graphics/pokemon/wiglett/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+105 66 31
+255 220 80
+239 174 39
+41 37 126
+31 28 94
+0 0 0
+77 89 247
+121 131 255
+15 13 45
+64 64 208
+103 152 130
+83 111 99
+154 186 172
+83 77 72
+179 203 192
diff --git a/graphics/pokemon/wo_chien/overworld.png b/graphics/pokemon/wo_chien/overworld.png
new file mode 100644
index 0000000000..65178388fb
Binary files /dev/null and b/graphics/pokemon/wo_chien/overworld.png differ
diff --git a/graphics/pokemon/wo_chien/overworld_normal.pal b/graphics/pokemon/wo_chien/overworld_normal.pal
new file mode 100644
index 0000000000..f638363e94
--- /dev/null
+++ b/graphics/pokemon/wo_chien/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+123 114 83
+72 75 63
+162 139 118
+140 151 157
+77 60 55
+185 156 96
+184 190 189
+118 180 88
+249 124 32
+97 128 68
+253 253 253
+23 31 16
+123 114 83
+0 0 0
+49 52 48
diff --git a/graphics/pokemon/wo_chien/overworld_shiny.pal b/graphics/pokemon/wo_chien/overworld_shiny.pal
new file mode 100644
index 0000000000..d8bd63a48e
--- /dev/null
+++ b/graphics/pokemon/wo_chien/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+123 114 83
+72 75 63
+162 139 118
+140 151 157
+77 60 55
+185 156 96
+184 190 189
+239 80 96
+249 124 32
+184 63 84
+253 253 253
+23 31 16
+123 114 83
+0 0 0
+49 52 48
diff --git a/graphics/pokemon/wugtrio/overworld.png b/graphics/pokemon/wugtrio/overworld.png
new file mode 100644
index 0000000000..c3d0619f1a
Binary files /dev/null and b/graphics/pokemon/wugtrio/overworld.png differ
diff --git a/graphics/pokemon/wugtrio/overworld_normal.pal b/graphics/pokemon/wugtrio/overworld_normal.pal
new file mode 100644
index 0000000000..d71097d06a
--- /dev/null
+++ b/graphics/pokemon/wugtrio/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+218 54 87
+102 28 43
+200 200 200
+159 43 86
+128 16 48
+171 147 179
+213 199 224
+193 36 68
+112 94 119
+43 57 74
+64 87 113
+88 118 143
+130 173 176
+0 0 0
diff --git a/graphics/pokemon/wugtrio/overworld_shiny.pal b/graphics/pokemon/wugtrio/overworld_shiny.pal
new file mode 100644
index 0000000000..782360162e
--- /dev/null
+++ b/graphics/pokemon/wugtrio/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+121 131 255
+41 37 126
+200 200 200
+77 89 247
+64 64 208
+217 153 34
+255 220 80
+100 112 255
+162 114 26
+43 57 74
+64 87 113
+88 118 143
+130 173 176
+0 0 0
diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk
index 3dfea83037..e97b1b5ffe 100644
--- a/spritesheet_rules.mk
+++ b/spritesheet_rules.mk
@@ -4005,6 +4005,414 @@ $(POKEMONGFXDIR)/wooper/wooper_paldean/overworld.4bpp: %.4bpp: %.png
 $(POKEMONGFXDIR)/clodsire/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
+$(POKEMONGFXDIR)/sprigatito/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/floragato/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/meowscarada/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/fuecoco/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/crocalor/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/skeledirge/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/quaxly/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/quaxwell/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/quaquaval/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/lechonk/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/oinkologne/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/oinkologne/female/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tarountula/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/spidops/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/nymble/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/lokix/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/pawmi/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/pawmo/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/pawmot/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tandemaus/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/maushold/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/maushold/four/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/fidough/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/dachsbun/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/smoliv/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/dolliv/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/arboliva/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/squawkabilly/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/squawkabilly/blue_plumage/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/squawkabilly/white_plumage/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/squawkabilly/yellow_plumage/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/nacli/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/naclstack/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/garganacl/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/charcadet/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/armarouge/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/ceruledge/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tadbulb/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/bellibolt/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/wattrel/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/kilowattrel/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/maschiff/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/mabosstiff/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/shroodle/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/grafaiai/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/bramblin/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/brambleghast/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/toedscool/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/toedscruel/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/klawf/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/capsakid/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/scovillain/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/rellor/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/rabsca/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/flittle/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/espathra/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tinkatink/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tinkatuff/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tinkaton/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/wiglett/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/wugtrio/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/bombirdier/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/finizen/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/palafin/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/palafin/hero/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/varoom/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/revavroom/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/cyclizar/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/orthworm/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/glimmet/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/glimmora/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/greavard/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/houndstone/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/flamigo/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/cetoddle/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/cetitan/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/kingambit/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 8
+
+$(POKEMONGFXDIR)/veluza/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/dondozo/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 8
+
+$(POKEMONGFXDIR)/tatsugiri/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tatsugiri/droopy/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tatsugiri/stretchy/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/annihilape/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/farigiraf/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/dudunsparce/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/dudunsparce/three_segment/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 8
+
+$(POKEMONGFXDIR)/great_tusk/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/scream_tail/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/brute_bonnet/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/slither_wing/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/flutter_mane/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/sandy_shocks/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/iron_treads/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/iron_bundle/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/iron_hands/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/iron_jugulis/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/iron_moth/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/iron_thorns/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/frigibax/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/arctibax/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/baxcalibur/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/gimmighoul/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/gholdengo/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/wo_chien/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/chien_pao/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/ting_lu/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/chi_yu/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/roaring_moon/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/iron_valiant/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/koraidon/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 8
+
+$(POKEMONGFXDIR)/miraidon/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 8
+
+$(POKEMONGFXDIR)/iron_leaves/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/walking_wake/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/dipplin/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/poltchageist/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/sinistcha/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/okidogi/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/munkidori/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/fezandipiti/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/ogerpon/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/ogerpon/cornerstone/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/ogerpon/hearthflame/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/ogerpon/wellspring/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/hydrapple/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 8
+
+$(POKEMONGFXDIR)/archaludon/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/gouging_fire/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/raging_bolt/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 8
+
+$(POKEMONGFXDIR)/iron_boulder/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/iron_crown/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/terapagos/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/terapagos/terastal/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/pecharunt/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tauros/paldean_aqua_breed/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tauros/paldean_blaze_breed/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/tauros/paldean_combat_breed/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(POKEMONGFXDIR)/ursaluna/bloodmoon/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
 $(MISCGFXDIR)/emotes.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 6387c3168f..e43fa7c565 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -1593,10 +1593,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Annihilape[] = INCBIN_COMP("graphics/pokemon/annihilape/overworld.4bpp");
+    const u32 gObjectEventPic_Annihilape[] = INCBIN_COMP("graphics/pokemon/annihilape/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_GEN_9_CROSS_EVOS
@@ -3690,9 +3690,17 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonIcon_TaurosPaldeanAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_aqua_breed/icon.4bpp");
 
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_TaurosPaldeanCombatBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_combat_breed/overworld.4bpp");
-    // const u32 gObjectEventPic_TaurosPaldeanBlazeBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_blaze_breed/overworld.4bpp");
-    // const u32 gObjectEventPic_TaurosPaldeanAquaBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_aqua_breed/overworld.4bpp");
+    const u32 gObjectEventPic_TaurosPaldeanCombatBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_combat_breed/overworld.4bpp");
+    const u32 gObjectEventPic_TaurosPaldeanBlazeBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_blaze_breed/overworld.4bpp");
+    const u32 gObjectEventPic_TaurosPaldeanAquaBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_aqua_breed/overworld.4bpp");
+#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
+    const u32 gOverworldPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/overworld_normal.gbapal.lz");
+    const u32 gOverworldPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/overworld_normal.gbapal.lz");
+    const u32 gOverworldPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/overworld_shiny.gbapal.lz");
+    const u32 gShinyOverworldPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/overworld_shiny.gbapal.lz");
+    const u32 gShinyOverworldPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/overworld_shiny.gbapal.lz");
+#endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_PALDEAN_FORMS
 #endif //P_FAMILY_TAUROS
@@ -5520,10 +5528,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Farigiraf[] = INCBIN_COMP("graphics/pokemon/farigiraf/overworld.4bpp");
+    const u32 gObjectEventPic_Farigiraf[] = INCBIN_COMP("graphics/pokemon/farigiraf/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_GEN_9_CROSS_EVOS
@@ -5588,10 +5596,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Dudunsparce[] = INCBIN_COMP("graphics/pokemon/dudunsparce/overworld.4bpp");
+    const u32 gObjectEventPic_DudunsparceTwoSegment[] = INCBIN_COMP("graphics/pokemon/dudunsparce/overworld.4bpp");
+    const u32 gObjectEventPic_DudunsparceThreeSegment[] = INCBIN_COMP("graphics/pokemon/dudunsparce/three_segment/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -5917,7 +5928,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gObjectEventPic_UrsalunaBloodmoon[] = INCBIN_COMP("graphics/pokemon/ursaluna/bloodmoon/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
     const u32 gOverworldPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/overworld_shiny.gbapal.lz");
+    const u32 gShinyOverworldPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_GEN_8_CROSS_EVOS
@@ -13759,10 +13770,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Kingambit[] = INCBIN_COMP("graphics/pokemon/kingambit/overworld.4bpp");
+    const u32 gObjectEventPic_Kingambit[] = INCBIN_COMP("graphics/pokemon/kingambit/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_GEN_9_CROSS_EVOS
@@ -18568,10 +18579,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Dipplin[] = INCBIN_COMP("graphics/pokemon/dipplin/overworld.4bpp");
+    const u32 gObjectEventPic_Dipplin[] = INCBIN_COMP("graphics/pokemon/dipplin/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -18584,10 +18595,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Hydrapple[] = INCBIN_COMP("graphics/pokemon/hydrapple/overworld.4bpp");
+    const u32 gObjectEventPic_Hydrapple[] = INCBIN_COMP("graphics/pokemon/hydrapple/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_GEN_9_CROSS_EVOS
@@ -19522,10 +19533,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Archaludon[] = INCBIN_COMP("graphics/pokemon/archaludon/overworld.4bpp");
+    const u32 gObjectEventPic_Archaludon[] = INCBIN_COMP("graphics/pokemon/archaludon/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_GEN_9_CROSS_EVOS
@@ -19893,10 +19904,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Sprigatito[] = INCBIN_COMP("graphics/pokemon/sprigatito/overworld.4bpp");
+    const u32 gObjectEventPic_Sprigatito[] = INCBIN_COMP("graphics/pokemon/sprigatito/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -19909,10 +19920,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Floragato[] = INCBIN_COMP("graphics/pokemon/floragato/overworld.4bpp");
+    const u32 gObjectEventPic_Floragato[] = INCBIN_COMP("graphics/pokemon/floragato/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -19925,10 +19936,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Meowscarada[] = INCBIN_COMP("graphics/pokemon/meowscarada/overworld.4bpp");
+    const u32 gObjectEventPic_Meowscarada[] = INCBIN_COMP("graphics/pokemon/meowscarada/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_SPRIGATITO
@@ -19943,10 +19954,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Fuecoco[] = INCBIN_COMP("graphics/pokemon/fuecoco/overworld.4bpp");
+    const u32 gObjectEventPic_Fuecoco[] = INCBIN_COMP("graphics/pokemon/fuecoco/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -19959,10 +19970,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Crocalor[] = INCBIN_COMP("graphics/pokemon/crocalor/overworld.4bpp");
+    const u32 gObjectEventPic_Crocalor[] = INCBIN_COMP("graphics/pokemon/crocalor/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -19975,10 +19986,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Skeledirge[] = INCBIN_COMP("graphics/pokemon/skeledirge/overworld.4bpp");
+    const u32 gObjectEventPic_Skeledirge[] = INCBIN_COMP("graphics/pokemon/skeledirge/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_FUECOCO
@@ -19993,10 +20004,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Quaxly[] = INCBIN_COMP("graphics/pokemon/quaxly/overworld.4bpp");
+    const u32 gObjectEventPic_Quaxly[] = INCBIN_COMP("graphics/pokemon/quaxly/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20009,10 +20020,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Quaxwell[] = INCBIN_U8("graphics/pokemon/quaxwell/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Quaxwell[] = INCBIN_COMP("graphics/pokemon/quaxwell/overworld.4bpp");
+    const u32 gObjectEventPic_Quaxwell[] = INCBIN_COMP("graphics/pokemon/quaxwell/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20025,10 +20036,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Quaquaval[] = INCBIN_COMP("graphics/pokemon/quaquaval/overworld.4bpp");
+    const u32 gObjectEventPic_Quaquaval[] = INCBIN_COMP("graphics/pokemon/quaquaval/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_QUAXLY
@@ -20043,10 +20054,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Lechonk[] = INCBIN_COMP("graphics/pokemon/lechonk/overworld.4bpp");
+    const u32 gObjectEventPic_Lechonk[] = INCBIN_COMP("graphics/pokemon/lechonk/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20059,10 +20070,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_OinkologneMale[] = INCBIN_COMP("graphics/pokemon/oinkologne/overworld.4bpp");
+    const u32 gObjectEventPic_OinkologneMale[] = INCBIN_COMP("graphics/pokemon/oinkologne/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20072,10 +20083,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/shiny.gbapal.lz");
     const u8 gMonIcon_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/oinkologne/female/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_OinkologneFemale[] = INCBIN_COMP("graphics/pokemon/oinkologne/female/overworld.4bpp");
+    const u32 gObjectEventPic_OinkologneFemale[] = INCBIN_COMP("graphics/pokemon/oinkologne/female/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_LECHONK
@@ -20090,10 +20101,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Tarountula[] = INCBIN_COMP("graphics/pokemon/tarountula/overworld.4bpp");
+    const u32 gObjectEventPic_Tarountula[] = INCBIN_COMP("graphics/pokemon/tarountula/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20106,10 +20117,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Spidops[] = INCBIN_COMP("graphics/pokemon/spidops/overworld.4bpp");
+    const u32 gObjectEventPic_Spidops[] = INCBIN_COMP("graphics/pokemon/spidops/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_TAROUNTULA
@@ -20124,10 +20135,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Nymble[] = INCBIN_COMP("graphics/pokemon/nymble/overworld.4bpp");
+    const u32 gObjectEventPic_Nymble[] = INCBIN_COMP("graphics/pokemon/nymble/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20140,10 +20151,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Lokix[] = INCBIN_COMP("graphics/pokemon/lokix/overworld.4bpp");
+    const u32 gObjectEventPic_Lokix[] = INCBIN_COMP("graphics/pokemon/lokix/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_NYMBLE
@@ -20158,10 +20169,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Pawmi[] = INCBIN_COMP("graphics/pokemon/pawmi/overworld.4bpp");
+    const u32 gObjectEventPic_Pawmi[] = INCBIN_COMP("graphics/pokemon/pawmi/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20174,10 +20185,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Pawmo[] = INCBIN_U8("graphics/pokemon/pawmo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Pawmo[] = INCBIN_COMP("graphics/pokemon/pawmo/overworld.4bpp");
+    const u32 gObjectEventPic_Pawmo[] = INCBIN_COMP("graphics/pokemon/pawmo/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20190,10 +20201,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Pawmot[] = INCBIN_COMP("graphics/pokemon/pawmot/overworld.4bpp");
+    const u32 gObjectEventPic_Pawmot[] = INCBIN_COMP("graphics/pokemon/pawmot/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_PAWMI
@@ -20208,10 +20219,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Tandemaus[] = INCBIN_COMP("graphics/pokemon/tandemaus/overworld.4bpp");
+    const u32 gObjectEventPic_Tandemaus[] = INCBIN_COMP("graphics/pokemon/tandemaus/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20225,10 +20236,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_MausholdFamilyOfThree[] = INCBIN_COMP("graphics/pokemon/maushold/overworld.4bpp");
+    const u32 gObjectEventPic_MausholdFamilyOfThree[] = INCBIN_COMP("graphics/pokemon/maushold/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20239,10 +20250,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/maushold/four/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_MausholdFamilyOfFour[] = INCBIN_COMP("graphics/pokemon/maushold/four/overworld.4bpp");
+    const u32 gObjectEventPic_MausholdFamilyOfFour[] = INCBIN_COMP("graphics/pokemon/maushold/four/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_TANDEMAUS
@@ -20257,10 +20268,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Fidough[] = INCBIN_COMP("graphics/pokemon/fidough/overworld.4bpp");
+    const u32 gObjectEventPic_Fidough[] = INCBIN_COMP("graphics/pokemon/fidough/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20273,10 +20284,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Dachsbun[] = INCBIN_COMP("graphics/pokemon/dachsbun/overworld.4bpp");
+    const u32 gObjectEventPic_Dachsbun[] = INCBIN_COMP("graphics/pokemon/dachsbun/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_FIDOUGH
@@ -20291,10 +20302,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Smoliv[] = INCBIN_COMP("graphics/pokemon/smoliv/overworld.4bpp");
+    const u32 gObjectEventPic_Smoliv[] = INCBIN_COMP("graphics/pokemon/smoliv/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20307,10 +20318,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Dolliv[] = INCBIN_COMP("graphics/pokemon/dolliv/overworld.4bpp");
+    const u32 gObjectEventPic_Dolliv[] = INCBIN_COMP("graphics/pokemon/dolliv/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20323,10 +20334,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Arboliva[] = INCBIN_COMP("graphics/pokemon/arboliva/overworld.4bpp");
+    const u32 gObjectEventPic_Arboliva[] = INCBIN_COMP("graphics/pokemon/arboliva/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_SMOLIV
@@ -20342,10 +20353,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/shiny.gbapal.lz");
     const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_SquawkabillyGreenPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/green_plumage/overworld.4bpp");
+    const u32 gObjectEventPic_SquawkabillyGreenPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20353,10 +20364,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/shiny.gbapal.lz");
     const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/blue_plumage/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_SquawkabillyBluePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/blue_plumage/overworld.4bpp");
+    const u32 gObjectEventPic_SquawkabillyBluePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/blue_plumage/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20364,10 +20375,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/shiny.gbapal.lz");
     const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/yellow_plumage/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_SquawkabillyYellowPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/yellow_plumage/overworld.4bpp");
+    const u32 gObjectEventPic_SquawkabillyYellowPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/yellow_plumage/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20375,10 +20386,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/shiny.gbapal.lz");
     const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/white_plumage/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_SquawkabillyWhitePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/white_plumage/overworld.4bpp");
+    const u32 gObjectEventPic_SquawkabillyWhitePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/white_plumage/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_SQUAWKABILLY
@@ -20393,10 +20404,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Nacli[] = INCBIN_COMP("graphics/pokemon/nacli/overworld.4bpp");
+    const u32 gObjectEventPic_Nacli[] = INCBIN_COMP("graphics/pokemon/nacli/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20409,10 +20420,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Naclstack[] = INCBIN_COMP("graphics/pokemon/naclstack/overworld.4bpp");
+    const u32 gObjectEventPic_Naclstack[] = INCBIN_COMP("graphics/pokemon/naclstack/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20425,10 +20436,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Garganacl[] = INCBIN_COMP("graphics/pokemon/garganacl/overworld.4bpp");
+    const u32 gObjectEventPic_Garganacl[] = INCBIN_COMP("graphics/pokemon/garganacl/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_NACLI
@@ -20443,10 +20454,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Charcadet[] = INCBIN_COMP("graphics/pokemon/charcadet/overworld.4bpp");
+    const u32 gObjectEventPic_Charcadet[] = INCBIN_COMP("graphics/pokemon/charcadet/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20459,10 +20470,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Armarouge[] = INCBIN_COMP("graphics/pokemon/armarouge/overworld.4bpp");
+    const u32 gObjectEventPic_Armarouge[] = INCBIN_COMP("graphics/pokemon/armarouge/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20475,10 +20486,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Ceruledge[] = INCBIN_COMP("graphics/pokemon/ceruledge/overworld.4bpp");
+    const u32 gObjectEventPic_Ceruledge[] = INCBIN_COMP("graphics/pokemon/ceruledge/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_CHARCADET
@@ -20493,10 +20504,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Tadbulb[] = INCBIN_COMP("graphics/pokemon/tadbulb/overworld.4bpp");
+    const u32 gObjectEventPic_Tadbulb[] = INCBIN_COMP("graphics/pokemon/tadbulb/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20509,10 +20520,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Bellibolt[] = INCBIN_COMP("graphics/pokemon/bellibolt/overworld.4bpp");
+    const u32 gObjectEventPic_Bellibolt[] = INCBIN_COMP("graphics/pokemon/bellibolt/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_TADBULB
@@ -20527,10 +20538,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Wattrel[] = INCBIN_COMP("graphics/pokemon/wattrel/overworld.4bpp");
+    const u32 gObjectEventPic_Wattrel[] = INCBIN_COMP("graphics/pokemon/wattrel/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20543,10 +20554,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Kilowattrel[] = INCBIN_COMP("graphics/pokemon/kilowattrel/overworld.4bpp");
+    const u32 gObjectEventPic_Kilowattrel[] = INCBIN_COMP("graphics/pokemon/kilowattrel/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_WATTREL
@@ -20561,10 +20572,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Maschiff[] = INCBIN_COMP("graphics/pokemon/maschiff/overworld.4bpp");
+    const u32 gObjectEventPic_Maschiff[] = INCBIN_COMP("graphics/pokemon/maschiff/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20577,10 +20588,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Mabosstiff[] = INCBIN_COMP("graphics/pokemon/mabosstiff/overworld.4bpp");
+    const u32 gObjectEventPic_Mabosstiff[] = INCBIN_COMP("graphics/pokemon/mabosstiff/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_MASCHIFF
@@ -20595,10 +20606,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Shroodle[] = INCBIN_COMP("graphics/pokemon/shroodle/overworld.4bpp");
+    const u32 gObjectEventPic_Shroodle[] = INCBIN_COMP("graphics/pokemon/shroodle/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20611,10 +20622,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Grafaiai[] = INCBIN_COMP("graphics/pokemon/grafaiai/overworld.4bpp");
+    const u32 gObjectEventPic_Grafaiai[] = INCBIN_COMP("graphics/pokemon/grafaiai/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_SHROODLE
@@ -20629,10 +20640,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Bramblin[] = INCBIN_U8("graphics/pokemon/bramblin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Bramblin[] = INCBIN_COMP("graphics/pokemon/bramblin/overworld.4bpp");
+    const u32 gObjectEventPic_Bramblin[] = INCBIN_COMP("graphics/pokemon/bramblin/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20645,10 +20656,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Brambleghast[] = INCBIN_COMP("graphics/pokemon/brambleghast/overworld.4bpp");
+    const u32 gObjectEventPic_Brambleghast[] = INCBIN_COMP("graphics/pokemon/brambleghast/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_BRAMBLIN
@@ -20663,10 +20674,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Toedscool[] = INCBIN_COMP("graphics/pokemon/toedscool/overworld.4bpp");
+    const u32 gObjectEventPic_Toedscool[] = INCBIN_COMP("graphics/pokemon/toedscool/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20679,10 +20690,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Toedscruel[] = INCBIN_COMP("graphics/pokemon/toedscruel/overworld.4bpp");
+    const u32 gObjectEventPic_Toedscruel[] = INCBIN_COMP("graphics/pokemon/toedscruel/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_TOEDSCOOL
@@ -20697,10 +20708,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Klawf[] = INCBIN_COMP("graphics/pokemon/klawf/overworld.4bpp");
+    const u32 gObjectEventPic_Klawf[] = INCBIN_COMP("graphics/pokemon/klawf/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_KLAWF
@@ -20715,10 +20726,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Capsakid[] = INCBIN_COMP("graphics/pokemon/capsakid/overworld.4bpp");
+    const u32 gObjectEventPic_Capsakid[] = INCBIN_COMP("graphics/pokemon/capsakid/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20731,10 +20742,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Scovillain[] = INCBIN_COMP("graphics/pokemon/scovillain/overworld.4bpp");
+    const u32 gObjectEventPic_Scovillain[] = INCBIN_COMP("graphics/pokemon/scovillain/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_CAPSAKID
@@ -20749,10 +20760,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Rellor[] = INCBIN_COMP("graphics/pokemon/rellor/overworld.4bpp");
+    const u32 gObjectEventPic_Rellor[] = INCBIN_COMP("graphics/pokemon/rellor/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20765,10 +20776,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Rabsca[] = INCBIN_COMP("graphics/pokemon/rabsca/overworld.4bpp");
+    const u32 gObjectEventPic_Rabsca[] = INCBIN_COMP("graphics/pokemon/rabsca/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_RELLOR
@@ -20783,10 +20794,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Flittle[] = INCBIN_COMP("graphics/pokemon/flittle/overworld.4bpp");
+    const u32 gObjectEventPic_Flittle[] = INCBIN_COMP("graphics/pokemon/flittle/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20799,10 +20810,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Espathra[] = INCBIN_COMP("graphics/pokemon/espathra/overworld.4bpp");
+    const u32 gObjectEventPic_Espathra[] = INCBIN_COMP("graphics/pokemon/espathra/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_FLITTLE
@@ -20817,10 +20828,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Tinkatink[] = INCBIN_COMP("graphics/pokemon/tinkatink/overworld.4bpp");
+    const u32 gObjectEventPic_Tinkatink[] = INCBIN_COMP("graphics/pokemon/tinkatink/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20833,10 +20844,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Tinkatuff[] = INCBIN_COMP("graphics/pokemon/tinkatuff/overworld.4bpp");
+    const u32 gObjectEventPic_Tinkatuff[] = INCBIN_COMP("graphics/pokemon/tinkatuff/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20849,10 +20860,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Tinkaton[] = INCBIN_U8("graphics/pokemon/tinkaton/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Tinkaton[] = INCBIN_COMP("graphics/pokemon/tinkaton/overworld.4bpp");
+    const u32 gObjectEventPic_Tinkaton[] = INCBIN_COMP("graphics/pokemon/tinkaton/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_TINKATINK
@@ -20867,10 +20878,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Wiglett[] = INCBIN_COMP("graphics/pokemon/wiglett/overworld.4bpp");
+    const u32 gObjectEventPic_Wiglett[] = INCBIN_COMP("graphics/pokemon/wiglett/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20883,10 +20894,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Wugtrio[] = INCBIN_COMP("graphics/pokemon/wugtrio/overworld.4bpp");
+    const u32 gObjectEventPic_Wugtrio[] = INCBIN_COMP("graphics/pokemon/wugtrio/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_WIGLETT
@@ -20901,10 +20912,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Bombirdier[] = INCBIN_COMP("graphics/pokemon/bombirdier/overworld.4bpp");
+    const u32 gObjectEventPic_Bombirdier[] = INCBIN_COMP("graphics/pokemon/bombirdier/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_BOMBIRDIER
@@ -20919,10 +20930,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Finizen[] = INCBIN_COMP("graphics/pokemon/finizen/overworld.4bpp");
+    const u32 gObjectEventPic_Finizen[] = INCBIN_COMP("graphics/pokemon/finizen/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20935,10 +20946,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_PalafinZero[] = INCBIN_COMP("graphics/pokemon/palafin/overworld.4bpp");
+    const u32 gObjectEventPic_PalafinZero[] = INCBIN_COMP("graphics/pokemon/palafin/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20948,10 +20959,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/shiny.gbapal.lz");
     const u8 gMonIcon_PalafinHero[] = INCBIN_U8("graphics/pokemon/palafin/hero/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_PalafinHero[] = INCBIN_COMP("graphics/pokemon/palafin/hero/overworld.4bpp");
+    const u32 gObjectEventPic_PalafinHero[] = INCBIN_COMP("graphics/pokemon/palafin/hero/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_FINIZEN
@@ -20966,10 +20977,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Varoom[] = INCBIN_COMP("graphics/pokemon/varoom/overworld.4bpp");
+    const u32 gObjectEventPic_Varoom[] = INCBIN_COMP("graphics/pokemon/varoom/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -20982,10 +20993,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Revavroom[] = INCBIN_COMP("graphics/pokemon/revavroom/overworld.4bpp");
+    const u32 gObjectEventPic_Revavroom[] = INCBIN_COMP("graphics/pokemon/revavroom/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_VAROOM
@@ -21000,10 +21011,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Cyclizar[] = INCBIN_COMP("graphics/pokemon/cyclizar/overworld.4bpp");
+    const u32 gObjectEventPic_Cyclizar[] = INCBIN_COMP("graphics/pokemon/cyclizar/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_CYCLIZAR
@@ -21018,10 +21029,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Orthworm[] = INCBIN_COMP("graphics/pokemon/orthworm/overworld.4bpp");
+    const u32 gObjectEventPic_Orthworm[] = INCBIN_COMP("graphics/pokemon/orthworm/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_ORTHWORM
@@ -21036,10 +21047,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Glimmet[] = INCBIN_COMP("graphics/pokemon/glimmet/overworld.4bpp");
+    const u32 gObjectEventPic_Glimmet[] = INCBIN_COMP("graphics/pokemon/glimmet/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21052,10 +21063,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Glimmora[] = INCBIN_COMP("graphics/pokemon/glimmora/overworld.4bpp");
+    const u32 gObjectEventPic_Glimmora[] = INCBIN_COMP("graphics/pokemon/glimmora/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_GLIMMET
@@ -21070,10 +21081,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Greavard[] = INCBIN_COMP("graphics/pokemon/greavard/overworld.4bpp");
+    const u32 gObjectEventPic_Greavard[] = INCBIN_COMP("graphics/pokemon/greavard/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21086,10 +21097,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Houndstone[] = INCBIN_COMP("graphics/pokemon/houndstone/overworld.4bpp");
+    const u32 gObjectEventPic_Houndstone[] = INCBIN_COMP("graphics/pokemon/houndstone/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_GREAVARD
@@ -21104,10 +21115,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Flamigo[] = INCBIN_COMP("graphics/pokemon/flamigo/overworld.4bpp");
+    const u32 gObjectEventPic_Flamigo[] = INCBIN_COMP("graphics/pokemon/flamigo/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_FLAMIGO
@@ -21122,10 +21133,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Cetoddle[] = INCBIN_COMP("graphics/pokemon/cetoddle/overworld.4bpp");
+    const u32 gObjectEventPic_Cetoddle[] = INCBIN_COMP("graphics/pokemon/cetoddle/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21138,10 +21149,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Cetitan[] = INCBIN_COMP("graphics/pokemon/cetitan/overworld.4bpp");
+    const u32 gObjectEventPic_Cetitan[] = INCBIN_COMP("graphics/pokemon/cetitan/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_CETODDLE
@@ -21156,10 +21167,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Veluza[] = INCBIN_COMP("graphics/pokemon/veluza/overworld.4bpp");
+    const u32 gObjectEventPic_Veluza[] = INCBIN_COMP("graphics/pokemon/veluza/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_VELUZA
@@ -21174,10 +21185,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Dondozo[] = INCBIN_COMP("graphics/pokemon/dondozo/overworld.4bpp");
+    const u32 gObjectEventPic_Dondozo[] = INCBIN_COMP("graphics/pokemon/dondozo/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_DONDOZO
@@ -21192,10 +21203,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_TatsugiriCurly[] = INCBIN_COMP("graphics/pokemon/tatsugiri/curly/overworld.4bpp");
+    const u32 gObjectEventPic_TatsugiriCurly[] = INCBIN_COMP("graphics/pokemon/tatsugiri/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21205,10 +21216,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/shiny.gbapal.lz");
     const u8 gMonIcon_TatsugiriDroopy[] = INCBIN_U8("graphics/pokemon/tatsugiri/droopy/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_TatsugiriDroopy[] = INCBIN_COMP("graphics/pokemon/tatsugiri/droopy/overworld.4bpp");
+    const u32 gObjectEventPic_TatsugiriDroopy[] = INCBIN_COMP("graphics/pokemon/tatsugiri/droopy/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21218,10 +21229,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/shiny.gbapal.lz");
     const u8 gMonIcon_TatsugiriStretchy[] = INCBIN_U8("graphics/pokemon/tatsugiri/stretchy/icon.4bpp");
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_TatsugiriStretchy[] = INCBIN_COMP("graphics/pokemon/tatsugiri/stretchy/overworld.4bpp");
+    const u32 gObjectEventPic_TatsugiriStretchy[] = INCBIN_COMP("graphics/pokemon/tatsugiri/stretchy/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_DONDOZO
@@ -21236,10 +21247,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_GreatTusk[] = INCBIN_COMP("graphics/pokemon/great_tusk/overworld.4bpp");
+    const u32 gObjectEventPic_GreatTusk[] = INCBIN_COMP("graphics/pokemon/great_tusk/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_GREAT_TUSK
@@ -21254,10 +21265,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_ScreamTail[] = INCBIN_COMP("graphics/pokemon/scream_tail/overworld.4bpp");
+    const u32 gObjectEventPic_ScreamTail[] = INCBIN_COMP("graphics/pokemon/scream_tail/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_SCREAM_TAIL
@@ -21272,10 +21283,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_BruteBonnet[] = INCBIN_COMP("graphics/pokemon/brute_bonnet/overworld.4bpp");
+    const u32 gObjectEventPic_BruteBonnet[] = INCBIN_COMP("graphics/pokemon/brute_bonnet/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_BRUTE_BONNET
@@ -21290,10 +21301,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_FlutterMane[] = INCBIN_COMP("graphics/pokemon/flutter_mane/overworld.4bpp");
+    const u32 gObjectEventPic_FlutterMane[] = INCBIN_COMP("graphics/pokemon/flutter_mane/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_FLUTTER_MANE
@@ -21308,10 +21319,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_SlitherWing[] = INCBIN_U8("graphics/pokemon/slither_wing/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_SlitherWing[] = INCBIN_COMP("graphics/pokemon/slither_wing/overworld.4bpp");
+    const u32 gObjectEventPic_SlitherWing[] = INCBIN_COMP("graphics/pokemon/slither_wing/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_SLITHER_WING
@@ -21326,10 +21337,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_SandyShocks[] = INCBIN_U8("graphics/pokemon/sandy_shocks/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_SandyShocks[] = INCBIN_COMP("graphics/pokemon/sandy_shocks/overworld.4bpp");
+    const u32 gObjectEventPic_SandyShocks[] = INCBIN_COMP("graphics/pokemon/sandy_shocks/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_SANDY_SHOCKS
@@ -21344,10 +21355,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronTreads[] = INCBIN_COMP("graphics/pokemon/iron_treads/overworld.4bpp");
+    const u32 gObjectEventPic_IronTreads[] = INCBIN_COMP("graphics/pokemon/iron_treads/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_TREADS
@@ -21362,10 +21373,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronBundle[] = INCBIN_COMP("graphics/pokemon/iron_bundle/overworld.4bpp");
+    const u32 gObjectEventPic_IronBundle[] = INCBIN_COMP("graphics/pokemon/iron_bundle/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_BUNDLE
@@ -21380,10 +21391,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronHands[] = INCBIN_COMP("graphics/pokemon/iron_hands/overworld.4bpp");
+    const u32 gObjectEventPic_IronHands[] = INCBIN_COMP("graphics/pokemon/iron_hands/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_HANDS
@@ -21398,10 +21409,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronJugulis[] = INCBIN_U8("graphics/pokemon/iron_jugulis/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronJugulis[] = INCBIN_COMP("graphics/pokemon/iron_jugulis/overworld.4bpp");
+    const u32 gObjectEventPic_IronJugulis[] = INCBIN_COMP("graphics/pokemon/iron_jugulis/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_JUGULIS
@@ -21416,10 +21427,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronMoth[] = INCBIN_COMP("graphics/pokemon/iron_moth/overworld.4bpp");
+    const u32 gObjectEventPic_IronMoth[] = INCBIN_COMP("graphics/pokemon/iron_moth/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_MOTH
@@ -21434,10 +21445,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronThorns[] = INCBIN_COMP("graphics/pokemon/iron_thorns/overworld.4bpp");
+    const u32 gObjectEventPic_IronThorns[] = INCBIN_COMP("graphics/pokemon/iron_thorns/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_THORNS
@@ -21452,10 +21463,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Frigibax[] = INCBIN_COMP("graphics/pokemon/frigibax/overworld.4bpp");
+    const u32 gObjectEventPic_Frigibax[] = INCBIN_COMP("graphics/pokemon/frigibax/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21468,10 +21479,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Arctibax[] = INCBIN_COMP("graphics/pokemon/arctibax/overworld.4bpp");
+    const u32 gObjectEventPic_Arctibax[] = INCBIN_COMP("graphics/pokemon/arctibax/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21484,10 +21495,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Baxcalibur[] = INCBIN_COMP("graphics/pokemon/baxcalibur/overworld.4bpp");
+    const u32 gObjectEventPic_Baxcalibur[] = INCBIN_COMP("graphics/pokemon/baxcalibur/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_FRIGIBAX
@@ -21502,10 +21513,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_GimmighoulChest[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_GimmighoulChest[] = INCBIN_COMP("graphics/pokemon/gimmighoul/overworld.4bpp");
+    const u32 gObjectEventPic_GimmighoulChest[] = INCBIN_COMP("graphics/pokemon/gimmighoul/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21518,10 +21529,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gimmighoul/roaming/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_GimmighoulRoaming[] = INCBIN_COMP("graphics/pokemon/gimmighoul/roaming/overworld.4bpp");
+//    const u32 gObjectEventPic_GimmighoulRoaming[] = INCBIN_COMP("graphics/pokemon/gimmighoul/roaming/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/overworld_shiny.gbapal.lz");
+//    const u32 gOverworldPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/overworld_normal.gbapal.lz");
+//    const u32 gShinyOverworldPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21534,10 +21545,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Gholdengo[] = INCBIN_COMP("graphics/pokemon/gholdengo/overworld.4bpp");
+    const u32 gObjectEventPic_Gholdengo[] = INCBIN_COMP("graphics/pokemon/gholdengo/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_GIMMIGHOUL
@@ -21552,10 +21563,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_WoChien[] = INCBIN_U8("graphics/pokemon/wo_chien/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_WoChien[] = INCBIN_COMP("graphics/pokemon/wo_chien/overworld.4bpp");
+    const u32 gObjectEventPic_WoChien[] = INCBIN_COMP("graphics/pokemon/wo_chien/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_WO_CHIEN
@@ -21570,10 +21581,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_ChienPao[] = INCBIN_U8("graphics/pokemon/chien_pao/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_ChienPao[] = INCBIN_COMP("graphics/pokemon/chien_pao/overworld.4bpp");
+    const u32 gObjectEventPic_ChienPao[] = INCBIN_COMP("graphics/pokemon/chien_pao/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_CHIEN_PAO
@@ -21588,10 +21599,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_TingLu[] = INCBIN_U8("graphics/pokemon/ting_lu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_TingLu[] = INCBIN_COMP("graphics/pokemon/ting_lu/overworld.4bpp");
+    const u32 gObjectEventPic_TingLu[] = INCBIN_COMP("graphics/pokemon/ting_lu/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_TING_LU
@@ -21606,10 +21617,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_ChiYu[] = INCBIN_COMP("graphics/pokemon/chi_yu/overworld.4bpp");
+    const u32 gObjectEventPic_ChiYu[] = INCBIN_COMP("graphics/pokemon/chi_yu/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_CHI_YU
@@ -21624,10 +21635,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_RoaringMoon[] = INCBIN_COMP("graphics/pokemon/roaring_moon/overworld.4bpp");
+    const u32 gObjectEventPic_RoaringMoon[] = INCBIN_COMP("graphics/pokemon/roaring_moon/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_ROARING_MOON
@@ -21642,10 +21653,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronValiant[] = INCBIN_COMP("graphics/pokemon/iron_valiant/overworld.4bpp");
+    const u32 gObjectEventPic_IronValiant[] = INCBIN_COMP("graphics/pokemon/iron_valiant/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_VALIANT
@@ -21660,10 +21671,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Koraidon[] = INCBIN_COMP("graphics/pokemon/koraidon/overworld.4bpp");
+    const u32 gObjectEventPic_Koraidon[] = INCBIN_COMP("graphics/pokemon/koraidon/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_KORAIDON
@@ -21678,10 +21689,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Miraidon[] = INCBIN_U8("graphics/pokemon/miraidon/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Miraidon[] = INCBIN_COMP("graphics/pokemon/miraidon/overworld.4bpp");
+    const u32 gObjectEventPic_Miraidon[] = INCBIN_COMP("graphics/pokemon/miraidon/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_MIRAIDON
@@ -21696,10 +21707,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_WalkingWake[] = INCBIN_COMP("graphics/pokemon/walking_wake/overworld.4bpp");
+    const u32 gObjectEventPic_WalkingWake[] = INCBIN_COMP("graphics/pokemon/walking_wake/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_WALKING_WAKE
@@ -21714,10 +21725,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronLeaves[] = INCBIN_COMP("graphics/pokemon/iron_leaves/overworld.4bpp");
+    const u32 gObjectEventPic_IronLeaves[] = INCBIN_COMP("graphics/pokemon/iron_leaves/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_LEAVES
@@ -21732,10 +21743,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Poltchageist[] = INCBIN_COMP("graphics/pokemon/poltchageist/overworld.4bpp");
+    const u32 gObjectEventPic_Poltchageist[] = INCBIN_COMP("graphics/pokemon/poltchageist/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21748,10 +21759,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Sinistcha[] = INCBIN_COMP("graphics/pokemon/sinistcha/overworld.4bpp");
+    const u32 gObjectEventPic_Sinistcha[] = INCBIN_COMP("graphics/pokemon/sinistcha/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_POLTCHAGEIST
@@ -21766,10 +21777,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Okidogi[] = INCBIN_COMP("graphics/pokemon/okidogi/overworld.4bpp");
+    const u32 gObjectEventPic_Okidogi[] = INCBIN_COMP("graphics/pokemon/okidogi/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_OKIDOGI
@@ -21784,10 +21795,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Munkidori[] = INCBIN_COMP("graphics/pokemon/munkidori/overworld.4bpp");
+    const u32 gObjectEventPic_Munkidori[] = INCBIN_COMP("graphics/pokemon/munkidori/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_MUNKIDORI
@@ -21802,10 +21813,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Fezandipiti[] = INCBIN_COMP("graphics/pokemon/fezandipiti/overworld.4bpp");
+    const u32 gObjectEventPic_Fezandipiti[] = INCBIN_COMP("graphics/pokemon/fezandipiti/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_FEZANDIPITI
@@ -21859,10 +21870,31 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz");
 
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_OgerponTealMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/overworld.4bpp");
-    // const u32 gObjectEventPic_OgerponWellspringMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/wellspring/overworld.4bpp");
-    // const u32 gObjectEventPic_OgerponHearthflameMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/hearthflame/overworld.4bpp");
-    // const u32 gObjectEventPic_OgerponCornerstoneMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/cornerstone/overworld.4bpp");
+    const u32 gObjectEventPic_OgerponTealMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/overworld.4bpp");
+    const u32 gObjectEventPic_OgerponWellspringMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/wellspring/overworld.4bpp");
+    const u32 gObjectEventPic_OgerponHearthflameMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/hearthflame/overworld.4bpp");
+    const u32 gObjectEventPic_OgerponCornerstoneMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/cornerstone/overworld.4bpp");
+    const u32 gOverworldPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_shiny.gbapal.lz");
+    
+    const u32 gObjectEventPic_OgerponTealMaskTeraTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/overworld.4bpp");
+    const u32 gObjectEventPic_OgerponWellspringMaskTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/wellspring/overworld.4bpp");
+    const u32 gObjectEventPic_OgerponHearthflameMaskTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/hearthflame/overworld.4bpp");
+    const u32 gObjectEventPic_OgerponCornerstoneMaskTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/cornerstone/overworld.4bpp");
+    const u32 gOverworldPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_shiny.gbapal.lz");
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_OGERPON
 
@@ -21876,10 +21908,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_GougingFire[] = INCBIN_COMP("graphics/pokemon/gouging_fire/overworld.4bpp");
+    const u32 gObjectEventPic_GougingFire[] = INCBIN_COMP("graphics/pokemon/gouging_fire/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_GOUGING_FIRE
@@ -21894,10 +21926,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_RagingBolt[] = INCBIN_COMP("graphics/pokemon/raging_bolt/overworld.4bpp");
+    const u32 gObjectEventPic_RagingBolt[] = INCBIN_COMP("graphics/pokemon/raging_bolt/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_RAGING_BOLT
@@ -21912,10 +21944,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronBoulder[] = INCBIN_COMP("graphics/pokemon/iron_boulder/overworld.4bpp");
+    const u32 gObjectEventPic_IronBoulder[] = INCBIN_COMP("graphics/pokemon/iron_boulder/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_BOULDER
@@ -21930,10 +21962,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_IronCrown[] = INCBIN_COMP("graphics/pokemon/iron_crown/overworld.4bpp");
+    const u32 gObjectEventPic_IronCrown[] = INCBIN_COMP("graphics/pokemon/iron_crown/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_IRON_CROWN
@@ -21948,10 +21980,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_TerapagosNormal[] = INCBIN_COMP("graphics/pokemon/terapagos/overworld.4bpp");
+    const u32 gObjectEventPic_TerapagosNormal[] = INCBIN_COMP("graphics/pokemon/terapagos/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21964,10 +21996,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_TerapagosTerastal[] = INCBIN_COMP("graphics/pokemon/terapagos/terastal/overworld.4bpp");
+    const u32 gObjectEventPic_TerapagosTerastal[] = INCBIN_COMP("graphics/pokemon/terapagos/terastal/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 
@@ -21980,10 +22012,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/terapagos/stellar/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_TerapagosStellar[] = INCBIN_COMP("graphics/pokemon/terapagos/stellar/overworld.4bpp");
+//    const u32 gObjectEventPic_TerapagosStellar[] = INCBIN_COMP("graphics/pokemon/terapagos/stellar/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/overworld_shiny.gbapal.lz");
+//    const u32 gOverworldPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/overworld_normal.gbapal.lz");
+//    const u32 gShinyOverworldPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_TERAPAGOS
@@ -21998,10 +22030,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
     const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp");
 #endif //P_FOOTPRINTS
 #if OW_POKEMON_OBJECT_EVENTS
-    // const u32 gObjectEventPic_Pecharunt[] = INCBIN_COMP("graphics/pokemon/pecharunt/overworld.4bpp");
+    const u32 gObjectEventPic_Pecharunt[] = INCBIN_COMP("graphics/pokemon/pecharunt/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
-    // const u32 gOverworldPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/overworld_normal.gbapal.lz");
-    // const u32 gShinyOverworldPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/overworld_shiny.gbapal.lz");
+    const u32 gOverworldPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/overworld_normal.gbapal.lz");
+    const u32 gShinyOverworldPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/overworld_shiny.gbapal.lz");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_PECHARUNT
diff --git a/src/data/object_events/object_event_pic_tables_followers.h b/src/data/object_events/object_event_pic_tables_followers.h
index b71dee44ef..1e20ef3798 100644
--- a/src/data/object_events/object_event_pic_tables_followers.h
+++ b/src/data/object_events/object_event_pic_tables_followers.h
@@ -432,9 +432,9 @@ static const struct SpriteFrameImage sPicTable_Primeape[] = {
     overworld_ascending_frames(gObjectEventPic_Primeape, 4, 4),
 };
 #if P_GEN_9_CROSS_EVOS
-/*static const struct SpriteFrameImage sPicTable_Annihilape[] = {
+static const struct SpriteFrameImage sPicTable_Annihilape[] = {
     overworld_ascending_frames(gObjectEventPic_Annihilape, 4, 4),
-};*/
+};
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_MANKEY
 
@@ -1010,7 +1010,7 @@ static const struct SpriteFrameImage sPicTable_Tauros[] = {
     overworld_ascending_frames(gObjectEventPic_Tauros, 4, 4),
 };
 #if P_PALDEAN_FORMS
-/*static const struct SpriteFrameImage sPicTable_TaurosPaldeanCombatBreed[] = {
+static const struct SpriteFrameImage sPicTable_TaurosPaldeanCombatBreed[] = {
     overworld_ascending_frames(gObjectEventPic_TaurosPaldeanCombatBreed, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_TaurosPaldeanBlazeBreed[] = {
@@ -1018,7 +1018,7 @@ static const struct SpriteFrameImage sPicTable_TaurosPaldeanBlazeBreed[] = {
 };
 static const struct SpriteFrameImage sPicTable_TaurosPaldeanAquaBreed[] = {
     overworld_ascending_frames(gObjectEventPic_TaurosPaldeanAquaBreed, 4, 4),
-};*/
+};
 #endif //P_PALDEAN_FORMS
 #endif //P_FAMILY_TAUROS
 
@@ -1560,9 +1560,9 @@ static const struct SpriteFrameImage sPicTable_Girafarig[] = {
     overworld_ascending_frames(gObjectEventPic_Girafarig, 4, 4),
 };
 #if P_GEN_9_CROSS_EVOS
-/*static const struct SpriteFrameImage sPicTable_Farigiraf[] = {
+static const struct SpriteFrameImage sPicTable_Farigiraf[] = {
     overworld_ascending_frames(gObjectEventPic_Farigiraf, 4, 4),
-};*/
+};
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_GIRAFARIG
 
@@ -1580,9 +1580,12 @@ static const struct SpriteFrameImage sPicTable_Dunsparce[] = {
     overworld_ascending_frames(gObjectEventPic_Dunsparce, 4, 4),
 };
 #if P_GEN_9_CROSS_EVOS
-/*static const struct SpriteFrameImage sPicTable_Dudunsparce[] = {
-    overworld_ascending_frames(gObjectEventPic_Dudunsparce, 4, 4),
-};*/
+static const struct SpriteFrameImage sPicTable_DudunsparceTwoSegment[] = {
+    overworld_ascending_frames(gObjectEventPic_DudunsparceTwoSegment, 4, 4),
+};
+static const struct SpriteFrameImage sPicTable_DudunsparceThreeSegment[] = {
+    overworld_ascending_frames(gObjectEventPic_DudunsparceThreeSegment, 8, 8),
+};
 
 
 #endif //P_GEN_9_CROSS_EVOS
@@ -3820,9 +3823,9 @@ static const struct SpriteFrameImage sPicTable_Bisharp[] = {
     overworld_ascending_frames(gObjectEventPic_Bisharp, 4, 4),
 };
 #if P_GEN_9_CROSS_EVOS
-/*static const struct SpriteFrameImage sPicTable_Kingambit[] = {
-    overworld_ascending_frames(gObjectEventPic_Kingambit, 4, 4),
-};*/
+static const struct SpriteFrameImage sPicTable_Kingambit[] = {
+    overworld_ascending_frames(gObjectEventPic_Kingambit, 8, 8),
+};
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_PAWNIARD
 
@@ -4481,13 +4484,13 @@ static const struct SpriteFrameImage sPicTable_Yveltal[] = {
 static const struct SpriteFrameImage sPicTable_Zygarde50[] = {
     overworld_ascending_frames(gObjectEventPic_Zygarde50, 4, 4),
 };
-/*static const struct SpriteFrameImage sPicTable_Zygarde10[] = {
-    overworld_ascending_frames(gObjectEventPic_Zygarde10, 4, 4),
-};
-static const struct SpriteFrameImage sPicTable_ZygardeComplete[] = {
-    overworld_ascending_frames(gObjectEventPic_ZygardeComplete, 4, 4),
-};
-*/
+//static const struct SpriteFrameImage sPicTable_Zygarde10[] = {
+//    overworld_ascending_frames(gObjectEventPic_Zygarde10, 4, 4),
+//};
+//static const struct SpriteFrameImage sPicTable_ZygardeComplete[] = {
+//    overworld_ascending_frames(gObjectEventPic_ZygardeComplete, 4, 4),
+//};
+
 #endif //P_FAMILY_ZYGARDE
 
 #if P_FAMILY_DIANCIE
@@ -5200,12 +5203,12 @@ static const struct SpriteFrameImage sPicTable_Appletun[] = {
 #endif //P_GIGANTAMAX_FORMS
 
 #if P_GEN_9_CROSS_EVOS
-/*static const struct SpriteFrameImage sPicTable_Dipplin[] = {
+static const struct SpriteFrameImage sPicTable_Dipplin[] = {
     overworld_ascending_frames(gObjectEventPic_Dipplin, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Hydrapple[] = {
-    overworld_ascending_frames(gObjectEventPic_Hydrapple, 4, 4),
-};*/
+    overworld_ascending_frames(gObjectEventPic_Hydrapple, 8, 8),
+};
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_APPLIN
 
@@ -5445,9 +5448,9 @@ static const struct SpriteFrameImage sPicTable_Duraludon[] = {
 #endif //P_GIGANTAMAX_FORMS
 
 #if P_GEN_9_CROSS_EVOS
-/*static const struct SpriteFrameImage sPicTable_Archaludon[] = {
+static const struct SpriteFrameImage sPicTable_Archaludon[] = {
     overworld_ascending_frames(gObjectEventPic_Archaludon, 4, 4),
-};*/
+};
 #endif //P_GEN_9_CROSS_EVOS
 #endif //P_FAMILY_DURALUDON
 
@@ -5559,7 +5562,7 @@ static const struct SpriteFrameImage sPicTable_CalyrexShadowRider[] = {
 #endif //P_FAMILY_CALYREX
 
 #if P_FAMILY_SPRIGATITO
-/*static const struct SpriteFrameImage sPicTable_Sprigatito[] = {
+static const struct SpriteFrameImage sPicTable_Sprigatito[] = {
     overworld_ascending_frames(gObjectEventPic_Sprigatito, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Floragato[] = {
@@ -5567,11 +5570,11 @@ static const struct SpriteFrameImage sPicTable_Floragato[] = {
 };
 static const struct SpriteFrameImage sPicTable_Meowscarada[] = {
     overworld_ascending_frames(gObjectEventPic_Meowscarada, 4, 4),
-};*/
+};
 #endif //P_FAMILY_SPRIGATITO
 
 #if P_FAMILY_FUECOCO
-/*static const struct SpriteFrameImage sPicTable_Fuecoco[] = {
+static const struct SpriteFrameImage sPicTable_Fuecoco[] = {
     overworld_ascending_frames(gObjectEventPic_Fuecoco, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Crocalor[] = {
@@ -5579,11 +5582,11 @@ static const struct SpriteFrameImage sPicTable_Crocalor[] = {
 };
 static const struct SpriteFrameImage sPicTable_Skeledirge[] = {
     overworld_ascending_frames(gObjectEventPic_Skeledirge, 4, 4),
-};*/
+};
 #endif //P_FAMILY_FUECOCO
 
 #if P_FAMILY_QUAXLY
-/*static const struct SpriteFrameImage sPicTable_Quaxly[] = {
+static const struct SpriteFrameImage sPicTable_Quaxly[] = {
     overworld_ascending_frames(gObjectEventPic_Quaxly, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Quaxwell[] = {
@@ -5591,11 +5594,11 @@ static const struct SpriteFrameImage sPicTable_Quaxwell[] = {
 };
 static const struct SpriteFrameImage sPicTable_Quaquaval[] = {
     overworld_ascending_frames(gObjectEventPic_Quaquaval, 4, 4),
-};*/
+};
 #endif //P_FAMILY_QUAXLY
 
 #if P_FAMILY_LECHONK
-/*static const struct SpriteFrameImage sPicTable_Lechonk[] = {
+static const struct SpriteFrameImage sPicTable_Lechonk[] = {
     overworld_ascending_frames(gObjectEventPic_Lechonk, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_OinkologneMale[] = {
@@ -5603,29 +5606,29 @@ static const struct SpriteFrameImage sPicTable_OinkologneMale[] = {
 };
 static const struct SpriteFrameImage sPicTable_OinkologneFemale[] = {
     overworld_ascending_frames(gObjectEventPic_OinkologneFemale, 4, 4),
-};*/
+};
 #endif //P_FAMILY_LECHONK
 
 #if P_FAMILY_TAROUNTULA
-/*static const struct SpriteFrameImage sPicTable_Tarountula[] = {
+static const struct SpriteFrameImage sPicTable_Tarountula[] = {
     overworld_ascending_frames(gObjectEventPic_Tarountula, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Spidops[] = {
     overworld_ascending_frames(gObjectEventPic_Spidops, 4, 4),
-};*/
+};
 #endif //P_FAMILY_TAROUNTULA
 
 #if P_FAMILY_NYMBLE
-/*static const struct SpriteFrameImage sPicTable_Nymble[] = {
+static const struct SpriteFrameImage sPicTable_Nymble[] = {
     overworld_ascending_frames(gObjectEventPic_Nymble, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Lokix[] = {
     overworld_ascending_frames(gObjectEventPic_Lokix, 4, 4),
-};*/
+};
 #endif //P_FAMILY_NYMBLE
 
 #if P_FAMILY_PAWMI
-/*static const struct SpriteFrameImage sPicTable_Pawmi[] = {
+static const struct SpriteFrameImage sPicTable_Pawmi[] = {
     overworld_ascending_frames(gObjectEventPic_Pawmi, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Pawmo[] = {
@@ -5633,11 +5636,11 @@ static const struct SpriteFrameImage sPicTable_Pawmo[] = {
 };
 static const struct SpriteFrameImage sPicTable_Pawmot[] = {
     overworld_ascending_frames(gObjectEventPic_Pawmot, 4, 4),
-};*/
+};
 #endif //P_FAMILY_PAWMI
 
 #if P_FAMILY_TANDEMAUS
-/*static const struct SpriteFrameImage sPicTable_Tandemaus[] = {
+static const struct SpriteFrameImage sPicTable_Tandemaus[] = {
     overworld_ascending_frames(gObjectEventPic_Tandemaus, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_MausholdFamilyOfThree[] = {
@@ -5645,20 +5648,20 @@ static const struct SpriteFrameImage sPicTable_MausholdFamilyOfThree[] = {
 };
 static const struct SpriteFrameImage sPicTable_MausholdFamilyOfFour[] = {
     overworld_ascending_frames(gObjectEventPic_MausholdFamilyOfFour, 4, 4),
-};*/
+};
 #endif //P_FAMILY_TANDEMAUS
 
 #if P_FAMILY_FIDOUGH
-/*static const struct SpriteFrameImage sPicTable_Fidough[] = {
+static const struct SpriteFrameImage sPicTable_Fidough[] = {
     overworld_ascending_frames(gObjectEventPic_Fidough, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Dachsbun[] = {
     overworld_ascending_frames(gObjectEventPic_Dachsbun, 4, 4),
-};*/
+};
 #endif //P_FAMILY_FIDOUGH
 
 #if P_FAMILY_SMOLIV
-/*static const struct SpriteFrameImage sPicTable_Smoliv[] = {
+static const struct SpriteFrameImage sPicTable_Smoliv[] = {
     overworld_ascending_frames(gObjectEventPic_Smoliv, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Dolliv[] = {
@@ -5666,11 +5669,11 @@ static const struct SpriteFrameImage sPicTable_Dolliv[] = {
 };
 static const struct SpriteFrameImage sPicTable_Arboliva[] = {
     overworld_ascending_frames(gObjectEventPic_Arboliva, 4, 4),
-};*/
+};
 #endif //P_FAMILY_SMOLIV
 
 #if P_FAMILY_SQUAWKABILLY
-/*static const struct SpriteFrameImage sPicTable_SquawkabillyGreenPlumage[] = {
+static const struct SpriteFrameImage sPicTable_SquawkabillyGreenPlumage[] = {
     overworld_ascending_frames(gObjectEventPic_SquawkabillyGreenPlumage, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_SquawkabillyBluePlumage[] = {
@@ -5681,11 +5684,11 @@ static const struct SpriteFrameImage sPicTable_SquawkabillyYellowPlumage[] = {
 };
 static const struct SpriteFrameImage sPicTable_SquawkabillyWhitePlumage[] = {
     overworld_ascending_frames(gObjectEventPic_SquawkabillyWhitePlumage, 4, 4),
-};*/
+};
 #endif //P_FAMILY_SQUAWKABILLY
 
 #if P_FAMILY_NACLI
-/*static const struct SpriteFrameImage sPicTable_Nacli[] = {
+static const struct SpriteFrameImage sPicTable_Nacli[] = {
     overworld_ascending_frames(gObjectEventPic_Nacli, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Naclstack[] = {
@@ -5693,11 +5696,11 @@ static const struct SpriteFrameImage sPicTable_Naclstack[] = {
 };
 static const struct SpriteFrameImage sPicTable_Garganacl[] = {
     overworld_ascending_frames(gObjectEventPic_Garganacl, 4, 4),
-};*/
+};
 #endif //P_FAMILY_NACLI
 
 #if P_FAMILY_CHARCADET
-/*static const struct SpriteFrameImage sPicTable_Charcadet[] = {
+static const struct SpriteFrameImage sPicTable_Charcadet[] = {
     overworld_ascending_frames(gObjectEventPic_Charcadet, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Armarouge[] = {
@@ -5705,98 +5708,98 @@ static const struct SpriteFrameImage sPicTable_Armarouge[] = {
 };
 static const struct SpriteFrameImage sPicTable_Ceruledge[] = {
     overworld_ascending_frames(gObjectEventPic_Ceruledge, 4, 4),
-};*/
+};
 #endif //P_FAMILY_CHARCADET
 
 #if P_FAMILY_TADBULB
-/*static const struct SpriteFrameImage sPicTable_Tadbulb[] = {
+static const struct SpriteFrameImage sPicTable_Tadbulb[] = {
     overworld_ascending_frames(gObjectEventPic_Tadbulb, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Bellibolt[] = {
     overworld_ascending_frames(gObjectEventPic_Bellibolt, 4, 4),
-};*/
+};
 #endif //P_FAMILY_TADBULB
 
 #if P_FAMILY_WATTREL
-/*static const struct SpriteFrameImage sPicTable_Wattrel[] = {
+static const struct SpriteFrameImage sPicTable_Wattrel[] = {
     overworld_ascending_frames(gObjectEventPic_Wattrel, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Kilowattrel[] = {
     overworld_ascending_frames(gObjectEventPic_Kilowattrel, 4, 4),
-};*/
+};
 #endif //P_FAMILY_WATTREL
 
 #if P_FAMILY_MASCHIFF
-/*static const struct SpriteFrameImage sPicTable_Maschiff[] = {
+static const struct SpriteFrameImage sPicTable_Maschiff[] = {
     overworld_ascending_frames(gObjectEventPic_Maschiff, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Mabosstiff[] = {
     overworld_ascending_frames(gObjectEventPic_Mabosstiff, 4, 4),
-};*/
+};
 #endif //P_FAMILY_MASCHIFF
 
 #if P_FAMILY_SHROODLE
-/*static const struct SpriteFrameImage sPicTable_Shroodle[] = {
+static const struct SpriteFrameImage sPicTable_Shroodle[] = {
     overworld_ascending_frames(gObjectEventPic_Shroodle, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Grafaiai[] = {
     overworld_ascending_frames(gObjectEventPic_Grafaiai, 4, 4),
-};*/
+};
 #endif //P_FAMILY_SHROODLE
 
 #if P_FAMILY_BRAMBLIN
-/*static const struct SpriteFrameImage sPicTable_Bramblin[] = {
+static const struct SpriteFrameImage sPicTable_Bramblin[] = {
     overworld_ascending_frames(gObjectEventPic_Bramblin, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Brambleghast[] = {
     overworld_ascending_frames(gObjectEventPic_Brambleghast, 4, 4),
-};*/
+};
 #endif //P_FAMILY_BRAMBLIN
 
 #if P_FAMILY_TOEDSCOOL
-/*static const struct SpriteFrameImage sPicTable_Toedscool[] = {
+static const struct SpriteFrameImage sPicTable_Toedscool[] = {
     overworld_ascending_frames(gObjectEventPic_Toedscool, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Toedscruel[] = {
     overworld_ascending_frames(gObjectEventPic_Toedscruel, 4, 4),
-};*/
+};
 #endif //P_FAMILY_TOEDSCOOL
 
 #if P_FAMILY_KLAWF
-/*static const struct SpriteFrameImage sPicTable_Klawf[] = {
+static const struct SpriteFrameImage sPicTable_Klawf[] = {
     overworld_ascending_frames(gObjectEventPic_Klawf, 4, 4),
-};*/
+};
 #endif //P_FAMILY_KLAWF
 
 #if P_FAMILY_CAPSAKID
-/*static const struct SpriteFrameImage sPicTable_Capsakid[] = {
+static const struct SpriteFrameImage sPicTable_Capsakid[] = {
     overworld_ascending_frames(gObjectEventPic_Capsakid, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Scovillain[] = {
     overworld_ascending_frames(gObjectEventPic_Scovillain, 4, 4),
-};*/
+};
 #endif //P_FAMILY_CAPSAKID
 
 #if P_FAMILY_RELLOR
-/*static const struct SpriteFrameImage sPicTable_Rellor[] = {
+static const struct SpriteFrameImage sPicTable_Rellor[] = {
     overworld_ascending_frames(gObjectEventPic_Rellor, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Rabsca[] = {
     overworld_ascending_frames(gObjectEventPic_Rabsca, 4, 4),
-};*/
+};
 #endif //P_FAMILY_RELLOR
 
 #if P_FAMILY_FLITTLE
-/*static const struct SpriteFrameImage sPicTable_Flittle[] = {
+static const struct SpriteFrameImage sPicTable_Flittle[] = {
     overworld_ascending_frames(gObjectEventPic_Flittle, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Espathra[] = {
     overworld_ascending_frames(gObjectEventPic_Espathra, 4, 4),
-};*/
+};
 #endif //P_FAMILY_FLITTLE
 
 #if P_FAMILY_TINKATINK
-/*static const struct SpriteFrameImage sPicTable_Tinkatink[] = {
+static const struct SpriteFrameImage sPicTable_Tinkatink[] = {
     overworld_ascending_frames(gObjectEventPic_Tinkatink, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Tinkatuff[] = {
@@ -5804,26 +5807,26 @@ static const struct SpriteFrameImage sPicTable_Tinkatuff[] = {
 };
 static const struct SpriteFrameImage sPicTable_Tinkaton[] = {
     overworld_ascending_frames(gObjectEventPic_Tinkaton, 4, 4),
-};*/
+};
 #endif //P_FAMILY_TINKATINK
 
 #if P_FAMILY_WIGLETT
-/*static const struct SpriteFrameImage sPicTable_Wiglett[] = {
+static const struct SpriteFrameImage sPicTable_Wiglett[] = {
     overworld_ascending_frames(gObjectEventPic_Wiglett, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Wugtrio[] = {
     overworld_ascending_frames(gObjectEventPic_Wugtrio, 4, 4),
-};*/
+};
 #endif //P_FAMILY_WIGLETT
 
 #if P_FAMILY_BOMBIRDIER
-/*static const struct SpriteFrameImage sPicTable_Bombirdier[] = {
+static const struct SpriteFrameImage sPicTable_Bombirdier[] = {
     overworld_ascending_frames(gObjectEventPic_Bombirdier, 4, 4),
-};*/
+};
 #endif //P_FAMILY_BOMBIRDIER
 
 #if P_FAMILY_FINIZEN
-/*static const struct SpriteFrameImage sPicTable_Finizen[] = {
+static const struct SpriteFrameImage sPicTable_Finizen[] = {
     overworld_ascending_frames(gObjectEventPic_Finizen, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_PalafinZero[] = {
@@ -5831,77 +5834,77 @@ static const struct SpriteFrameImage sPicTable_PalafinZero[] = {
 };
 static const struct SpriteFrameImage sPicTable_PalafinHero[] = {
     overworld_ascending_frames(gObjectEventPic_PalafinHero, 4, 4),
-};*/
+};
 #endif //P_FAMILY_FINIZEN
 
 #if P_FAMILY_VAROOM
-/*static const struct SpriteFrameImage sPicTable_Varoom[] = {
+static const struct SpriteFrameImage sPicTable_Varoom[] = {
     overworld_ascending_frames(gObjectEventPic_Varoom, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Revavroom[] = {
     overworld_ascending_frames(gObjectEventPic_Revavroom, 4, 4),
-};*/
+};
 #endif //P_FAMILY_VAROOM
 
 #if P_FAMILY_CYCLIZAR
-/*static const struct SpriteFrameImage sPicTable_Cyclizar[] = {
+static const struct SpriteFrameImage sPicTable_Cyclizar[] = {
     overworld_ascending_frames(gObjectEventPic_Cyclizar, 4, 4),
-};*/
+};
 #endif //P_FAMILY_CYCLIZAR
 
 #if P_FAMILY_ORTHWORM
-/*static const struct SpriteFrameImage sPicTable_Orthworm[] = {
+static const struct SpriteFrameImage sPicTable_Orthworm[] = {
     overworld_ascending_frames(gObjectEventPic_Orthworm, 4, 4),
-};*/
+};
 #endif //P_FAMILY_ORTHWORM
 
 #if P_FAMILY_GLIMMET
-/*static const struct SpriteFrameImage sPicTable_Glimmet[] = {
+static const struct SpriteFrameImage sPicTable_Glimmet[] = {
     overworld_ascending_frames(gObjectEventPic_Glimmet, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Glimmora[] = {
     overworld_ascending_frames(gObjectEventPic_Glimmora, 4, 4),
-};*/
+};
 #endif //P_FAMILY_GLIMMET
 
 #if P_FAMILY_GREAVARD
-/*static const struct SpriteFrameImage sPicTable_Greavard[] = {
+static const struct SpriteFrameImage sPicTable_Greavard[] = {
     overworld_ascending_frames(gObjectEventPic_Greavard, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Houndstone[] = {
     overworld_ascending_frames(gObjectEventPic_Houndstone, 4, 4),
-};*/
+};
 #endif //P_FAMILY_GREAVARD
 
 #if P_FAMILY_FLAMIGO
-/*static const struct SpriteFrameImage sPicTable_Flamigo[] = {
+static const struct SpriteFrameImage sPicTable_Flamigo[] = {
     overworld_ascending_frames(gObjectEventPic_Flamigo, 4, 4),
-};*/
+};
 #endif //P_FAMILY_FLAMIGO
 
 #if P_FAMILY_CETODDLE
-/*static const struct SpriteFrameImage sPicTable_Cetoddle[] = {
+static const struct SpriteFrameImage sPicTable_Cetoddle[] = {
     overworld_ascending_frames(gObjectEventPic_Cetoddle, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Cetitan[] = {
     overworld_ascending_frames(gObjectEventPic_Cetitan, 4, 4),
-};*/
+};
 #endif //P_FAMILY_CETODDLE
 
 #if P_FAMILY_VELUZA
-/*static const struct SpriteFrameImage sPicTable_Veluza[] = {
+static const struct SpriteFrameImage sPicTable_Veluza[] = {
     overworld_ascending_frames(gObjectEventPic_Veluza, 4, 4),
-};*/
+};
 #endif //P_FAMILY_VELUZA
 
 #if P_FAMILY_DONDOZO
-/*static const struct SpriteFrameImage sPicTable_Dondozo[] = {
-    overworld_ascending_frames(gObjectEventPic_Dondozo, 4, 4),
-};*/
+static const struct SpriteFrameImage sPicTable_Dondozo[] = {
+    overworld_ascending_frames(gObjectEventPic_Dondozo, 8, 8),
+};
 #endif //P_FAMILY_DONDOZO
 
 #if P_FAMILY_TATSUGIRI
-/*static const struct SpriteFrameImage sPicTable_TatsugiriCurly[] = {
+static const struct SpriteFrameImage sPicTable_TatsugiriCurly[] = {
     overworld_ascending_frames(gObjectEventPic_TatsugiriCurly, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_TatsugiriDroopy[] = {
@@ -5909,83 +5912,83 @@ static const struct SpriteFrameImage sPicTable_TatsugiriDroopy[] = {
 };
 static const struct SpriteFrameImage sPicTable_TatsugiriStretchy[] = {
     overworld_ascending_frames(gObjectEventPic_TatsugiriStretchy, 4, 4),
-};*/
+};
 #endif //P_FAMILY_DONDOZO
 
 #if P_FAMILY_GREAT_TUSK
-/*static const struct SpriteFrameImage sPicTable_GreatTusk[] = {
+static const struct SpriteFrameImage sPicTable_GreatTusk[] = {
     overworld_ascending_frames(gObjectEventPic_GreatTusk, 4, 4),
-};*/
+};
 #endif //P_FAMILY_GREAT_TUSK
 
 #if P_FAMILY_SCREAM_TAIL
-/*static const struct SpriteFrameImage sPicTable_ScreamTail[] = {
+static const struct SpriteFrameImage sPicTable_ScreamTail[] = {
     overworld_ascending_frames(gObjectEventPic_ScreamTail, 4, 4),
-};*/
+};
 #endif //P_FAMILY_SCREAM_TAIL
 
 #if P_FAMILY_BRUTE_BONNET
-/*static const struct SpriteFrameImage sPicTable_BruteBonnet[] = {
+static const struct SpriteFrameImage sPicTable_BruteBonnet[] = {
     overworld_ascending_frames(gObjectEventPic_BruteBonnet, 4, 4),
-};*/
+};
 #endif //P_FAMILY_BRUTE_BONNET
 
 #if P_FAMILY_FLUTTER_MANE
-/*static const struct SpriteFrameImage sPicTable_FlutterMane[] = {
+static const struct SpriteFrameImage sPicTable_FlutterMane[] = {
     overworld_ascending_frames(gObjectEventPic_FlutterMane, 4, 4),
-};*/
+};
 #endif //P_FAMILY_FLUTTER_MANE
 
 #if P_FAMILY_SLITHER_WING
-/*static const struct SpriteFrameImage sPicTable_SlitherWing[] = {
+static const struct SpriteFrameImage sPicTable_SlitherWing[] = {
     overworld_ascending_frames(gObjectEventPic_SlitherWing, 4, 4),
-};*/
+};
 #endif //P_FAMILY_SLITHER_WING
 
 #if P_FAMILY_SANDY_SHOCKS
-/*static const struct SpriteFrameImage sPicTable_SandyShocks[] = {
+static const struct SpriteFrameImage sPicTable_SandyShocks[] = {
     overworld_ascending_frames(gObjectEventPic_SandyShocks, 4, 4),
-};*/
+};
 #endif //P_FAMILY_SANDY_SHOCKS
 
 #if P_FAMILY_IRON_TREADS
-/*static const struct SpriteFrameImage sPicTable_IronTreads[] = {
+static const struct SpriteFrameImage sPicTable_IronTreads[] = {
     overworld_ascending_frames(gObjectEventPic_IronTreads, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_TREADS
 
 #if P_FAMILY_IRON_BUNDLE
-/*static const struct SpriteFrameImage sPicTable_IronBundle[] = {
+static const struct SpriteFrameImage sPicTable_IronBundle[] = {
     overworld_ascending_frames(gObjectEventPic_IronBundle, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_BUNDLE
 
 #if P_FAMILY_IRON_HANDS
-/*static const struct SpriteFrameImage sPicTable_IronHands[] = {
+static const struct SpriteFrameImage sPicTable_IronHands[] = {
     overworld_ascending_frames(gObjectEventPic_IronHands, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_HANDS
 
 #if P_FAMILY_IRON_JUGULIS
-/*static const struct SpriteFrameImage sPicTable_IronJugulis[] = {
+static const struct SpriteFrameImage sPicTable_IronJugulis[] = {
     overworld_ascending_frames(gObjectEventPic_IronJugulis, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_JUGULIS
 
 #if P_FAMILY_IRON_MOTH
-/*static const struct SpriteFrameImage sPicTable_IronMoth[] = {
+static const struct SpriteFrameImage sPicTable_IronMoth[] = {
     overworld_ascending_frames(gObjectEventPic_IronMoth, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_MOTH
 
 #if P_FAMILY_IRON_THORNS
-/*static const struct SpriteFrameImage sPicTable_IronThorns[] = {
+static const struct SpriteFrameImage sPicTable_IronThorns[] = {
     overworld_ascending_frames(gObjectEventPic_IronThorns, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_THORNS
 
 #if P_FAMILY_FRIGIBAX
-/*static const struct SpriteFrameImage sPicTable_Frigibax[] = {
+static const struct SpriteFrameImage sPicTable_Frigibax[] = {
     overworld_ascending_frames(gObjectEventPic_Frigibax, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Arctibax[] = {
@@ -5993,110 +5996,110 @@ static const struct SpriteFrameImage sPicTable_Arctibax[] = {
 };
 static const struct SpriteFrameImage sPicTable_Baxcalibur[] = {
     overworld_ascending_frames(gObjectEventPic_Baxcalibur, 4, 4),
-};*/
+};
 #endif //P_FAMILY_FRIGIBAX
 
 #if P_FAMILY_GIMMIGHOUL
-/*static const struct SpriteFrameImage sPicTable_GimmighoulChest[] = {
+static const struct SpriteFrameImage sPicTable_GimmighoulChest[] = {
     overworld_ascending_frames(gObjectEventPic_GimmighoulChest, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_GimmighoulRoaming[] = {
-    overworld_ascending_frames(gObjectEventPic_GimmighoulRoaming, 4, 4),
-};
+//static const struct SpriteFrameImage sPicTable_GimmighoulRoaming[] = {
+//    overworld_ascending_frames(gObjectEventPic_GimmighoulRoaming, 4, 4),
+//};
 static const struct SpriteFrameImage sPicTable_Gholdengo[] = {
     overworld_ascending_frames(gObjectEventPic_Gholdengo, 4, 4),
-};*/
+};
 #endif //P_FAMILY_GIMMIGHOUL
 
 #if P_FAMILY_WO_CHIEN
-/*static const struct SpriteFrameImage sPicTable_WoChien[] = {
+static const struct SpriteFrameImage sPicTable_WoChien[] = {
     overworld_ascending_frames(gObjectEventPic_WoChien, 4, 4),
-};*/
+};
 #endif //P_FAMILY_WO_CHIEN
 
 #if P_FAMILY_CHIEN_PAO
-/*static const struct SpriteFrameImage sPicTable_ChienPao[] = {
+static const struct SpriteFrameImage sPicTable_ChienPao[] = {
     overworld_ascending_frames(gObjectEventPic_ChienPao, 4, 4),
-};*/
+};
 #endif //P_FAMILY_CHIEN_PAO
 
 #if P_FAMILY_TING_LU
-/*static const struct SpriteFrameImage sPicTable_TingLu[] = {
+static const struct SpriteFrameImage sPicTable_TingLu[] = {
     overworld_ascending_frames(gObjectEventPic_TingLu, 4, 4),
-};*/
+};
 #endif //P_FAMILY_TING_LU
 
 #if P_FAMILY_CHI_YU
-/*static const struct SpriteFrameImage sPicTable_ChiYu[] = {
+static const struct SpriteFrameImage sPicTable_ChiYu[] = {
     overworld_ascending_frames(gObjectEventPic_ChiYu, 4, 4),
-};*/
+};
 #endif //P_FAMILY_CHI_YU
 
 #if P_FAMILY_ROARING_MOON
-/*static const struct SpriteFrameImage sPicTable_RoaringMoon[] = {
+static const struct SpriteFrameImage sPicTable_RoaringMoon[] = {
     overworld_ascending_frames(gObjectEventPic_RoaringMoon, 4, 4),
-};*/
+};
 #endif //P_FAMILY_ROARING_MOON
 
 #if P_FAMILY_IRON_VALIANT
-/*static const struct SpriteFrameImage sPicTable_IronValiant[] = {
+static const struct SpriteFrameImage sPicTable_IronValiant[] = {
     overworld_ascending_frames(gObjectEventPic_IronValiant, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_VALIANT
 
 #if P_FAMILY_KORAIDON
-/*static const struct SpriteFrameImage sPicTable_Koraidon[] = {
-    overworld_ascending_frames(gObjectEventPic_Koraidon, 4, 4),
-};*/
+static const struct SpriteFrameImage sPicTable_Koraidon[] = {
+    overworld_ascending_frames(gObjectEventPic_Koraidon, 8, 8),
+};
 #endif //P_FAMILY_KORAIDON
 
 #if P_FAMILY_MIRAIDON
-/*static const struct SpriteFrameImage sPicTable_Miraidon[] = {
-    overworld_ascending_frames(gObjectEventPic_Miraidon, 4, 4),
-};*/
+static const struct SpriteFrameImage sPicTable_Miraidon[] = {
+    overworld_ascending_frames(gObjectEventPic_Miraidon, 8, 8),
+};
 #endif //P_FAMILY_MIRAIDON
 
 #if P_FAMILY_WALKING_WAKE
-/*static const struct SpriteFrameImage sPicTable_WalkingWake[] = {
+static const struct SpriteFrameImage sPicTable_WalkingWake[] = {
     overworld_ascending_frames(gObjectEventPic_WalkingWake, 4, 4),
-};*/
+};
 #endif //P_FAMILY_WALKING_WAKE
 
 #if P_FAMILY_IRON_LEAVES
-/*static const struct SpriteFrameImage sPicTable_IronLeaves[] = {
+static const struct SpriteFrameImage sPicTable_IronLeaves[] = {
     overworld_ascending_frames(gObjectEventPic_IronLeaves, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_LEAVES
 
 #if P_FAMILY_POLTCHAGEIST
-/*static const struct SpriteFrameImage sPicTable_Poltchageist[] = {
+static const struct SpriteFrameImage sPicTable_Poltchageist[] = {
     overworld_ascending_frames(gObjectEventPic_Poltchageist, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_Sinistcha[] = {
     overworld_ascending_frames(gObjectEventPic_Sinistcha, 4, 4),
-};*/
+};
 #endif //P_FAMILY_POLTCHAGEIST
 
 #if P_FAMILY_OKIDOGI
-/*static const struct SpriteFrameImage sPicTable_Okidogi[] = {
+static const struct SpriteFrameImage sPicTable_Okidogi[] = {
     overworld_ascending_frames(gObjectEventPic_Okidogi, 4, 4),
-};*/
+};
 #endif //P_FAMILY_OKIDOGI
 
 #if P_FAMILY_MUNKIDORI
-/*static const struct SpriteFrameImage sPicTable_Munkidori[] = {
+static const struct SpriteFrameImage sPicTable_Munkidori[] = {
     overworld_ascending_frames(gObjectEventPic_Munkidori, 4, 4),
-};*/
+};
 #endif //P_FAMILY_MUNKIDORI
 
 #if P_FAMILY_FEZANDIPITI
-/*static const struct SpriteFrameImage sPicTable_Fezandipiti[] = {
+static const struct SpriteFrameImage sPicTable_Fezandipiti[] = {
     overworld_ascending_frames(gObjectEventPic_Fezandipiti, 4, 4),
-};*/
+};
 #endif //P_FAMILY_FEZANDIPITI
 
 #if P_FAMILY_OGERPON
-/*static const struct SpriteFrameImage sPicTable_OgerponTealMask[] = {
+static const struct SpriteFrameImage sPicTable_OgerponTealMask[] = {
     overworld_ascending_frames(gObjectEventPic_OgerponTealMask, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_OgerponWellspringMask[] = {
@@ -6107,49 +6110,61 @@ static const struct SpriteFrameImage sPicTable_OgerponHearthflameMask[] = {
 };
 static const struct SpriteFrameImage sPicTable_OgerponCornerstoneMask[] = {
     overworld_ascending_frames(gObjectEventPic_OgerponCornerstoneMask, 4, 4),
-};*/
+};
+static const struct SpriteFrameImage sPicTable_OgerponTealMaskTera[] = {
+    overworld_ascending_frames(gObjectEventPic_OgerponTealMask, 4, 4),
+};
+static const struct SpriteFrameImage sPicTable_OgerponWellspringMaskTera[] = {
+    overworld_ascending_frames(gObjectEventPic_OgerponWellspringMask, 4, 4),
+};
+static const struct SpriteFrameImage sPicTable_OgerponHearthflameMaskTera[] = {
+    overworld_ascending_frames(gObjectEventPic_OgerponHearthflameMask, 4, 4),
+};
+static const struct SpriteFrameImage sPicTable_OgerponCornerstoneMaskTera[] = {
+    overworld_ascending_frames(gObjectEventPic_OgerponCornerstoneMask, 4, 4),
+};
 #endif //P_FAMILY_OGERPON
 
 #if P_FAMILY_GOUGING_FIRE
-/*static const struct SpriteFrameImage sPicTable_GougingFire[] = {
+static const struct SpriteFrameImage sPicTable_GougingFire[] = {
     overworld_ascending_frames(gObjectEventPic_GougingFire, 4, 4),
-};*/
+};
 #endif //P_FAMILY_GOUGING_FIRE
 
 #if P_FAMILY_RAGING_BOLT
-/*static const struct SpriteFrameImage sPicTable_RagingBolt[] = {
-    overworld_ascending_frames(gObjectEventPic_RagingBolt, 4, 4),
-};*/
+static const struct SpriteFrameImage sPicTable_RagingBolt[] = {
+    overworld_ascending_frames(gObjectEventPic_RagingBolt, 8, 8),
+};
 #endif //P_FAMILY_RAGING_BOLT
 
 #if P_FAMILY_IRON_BOULDER
-/*static const struct SpriteFrameImage sPicTable_IronBoulder[] = {
+static const struct SpriteFrameImage sPicTable_IronBoulder[] = {
     overworld_ascending_frames(gObjectEventPic_IronBoulder, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_BOULDER
 
 #if P_FAMILY_IRON_CROWN
-/*static const struct SpriteFrameImage sPicTable_IronCrown[] = {
+static const struct SpriteFrameImage sPicTable_IronCrown[] = {
     overworld_ascending_frames(gObjectEventPic_IronCrown, 4, 4),
-};*/
+};
 #endif //P_FAMILY_IRON_CROWN
 
 #if P_FAMILY_TERAPAGOS
-/*static const struct SpriteFrameImage sPicTable_TerapagosNormal[] = {
+static const struct SpriteFrameImage sPicTable_TerapagosNormal[] = {
     overworld_ascending_frames(gObjectEventPic_TerapagosNormal, 4, 4),
 };
 static const struct SpriteFrameImage sPicTable_TerapagosTerastal[] = {
     overworld_ascending_frames(gObjectEventPic_TerapagosTerastal, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_TerapagosStellar[] = {
-    overworld_ascending_frames(gObjectEventPic_TerapagosStellar, 4, 4),
-};*/
+//static const struct SpriteFrameImage sPicTable_TerapagosStellar[] = {
+//    overworld_ascending_frames(gObjectEventPic_TerapagosStellar, 4, 4),
+//};
 #endif //P_FAMILY_TERAPAGOS
 
 #if P_FAMILY_PECHARUNT
-/*static const struct SpriteFrameImage sPicTable_Pecharunt[] = {
+static const struct SpriteFrameImage sPicTable_Pecharunt[] = {
     overworld_ascending_frames(gObjectEventPic_Pecharunt, 4, 4),
-};*/
+};
 #endif //P_FAMILY_PECHARUNT
 
 #endif //OW_POKEMON_OBJECT_EVENTS
diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h
index e35bb848b7..386418fa2c 100644
--- a/src/data/pokemon/species_info/gen_1_families.h
+++ b/src/data/pokemon/species_info/gen_1_families.h
@@ -6709,6 +6709,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
         .iconSprite = gMonIcon_Annihilape,
         .iconPalIndex = 0,
         FOOTPRINT(Annihilape)
+        OVERWORLD(
+            sPicTable_Annihilape,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Annihilape,
+            gShinyOverworldPalette_Annihilape
+        )
         .levelUpLearnset = sAnnihilapeLevelUpLearnset,
         .teachableLearnset = sAnnihilapeTeachableLearnset,
     },
@@ -14883,6 +14891,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
         .iconSprite = gMonIcon_TaurosPaldeanCombatBreed,
         .iconPalIndex = 0,
         FOOTPRINT(Tauros)
+        OVERWORLD(
+            sPicTable_TaurosPaldeanCombatBreed,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_TaurosPaldeanCombatBreed,
+            gShinyOverworldPalette_TaurosPaldeanCombatBreed
+        )
         .isPaldeanForm = TRUE,
         .levelUpLearnset = sTaurosPaldeanCombatBreedLevelUpLearnset,
         .teachableLearnset = sTaurosPaldeanCombatBreedTeachableLearnset,
@@ -14938,6 +14954,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
         .iconSprite = gMonIcon_TaurosPaldeanBlazeBreed,
         .iconPalIndex = 0,
         FOOTPRINT(Tauros)
+        OVERWORLD(
+            sPicTable_TaurosPaldeanBlazeBreed,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_TaurosPaldeanBlazeBreed,
+            gShinyOverworldPalette_TaurosPaldeanBlazeBreed
+        )
         .isPaldeanForm = TRUE,
         .levelUpLearnset = sTaurosPaldeanBlazeBreedLevelUpLearnset,
         .teachableLearnset = sTaurosPaldeanBlazeBreedTeachableLearnset,
@@ -14993,6 +15017,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
         .iconSprite = gMonIcon_TaurosPaldeanAquaBreed,
         .iconPalIndex = 0,
         FOOTPRINT(Tauros)
+        OVERWORLD(
+            sPicTable_TaurosPaldeanAquaBreed,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_TaurosPaldeanAquaBreed,
+            gShinyOverworldPalette_TaurosPaldeanAquaBreed
+        )
         .isPaldeanForm = TRUE,
         .levelUpLearnset = sTaurosPaldeanAquaBreedLevelUpLearnset,
         .teachableLearnset = sTaurosPaldeanAquaBreedTeachableLearnset,
diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h
index d566975ab2..5dcabda292 100644
--- a/src/data/pokemon/species_info/gen_2_families.h
+++ b/src/data/pokemon/species_info/gen_2_families.h
@@ -3692,6 +3692,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
         .iconSprite = gMonIcon_Farigiraf,
         .iconPalIndex = 0,
         FOOTPRINT(Farigiraf)
+        OVERWORLD(
+            sPicTable_Farigiraf,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Farigiraf,
+            gShinyOverworldPalette_Farigiraf
+        )
         .levelUpLearnset = sFarigirafLevelUpLearnset,
         .teachableLearnset = sFarigirafTeachableLearnset,
     },
@@ -3942,6 +3950,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
         .iconSprite = gMonIcon_Dudunsparce,
         .iconPalIndex = 0,
         FOOTPRINT(Dudunsparce)
+        OVERWORLD(
+            sPicTable_DudunsparceTwoSegment,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_SLITHER,
+            gOverworldPalette_Dudunsparce,
+            gShinyOverworldPalette_Dudunsparce
+        )
         .levelUpLearnset = sDudunsparceLevelUpLearnset,
         .teachableLearnset = sDudunsparceTeachableLearnset,
         .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable,
@@ -3995,6 +4011,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
         .iconSprite = gMonIcon_Dudunsparce,
         .iconPalIndex = 0,
         FOOTPRINT(Dudunsparce)
+        OVERWORLD(
+            sPicTable_DudunsparceThreeSegment,
+            SIZE_64x64,
+            SHADOW_SIZE_M,
+            TRACKS_SLITHER,
+            gOverworldPalette_DudunsparceThreeSegment,
+            gShinyOverworldPalette_DudunsparceThreeSegment
+        )
         .levelUpLearnset = sDudunsparceLevelUpLearnset,
         .teachableLearnset = sDudunsparceTeachableLearnset,
         .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable,
diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h
index ffa2dd4a1c..d73559f169 100644
--- a/src/data/pokemon/species_info/gen_5_families.h
+++ b/src/data/pokemon/species_info/gen_5_families.h
@@ -9915,6 +9915,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
         .iconSprite = gMonIcon_Kingambit,
         .iconPalIndex = 0,
         FOOTPRINT(Kingambit)
+        OVERWORLD(
+            sPicTable_Kingambit,
+            SIZE_64x64,
+            SHADOW_SIZE_L,
+            TRACKS_NONE,
+            gOverworldPalette_Kingambit,
+            gShinyOverworldPalette_Kingambit
+        )
         .levelUpLearnset = sKingambitLevelUpLearnset,
         .teachableLearnset = sKingambitTeachableLearnset,
     },
diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h
index fd52785a54..2f63abf560 100644
--- a/src/data/pokemon/species_info/gen_8_families.h
+++ b/src/data/pokemon/species_info/gen_8_families.h
@@ -2620,6 +2620,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
         .iconSprite = gMonIcon_Dipplin,
         .iconPalIndex = 1,
         FOOTPRINT(Dipplin)
+        OVERWORLD(
+            sPicTable_Dipplin,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Dipplin,
+            gShinyOverworldPalette_Dipplin
+        )
         .levelUpLearnset = sDipplinLevelUpLearnset,
         .teachableLearnset = sDipplinTeachableLearnset,
         .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_CHEER, SPECIES_HYDRAPPLE}),
@@ -2673,6 +2681,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
         .iconSprite = gMonIcon_Hydrapple,
         .iconPalIndex = 5,
         FOOTPRINT(Hydrapple)
+        OVERWORLD(
+            sPicTable_Hydrapple,
+            SIZE_64x64,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Hydrapple,
+            gShinyOverworldPalette_Hydrapple
+        )
         .levelUpLearnset = sHydrappleLevelUpLearnset,
         .teachableLearnset = sHydrappleTeachableLearnset,
     },
@@ -6018,6 +6034,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
         .iconSprite = gMonIcon_Archaludon,
         .iconPalIndex = 0,
         FOOTPRINT(Archaludon)
+        OVERWORLD(
+            sPicTable_Archaludon,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Archaludon,
+            gShinyOverworldPalette_Archaludon
+        )
         .levelUpLearnset = sArchaludonLevelUpLearnset,
         .teachableLearnset = sArchaludonTeachableLearnset,
     },
diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h
index a59dd88fe2..554c0c1d9b 100644
--- a/src/data/pokemon/species_info/gen_9_families.h
+++ b/src/data/pokemon/species_info/gen_9_families.h
@@ -52,6 +52,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Sprigatito,
         .iconPalIndex = 1,
         FOOTPRINT(Sprigatito)
+        OVERWORLD(
+            sPicTable_Sprigatito,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Sprigatito,
+            gShinyOverworldPalette_Sprigatito
+        )
         .levelUpLearnset = sSprigatitoLevelUpLearnset,
         .teachableLearnset = sSprigatitoTeachableLearnset,
         .eggMoveLearnset = sSprigatitoEggMoveLearnset,
@@ -106,6 +114,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Floragato,
         .iconPalIndex = 1,
         FOOTPRINT(Floragato)
+        OVERWORLD(
+            sPicTable_Floragato,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Floragato,
+            gShinyOverworldPalette_Floragato
+        )
         .levelUpLearnset = sFloragatoLevelUpLearnset,
         .teachableLearnset = sFloragatoTeachableLearnset,
         .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_MEOWSCARADA}),
@@ -159,6 +175,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Meowscarada,
         .iconPalIndex = 1,
         FOOTPRINT(Meowscarada)
+        OVERWORLD(
+            sPicTable_Meowscarada,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Meowscarada,
+            gShinyOverworldPalette_Meowscarada
+        )
         .levelUpLearnset = sMeowscaradaLevelUpLearnset,
         .teachableLearnset = sMeowscaradaTeachableLearnset,
     },
@@ -213,6 +237,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Fuecoco,
         .iconPalIndex = 2,
         FOOTPRINT(Fuecoco)
+        OVERWORLD(
+            sPicTable_Fuecoco,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Fuecoco,
+            gShinyOverworldPalette_Fuecoco
+        )
         .levelUpLearnset = sFuecocoLevelUpLearnset,
         .teachableLearnset = sFuecocoTeachableLearnset,
         .eggMoveLearnset = sFuecocoEggMoveLearnset,
@@ -267,6 +299,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Crocalor,
         .iconPalIndex = 0,
         FOOTPRINT(Crocalor)
+        OVERWORLD(
+            sPicTable_Crocalor,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Crocalor,
+            gShinyOverworldPalette_Crocalor
+        )
         .levelUpLearnset = sCrocalorLevelUpLearnset,
         .teachableLearnset = sCrocalorTeachableLearnset,
         .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SKELEDIRGE}),
@@ -320,6 +360,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Skeledirge,
         .iconPalIndex = 0,
         FOOTPRINT(Skeledirge)
+        OVERWORLD(
+            sPicTable_Skeledirge,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Skeledirge,
+            gShinyOverworldPalette_Skeledirge
+        )
         .levelUpLearnset = sSkeledirgeLevelUpLearnset,
         .teachableLearnset = sSkeledirgeTeachableLearnset,
     },
@@ -374,6 +422,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Quaxly,
         .iconPalIndex = 0,
         FOOTPRINT(Quaxly)
+        OVERWORLD(
+            sPicTable_Quaxly,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Quaxly,
+            gShinyOverworldPalette_Quaxly
+        )
         .levelUpLearnset = sQuaxlyLevelUpLearnset,
         .teachableLearnset = sQuaxlyTeachableLearnset,
         .eggMoveLearnset = sQuaxlyEggMoveLearnset,
@@ -428,6 +484,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Quaxwell,
         .iconPalIndex = 0,
         FOOTPRINT(Quaxwell)
+        OVERWORLD(
+            sPicTable_Quaxwell,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Quaxwell,
+            gShinyOverworldPalette_Quaxwell
+        )
         .levelUpLearnset = sQuaxwellLevelUpLearnset,
         .teachableLearnset = sQuaxwellTeachableLearnset,
         .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_QUAQUAVAL}),
@@ -481,6 +545,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Quaquaval,
         .iconPalIndex = 0,
         FOOTPRINT(Quaquaval)
+        OVERWORLD(
+            sPicTable_Quaquaval,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Quaquaval,
+            gShinyOverworldPalette_Quaquaval
+        )
         .levelUpLearnset = sQuaquavalLevelUpLearnset,
         .teachableLearnset = sQuaquavalTeachableLearnset,
     },
@@ -535,6 +607,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Lechonk,
         .iconPalIndex = 1,
         FOOTPRINT(Lechonk)
+        OVERWORLD(
+            sPicTable_Lechonk,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Lechonk,
+            gShinyOverworldPalette_Lechonk
+        )
         .levelUpLearnset = sLechonkLevelUpLearnset,
         .teachableLearnset = sLechonkTeachableLearnset,
         .eggMoveLearnset = sLechonkEggMoveLearnset,
@@ -589,6 +669,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_OinkologneMale,
         .iconPalIndex = 1,
         FOOTPRINT(Oinkologne)
+        OVERWORLD(
+            sPicTable_OinkologneMale,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_OinkologneMale,
+            gShinyOverworldPalette_OinkologneMale
+        )
         .levelUpLearnset = sOinkologneMaleLevelUpLearnset,
         .teachableLearnset = sOinkologneTeachableLearnset,
         .formSpeciesIdTable = sOinkologneFormSpeciesIdTable,
@@ -642,6 +730,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_OinkologneFemale,
         .iconPalIndex = 0,
         FOOTPRINT(Oinkologne)
+        OVERWORLD(
+            sPicTable_OinkologneFemale,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_OinkologneFemale,
+            gShinyOverworldPalette_OinkologneFemale
+        )
         .levelUpLearnset = sOinkologneFemaleLevelUpLearnset,
         .teachableLearnset = sOinkologneTeachableLearnset,
         .formSpeciesIdTable = sOinkologneFormSpeciesIdTable,
@@ -697,6 +793,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Tarountula,
         .iconPalIndex = 1,
         FOOTPRINT(Tarountula)
+        OVERWORLD(
+            sPicTable_Tarountula,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_BUG,
+            gOverworldPalette_Tarountula,
+            gShinyOverworldPalette_Tarountula
+        )
         .levelUpLearnset = sTarountulaLevelUpLearnset,
         .teachableLearnset = sTarountulaTeachableLearnset,
         .eggMoveLearnset = sTarountulaEggMoveLearnset,
@@ -751,6 +855,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Spidops,
         .iconPalIndex = 1,
         FOOTPRINT(Spidops)
+        OVERWORLD(
+            sPicTable_Spidops,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Spidops,
+            gShinyOverworldPalette_Spidops
+        )
         .levelUpLearnset = sSpidopsLevelUpLearnset,
         .teachableLearnset = sSpidopsTeachableLearnset,
     },
@@ -805,6 +917,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Nymble,
         .iconPalIndex = 0,
         FOOTPRINT(Nymble)
+        OVERWORLD(
+            sPicTable_Nymble,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_BUG,
+            gOverworldPalette_Nymble,
+            gShinyOverworldPalette_Nymble
+        )
         .levelUpLearnset = sNymbleLevelUpLearnset,
         .teachableLearnset = sNymbleTeachableLearnset,
         .eggMoveLearnset = sNymbleEggMoveLearnset,
@@ -859,6 +979,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Lokix,
         .iconPalIndex = 0,
         FOOTPRINT(Lokix)
+        OVERWORLD(
+            sPicTable_Lokix,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Lokix,
+            gShinyOverworldPalette_Lokix
+        )
         .levelUpLearnset = sLokixLevelUpLearnset,
         .teachableLearnset = sLokixTeachableLearnset,
     },
@@ -913,6 +1041,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Pawmi,
         .iconPalIndex = 0,
         FOOTPRINT(Pawmi)
+            OVERWORLD(
+            sPicTable_Pawmi,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Pawmi,
+            gShinyOverworldPalette_Pawmi
+        )
         .levelUpLearnset = sPawmiLevelUpLearnset,
         .teachableLearnset = sPawmiTeachableLearnset,
         .eggMoveLearnset = sPawmiEggMoveLearnset,
@@ -967,6 +1103,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Pawmo,
         .iconPalIndex = 0,
         FOOTPRINT(Pawmo)
+        OVERWORLD(
+            sPicTable_Pawmo,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Pawmo,
+            gShinyOverworldPalette_Pawmo
+        )
         .levelUpLearnset = sPawmoLevelUpLearnset,
         .teachableLearnset = sPawmoTeachableLearnset,
         .evolutions = EVOLUTION({EVO_OVERWORLD_STEPS, 1000, SPECIES_PAWMOT}),
@@ -1020,6 +1164,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Pawmot,
         .iconPalIndex = 0,
         FOOTPRINT(Pawmot)
+        OVERWORLD(
+            sPicTable_Pawmot,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Pawmot,
+            gShinyOverworldPalette_Pawmot
+        )
         .levelUpLearnset = sPawmotLevelUpLearnset,
         .teachableLearnset = sPawmotTeachableLearnset,
     },
@@ -1074,6 +1226,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Tandemaus,
         .iconPalIndex = 1,
         FOOTPRINT(Tandemaus)
+        OVERWORLD(
+            sPicTable_Tandemaus,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Tandemaus,
+            gShinyOverworldPalette_Tandemaus
+        )
         .levelUpLearnset = sTandemausLevelUpLearnset,
         .teachableLearnset = sTandemausTeachableLearnset,
         .eggMoveLearnset = sTandemausEggMoveLearnset,
@@ -1129,6 +1289,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_MausholdFamilyOfThree,
         .iconPalIndex = 1,
         FOOTPRINT(MausholdFamilyOfThree)
+        OVERWORLD(
+            sPicTable_MausholdFamilyOfThree,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_MausholdFamilyOfThree,
+            gShinyOverworldPalette_MausholdFamilyOfThree
+        )
         .levelUpLearnset = sMausholdLevelUpLearnset,
         .teachableLearnset = sMausholdTeachableLearnset,
         .formSpeciesIdTable = sMausholdFormSpeciesIdTable,
@@ -1181,6 +1349,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_MausholdFamilyOfFour,
         .iconPalIndex = 1,
         FOOTPRINT(MausholdFamilyOfFour)
+        OVERWORLD(
+            sPicTable_MausholdFamilyOfFour,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_MausholdFamilyOfFour,
+            gShinyOverworldPalette_MausholdFamilyOfFour
+        )
         .levelUpLearnset = sMausholdLevelUpLearnset,
         .teachableLearnset = sMausholdTeachableLearnset,
         .formSpeciesIdTable = sMausholdFormSpeciesIdTable,
@@ -1236,6 +1412,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Fidough,
         .iconPalIndex = 1,
         FOOTPRINT(Fidough)
+        OVERWORLD(
+            sPicTable_Fidough,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Fidough,
+            gShinyOverworldPalette_Fidough
+        )
         .levelUpLearnset = sFidoughLevelUpLearnset,
         .teachableLearnset = sFidoughTeachableLearnset,
         .eggMoveLearnset = sFidoughEggMoveLearnset,
@@ -1290,6 +1474,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Dachsbun,
         .iconPalIndex = 0,
         FOOTPRINT(Dachsbun)
+        OVERWORLD(
+            sPicTable_Dachsbun,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Dachsbun,
+            gShinyOverworldPalette_Dachsbun
+        )
         .levelUpLearnset = sDachsbunLevelUpLearnset,
         .teachableLearnset = sDachsbunTeachableLearnset,
     },
@@ -1344,6 +1536,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Smoliv,
         .iconPalIndex = 1,
         FOOTPRINT(Smoliv)
+        OVERWORLD(
+            sPicTable_Smoliv,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Smoliv,
+            gShinyOverworldPalette_Smoliv
+        )
         .levelUpLearnset = sSmolivLevelUpLearnset,
         .teachableLearnset = sSmolivTeachableLearnset,
         .eggMoveLearnset = sSmolivEggMoveLearnset,
@@ -1398,6 +1598,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Dolliv,
         .iconPalIndex = 1,
         FOOTPRINT(Dolliv)
+        OVERWORLD(
+            sPicTable_Dolliv,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Dolliv,
+            gShinyOverworldPalette_Dolliv
+        )
         .levelUpLearnset = sDollivLevelUpLearnset,
         .teachableLearnset = sDollivTeachableLearnset,
         .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARBOLIVA}),
@@ -1451,6 +1659,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Arboliva,
         .iconPalIndex = 1,
         FOOTPRINT(Arboliva)
+        OVERWORLD(
+            sPicTable_Arboliva,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Arboliva,
+            gShinyOverworldPalette_Arboliva
+        )
         .levelUpLearnset = sArbolivaLevelUpLearnset,
         .teachableLearnset = sArbolivaTeachableLearnset,
     },
@@ -1505,6 +1721,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_SquawkabillyGreenPlumage,
         .iconPalIndex = 1,
         FOOTPRINT(Squawkabilly)
+        OVERWORLD(
+            sPicTable_SquawkabillyGreenPlumage,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_SquawkabillyGreenPlumage,
+            gShinyOverworldPalette_SquawkabillyGreenPlumage
+        )
         .levelUpLearnset = sSquawkabillyLevelUpLearnset,
         .teachableLearnset = sSquawkabillyTeachableLearnset,
         .eggMoveLearnset = sSquawkabillyEggMoveLearnset,
@@ -1559,6 +1783,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_SquawkabillyBluePlumage,
         .iconPalIndex = 0,
         FOOTPRINT(Squawkabilly)
+        OVERWORLD(
+            sPicTable_SquawkabillyBluePlumage,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_SquawkabillyBluePlumage,
+            gShinyOverworldPalette_SquawkabillyBluePlumage
+        )
         .levelUpLearnset = sSquawkabillyLevelUpLearnset,
         .teachableLearnset = sSquawkabillyTeachableLearnset,
         .eggMoveLearnset = sSquawkabillyEggMoveLearnset,
@@ -1613,6 +1845,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_SquawkabillyYellowPlumage,
         .iconPalIndex = 1,
         FOOTPRINT(Squawkabilly)
+        OVERWORLD(
+            sPicTable_SquawkabillyYellowPlumage,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_SquawkabillyYellowPlumage,
+            gShinyOverworldPalette_SquawkabillyYellowPlumage
+        )
         .levelUpLearnset = sSquawkabillyLevelUpLearnset,
         .teachableLearnset = sSquawkabillyTeachableLearnset,
         .eggMoveLearnset = sSquawkabillyEggMoveLearnset,
@@ -1667,6 +1907,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_SquawkabillyWhitePlumage,
         .iconPalIndex = 0,
         FOOTPRINT(Squawkabilly)
+        OVERWORLD(
+            sPicTable_SquawkabillyWhitePlumage,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_SquawkabillyWhitePlumage,
+            gShinyOverworldPalette_SquawkabillyWhitePlumage
+        )
         .levelUpLearnset = sSquawkabillyLevelUpLearnset,
         .teachableLearnset = sSquawkabillyTeachableLearnset,
         .eggMoveLearnset = sSquawkabillyEggMoveLearnset,
@@ -1723,6 +1971,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Nacli,
         .iconPalIndex = 2,
         FOOTPRINT(Nacli)
+        OVERWORLD(
+            sPicTable_Nacli,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Nacli,
+            gShinyOverworldPalette_Nacli
+        )
         .levelUpLearnset = sNacliLevelUpLearnset,
         .teachableLearnset = sNacliTeachableLearnset,
         .eggMoveLearnset = sNacliEggMoveLearnset,
@@ -1777,6 +2033,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Naclstack,
         .iconPalIndex = 2,
         FOOTPRINT(Naclstack)
+        OVERWORLD(
+            sPicTable_Naclstack,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Naclstack,
+            gShinyOverworldPalette_Naclstack
+        )
         .levelUpLearnset = sNaclstackLevelUpLearnset,
         .teachableLearnset = sNaclstackTeachableLearnset,
         .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_GARGANACL}),
@@ -1830,6 +2094,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Garganacl,
         .iconPalIndex = 2,
         FOOTPRINT(Garganacl)
+        OVERWORLD(
+            sPicTable_Garganacl,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Garganacl,
+            gShinyOverworldPalette_Garganacl
+        )
         .levelUpLearnset = sGarganaclLevelUpLearnset,
         .teachableLearnset = sGarganaclTeachableLearnset,
     },
@@ -1884,6 +2156,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Charcadet,
         .iconPalIndex = 0,
         FOOTPRINT(Charcadet)
+        OVERWORLD(
+            sPicTable_Charcadet,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Charcadet,
+            gShinyOverworldPalette_Charcadet
+        )
         .levelUpLearnset = sCharcadetLevelUpLearnset,
         .teachableLearnset = sCharcadetTeachableLearnset,
         .eggMoveLearnset = sCharcadetEggMoveLearnset,
@@ -1939,6 +2219,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Armarouge,
         .iconPalIndex = 0,
         FOOTPRINT(Armarouge)
+        OVERWORLD(
+            sPicTable_Armarouge,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Armarouge,
+            gShinyOverworldPalette_Armarouge
+        )
         .levelUpLearnset = sArmarougeLevelUpLearnset,
         .teachableLearnset = sArmarougeTeachableLearnset,
     },
@@ -1991,6 +2279,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Ceruledge,
         .iconPalIndex = 2,
         FOOTPRINT(Ceruledge)
+        OVERWORLD(
+            sPicTable_Ceruledge,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Ceruledge,
+            gShinyOverworldPalette_Ceruledge
+        )
         .levelUpLearnset = sCeruledgeLevelUpLearnset,
         .teachableLearnset = sCeruledgeTeachableLearnset,
     },
@@ -2046,6 +2342,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Tadbulb,
         .iconPalIndex = 0,
         FOOTPRINT(Tadbulb)
+        OVERWORLD(
+            sPicTable_Tadbulb,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Tadbulb,
+            gShinyOverworldPalette_Tadbulb
+        )
         .levelUpLearnset = sTadbulbLevelUpLearnset,
         .teachableLearnset = sTadbulbTeachableLearnset,
         .eggMoveLearnset = sTadbulbEggMoveLearnset,
@@ -2100,6 +2404,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Bellibolt,
         .iconPalIndex = 0,
         FOOTPRINT(Bellibolt)
+        OVERWORLD(
+            sPicTable_Bellibolt,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Bellibolt,
+            gShinyOverworldPalette_Bellibolt
+        )
         .levelUpLearnset = sBelliboltLevelUpLearnset,
         .teachableLearnset = sBelliboltTeachableLearnset,
     },
@@ -2154,6 +2466,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Wattrel,
         .iconPalIndex = 0,
         FOOTPRINT(Wattrel)
+        OVERWORLD(
+            sPicTable_Wattrel,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Wattrel,
+            gShinyOverworldPalette_Wattrel
+        )
         .levelUpLearnset = sWattrelLevelUpLearnset,
         .teachableLearnset = sWattrelTeachableLearnset,
         .eggMoveLearnset = sWattrelEggMoveLearnset,
@@ -2208,6 +2528,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Kilowattrel,
         .iconPalIndex = 0,
         FOOTPRINT(Kilowattrel)
+        OVERWORLD(
+            sPicTable_Kilowattrel,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Kilowattrel,
+            gShinyOverworldPalette_Kilowattrel
+        )
         .levelUpLearnset = sKilowattrelLevelUpLearnset,
         .teachableLearnset = sKilowattrelTeachableLearnset,
     },
@@ -2262,6 +2590,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Maschiff,
         .iconPalIndex = 0,
         FOOTPRINT(Maschiff)
+        OVERWORLD(
+            sPicTable_Maschiff,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Maschiff,
+            gShinyOverworldPalette_Maschiff
+        )
         .levelUpLearnset = sMaschiffLevelUpLearnset,
         .teachableLearnset = sMaschiffTeachableLearnset,
         .eggMoveLearnset = sMaschiffEggMoveLearnset,
@@ -2316,6 +2652,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Mabosstiff,
         .iconPalIndex = 0,
         FOOTPRINT(Mabosstiff)
+        OVERWORLD(
+            sPicTable_Mabosstiff,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Mabosstiff,
+            gShinyOverworldPalette_Mabosstiff
+        )
         .levelUpLearnset = sMabosstiffLevelUpLearnset,
         .teachableLearnset = sMabosstiffTeachableLearnset,
     },
@@ -2370,6 +2714,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Shroodle,
         .iconPalIndex = 0,
         FOOTPRINT(Shroodle)
+        OVERWORLD(
+            sPicTable_Shroodle,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_BUG,
+            gOverworldPalette_Shroodle,
+            gShinyOverworldPalette_Shroodle
+        )
         .levelUpLearnset = sShroodleLevelUpLearnset,
         .teachableLearnset = sShroodleTeachableLearnset,
         .eggMoveLearnset = sShroodleEggMoveLearnset,
@@ -2424,6 +2776,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Grafaiai,
         .iconPalIndex = 0,
         FOOTPRINT(Grafaiai)
+        OVERWORLD(
+            sPicTable_Grafaiai,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Grafaiai,
+            gShinyOverworldPalette_Grafaiai
+        )
         .levelUpLearnset = sGrafaiaiLevelUpLearnset,
         .teachableLearnset = sGrafaiaiTeachableLearnset,
     },
@@ -2478,6 +2838,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Bramblin,
         .iconPalIndex = 1,
         FOOTPRINT(Bramblin)
+        OVERWORLD(
+            sPicTable_Bramblin,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Bramblin,
+            gShinyOverworldPalette_Bramblin
+        )
         .levelUpLearnset = sBramblinLevelUpLearnset,
         .teachableLearnset = sBramblinTeachableLearnset,
         .eggMoveLearnset = sBramblinEggMoveLearnset,
@@ -2532,6 +2900,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Brambleghast,
         .iconPalIndex = 2,
         FOOTPRINT(Brambleghast)
+        OVERWORLD(
+            sPicTable_Brambleghast,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Brambleghast,
+            gShinyOverworldPalette_Brambleghast
+        )
         .levelUpLearnset = sBrambleghastLevelUpLearnset,
         .teachableLearnset = sBrambleghastTeachableLearnset,
     },
@@ -2588,6 +2964,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Toedscool,
         .iconPalIndex = 0,
         FOOTPRINT(Toedscool)
+        OVERWORLD(
+            sPicTable_Toedscool,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Toedscool,
+            gShinyOverworldPalette_Toedscool
+        )
         .levelUpLearnset = sToedscoolLevelUpLearnset,
         .teachableLearnset = sToedscoolTeachableLearnset,
         .eggMoveLearnset = sToedscoolEggMoveLearnset,
@@ -2644,6 +3028,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Toedscruel,
         .iconPalIndex = 0,
         FOOTPRINT(Toedscruel)
+        OVERWORLD(
+            sPicTable_Toedscruel,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Toedscruel,
+            gShinyOverworldPalette_Toedscruel
+        )
         .levelUpLearnset = sToedscruelLevelUpLearnset,
         .teachableLearnset = sToedscruelTeachableLearnset,
     },
@@ -2698,6 +3090,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Klawf,
         .iconPalIndex = 0,
         FOOTPRINT(Klawf)
+        OVERWORLD(
+            sPicTable_Klawf,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Klawf,
+            gShinyOverworldPalette_Klawf
+        )
         .levelUpLearnset = sKlawfLevelUpLearnset,
         .teachableLearnset = sKlawfTeachableLearnset,
         .eggMoveLearnset = sKlawfEggMoveLearnset,
@@ -2753,6 +3153,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Capsakid,
         .iconPalIndex = 1,
         FOOTPRINT(Capsakid)
+        OVERWORLD(
+            sPicTable_Capsakid,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Capsakid,
+            gShinyOverworldPalette_Capsakid
+        )
         .levelUpLearnset = sCapsakidLevelUpLearnset,
         .teachableLearnset = sCapsakidTeachableLearnset,
         .eggMoveLearnset = sCapsakidEggMoveLearnset,
@@ -2807,6 +3215,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Scovillain,
         .iconPalIndex = 1,
         FOOTPRINT(Scovillain)
+        OVERWORLD(
+            sPicTable_Scovillain,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            //sAnimTable_Following_Asym,
+            gOverworldPalette_Scovillain,
+            gShinyOverworldPalette_Scovillain
+        )
         .levelUpLearnset = sScovillainLevelUpLearnset,
         .teachableLearnset = sScovillainTeachableLearnset,
     },
@@ -2861,6 +3278,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Rellor,
         .iconPalIndex = 0,
         FOOTPRINT(Rellor)
+        OVERWORLD(
+            sPicTable_Rellor,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_BUG,
+            gOverworldPalette_Rellor,
+            gShinyOverworldPalette_Rellor
+        )
         .levelUpLearnset = sRellorLevelUpLearnset,
         .teachableLearnset = sRellorTeachableLearnset,
         .eggMoveLearnset = sRellorEggMoveLearnset,
@@ -2915,6 +3340,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Rabsca,
         .iconPalIndex = 0,
         FOOTPRINT(Rabsca)
+        OVERWORLD(
+            sPicTable_Rabsca,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Rabsca,
+            gShinyOverworldPalette_Rabsca
+        )
         .levelUpLearnset = sRabscaLevelUpLearnset,
         .teachableLearnset = sRabscaTeachableLearnset,
     },
@@ -2969,6 +3402,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Flittle,
         .iconPalIndex = 1,
         FOOTPRINT(Flittle)
+        OVERWORLD(
+            sPicTable_Flittle,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Flittle,
+            gShinyOverworldPalette_Flittle
+        )
         .levelUpLearnset = sFlittleLevelUpLearnset,
         .teachableLearnset = sFlittleTeachableLearnset,
         .eggMoveLearnset = sFlittleEggMoveLearnset,
@@ -3023,6 +3464,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Espathra,
         .iconPalIndex = 0,
         FOOTPRINT(Espathra)
+        OVERWORLD(
+            sPicTable_Espathra,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Espathra,
+            gShinyOverworldPalette_Espathra
+        )
         .levelUpLearnset = sEspathraLevelUpLearnset,
         .teachableLearnset = sEspathraTeachableLearnset,
     },
@@ -3077,6 +3526,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Tinkatink,
         .iconPalIndex = 1,
         FOOTPRINT(Tinkatink)
+        OVERWORLD(
+            sPicTable_Tinkatink,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            //sAnimTable_Following_Asym,
+            gOverworldPalette_Tinkatink,
+            gShinyOverworldPalette_Tinkatink
+        )
         .levelUpLearnset = sTinkatinkLevelUpLearnset,
         .teachableLearnset = sTinkatinkTeachableLearnset,
         .eggMoveLearnset = sTinkatinkEggMoveLearnset,
@@ -3131,6 +3589,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Tinkatuff,
         .iconPalIndex = 1,
         FOOTPRINT(Tinkatuff)
+        OVERWORLD(
+            sPicTable_Tinkatuff,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            //sAnimTable_Following_Asym,
+            gOverworldPalette_Tinkatuff,
+            gShinyOverworldPalette_Tinkatuff
+        )
         .levelUpLearnset = sTinkatuffLevelUpLearnset,
         .teachableLearnset = sTinkatuffTeachableLearnset,
         .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TINKATON}),
@@ -3184,6 +3651,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Tinkaton,
         .iconPalIndex = 1,
         FOOTPRINT(Tinkaton)
+        OVERWORLD(
+            sPicTable_Tinkaton,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            //sAnimTable_Following_Asym,
+            gOverworldPalette_Tinkaton,
+            gShinyOverworldPalette_Tinkaton
+        )
         .levelUpLearnset = sTinkatonLevelUpLearnset,
         .teachableLearnset = sTinkatonTeachableLearnset,
     },
@@ -3237,6 +3713,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Wiglett,
         .iconPalIndex = 0,
         FOOTPRINT(Wiglett)
+        OVERWORLD(
+            sPicTable_Wiglett,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_SLITHER,
+            gOverworldPalette_Wiglett,
+            gShinyOverworldPalette_Wiglett
+        )
         .levelUpLearnset = sWiglettLevelUpLearnset,
         .teachableLearnset = sWiglettTeachableLearnset,
         .eggMoveLearnset = sWiglettEggMoveLearnset,
@@ -3290,6 +3774,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Wugtrio,
         .iconPalIndex = 0,
         FOOTPRINT(Wugtrio)
+        OVERWORLD(
+            sPicTable_Wugtrio,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_SLITHER,
+            gOverworldPalette_Wugtrio,
+            gShinyOverworldPalette_Wugtrio
+        )
         .levelUpLearnset = sWugtrioLevelUpLearnset,
         .teachableLearnset = sWugtrioTeachableLearnset,
     },
@@ -3345,6 +3837,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Bombirdier,
         .iconPalIndex = 0,
         FOOTPRINT(Bombirdier)
+        OVERWORLD(
+            sPicTable_Bombirdier,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Bombirdier,
+            gShinyOverworldPalette_Bombirdier
+        )
         .levelUpLearnset = sBombirdierLevelUpLearnset,
         .teachableLearnset = sBombirdierTeachableLearnset,
         .eggMoveLearnset = sBombirdierEggMoveLearnset,
@@ -3399,6 +3899,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Finizen,
         .iconPalIndex = 0,
         FOOTPRINT(Finizen)
+        OVERWORLD(
+            sPicTable_Finizen,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Finizen,
+            gShinyOverworldPalette_Finizen
+        )
         .levelUpLearnset = sFinizenLevelUpLearnset,
         .teachableLearnset = sFinizenTeachableLearnset,
         .eggMoveLearnset = sFinizenEggMoveLearnset,
@@ -3453,6 +3961,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_PalafinZero,
         .iconPalIndex = 0,
         FOOTPRINT(Palafin)
+        OVERWORLD(
+            sPicTable_PalafinZero,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_PalafinZero,
+            gShinyOverworldPalette_PalafinZero
+        )
         .levelUpLearnset = sPalafinLevelUpLearnset,
         .teachableLearnset = sPalafinTeachableLearnset,
         .formSpeciesIdTable = sPalafinFormSpeciesIdTable,
@@ -3507,6 +4023,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_PalafinHero,
         .iconPalIndex = 0,
         FOOTPRINT(Palafin)
+        OVERWORLD(
+            sPicTable_PalafinHero,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_PalafinHero,
+            gShinyOverworldPalette_PalafinHero
+        )
         .levelUpLearnset = sPalafinLevelUpLearnset,
         .teachableLearnset = sPalafinTeachableLearnset,
         .formSpeciesIdTable = sPalafinFormSpeciesIdTable,
@@ -3563,6 +4087,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Varoom,
         .iconPalIndex = 2,
         FOOTPRINT(Varoom)
+        OVERWORLD(
+            sPicTable_Varoom,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Varoom,
+            gShinyOverworldPalette_Varoom
+        )
         .levelUpLearnset = sVaroomLevelUpLearnset,
         .teachableLearnset = sVaroomTeachableLearnset,
         .eggMoveLearnset = sVaroomEggMoveLearnset,
@@ -3617,6 +4149,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Revavroom,
         .iconPalIndex = 0,
         FOOTPRINT(Revavroom)
+        OVERWORLD(
+            sPicTable_Revavroom,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Revavroom,
+            gShinyOverworldPalette_Revavroom
+        )
         .levelUpLearnset = sRevavroomLevelUpLearnset,
         .teachableLearnset = sRevavroomTeachableLearnset,
     },
@@ -3671,6 +4211,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Cyclizar,
         .iconPalIndex = 1,
         FOOTPRINT(Cyclizar)
+        OVERWORLD(
+            sPicTable_Cyclizar,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Cyclizar,
+            gShinyOverworldPalette_Cyclizar
+        )
         .levelUpLearnset = sCyclizarLevelUpLearnset,
         .teachableLearnset = sCyclizarTeachableLearnset,
         .eggMoveLearnset = sCyclizarEggMoveLearnset,
@@ -3726,6 +4274,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Orthworm,
         .iconPalIndex = 0,
         FOOTPRINT(Orthworm)
+        OVERWORLD(
+            sPicTable_Orthworm,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_SLITHER,
+            gOverworldPalette_Orthworm,
+            gShinyOverworldPalette_Orthworm
+        )
         .levelUpLearnset = sOrthwormLevelUpLearnset,
         .teachableLearnset = sOrthwormTeachableLearnset,
         .eggMoveLearnset = sOrthwormEggMoveLearnset,
@@ -3782,6 +4338,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Glimmet,
         .iconPalIndex = 0,
         FOOTPRINT(Glimmet)
+        OVERWORLD(
+            sPicTable_Glimmet,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Glimmet,
+            gShinyOverworldPalette_Glimmet
+        )
         .levelUpLearnset = sGlimmetLevelUpLearnset,
         .teachableLearnset = sGlimmetTeachableLearnset,
         .eggMoveLearnset = sGlimmetEggMoveLearnset,
@@ -3837,6 +4401,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Glimmora,
         .iconPalIndex = 0,
         FOOTPRINT(Glimmora)
+        OVERWORLD(
+            sPicTable_Glimmora,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Glimmora,
+            gShinyOverworldPalette_Glimmora
+        )
         .levelUpLearnset = sGlimmoraLevelUpLearnset,
         .teachableLearnset = sGlimmoraTeachableLearnset,
     },
@@ -3891,6 +4463,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Greavard,
         .iconPalIndex = 0,
         FOOTPRINT(Greavard)
+        OVERWORLD(
+            sPicTable_Greavard,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Greavard,
+            gShinyOverworldPalette_Greavard
+        )
         .levelUpLearnset = sGreavardLevelUpLearnset,
         .teachableLearnset = sGreavardTeachableLearnset,
         .eggMoveLearnset = sGreavardEggMoveLearnset,
@@ -3945,6 +4525,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Houndstone,
         .iconPalIndex = 2,
         FOOTPRINT(Houndstone)
+        OVERWORLD(
+            sPicTable_Houndstone,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Houndstone,
+            gShinyOverworldPalette_Houndstone
+        )
         .levelUpLearnset = sHoundstoneLevelUpLearnset,
         .teachableLearnset = sHoundstoneTeachableLearnset,
     },
@@ -3999,6 +4587,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Flamigo,
         .iconPalIndex = 1,
         FOOTPRINT(Flamigo)
+        OVERWORLD(
+            sPicTable_Flamigo,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Flamigo,
+            gShinyOverworldPalette_Flamigo
+        )
         .levelUpLearnset = sFlamigoLevelUpLearnset,
         .teachableLearnset = sFlamigoTeachableLearnset,
         .eggMoveLearnset = sFlamigoEggMoveLearnset,
@@ -4054,6 +4650,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Cetoddle,
         .iconPalIndex = 0,
         FOOTPRINT(Cetoddle)
+        OVERWORLD(
+            sPicTable_Cetoddle,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Cetoddle,
+            gShinyOverworldPalette_Cetoddle
+        )
         .levelUpLearnset = sCetoddleLevelUpLearnset,
         .teachableLearnset = sCetoddleTeachableLearnset,
         .eggMoveLearnset = sCetoddleEggMoveLearnset,
@@ -4108,6 +4712,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Cetitan,
         .iconPalIndex = 0,
         FOOTPRINT(Cetitan)
+        OVERWORLD(
+            sPicTable_Cetitan,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Cetitan,
+            gShinyOverworldPalette_Cetitan
+        )
         .levelUpLearnset = sCetitanLevelUpLearnset,
         .teachableLearnset = sCetitanTeachableLearnset,
     },
@@ -4163,6 +4775,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Veluza,
         .iconPalIndex = 1,
         FOOTPRINT(Veluza)
+        OVERWORLD(
+            sPicTable_Veluza,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Veluza,
+            gShinyOverworldPalette_Veluza
+        )
         .levelUpLearnset = sVeluzaLevelUpLearnset,
         .teachableLearnset = sVeluzaTeachableLearnset,
         .eggMoveLearnset = sVeluzaEggMoveLearnset,
@@ -4219,6 +4839,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Dondozo,
         .iconPalIndex = 0,
         FOOTPRINT(Dondozo)
+        OVERWORLD(
+            sPicTable_Dondozo,
+            SIZE_64x64,
+            SHADOW_SIZE_L,
+            TRACKS_NONE,
+            gOverworldPalette_Dondozo,
+            gShinyOverworldPalette_Dondozo
+        )
         .levelUpLearnset = sDondozoLevelUpLearnset,
         .teachableLearnset = sDondozoTeachableLearnset,
         .eggMoveLearnset = sDondozoEggMoveLearnset,
@@ -4274,6 +4902,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_TatsugiriCurly,
         .iconPalIndex = 0,
         FOOTPRINT(Tatsugiri)
+        OVERWORLD(
+            sPicTable_TatsugiriCurly,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_SLITHER,
+            gOverworldPalette_TatsugiriCurly,
+            gShinyOverworldPalette_TatsugiriCurly
+        )
         .levelUpLearnset = sTatsugiriLevelUpLearnset,
         .teachableLearnset = sTatsugiriTeachableLearnset,
         .eggMoveLearnset = sTatsugiriEggMoveLearnset,
@@ -4327,6 +4963,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_TatsugiriDroopy,
         .iconPalIndex = 0,
         FOOTPRINT(Tatsugiri)
+        OVERWORLD(
+            sPicTable_TatsugiriDroopy,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_SLITHER,
+            gOverworldPalette_TatsugiriDroopy,
+            gShinyOverworldPalette_TatsugiriDroopy
+        )
         .levelUpLearnset = sTatsugiriLevelUpLearnset,
         .teachableLearnset = sTatsugiriTeachableLearnset,
         .eggMoveLearnset = sTatsugiriEggMoveLearnset,
@@ -4380,6 +5024,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_TatsugiriStretchy,
         .iconPalIndex = 0,
         FOOTPRINT(Tatsugiri)
+        OVERWORLD(
+            sPicTable_TatsugiriStretchy,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_SLITHER,
+            gOverworldPalette_TatsugiriStretchy,
+            gShinyOverworldPalette_TatsugiriStretchy
+        )
         .levelUpLearnset = sTatsugiriLevelUpLearnset,
         .teachableLearnset = sTatsugiriTeachableLearnset,
         .eggMoveLearnset = sTatsugiriEggMoveLearnset,
@@ -4437,6 +5089,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_GreatTusk,
         .iconPalIndex = 0,
         FOOTPRINT(GreatTusk)
+        OVERWORLD(
+            sPicTable_GreatTusk,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_GreatTusk,
+            gShinyOverworldPalette_GreatTusk
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sGreatTuskLevelUpLearnset,
         .teachableLearnset = sGreatTuskTeachableLearnset,
@@ -4493,6 +5153,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_ScreamTail,
         .iconPalIndex = 0,
         FOOTPRINT(ScreamTail)
+        OVERWORLD(
+            sPicTable_ScreamTail,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_ScreamTail,
+            gShinyOverworldPalette_ScreamTail
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sScreamTailLevelUpLearnset,
         .teachableLearnset = sScreamTailTeachableLearnset,
@@ -4549,6 +5217,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_BruteBonnet,
         .iconPalIndex = 1,
         FOOTPRINT(BruteBonnet)
+        OVERWORLD(
+            sPicTable_BruteBonnet,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_BruteBonnet,
+            gShinyOverworldPalette_BruteBonnet
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sBruteBonnetLevelUpLearnset,
         .teachableLearnset = sBruteBonnetTeachableLearnset,
@@ -4608,6 +5284,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_FlutterMane,
         .iconPalIndex = 2,
         FOOTPRINT(FlutterMane)
+        OVERWORLD(
+            sPicTable_FlutterMane,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_FlutterMane,
+            gShinyOverworldPalette_FlutterMane
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sFlutterManeLevelUpLearnset,
         .teachableLearnset = sFlutterManeTeachableLearnset,
@@ -4663,6 +5347,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_SlitherWing,
         .iconPalIndex = 1,
         FOOTPRINT(SlitherWing)
+        OVERWORLD(
+            sPicTable_SlitherWing,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_SLITHER,
+            gOverworldPalette_SlitherWing,
+            gShinyOverworldPalette_SlitherWing
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sSlitherWingLevelUpLearnset,
         .teachableLearnset = sSlitherWingTeachableLearnset,
@@ -4719,6 +5411,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_SandyShocks,
         .iconPalIndex = 0,
         FOOTPRINT(SandyShocks)
+        OVERWORLD(
+            sPicTable_SandyShocks,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_SandyShocks,
+            gShinyOverworldPalette_SandyShocks
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sSandyShocksLevelUpLearnset,
         .teachableLearnset = sSandyShocksTeachableLearnset,
@@ -4775,6 +5475,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronTreads,
         .iconPalIndex = 1,
         FOOTPRINT(IronTreads)
+        OVERWORLD(
+            sPicTable_IronTreads,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronTreads,
+            gShinyOverworldPalette_IronTreads
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronTreadsLevelUpLearnset,
         .teachableLearnset = sIronTreadsTeachableLearnset,
@@ -4831,6 +5539,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronBundle,
         .iconPalIndex = 0,
         FOOTPRINT(IronBundle)
+        OVERWORLD(
+            sPicTable_IronBundle,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronBundle,
+            gShinyOverworldPalette_IronBundle
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronBundleLevelUpLearnset,
         .teachableLearnset = sIronBundleTeachableLearnset,
@@ -4887,6 +5603,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronHands,
         .iconPalIndex = 0,
         FOOTPRINT(IronHands)
+        OVERWORLD(
+            sPicTable_IronHands,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronHands,
+            gShinyOverworldPalette_IronHands
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronHandsLevelUpLearnset,
         .teachableLearnset = sIronHandsTeachableLearnset,
@@ -4944,6 +5668,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronJugulis,
         .iconPalIndex = 0,
         FOOTPRINT(IronJugulis)
+        OVERWORLD(
+            sPicTable_IronJugulis,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_IronJugulis,
+            gShinyOverworldPalette_IronJugulis
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronJugulisLevelUpLearnset,
         .teachableLearnset = sIronJugulisTeachableLearnset,
@@ -5001,6 +5733,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronMoth,
         .iconPalIndex = 3,
         FOOTPRINT(IronMoth)
+        OVERWORLD(
+            sPicTable_IronMoth,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronMoth,
+            gShinyOverworldPalette_IronMoth
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronMothLevelUpLearnset,
         .teachableLearnset = sIronMothTeachableLearnset,
@@ -5057,6 +5797,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronThorns,
         .iconPalIndex = 1,
         FOOTPRINT(IronThorns)
+        OVERWORLD(
+            sPicTable_IronThorns,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronThorns,
+            gShinyOverworldPalette_IronThorns
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronThornsLevelUpLearnset,
         .teachableLearnset = sIronThornsTeachableLearnset,
@@ -5112,6 +5860,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Frigibax,
         .iconPalIndex = 0,
         FOOTPRINT(Frigibax)
+        OVERWORLD(
+            sPicTable_Frigibax,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Frigibax,
+            gShinyOverworldPalette_Frigibax
+        )
         .levelUpLearnset = sFrigibaxLevelUpLearnset,
         .teachableLearnset = sFrigibaxTeachableLearnset,
         .eggMoveLearnset = sFrigibaxEggMoveLearnset,
@@ -5166,6 +5922,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Arctibax,
         .iconPalIndex = 0,
         FOOTPRINT(Arctibax)
+        OVERWORLD(
+            sPicTable_Arctibax,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_FOOT,
+            gOverworldPalette_Arctibax,
+            gShinyOverworldPalette_Arctibax
+        )
         .levelUpLearnset = sArctibaxLevelUpLearnset,
         .teachableLearnset = sArctibaxTeachableLearnset,
         .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_BAXCALIBUR}),
@@ -5219,6 +5983,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Baxcalibur,
         .iconPalIndex = 0,
         FOOTPRINT(Baxcalibur)
+        OVERWORLD(
+            sPicTable_Baxcalibur,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Baxcalibur,
+            gShinyOverworldPalette_Baxcalibur
+        )
         .levelUpLearnset = sBaxcaliburLevelUpLearnset,
         .teachableLearnset = sBaxcaliburTeachableLearnset,
     },
@@ -5273,6 +6045,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_GimmighoulChest,
         .iconPalIndex = 0,
         FOOTPRINT(GimmighoulChest)
+        OVERWORLD(
+            sPicTable_GimmighoulChest,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_GimmighoulChest,
+            gShinyOverworldPalette_GimmighoulChest
+        )
         .levelUpLearnset = sGimmighoulLevelUpLearnset,
         .teachableLearnset = sGimmighoulTeachableLearnset,
         .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable,
@@ -5381,6 +6161,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Gholdengo,
         .iconPalIndex = 0,
         FOOTPRINT(Gholdengo)
+        OVERWORLD(
+            sPicTable_Gholdengo,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Gholdengo,
+            gShinyOverworldPalette_Gholdengo
+        )
         .levelUpLearnset = sGholdengoLevelUpLearnset,
         .teachableLearnset = sGholdengoTeachableLearnset,
     },
@@ -5435,6 +6223,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_WoChien,
         .iconPalIndex = 1,
         FOOTPRINT(WoChien)
+        OVERWORLD(
+            sPicTable_WoChien,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_SLITHER,
+            gOverworldPalette_WoChien,
+            gShinyOverworldPalette_WoChien
+        )
         .isLegendary = TRUE,
         .levelUpLearnset = sWoChienLevelUpLearnset,
         .teachableLearnset = sWoChienTeachableLearnset,
@@ -5490,6 +6286,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_ChienPao,
         .iconPalIndex = 0,
         FOOTPRINT(ChienPao)
+        OVERWORLD(
+            sPicTable_ChienPao,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_ChienPao,
+            gShinyOverworldPalette_ChienPao
+        )
         .isLegendary = TRUE,
         .levelUpLearnset = sChienPaoLevelUpLearnset,
         .teachableLearnset = sChienPaoTeachableLearnset,
@@ -5545,6 +6349,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_TingLu,
         .iconPalIndex = 0,
         FOOTPRINT(TingLu)
+        OVERWORLD(
+            sPicTable_TingLu,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_TingLu,
+            gShinyOverworldPalette_TingLu
+        )
         .isLegendary = TRUE,
         .levelUpLearnset = sTingLuLevelUpLearnset,
         .teachableLearnset = sTingLuTeachableLearnset,
@@ -5601,6 +6413,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_ChiYu,
         .iconPalIndex = 0,
         FOOTPRINT(ChiYu)
+        OVERWORLD(
+            sPicTable_ChiYu,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_ChiYu,
+            gShinyOverworldPalette_ChiYu
+        )
         .isLegendary = TRUE,
         .levelUpLearnset = sChiYuLevelUpLearnset,
         .teachableLearnset = sChiYuTeachableLearnset,
@@ -5658,6 +6478,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_RoaringMoon,
         .iconPalIndex = 0,
         FOOTPRINT(RoaringMoon)
+        OVERWORLD(
+            sPicTable_RoaringMoon,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_RoaringMoon,
+            gShinyOverworldPalette_RoaringMoon
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sRoaringMoonLevelUpLearnset,
         .teachableLearnset = sRoaringMoonTeachableLearnset,
@@ -5713,6 +6541,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronValiant,
         .iconPalIndex = 1,
         FOOTPRINT(IronValiant)
+        OVERWORLD(
+            sPicTable_IronValiant,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronValiant,
+            gShinyOverworldPalette_IronValiant
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronValiantLevelUpLearnset,
         .teachableLearnset = sIronValiantTeachableLearnset,
@@ -5768,6 +6604,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Koraidon,
         .iconPalIndex = 0,
         FOOTPRINT(Koraidon)
+        OVERWORLD(
+            sPicTable_Koraidon,
+            SIZE_64x64,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Koraidon,
+            gShinyOverworldPalette_Koraidon
+        )
         .isLegendary = TRUE,
         .isFrontierBanned = TRUE,
         .levelUpLearnset = sKoraidonLevelUpLearnset,
@@ -5824,6 +6668,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Miraidon,
         .iconPalIndex = 2,
         FOOTPRINT(Miraidon)
+        OVERWORLD(
+            sPicTable_Miraidon,
+            SIZE_64x64,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Miraidon,
+            gShinyOverworldPalette_Miraidon
+        )
         .isLegendary = TRUE,
         .isFrontierBanned = TRUE,
         .levelUpLearnset = sMiraidonLevelUpLearnset,
@@ -5880,6 +6732,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_WalkingWake,
         .iconPalIndex = 2,
         FOOTPRINT(WalkingWake)
+        OVERWORLD(
+            sPicTable_WalkingWake,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_WalkingWake,
+            gShinyOverworldPalette_WalkingWake
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sWalkingWakeLevelUpLearnset,
         .teachableLearnset = sWalkingWakeTeachableLearnset,
@@ -5935,6 +6795,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronLeaves,
         .iconPalIndex = 1,
         FOOTPRINT(IronLeaves)
+        OVERWORLD(
+            sPicTable_IronLeaves,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronLeaves,
+            gShinyOverworldPalette_IronLeaves
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronLeavesLevelUpLearnset,
         .teachableLearnset = sIronLeavesTeachableLearnset,
@@ -5991,6 +6859,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Poltchageist,
         .iconPalIndex = 1,
         FOOTPRINT(Poltchageist)
+        OVERWORLD(
+            sPicTable_Poltchageist,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Poltchageist,
+            gShinyOverworldPalette_Poltchageist
+        )
         .levelUpLearnset = sPoltchageistLevelUpLearnset,
         .teachableLearnset = sPoltchageistTeachableLearnset,
         .evolutions = EVOLUTION({EVO_ITEM, ITEM_UNREMARKABLE_TEACUP, SPECIES_SINISTCHA_UNREMARKABLE}),
@@ -6044,6 +6920,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Poltchageist,
         .iconPalIndex = 1,
         FOOTPRINT(Poltchageist)
+        OVERWORLD(
+            sPicTable_Poltchageist,
+            SIZE_32x32,
+            SHADOW_SIZE_S,
+            TRACKS_NONE,
+            gOverworldPalette_Poltchageist,
+            gShinyOverworldPalette_Poltchageist
+        )
         .levelUpLearnset = sPoltchageistLevelUpLearnset,
         .teachableLearnset = sPoltchageistTeachableLearnset,
         .evolutions = EVOLUTION({EVO_ITEM, ITEM_MASTERPIECE_TEACUP, SPECIES_SINISTCHA_MASTERPIECE}),
@@ -6098,6 +6982,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Sinistcha,
         .iconPalIndex = 1,
         FOOTPRINT(Sinistcha)
+        OVERWORLD(
+            sPicTable_Sinistcha,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Sinistcha,
+            gShinyOverworldPalette_Sinistcha
+        )
         .levelUpLearnset = sSinistchaLevelUpLearnset,
         .teachableLearnset = sSinistchaTeachableLearnset,
     },
@@ -6150,6 +7042,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Sinistcha,
         .iconPalIndex = 1,
         FOOTPRINT(Sinistcha)
+        OVERWORLD(
+            sPicTable_Sinistcha,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_NONE,
+            gOverworldPalette_Sinistcha,
+            gShinyOverworldPalette_Sinistcha
+        )
         .levelUpLearnset = sSinistchaLevelUpLearnset,
         .teachableLearnset = sSinistchaTeachableLearnset,
     },
@@ -6204,6 +7104,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Okidogi,
         .iconPalIndex = 1,
         FOOTPRINT(Okidogi)
+        OVERWORLD(
+            sPicTable_Okidogi,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Okidogi,
+            gShinyOverworldPalette_Okidogi
+        )
         .isLegendary = TRUE,
         .levelUpLearnset = sOkidogiLevelUpLearnset,
         .teachableLearnset = sOkidogiTeachableLearnset,
@@ -6259,6 +7167,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Munkidori,
         .iconPalIndex = 0,
         FOOTPRINT(Munkidori)
+        OVERWORLD(
+            sPicTable_Munkidori,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Munkidori,
+            gShinyOverworldPalette_Munkidori
+        )
         .isLegendary = TRUE,
         .levelUpLearnset = sMunkidoriLevelUpLearnset,
         .teachableLearnset = sMunkidoriTeachableLearnset,
@@ -6314,6 +7230,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Fezandipiti,
         .iconPalIndex = 0,
         FOOTPRINT(Fezandipiti)
+        OVERWORLD(
+            sPicTable_Fezandipiti,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Fezandipiti,
+            gShinyOverworldPalette_Fezandipiti
+        )        
         .isLegendary = TRUE,
         .levelUpLearnset = sFezandipitiLevelUpLearnset,
         .teachableLearnset = sFezandipitiTeachableLearnset,
@@ -6366,6 +7290,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Ogerpon##Form1##Mask,                                        \
         .iconPalIndex = iconpalette,                                                        \
         FOOTPRINT(Ogerpon)                                                                  \
+        OVERWORLD(                                                                          \
+            sPicTable_Ogerpon##Form1##Form2,                                                \
+            SIZE_32x32,                                                                     \
+            SHADOW_SIZE_M,                                                                  \
+            TRACKS_FOOT,                                                                    \
+            gOverworldPalette_Ogerpon##Form1##Form2,                                        \
+            gShinyOverworldPalette_Ogerpon##Form1##Form2                                    \
+        )                                                                                   \
         .levelUpLearnset = sOgerponLevelUpLearnset,                                         \
         .teachableLearnset = sOgerponTeachableLearnset,                                     \
         .formSpeciesIdTable = sOgerponFormSpeciesIdTable,                                   \
@@ -6437,6 +7369,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_GougingFire,
         .iconPalIndex = 5,
         FOOTPRINT(GougingFire)
+        OVERWORLD(
+            sPicTable_GougingFire,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_GougingFire,
+            gShinyOverworldPalette_GougingFire
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sGougingFireLevelUpLearnset,
         .teachableLearnset = sGougingFireTeachableLearnset,
@@ -6493,6 +7433,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_RagingBolt,
         .iconPalIndex = 2,
         FOOTPRINT(RagingBolt)
+        OVERWORLD(
+            sPicTable_RagingBolt,
+            SIZE_64x64,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_RagingBolt,
+            gShinyOverworldPalette_RagingBolt
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sRagingBoltLevelUpLearnset,
         .teachableLearnset = sRagingBoltTeachableLearnset,
@@ -6548,6 +7496,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronBoulder,
         .iconPalIndex = 5,
         FOOTPRINT(IronBoulder)
+        OVERWORLD(
+            sPicTable_IronBoulder,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronBoulder,
+            gShinyOverworldPalette_IronBoulder
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronBoulderLevelUpLearnset,
         .teachableLearnset = sIronBoulderTeachableLearnset,
@@ -6604,6 +7560,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_IronCrown,
         .iconPalIndex = 3,
         FOOTPRINT(IronCrown)
+        OVERWORLD(
+            sPicTable_IronCrown,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_IronCrown,
+            gShinyOverworldPalette_IronCrown
+        )
         .isParadox = TRUE,
         .levelUpLearnset = sIronCrownLevelUpLearnset,
         .teachableLearnset = sIronCrownTeachableLearnset,
@@ -6661,6 +7625,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_TerapagosNormal,
         .iconPalIndex = 0,
         FOOTPRINT(TerapagosNormal)
+        OVERWORLD(
+            sPicTable_TerapagosNormal,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_TerapagosNormal,
+            gShinyOverworldPalette_TerapagosNormal
+        )
         .isLegendary = TRUE,
         .isFrontierBanned = TRUE,
         .levelUpLearnset = sTerapagosLevelUpLearnset,
@@ -6720,6 +7692,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_TerapagosTerastal,
         .iconPalIndex = 0,
         FOOTPRINT(TerapagosTerastal)
+        OVERWORLD(
+            sPicTable_TerapagosTerastal,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_TerapagosTerastal,
+            gShinyOverworldPalette_TerapagosTerastal
+        )
         .isLegendary = TRUE,
         .isFrontierBanned = TRUE,
         .levelUpLearnset = sTerapagosLevelUpLearnset,
@@ -6836,6 +7816,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .iconSprite = gMonIcon_Pecharunt,
         .iconPalIndex = 0,
         FOOTPRINT(Pecharunt)
+        OVERWORLD(
+            sPicTable_Pecharunt,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            gOverworldPalette_Pecharunt,
+            gShinyOverworldPalette_Pecharunt
+        )
         .isMythical = TRUE,
         .isFrontierBanned = TRUE,
         .levelUpLearnset = sPecharuntLevelUpLearnset,