Merge pull request #1843 from GriffinRichards/colorize

Colorize more grayscaled/incorrectly colored pngs

graphics/berry_crush/crusher.pal

@@ -1,147 +0,0 @@
-JASC-PAL
-0100
-144
-98 172 180
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-156 213 189
-123 180 156
-222 156 255
-172 123 222
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-156 148 172
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-255 238 0
-230 189 0
-180 180 180
-139 139 139
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-156 148 172
-255 213 156
-255 197 139
-255 164 106
-238 131 82
-222 123 74
-213 98 49
-197 82 41
-197 213 246
-255 255 255
-238 238 246
-205 205 213
-255 0 255
-255 0 255
-230 230 255
-65 74 90
-255 180 255
-164 172 172
-98 106 115
-123 131 139
-139 148 156
-148 222 164
-156 189 222
-197 213 246
-180 164 115
-205 189 148
-213 205 172
-230 222 189
-246 238 205
-139 123 74
-74 131 189
-65 74 90
-0 0 0
-148 222 164
-164 230 172
-180 238 189
-197 246 205
-213 255 222
-238 255 238
-255 255 255
-65 180 238
-255 255 255
-0 197 57
-255 255 255
-246 213 0
-255 0 255
-246 238 205
-139 123 74
-255 164 106
-164 172 172
-98 106 115
-123 131 139
-139 148 156
-115 156 189
-156 189 222
-197 213 246
-180 164 115
-205 189 148
-213 205 172
-230 222 189
-246 238 205
-139 123 74
-74 131 189
-65 74 90
-0 0 0
-148 222 164
-164 230 172
-180 238 189
-197 246 205
-213 255 222
-238 255 238
-255 255 255
-189 65 255
-255 255 255
-123 123 123
-255 0 255
-246 238 205
-139 123 74
-180 189 189
-255 255 255
-0 0 255
-164 172 172
-98 106 115
-123 131 139
-139 148 156
-115 156 189
-156 189 222
-148 222 164
-180 164 115
-205 189 148
-213 205 172
-230 222 189
-246 238 205
-139 123 74
-74 131 189
-65 74 90
-98 172 180
-41 41 57
-213 213 222
-205 205 205
-238 238 238
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/cable_car/bg.pal

@@ -1,67 +0,0 @@
-JASC-PAL
-0100
-64
-0 0 0
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-255 230 139
-238 205 123
-222 189 115
-205 172 106
-189 156 98
-180 139 90
-230 106 189
-230 106 189
-230 106 189
-0 0 0
-189 255 148
-156 222 98
-131 197 74
-106 164 49
-82 115 24
-57 82 0
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-230 106 189
-0 0 0
-213 238 255
-189 230 255
-164 222 255
-139 213 255
-115 205 255
-98 205 255
-197 205 222
-189 189 197
-180 164 164
-156 131 131
-131 90 90
-123 65 65
-230 106 189
-230 106 189
-230 106 189
-0 0 0
-197 205 246
-172 189 238
-156 172 238
-131 156 230
-115 139 230
-98 123 230
-65 74 106
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/contest/interface_audience.pal

@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 0
-255 255 255
-230 230 230
-197 197 197
-148 148 148
-74 65 82
-0 255 0
-0 255 0
-65 74 123
-139 123 131
-82 82 197
-189 82 74
-131 74 98
-74 74 131
-131 139 222
-106 164 164
-0 0 0
-115 123 156
-90 65 57
-148 197 106
-123 98 65
-131 123 49
-222 189 148
-164 131 106
-115 164 82
-164 148 57
-90 106 139
-180 172 82
-82 139 49
-255 230 189
-222 131 41
-246 246 222
-205 148 115
-255 106 115
-255 57 57
-156 0 0
-164 222 255
-106 148 255
-49 82 255
-255 255 115
-246 222 65
-230 106 0
-255 255 255
-189 189 197
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-0 0 0
-255 255 115
-246 222 90
-238 189 65
-238 164 41
-230 131 16
-230 106 0
-255 41 0
-255 148 82
-255 255 164
-255 255 255
-189 189 197
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-0 0 0
-255 131 106
-197 24 16
-164 222 255
-106 148 255
-49 82 255
-255 197 255
-255 139 255
-213 0 139
-148 255 164
-65 205 57
-246 222 65
-230 106 0
-255 255 255
-65 74 106
-65 74 106
-197 255 255
-246 246 90
-205 205 65
-255 255 180
-180 180 24
-74 65 82
-255 255 255
-156 156 156
-255 156 156
-0 0 0
-255 255 255
-255 148 148
-255 123 98
-255 0 0
-148 148 148
-0 0 0
-197 255 255
-246 246 90
-205 205 65
-255 255 180
-180 180 24
-74 65 82
-255 255 255
-156 156 156
-255 156 156
-0 0 0
-255 255 255
-255 148 148
-255 123 98
-255 0 0
-148 148 148
-0 0 0
-197 255 255
-246 246 90
-205 205 65
-255 255 180
-180 180 24
-74 65 82
-255 255 255
-156 156 156
-255 156 156
-0 0 0
-255 255 255
-255 148 148
-255 123 98
-255 0 0
-148 148 148
-0 0 0
-197 255 255
-213 255 213
-156 222 148
-222 255 230
-123 189 115
-74 65 82
-255 255 255
-156 156 156
-255 156 156
-0 0 0
-255 255 255
-255 148 148
-255 123 98
-255 0 0
-148 148 148
-0 0 0
-0 172 255
-0 0 0
-255 255 255
-230 230 213
-0 0 0
-197 197 197
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-255 255 255
-197 255 255
-0 0 0
-0 0 0
-0 0 0
-65 0 0
-123 0 0
-189 0 0
-255 8 0
-255 65 0
-255 123 0
-255 189 0
-255 255 0
-255 255 123
-255 255 255
-189 189 197
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/contest/results_screen/tiles.pal

@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 0
-255 255 255
-189 189 197
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-255 106 115
-255 57 57
-205 32 0
-246 213 0
-255 123 98
-156 180 90
-164 148 57
-90 106 139
-180 172 82
-0 0 0
-255 255 255
-189 189 197
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-164 222 255
-106 148 255
-24 57 205
-246 213 0
-255 123 98
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-255 255 255
-189 189 197
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-255 197 255
-255 139 255
-213 0 139
-246 213 0
-255 123 98
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-255 255 255
-189 189 197
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-180 255 197
-148 255 164
-65 172 57
-246 213 0
-255 123 98
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-255 255 255
-189 189 197
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-255 255 164
-246 213 0
-230 106 0
-246 213 0
-255 123 98
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-197 255 255
-255 255 255
-213 213 213
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-164 222 255
-106 148 255
-49 82 255
-180 255 197
-148 255 164
-65 172 57
-0 0 0
-0 0 0
-0 0 0
-197 255 255
-255 255 255
-213 213 213
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-255 139 230
-255 139 230
-255 49 156
-255 255 0
-255 255 0
-189 172 0
-41 49 90
-41 49 90
-0 0 0
-197 123 131
-255 255 255
-230 246 255
-205 238 255
-180 238 255
-156 230 255
-139 230 255
-255 205 230
-255 255 139
-255 230 255
-255 255 197
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-197 255 255
-255 255 255
-213 213 213
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-255 172 197
-255 172 172
-255 180 148
-255 189 123
-255 197 98
-255 205 82
-156 156 156
-156 156 156
-156 156 156
-197 255 255
-255 255 255
-213 213 213
-131 131 139
-98 98 123
-65 74 106
-41 49 90
-164 222 255
-106 148 255
-49 82 255
-180 255 197
-148 255 164
-65 172 57
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-164 222 255
-106 230 222
-49 238 189
-0 255 156
-0 255 156
-82 255 98
-164 255 49
-255 255 0
-255 172 16
-255 90 32
-255 8 57
-230 57 106
-205 115 156
-180 164 205
-164 222 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/frontier_pass/bg.pal

@@ -1,131 +0,0 @@
-JASC-PAL
-0100
-128
-57 74 74
-255 255 255
-205 205 205
-164 164 164
-123 123 123
-98 98 115
-57 74 74
-230 246 255
-98 41 65
-255 255 230
-230 230 197
-255 32 32
-98 164 222
-82 139 197
-74 115 172
-74 98 106
-139 98 115
-255 255 255
-230 255 222
-164 164 164
-123 123 123
-98 98 115
-41 57 65
-57 106 139
-65 139 197
-180 230 156
-148 238 131
-131 222 115
-82 172 74
-106 189 255
-205 205 205
-0 0 0
-139 98 115
-238 255 246
-213 238 230
-164 164 164
-123 123 123
-98 98 115
-41 57 65
-57 106 139
-65 139 197
-189 213 205
-148 180 164
-106 148 123
-65 115 90
-106 189 255
-205 205 205
-0 0 0
-139 98 115
-255 246 230
-246 230 213
-205 156 90
-180 131 65
-98 98 115
-41 57 65
-57 106 139
-65 139 197
-230 189 139
-205 156 115
-180 131 82
-156 106 41
-106 189 255
-205 205 205
-0 0 0
-139 98 115
-246 246 255
-230 230 238
-189 189 197
-156 156 156
-156 106 41
-41 57 65
-57 106 139
-65 139 197
-230 230 238
-189 189 197
-156 156 156
-123 123 123
-106 189 255
-205 205 205
-0 0 0
-139 98 115
-246 246 222
-246 238 172
-164 164 164
-123 123 123
-98 98 115
-41 57 65
-57 106 139
-65 139 197
-246 230 139
-230 213 49
-213 197 57
-156 115 57
-106 189 255
-205 205 205
-0 0 0
-0 0 0
-106 131 238
-139 164 213
-189 205 205
-213 197 131
-246 222 164
-172 131 131
-148 98 106
-115 106 148
-106 123 197
-197 230 230
-139 189 131
-106 156 74
-148 222 189
-238 156 131
-238 246 255
-0 0 0
-123 148 189
-65 74 106
-106 98 115
-82 90 180
-139 123 139
-164 172 189
-106 148 131
-180 205 213
-156 156 156
-213 238 230
-255 255 255
-213 180 172
-222 230 238
-213 205 156
-0 0 0

graphics/intro/scene_1/bg.pal

@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 0
-24 90 0
-49 115 0
-65 139 0
-90 172 0
-164 172 255
-164 197 255
-139 213 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-148 205 98
-180 255 131
-164 238 98
-0 0 0
-24 90 0
-49 115 0
-65 139 0
-90 172 0
-164 172 255
-164 197 255
-139 213 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-148 205 98
-180 255 131
-164 238 98
-0 0 0
-24 82 0
-32 90 0
-41 98 0
-49 115 0
-57 123 0
-65 139 0
-74 148 0
-82 156 0
-90 172 0
-0 16 0
-8 41 0
-16 57 0
-123 197 16
-180 255 131
-164 238 98
-0 0 0
-24 82 0
-32 90 0
-41 98 0
-49 115 0
-57 123 0
-65 139 0
-74 148 0
-82 156 0
-90 172 0
-8 24 8
-8 41 0
-16 57 0
-148 205 98
-98 172 74
-238 255 238
-0 0 0
-24 90 0
-49 115 0
-65 139 0
-90 172 0
-164 172 255
-164 197 255
-139 213 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-148 205 98
-180 255 131
-164 238 98
-0 0 0
-255 255 255
-246 246 238
-238 246 230
-230 246 222
-205 238 222
-180 230 230
-172 213 238
-131 205 238
-180 180 156
-213 213 230
-205 197 213
-189 230 115
-156 213 98
-222 230 222
-115 172 98
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-156 246 0
-65 90 156
-49 115 255
-82 82 82
-98 98 98
-115 115 115
-131 131 131
-148 148 148
-164 164 164
-180 180 180
-197 197 197
-213 213 213
-230 230 230
-255 255 255
-255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/party_menu/bg.pal

@@ -1,179 +0,0 @@
-JASC-PAL
-0100
-176
-123 156 115
-255 255 255
-106 106 106
-0 0 0
-65 205 255
-0 139 189
-49 189 238
-255 156 148
-189 90 82
-222 123 115
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-139 148 123
-74 74 98
-65 156 148
-139 156 41
-205 213 123
-180 180 90
-82 65 74
-32 16 24
-255 0 255
-255 0 255
-255 255 255
-230 238 139
-98 90 0
-255 0 255
-255 0 255
-115 90 180
-139 148 123
-255 115 49
-65 156 148
-139 156 41
-205 213 123
-180 180 90
-82 65 74
-82 82 90
-255 0 255
-255 0 255
-255 255 255
-123 205 180
-57 148 123
-255 0 255
-255 0 255
-164 115 246
-123 156 115
-74 74 98
-115 115 115
-255 255 255
-131 197 222
-57 148 222
-41 123 180
-131 197 222
-41 123 180
-115 255 172
-90 213 131
-65 205 255
-0 98 148
-82 82 82
-255 213 82
-255 180 65
-123 156 115
-74 74 98
-115 115 115
-255 255 255
-213 197 90
-197 164 24
-156 156 32
-213 197 90
-156 156 32
-255 230 57
-205 172 8
-255 156 148
-156 65 57
-82 82 82
-255 213 82
-255 180 65
-123 156 115
-74 74 98
-115 115 115
-255 255 255
-213 164 32
-197 106 16
-164 74 0
-213 164 32
-164 74 0
-255 115 49
-197 57 0
-255 0 255
-255 0 255
-82 82 82
-255 213 82
-255 180 65
-123 156 115
-255 115 49
-115 115 115
-255 255 255
-180 255 164
-123 222 131
-123 156 98
-255 115 49
-255 115 49
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-82 82 82
-255 213 82
-255 180 65
-57 156 255
-255 115 49
-115 115 115
-255 255 255
-172 238 255
-123 213 238
-74 172 205
-255 115 49
-255 115 49
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-82 82 82
-255 213 82
-255 180 65
-57 156 255
-255 115 49
-115 115 115
-255 255 255
-246 246 148
-246 230 98
-222 197 32
-255 115 49
-255 115 49
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-82 82 82
-255 213 82
-255 180 65
-57 156 255
-255 115 49
-115 115 115
-255 255 255
-255 213 222
-255 189 148
-238 164 131
-255 115 49
-255 115 49
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-82 82 82
-255 213 82
-255 180 65
-57 156 255
-255 255 115
-115 115 115
-255 255 255
-180 255 164
-123 222 131
-131 172 106
-255 255 115
-255 255 115
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-82 82 82
-255 213 82
-255 180 65

graphics/pokemon_storage/box_bg1.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-106 205 106
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/pokemon_storage/party_menu.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+131 172 180
+41 106 98
+82 98 115
+74 172 164
+57 139 139
+164 213 246
+115 189 98
+255 255 255
+123 189 255
+0 123 255
+41 90 164
+123 205 180
+8 74 65
+164 238 148
+65 82 90

graphics/rayquaza_scene/scene_1/clouds.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-164 205 180
-82 82 90
-255 0 255
-205 115 0
-156 98 16
-98 82 32
-49 65 49
-0 49 65
-24 57 65
-49 65 74
-49 49 57
-74 74 82
-98 98 106
-115 115 131
-139 148 148
-0 0 0
-32 90 115
-131 131 131
-148 148 148
-172 172 172
-197 197 197
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/slot_machine/menu.pal

@@ -1,83 +0,0 @@
-JASC-PAL
-0100
-80
-0 0 0
-57 57 49
-230 230 230
-255 255 255
-131 213 172
-49 123 74
-90 172 106
-255 0 255
-90 172 106
-255 164 41
-255 98 57
-255 197 156
-172 57 0
-0 65 24
-98 98 90
-0 0 0
-222 222 222
-255 255 255
-131 213 172
-255 90 0
-222 41 0
-255 90 0
-222 41 0
-255 90 0
-222 41 0
-255 90 0
-222 41 0
-255 90 0
-222 41 0
-255 0 255
-156 0 0
-0 0 0
-0 0 0
-255 255 255
-74 74 213
-115 172 255
-115 164 74
-156 238 74
-230 65 24
-255 164 41
-255 238 32
-131 213 172
-189 189 189
-156 156 156
-123 123 123
-90 90 90
-65 65 65
-0 0 0
-255 0 255
-255 255 255
-65 164 82
-139 230 139
-139 230 139
-148 238 148
-164 246 164
-180 246 180
-189 246 189
-205 255 205
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-255 0 255
-0 0 0
-222 222 222
-65 90 213
-90 172 106
-255 255 255
-131 213 172
-0 98 115
-90 90 0
-90 90 0
-156 16 0
-156 16 0
-106 156 246
-205 205 0
-205 205 0
-246 106 74
-246 106 74
-0 0 0

graphics/summary_screen/tiles.pal

@@ -1,131 +0,0 @@
-JASC-PAL
-0100
-128
-180 180 115
-74 65 57
-255 255 255
-222 230 246
-213 213 189
-246 255 255
-115 106 98
-98 156 222
-74 148 189
-57 148 164
-32 148 139
-16 148 115
-156 222 164
-98 180 139
-49 139 115
-0 106 98
-180 180 115
-74 65 57
-255 255 255
-90 106 0
-123 139 32
-255 246 205
-115 106 98
-90 222 123
-90 205 98
-90 189 74
-98 172 49
-98 156 24
-238 164 255
-189 156 164
-148 148 82
-106 148 0
-180 180 115
-74 65 57
-255 255 255
-172 180 172
-205 205 197
-246 255 238
-115 106 98
-238 222 24
-213 189 57
-189 164 98
-164 139 131
-139 115 172
-205 222 123
-172 172 148
-139 131 180
-115 90 213
-180 180 115
-74 65 57
-255 255 255
-0 0 0
-0 0 0
-246 255 246
-115 106 98
-222 24 238
-189 16 238
-164 8 238
-131 8 246
-106 0 246
-172 222 222
-139 148 230
-106 74 238
-82 0 255
-180 180 115
-74 65 57
-148 32 172
-189 106 213
-230 189 255
-255 255 255
-213 148 246
-189 139 205
-255 230 255
-230 180 213
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-115 98 90
-180 180 115
-74 65 57
-255 255 255
-222 230 246
-246 246 222
-246 255 255
-115 106 98
-255 205 74
-230 164 98
-205 123 123
-180 82 148
-156 41 172
-230 156 255
-197 98 238
-164 49 222
-131 0 205
-98 180 106
-0 0 0
-213 213 205
-255 255 255
-98 98 98
-230 8 8
-255 189 115
-65 205 255
-0 139 189
-255 156 148
-189 90 82
-139 246 255
-24 164 213
-255 189 180
-213 115 106
-0 0 0
-98 180 106
-0 0 0
-213 213 205
-255 255 255
-98 98 98
-230 8 8
-255 189 115
-238 238 172
-164 164 98
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-255 0 0
-164 0 0
-255 255 255

graphics/trainer_card/four_stars.pal

@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-139 98 115
-246 246 222
-246 238 172
-164 164 164
-123 123 123
-98 98 115
-41 57 65
-57 106 139
-65 139 197
-246 230 139
-230 213 49
-213 197 57
-156 115 57
-106 189 255
-205 205 205
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-106 180 213
-41 123 164
-0 0 0
-0 0 0
-98 98 115
-255 255 255
-230 230 238
-164 164 164
-123 123 123
-255 255 255
-230 230 238
-164 164 164
-123 123 123
-255 255 255
-230 230 238
-164 164 164
-123 123 123
-106 189 255
-205 205 205
-0 0 0

graphics/trainer_card/gold.pal

@@ -1,19 +1,51 @@
 JASC-PAL
 0100
-16
+48
 139 98 115
-246 197 0
-205 164 0
-246 197 0
-246 197 0
-246 197 0
-246 197 0
-246 197 0
+246 246 222
+246 238 172
+164 164 164
+123 123 123
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+246 230 139
+230 213 49
+213 197 57
+156 115 57
+106 189 255
+205 205 205
 0 0 0
 0 0 0
-189 148 16
-255 213 82
 0 0 0
 0 0 0
-189 148 16
-246 197 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 180 213
+41 123 164
+0 0 0
+0 0 0
+98 98 115
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+106 189 255
+205 205 205
+0 0 0

graphics/trainer_card/star.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 98 115
+246 197 0
+205 164 0
+246 197 0
+246 197 0
+246 197 0
+246 197 0
+246 197 0
+0 0 0
+0 0 0
+189 148 16
+255 213 82
+0 0 0
+0 0 0
+189 148 16
+246 197 0

graphics_file_rules.mk

@@ -632,9 +632,6 @@ $(WALLPAPERGFXDIR)/ludicolo/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $
 $(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/whiscash/bg.4bpp
 	@cat $^ >$@
 
-$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 11 -Wnum_tiles
-
 $(INTERFACEGFXDIR)/outline_cursor.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 8 -Wnum_tiles
 
@@ -675,9 +672,6 @@ $(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png
 $(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
 	$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
 
-$(STARTERGFXDIR)/birch_help.4bpp: $(STARTERGFXDIR)/birch_bag.4bpp $(STARTERGFXDIR)/birch_grass.4bpp
-	@cat $^ >$@
-
 $(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 

include/graphics.h

@@ -4949,9 +4949,9 @@ extern const u16 gContestResultsTitle_Tough_Tilemap[];
 extern const u16 gContestResultsTitle_Tilemap[];
 
 // Trainer Card.
-extern const u16 gHoennTrainerCard0Star_Pal[];
+extern const u16 gHoennTrainerCardGreen_Pal[];
 extern const u32 gHoennTrainerCard_Gfx[];
-extern const u16 gKantoTrainerCard0Star_Pal[];
+extern const u16 gKantoTrainerCardBlue_Pal[];
 extern const u32 gKantoTrainerCard_Gfx[];
 extern const u32 gKantoTrainerCardBg_Tilemap[];
 extern const u32 gHoennTrainerCardBack_Tilemap[];

include/starter_choose.h

@@ -1,10 +1,10 @@
 #ifndef GUARD_STARTER_CHOOSE_H
 #define GUARD_STARTER_CHOOSE_H
 
-extern const u16 gBirchBagGrassPal[2][16];
+extern const u16 gBirchBagGrass_Pal[];
 extern const u32 gBirchBagTilemap[];
 extern const u32 gBirchGrassTilemap[];
-extern const u32 gBirchHelpGfx[];
+extern const u32 gBirchBagGrass_Gfx[];
 extern const u32 gPokeballSelection_Gfx[];
 
 u16 GetStarterPokemon(u16 chosenStarterId);

src/credits.c

@@ -547,9 +547,9 @@ static void Task_LoadShowMons(u8 taskId)
         ResetAllPicSprites();
         FreeAllSpritePalettes();
         gReservedSpritePaletteCount = 8;
-        LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
+        LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM);
         LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7)));
-        LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2);
+        LoadPalette(gBirchBagGrass_Pal + 1, 1, 31 * 2);
 
         for (i = 0; i < MON_PIC_SIZE; i++)
             gDecompressionBuffer[i] = 0x11;

src/graphics.c

@@ -356,19 +356,15 @@ const u16 gBattleInterface_BallDisplayPal[] = INCBIN_U16("graphics/battle_interf
 
 const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpbar.4bpp",
                                                   "graphics/battle_interface/expbar.4bpp",
-                                                  "graphics/battle_interface/status_psn.4bpp",
-                                                  "graphics/battle_interface/status_par.4bpp",
-                                                  "graphics/battle_interface/status_slp.4bpp",
-                                                  "graphics/battle_interface/status_frz.4bpp",
-                                                  "graphics/battle_interface/status_brn.4bpp",
+                                                  "graphics/battle_interface/status.4bpp",
                                                   "graphics/battle_interface/misc.4bpp",
                                                   "graphics/battle_interface/hpbar_anim.4bpp",
                                                   "graphics/battle_interface/misc_frameend.4bpp",
                                                   "graphics/battle_interface/ball_display.4bpp",
                                                   "graphics/battle_interface/ball_caught_indicator.4bpp",
-                                                  "graphics/battle_interface/status2.4bpp",  // these three duplicate sets of graphics are for the opponent pokemon
-                                                  "graphics/battle_interface/status3.4bpp",  // and are also for use in double battles. they use dynamic palettes so
-                                                  "graphics/battle_interface/status4.4bpp",  // coloring them is an extreme headache and wont be done for now
+                                                  "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent/partner pokemon
+                                                  "graphics/battle_interface/status3.4bpp",
+                                                  "graphics/battle_interface/status4.4bpp",
                                                   "graphics/battle_interface/healthbox_doubles_frameend.4bpp",
                                                   "graphics/battle_interface/healthbox_doubles_frameend_bar.4bpp");
 const u32 gBattleInterfaceGfx_UnusedWindow3[] = INCBIN_U32("graphics/battle_interface/unused_window3.4bpp.lz");
@@ -439,7 +435,7 @@ const u32 gJPContestBgTilemap[] = INCBIN_U32("graphics/contest/japanese/bg.bin.l
 const u32 gJPContestWindowsTilemap[] = INCBIN_U32("graphics/contest/japanese/windows.bin.lz");
 const u32 gJPContestGfx2[] = INCBIN_U32("graphics/contest/japanese/composite_2.4bpp.lz");
 
-const u32 gContestInterfaceAudiencePalette[] = INCBIN_U32("graphics/contest/interface_audience.gbapal.lz");
+const u32 gContestInterfaceAudiencePalette[] = INCBIN_U32("graphics/contest/interface.gbapal.lz");
 const u32 gContestAudienceTilemap[] = INCBIN_U32("graphics/contest/audience.bin.lz");
 const u32 gContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/interface.bin.lz");
 const u32 gJPContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/japanese/interface.bin.lz");
@@ -1378,24 +1374,24 @@ const u16 gUsePokeblockNatureWin_Pal[] = INCBIN_U16("graphics/pokeblock/use_scre
 
 // trainer card
 
-const u16 gHoennTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
-const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
+const u16 gHoennTrainerCardGreen_Pal[] = INCBIN_U16("graphics/trainer_card/green.gbapal");
+const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/tiles.4bpp.lz");
 const u32 gHoennTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg.bin.lz");
 const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front.bin.lz");
 const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin.lz");
 const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link.bin.lz");
 
-const u16 gKantoTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/0star_fr.gbapal");
-const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_fr.4bpp.lz");
-const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg_fr.bin.lz");
-const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_fr.bin.lz");
-const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back_fr.bin.lz");
-const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link_fr.bin.lz");
+const u16 gKantoTrainerCardBlue_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/blue.gbapal");
+const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/tiles.4bpp.lz");
+const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/bg.bin.lz");
+const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front.bin.lz");
+const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back.bin.lz");
+const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front_link.bin.lz");
 
 // pokemon storage system
 
 const u32 gStorageSystemMenu_Gfx[] = INCBIN_U32("graphics/pokemon_storage/menu.4bpp.lz");
-const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/menu.gbapal"); // Only used by party menu, but generated from all menu gfx
+const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/party_menu.gbapal");
 const u32 gStorageSystemPartyMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/party_menu.bin.lz");
 
 // naming screen

src/pokemon_storage_system.c

@@ -945,26 +945,26 @@ static const union AffineAnimCmd *const sAffineAnims_ChooseBoxMenu[] =
 static const u8 sChooseBoxMenu_TextColors[] = {TEXT_COLOR_RED, TEXT_DYNAMIC_COLOR_6, TEXT_DYNAMIC_COLOR_5};
 static const u8 sText_OutOf30[] = _("/30");
 
-static const u16 sChooseBoxMenu_Pal[]       = INCBIN_U16("graphics/pokemon_storage/box_selection_popup.gbapal");
-static const u8 sChooseBoxMenuCenter_Gfx[]  = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_center.4bpp");
-static const u8 sChooseBoxMenuSides_Gfx[]   = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp");
-static const u32 sScrollingBg_Gfx[]         = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.4bpp.lz");
-static const u32 sScrollingBg_Tilemap[]     = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.bin.lz");
-static const u16 sDisplayMenu_Pal[]         = INCBIN_U16("graphics/pokemon_storage/display_menu.gbapal"); // Unused
-static const u32 sDisplayMenu_Tilemap[]     = INCBIN_U32("graphics/pokemon_storage/display_menu.bin.lz");
-static const u16 sPkmnData_Tilemap[]        = INCBIN_U16("graphics/pokemon_storage/pkmn_data.bin");
+static const u16 sChooseBoxMenu_Pal[]        = INCBIN_U16("graphics/pokemon_storage/box_selection_popup.gbapal");
+static const u8 sChooseBoxMenuCenter_Gfx[]   = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_center.4bpp");
+static const u8 sChooseBoxMenuSides_Gfx[]    = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp");
+static const u32 sScrollingBg_Gfx[]          = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.4bpp.lz");
+static const u32 sScrollingBg_Tilemap[]      = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.bin.lz");
+static const u16 sDisplayMenu_Pal[]          = INCBIN_U16("graphics/pokemon_storage/display_menu.gbapal"); // Unused
+static const u32 sDisplayMenu_Tilemap[]      = INCBIN_U32("graphics/pokemon_storage/display_menu.bin.lz");
+static const u16 sPkmnData_Tilemap[]         = INCBIN_U16("graphics/pokemon_storage/pkmn_data.bin");
 // sInterface_Pal - parts of the display frame, "PkmnData"'s normal color, Close Box
-static const u16 sInterface_Pal[]           = INCBIN_U16("graphics/pokemon_storage/interface.gbapal");
-static const u16 sPkmnDataGray_Pal[]        = INCBIN_U16("graphics/pokemon_storage/pkmn_data_gray.gbapal");
-static const u16 sBg_Pal[]                  = INCBIN_U16("graphics/pokemon_storage/bg.gbapal");
-static const u16 sBgMoveItems_Pal[]         = INCBIN_U16("graphics/pokemon_storage/bg_move_items.gbapal");
-static const u16 sCloseBoxButton_Tilemap[]  = INCBIN_U16("graphics/pokemon_storage/close_box_button.bin");
-static const u16 sPartySlotFilled_Tilemap[] = INCBIN_U16("graphics/pokemon_storage/party_slot_filled.bin");
-static const u16 sPartySlotEmpty_Tilemap[]  = INCBIN_U16("graphics/pokemon_storage/party_slot_empty.bin");
-static const u16 sWaveform_Pal[]            = INCBIN_U16("graphics/pokemon_storage/waveform.gbapal");
-static const u32 sWaveform_Gfx[]            = INCBIN_U32("graphics/pokemon_storage/waveform.4bpp");
-static const u16 sUnused_Pal[]              = INCBIN_U16("graphics/pokemon_storage/unused.gbapal");
-static const u16 sTextWindows_Pal[]         = INCBIN_U16("graphics/pokemon_storage/text_windows.gbapal");
+static const u16 sInterface_Pal[]            = INCBIN_U16("graphics/pokemon_storage/interface.gbapal");
+static const u16 sPkmnDataGray_Pal[]         = INCBIN_U16("graphics/pokemon_storage/pkmn_data_gray.gbapal");
+static const u16 sScrollingBg_Pal[]          = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.gbapal");
+static const u16 sScrollingBgMoveItems_Pal[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg_move_items.gbapal");
+static const u16 sCloseBoxButton_Tilemap[]   = INCBIN_U16("graphics/pokemon_storage/close_box_button.bin");
+static const u16 sPartySlotFilled_Tilemap[]  = INCBIN_U16("graphics/pokemon_storage/party_slot_filled.bin");
+static const u16 sPartySlotEmpty_Tilemap[]   = INCBIN_U16("graphics/pokemon_storage/party_slot_empty.bin");
+static const u16 sWaveform_Pal[]             = INCBIN_U16("graphics/pokemon_storage/waveform.gbapal");
+static const u32 sWaveform_Gfx[]             = INCBIN_U32("graphics/pokemon_storage/waveform.4bpp");
+static const u16 sUnused_Pal[]               = INCBIN_U16("graphics/pokemon_storage/unused.gbapal");
+static const u16 sTextWindows_Pal[]          = INCBIN_U16("graphics/pokemon_storage/text_windows.gbapal");
 
 static const struct WindowTemplate sWindowTemplates[] =
 {
@@ -1763,6 +1763,8 @@ void ResetPokemonStorageSystem(void)
 
 static void LoadChooseBoxMenuGfx(struct ChooseBoxMenu *menu, u16 tileTag, u16 palTag, u8 subpriority, bool32 loadPal)
 {
+    // Because loadPal is always false, the below palette is never used.
+    // The Choose Box menu instead uses the palette indicated by palTag, which is always PALTAG_MISC_1 (sHandCursor_Pal)
     struct SpritePalette palette =
     {
         sChooseBoxMenu_Pal, palTag
@@ -3852,9 +3854,9 @@ static void InitPalettesAndSprites(void)
     LoadPalette(sPkmnDataGray_Pal, 0x20, sizeof(sPkmnDataGray_Pal));
     LoadPalette(sTextWindows_Pal, 0xF0, sizeof(sTextWindows_Pal));
     if (sStorage->boxOption != OPTION_MOVE_ITEMS)
-        LoadPalette(sBg_Pal, 0x30, sizeof(sBg_Pal));
+        LoadPalette(sScrollingBg_Pal, 0x30, sizeof(sScrollingBg_Pal));
     else
-        LoadPalette(sBgMoveItems_Pal, 0x30, sizeof(sBgMoveItems_Pal));
+        LoadPalette(sScrollingBgMoveItems_Pal, 0x30, sizeof(sScrollingBgMoveItems_Pal));
 
     SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_16COLOR | BGCNT_SCREENBASE(30));
     CreateDisplayMonSprite();

src/save_failed_screen.c

@@ -196,7 +196,7 @@ static void CB2_SaveFailedScreen(void)
         DmaFill16(3, 0, VRAM, VRAM_SIZE);
         DmaFill32(3, 0, OAM, OAM_SIZE);
         DmaFill16(3, 0, PLTT, PLTT_SIZE);
-        LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
+        LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM);
         LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(14)));
         LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(15)));
         LZ77UnCompVram(sSaveFailedClockGfx, (void *)(OBJ_VRAM0 + 0x20));
@@ -214,7 +214,7 @@ static void CB2_SaveFailedScreen(void)
         ResetSpriteData();
         ResetTasks();
         ResetPaletteFade();
-        LoadPalette(gBirchBagGrassPal, 0, 0x40);
+        LoadPalette(gBirchBagGrass_Pal, 0, 0x40);
         LoadPalette(sSaveFailedClockPal, 0x100, 0x20);
         LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20);
         LoadPalette(gStandardMenuPalette, 0xF0, 0x20);

src/starter_choose.c

@@ -51,17 +51,12 @@ static void SpriteCB_StarterPokemon(struct Sprite *sprite);
 
 static u16 sStarterLabelWindowId;
 
-const u16 gBirchBagGrassPal[][16] =
-{
-    INCBIN_U16("graphics/starter_choose/birch_bag.gbapal"),
-    INCBIN_U16("graphics/starter_choose/birch_grass.gbapal"),
-};
-
+const u16 gBirchBagGrass_Pal[] = INCBIN_U16("graphics/starter_choose/tiles.gbapal");
 static const u16 sPokeballSelection_Pal[] = INCBIN_U16("graphics/starter_choose/pokeball_selection.gbapal");
 static const u16 sStarterCircle_Pal[] = INCBIN_U16("graphics/starter_choose/starter_circle.gbapal");
 const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/starter_choose/birch_bag.bin.lz");
 const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/starter_choose/birch_grass.bin.lz");
-const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/starter_choose/birch_help.4bpp.lz"); // Birch bag and grass combined
+const u32 gBirchBagGrass_Gfx[] = INCBIN_U32("graphics/starter_choose/tiles.4bpp.lz");
 const u32 gPokeballSelection_Gfx[] = INCBIN_U32("graphics/starter_choose/pokeball_selection.4bpp.lz");
 static const u32 sStarterCircle_Gfx[] = INCBIN_U32("graphics/starter_choose/starter_circle.4bpp.lz");
 
@@ -402,7 +397,7 @@ void CB2_ChooseStarter(void)
     DmaFill32(3, 0, OAM, OAM_SIZE);
     DmaFill16(3, 0, PLTT, PLTT_SIZE);
 
-    LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
+    LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM);
     LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(6)));
     LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7)));
 
@@ -421,7 +416,7 @@ void CB2_ChooseStarter(void)
     ResetAllPicSprites();
 
     LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20);
-    LoadPalette(gBirchBagGrassPal, 0, 0x40);
+    LoadPalette(gBirchBagGrass_Pal, 0, sizeof(gBirchBagGrass_Pal));
     LoadCompressedSpriteSheet(&sSpriteSheet_PokeballSelect[0]);
     LoadCompressedSpriteSheet(&sSpriteSheet_StarterCircle[0]);
     LoadSpritePalettes(sSpritePalettes_StarterChoose);

src/trainer_card.c

@@ -162,27 +162,27 @@ static bool8 Task_EndCardFlip(struct Task *task);
 static void UpdateCardFlipRegs(u16);
 static void LoadMonIconGfx(void);
 
-static const u32 sTrainerCardStickers_Gfx[]      = INCBIN_U32("graphics/trainer_card/stickers_fr.4bpp.lz");
+static const u32 sTrainerCardStickers_Gfx[]      = INCBIN_U32("graphics/trainer_card/frlg/stickers.4bpp.lz");
 static const u16 sUnused_Pal[]                   = INCBIN_U16("graphics/trainer_card/unused.gbapal");
-static const u16 sHoennTrainerCard1Star_Pal[]    = INCBIN_U16("graphics/trainer_card/one_star.gbapal");
-static const u16 sKantoTrainerCard1Star_Pal[]    = INCBIN_U16("graphics/trainer_card/one_star_fr.gbapal");
-static const u16 sHoennTrainerCard2Star_Pal[]    = INCBIN_U16("graphics/trainer_card/two_stars.gbapal");
-static const u16 sKantoTrainerCard2Star_Pal[]    = INCBIN_U16("graphics/trainer_card/two_stars_fr.gbapal");
-static const u16 sHoennTrainerCard3Star_Pal[]    = INCBIN_U16("graphics/trainer_card/three_stars.gbapal");
-static const u16 sKantoTrainerCard3Star_Pal[]    = INCBIN_U16("graphics/trainer_card/three_stars_fr.gbapal");
-static const u16 sHoennTrainerCard4Star_Pal[]    = INCBIN_U16("graphics/trainer_card/four_stars.gbapal");
-static const u16 sKantoTrainerCard4Star_Pal[]    = INCBIN_U16("graphics/trainer_card/four_stars_fr.gbapal");
+static const u16 sHoennTrainerCardBronze_Pal[]   = INCBIN_U16("graphics/trainer_card/bronze.gbapal");
+static const u16 sKantoTrainerCardGreen_Pal[]    = INCBIN_U16("graphics/trainer_card/frlg/green.gbapal");
+static const u16 sHoennTrainerCardCopper_Pal[]   = INCBIN_U16("graphics/trainer_card/copper.gbapal");
+static const u16 sKantoTrainerCardBronze_Pal[]   = INCBIN_U16("graphics/trainer_card/frlg/bronze.gbapal");
+static const u16 sHoennTrainerCardSilver_Pal[]   = INCBIN_U16("graphics/trainer_card/silver.gbapal");
+static const u16 sKantoTrainerCardSilver_Pal[]   = INCBIN_U16("graphics/trainer_card/frlg/silver.gbapal");
+static const u16 sHoennTrainerCardGold_Pal[]     = INCBIN_U16("graphics/trainer_card/gold.gbapal");
+static const u16 sKantoTrainerCardGold_Pal[]     = INCBIN_U16("graphics/trainer_card/frlg/gold.gbapal");
 static const u16 sHoennTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/female_bg.gbapal");
-static const u16 sKantoTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/female_bg_fr.gbapal");
+static const u16 sKantoTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/female_bg.gbapal");
 static const u16 sHoennTrainerCardBadges_Pal[]   = INCBIN_U16("graphics/trainer_card/badges.gbapal");
-static const u16 sKantoTrainerCardBadges_Pal[]   = INCBIN_U16("graphics/trainer_card/badges_fr.gbapal");
-static const u16 sTrainerCardGold_Pal[]          = INCBIN_U16("graphics/trainer_card/gold.gbapal");
-static const u16 sTrainerCardSticker1_Pal[]      = INCBIN_U16("graphics/trainer_card/stickers_fr1.gbapal");
-static const u16 sTrainerCardSticker2_Pal[]      = INCBIN_U16("graphics/trainer_card/stickers_fr2.gbapal");
-static const u16 sTrainerCardSticker3_Pal[]      = INCBIN_U16("graphics/trainer_card/stickers_fr3.gbapal");
-static const u16 sTrainerCardSticker4_Pal[]      = INCBIN_U16("graphics/trainer_card/stickers_fr4.gbapal");
+static const u16 sKantoTrainerCardBadges_Pal[]   = INCBIN_U16("graphics/trainer_card/frlg/badges.gbapal");
+static const u16 sTrainerCardStar_Pal[]          = INCBIN_U16("graphics/trainer_card/star.gbapal");
+static const u16 sTrainerCardSticker1_Pal[]      = INCBIN_U16("graphics/trainer_card/frlg/stickers1.gbapal");
+static const u16 sTrainerCardSticker2_Pal[]      = INCBIN_U16("graphics/trainer_card/frlg/stickers2.gbapal");
+static const u16 sTrainerCardSticker3_Pal[]      = INCBIN_U16("graphics/trainer_card/frlg/stickers3.gbapal");
+static const u16 sTrainerCardSticker4_Pal[]      = INCBIN_U16("graphics/trainer_card/frlg/stickers4.gbapal");
 static const u32 sHoennTrainerCardBadges_Gfx[]   = INCBIN_U32("graphics/trainer_card/badges.4bpp.lz");
-static const u32 sKantoTrainerCardBadges_Gfx[]   = INCBIN_U32("graphics/trainer_card/badges_fr.4bpp.lz");
+static const u32 sKantoTrainerCardBadges_Gfx[]   = INCBIN_U32("graphics/trainer_card/frlg/badges.4bpp.lz");
 
 static const struct BgTemplate sTrainerCardBgTemplates[4] =
 {
@@ -256,22 +256,22 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] =
     DUMMY_WIN_TEMPLATE
 };
 
-static const u16 *const sHoennTrainerCardStarPals[] =
+static const u16 *const sHoennTrainerCardPals[] =
 {
-    gHoennTrainerCard0Star_Pal,
-    sHoennTrainerCard1Star_Pal,
-    sHoennTrainerCard2Star_Pal,
-    sHoennTrainerCard3Star_Pal,
-    sHoennTrainerCard4Star_Pal,
+    gHoennTrainerCardGreen_Pal,  // Default (0 stars)
+    sHoennTrainerCardBronze_Pal, // 1 star
+    sHoennTrainerCardCopper_Pal, // 2 stars
+    sHoennTrainerCardSilver_Pal, // 3 stars
+    sHoennTrainerCardGold_Pal,   // 4 stars
 };
 
-static const u16 *const sKantoTrainerCardStarPals[] =
+static const u16 *const sKantoTrainerCardPals[] =
 {
-    gKantoTrainerCard0Star_Pal,
-    sKantoTrainerCard1Star_Pal,
-    sKantoTrainerCard2Star_Pal,
-    sKantoTrainerCard3Star_Pal,
-    sKantoTrainerCard4Star_Pal,
+    gKantoTrainerCardBlue_Pal,   // Default (0 stars)
+    sKantoTrainerCardGreen_Pal,  // 1 star
+    sKantoTrainerCardBronze_Pal, // 2 stars
+    sKantoTrainerCardSilver_Pal, // 3 stars
+    sKantoTrainerCardGold_Pal,   // 4 stars
 };
 
 static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
@@ -1425,19 +1425,19 @@ static u8 SetCardBgsAndPals(void)
     case 2:
         if (sData->cardType != CARD_TYPE_FRLG)
         {
-            LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], 0, 96);
+            LoadPalette(sHoennTrainerCardPals[sData->trainerCard.stars], 0, 96);
             LoadPalette(sHoennTrainerCardBadges_Pal, 48, 32);
             if (sData->trainerCard.gender != MALE)
                 LoadPalette(sHoennTrainerCardFemaleBg_Pal, 16, 32);
         }
         else
         {
-            LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], 0, 96);
+            LoadPalette(sKantoTrainerCardPals[sData->trainerCard.stars], 0, 96);
             LoadPalette(sKantoTrainerCardBadges_Pal, 48, 32);
             if (sData->trainerCard.gender != MALE)
                 LoadPalette(sKantoTrainerCardFemaleBg_Pal, 16, 32);
         }
-        LoadPalette(sTrainerCardGold_Pal, 64, 32);
+        LoadPalette(sTrainerCardStar_Pal, 64, 32);
         break;
     case 3:
         SetBgTilemapBuffer(0, sData->cardTilemapBuffer);