Merge branch 'master' into slot_machine

graphics/battle_records/palette.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+74 74 74
+189 131 156
+230 156 213
+222 238 255
+230 246 255
+148 115 139
+197 213 222
+172 164 189
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/diploma/unk_8415954.pal

@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+123 205 172
+255 0 255
+222 230 139
+205 246 156
+230 222 164
+197 238 172
+205 230 213
+213 246 172
+205 230 164
+238 255 156
+197 238 172
+222 230 238
+222 238 238
+213 246 172
+246 238 172
+238 238 139
+123 205 172
+255 0 255
+255 0 255
+246 246 205
+230 230 148
+230 230 148
+230 230 148
+238 238 164
+222 222 148
+255 238 180
+238 230 164
+238 222 180
+246 246 164
+246 230 131
+246 230 172
+222 238 222

graphics/interface/dex_caught_pokeball.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+123 156 131
+238 238 238
+0 0 0
+213 213 189
+172 164 123
+255 131 123
+238 49 0
+222 49 16
+197 49 41
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/interface/pokemon_types.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+123 156 131
+238 49 0
+246 131 49
+255 180 16
+222 230 49
+123 205 82
+156 222 222
+106 148 246
+164 65 164
+172 172 123
+222 222 197
+189 164 57
+255 90 139
+82 123 139
+65 65 65
+255 255 255

graphics/interface/red_arrow.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 164 197
+255 82 0
+131 32 0
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255

graphics/intro/unk_8402260.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 32 32
+24 57 57
+49 82 82
+82 106 106
+106 131 131
+139 156 156
+164 180 180
+197 205 205
+222 230 230
+255 255 255

graphics/intro/unk_8402630.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+24 41 74
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+82 82 82
+180 180 180
+255 255 255

graphics/intro/unk_840270C.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 74
+0 0 0
+139 123 16
+189 172 16
+131 164 65
+148 230 49
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+222 222 222
+24 41 74
+82 82 82
+180 180 180
+255 255 255

graphics/intro/unk_8402D34.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+115 197 106
+41 164 8
+82 180 65
+139 222 131
+98 197 82
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+16 139 98
+16 115 98
+24 90 90
+32 74 90
+32 65 82

graphics/intro/unk_84048CC.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+255 255 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+238 246 246
+222 230 230
+180 189 197
+148 156 172
+106 123 139
+74 90 115
+41 57 90
+0 0 0

graphics/intro/unk_84053B4.pal

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

graphics/intro/unk_8405B08.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+131 238 115
+82 189 74
+57 164 57
+115 213 98
+16 123 16
+164 255 131
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 148 0
+164 222 98

graphics/intro/unk_8405DA4.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 222 205
+255 255 255
+222 222 222
+123 123 123
+255 0 255
+255 0 255
+255 0 255
+65 41 74
+255 180 123
+238 98 74
+205 57 32
+197 131 180
+164 98 148
+131 65 123
+90 57 90
+16 16 16

graphics/intro/unk_8406634.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 123 41
+65 148 90
+49 115 74
+106 57 98
+49 115 98
+82 205 156
+49 164 115
+255 255 255
+106 189 115
+90 41 82
+222 180 205
+189 131 189
+139 90 148
+205 205 222
+131 131 131
+16 16 16

graphics/intro/unk_8407430.pal

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

graphics/intro/unk_84096AC.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 222 205
+255 106 82
+222 65 41
+180 24 0
+57 238 189
+82 205 156
+0 164 115
+255 255 255
+255 0 255
+222 180 205
+189 131 189
+139 90 148
+106 57 98
+205 205 222
+131 131 131
+16 16 16

graphics/intro/unk_8409A1C.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+164 238 139
+57 148 57
+131 213 115
+156 230 156
+131 205 148
+106 180 131
+65 139 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 0 0

graphics/intro/unk_840B834.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+238 246 189
+0 0 0
+0 0 0
+115 213 255
+156 222 255
+205 238 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

graphics/intro/unk_840B854.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 222 205
+255 255 255
+222 222 222
+123 123 123
+156 222 255
+189 230 255
+222 238 255
+255 255 255
+255 180 123
+238 98 74
+205 57 32
+197 131 180
+164 98 148
+131 65 123
+90 57 90
+16 16 16

graphics/item_pc/unk_8E85408.pal

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