Merge branch 'master' into slot_machine

18 files changed, 171 insertions, 0 deletions

diff --git a/graphics/battle_transitions/agatha_bg.pal b/graphics/battle_transitions/agatha_bg.pal
new file mode 100644
index 000000000..4aac79fec
--- /dev/null
+++ b/graphics/battle_transitions/agatha_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+255 82 172
+255 98 189
+255 115 205
+255 131 222
+255 148 238
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/big_pokeball_tilemap.bin b/graphics/battle_transitions/big_pokeball_tilemap.bin
new file mode 100644
index 000000000..691e16ef7
--- /dev/null
+++ b/graphics/battle_transitions/big_pokeball_tilemap.bin
diff --git a/graphics/battle_transitions/big_pokeball_tileset.png b/graphics/battle_transitions/big_pokeball_tileset.png
new file mode 100644
index 000000000..21b227441
--- /dev/null
+++ b/graphics/battle_transitions/big_pokeball_tileset.png
diff --git a/graphics/battle_transitions/blue_bg.pal b/graphics/battle_transitions/blue_bg.pal
new file mode 100644
index 000000000..30da9c5f9
--- /dev/null
+++ b/graphics/battle_transitions/blue_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+197 197 65
+213 213 82
+230 230 98
+246 246 115
+255 255 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/bruno_bg.pal b/graphics/battle_transitions/bruno_bg.pal
new file mode 100644
index 000000000..b55e6a6cd
--- /dev/null
+++ b/graphics/battle_transitions/bruno_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+8 213 8
+32 238 32
+49 246 49
+74 255 74
+123 255 123
+230 123 139
+246 139 156
+255 156 172
+255 172 189
+255 189 205
+230 123 139
diff --git a/graphics/battle_transitions/green_bg.pal b/graphics/battle_transitions/green_bg.pal
new file mode 100644
index 000000000..8ebd38309
--- /dev/null
+++ b/graphics/battle_transitions/green_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 123 139
+246 139 156
+255 156 172
+255 172 189
+255 189 205
+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
diff --git a/graphics/battle_transitions/grid_square_tileset.png b/graphics/battle_transitions/grid_square_tileset.png
new file mode 100644
index 000000000..fb8a9e6fd
--- /dev/null
+++ b/graphics/battle_transitions/grid_square_tileset.png
diff --git a/graphics/battle_transitions/lance_bg.pal b/graphics/battle_transitions/lance_bg.pal
new file mode 100644
index 000000000..6717a90bd
--- /dev/null
+++ b/graphics/battle_transitions/lance_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+0 0 131
+16 16 148
+32 32 164
+49 49 180
+65 65 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/lorelei_bg.pal b/graphics/battle_transitions/lorelei_bg.pal
new file mode 100644
index 000000000..1f30ed062
--- /dev/null
+++ b/graphics/battle_transitions/lorelei_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+189 0 189
+205 16 205
+222 32 222
+238 49 238
+255 65 255
+106 180 213
+123 197 230
+139 213 246
+156 230 255
+172 246 255
+255 255 255
diff --git a/graphics/battle_transitions/red_bg.pal b/graphics/battle_transitions/red_bg.pal
new file mode 100644
index 000000000..e43b0f74c
--- /dev/null
+++ b/graphics/battle_transitions/red_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 180 213
+123 197 230
+139 213 246
+156 230 255
+172 246 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
diff --git a/graphics/battle_transitions/sliding_pokeball.pal b/graphics/battle_transitions/sliding_pokeball.pal
new file mode 100644
index 000000000..6190709ed
--- /dev/null
+++ b/graphics/battle_transitions/sliding_pokeball.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 172 238
+246 8 0
+238 213 180
+222 180 148
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+98 156 180
+148 0 0
+197 197 197
+238 230 164
+222 205 131
+213 180 106
+205 156 82
+0 0 0
diff --git a/graphics/battle_transitions/sliding_pokeball.png b/graphics/battle_transitions/sliding_pokeball.png
new file mode 100644
index 000000000..3802a915b
--- /dev/null
+++ b/graphics/battle_transitions/sliding_pokeball.png
diff --git a/graphics/battle_transitions/sliding_pokeball_tilemap.bin b/graphics/battle_transitions/sliding_pokeball_tilemap.bin
new file mode 100644
index 000000000..6cdeb0d17
--- /dev/null
+++ b/graphics/battle_transitions/sliding_pokeball_tilemap.bin
diff --git a/graphics/battle_transitions/unused_brendan.png b/graphics/battle_transitions/unused_brendan.png
new file mode 100644
index 000000000..926ba0ff7
--- /dev/null
+++ b/graphics/battle_transitions/unused_brendan.png
diff --git a/graphics/battle_transitions/unused_lass.png b/graphics/battle_transitions/unused_lass.png
new file mode 100644
index 000000000..378fa3c19
--- /dev/null
+++ b/graphics/battle_transitions/unused_lass.png
diff --git a/graphics/battle_transitions/unused_trainer.pal b/graphics/battle_transitions/unused_trainer.pal
new file mode 100644
index 000000000..ad94d728a
--- /dev/null
+++ b/graphics/battle_transitions/unused_trainer.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 222 205
+222 164 148
+205 131 115
+123 90 82
+57 74 123
+41 57 98
+24 41 82
+16 32 57
+222 230 238
+255 197 90
+189 156 90
+255 98 90
+197 65 65
+255 255 255
+0 0 0
diff --git a/graphics/battle_transitions/vsbar_tilemap.bin b/graphics/battle_transitions/vsbar_tilemap.bin
new file mode 100644
index 000000000..4f170b470
--- /dev/null
+++ b/graphics/battle_transitions/vsbar_tilemap.bin
diff --git a/graphics/battle_transitions/vsbar_tileset.png b/graphics/battle_transitions/vsbar_tileset.png
new file mode 100644
index 000000000..1d327cdaf
--- /dev/null
+++ b/graphics/battle_transitions/vsbar_tileset.png