Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps

72 files changed, 0 insertions, 19 deletions

diff --git a/graphics/intro/intro.png b/graphics/intro/intro.png
deleted file mode 100644
index e0f28c841..000000000
--- a/graphics/intro/intro.png
+++ /dev/null
diff --git a/graphics/intro/intro2_bgtrees2.pal b/graphics/intro/intro2_bgtrees2.pal
deleted file mode 100644
index 5c506481a..000000000
--- a/graphics/intro/intro2_bgtrees2.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-156 189 246
-172 205 246
-197 230 255
-213 246 255
-238 255 255
-156 180 172
-197 197 156
-172 189 164
-98 139 98
-98 156 57
-123 164 131
-156 213 82
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/intro/intro1_bgpal.pal b/graphics/intro/scene_1/bg.pal
index 95145b854..95145b854 100644
--- a/graphics/intro/intro1_bgpal.pal
+++ b/graphics/intro/scene_1/bg.pal
diff --git a/graphics/intro/introgfx.png b/graphics/intro/scene_1/bg.png
index 041901463..041901463 100644
--- a/graphics/intro/introgfx.png
+++ b/graphics/intro/scene_1/bg.png
diff --git a/graphics/intro/intro1_bg0_map.bin b/graphics/intro/scene_1/bg0_map.bin
index 8307cf656..8307cf656 100644
--- a/graphics/intro/intro1_bg0_map.bin
+++ b/graphics/intro/scene_1/bg0_map.bin
diff --git a/graphics/intro/intro1_bg1_map.bin b/graphics/intro/scene_1/bg1_map.bin
index 7d34e5bba..7d34e5bba 100644
--- a/graphics/intro/intro1_bg1_map.bin
+++ b/graphics/intro/scene_1/bg1_map.bin
diff --git a/graphics/intro/intro1_bg2_map.bin b/graphics/intro/scene_1/bg2_map.bin
index 7781e8b08..7781e8b08 100644
--- a/graphics/intro/intro1_bg2_map.bin
+++ b/graphics/intro/scene_1/bg2_map.bin
diff --git a/graphics/intro/intro1_bg3_map.bin b/graphics/intro/scene_1/bg3_map.bin
index 1af02a025..1af02a025 100644
--- a/graphics/intro/intro1_bg3_map.bin
+++ b/graphics/intro/scene_1/bg3_map.bin
diff --git a/graphics/intro/intro1_drops.pal b/graphics/intro/scene_1/drops.pal
index 1b8ce3d6e..1b8ce3d6e 100644
--- a/graphics/intro/intro1_drops.pal
+++ b/graphics/intro/scene_1/drops.pal
diff --git a/graphics/intro/scene_1/drops_logo.png b/graphics/intro/scene_1/drops_logo.png
new file mode 100644
index 000000000..9c903656a
--- /dev/null
+++ b/graphics/intro/scene_1/drops_logo.png
diff --git a/graphics/intro/intro1_flygon.png b/graphics/intro/scene_1/flygon.png
index 080ab1a65..080ab1a65 100644
--- a/graphics/intro/intro1_flygon.png
+++ b/graphics/intro/scene_1/flygon.png
diff --git a/graphics/intro/intro1_eon.png b/graphics/intro/scene_1/lati.png
index cf8eedc08..cf8eedc08 100644
--- a/graphics/intro/intro1_eon.png
+++ b/graphics/intro/scene_1/lati.png
diff --git a/graphics/intro/intro1_gflogo.pal b/graphics/intro/scene_1/logo.pal
index aef9152e4..aef9152e4 100644
--- a/graphics/intro/intro1_gflogo.pal
+++ b/graphics/intro/scene_1/logo.pal
diff --git a/graphics/intro/intro1_sparkle.png b/graphics/intro/scene_1/sparkle.png
index f8db885ec..f8db885ec 100644
--- a/graphics/intro/intro1_sparkle.png
+++ b/graphics/intro/scene_1/sparkle.png
diff --git a/graphics/intro/intro1_text.pal b/graphics/intro/scene_1/text.pal
index 574921c0d..574921c0d 100644
--- a/graphics/intro/intro1_text.pal
+++ b/graphics/intro/scene_1/text.pal
diff --git a/graphics/intro/intro2_bicycle.png b/graphics/intro/scene_2/bicycle.png
index ff63f93a4..ff63f93a4 100644
--- a/graphics/intro/intro2_bicycle.png
+++ b/graphics/intro/scene_2/bicycle.png
diff --git a/graphics/intro/intro2_brendan_noturn.png b/graphics/intro/scene_2/brendan.png
index 7c7a9e494..7c7a9e494 100644
--- a/graphics/intro/intro2_brendan_noturn.png
+++ b/graphics/intro/scene_2/brendan.png
diff --git a/graphics/intro/intro2_brendan.png b/graphics/intro/scene_2/brendan_credits.png
index 045953002..045953002 100644
--- a/graphics/intro/intro2_brendan.png
+++ b/graphics/intro/scene_2/brendan_credits.png
diff --git a/graphics/intro/intro2_bgclouds2.png b/graphics/intro/scene_2/clouds.png
index 933332fdd..933332fdd 100644
--- a/graphics/intro/intro2_bgclouds2.png
+++ b/graphics/intro/scene_2/clouds.png
diff --git a/graphics/intro/85F0CFC.pal b/graphics/intro/scene_2/clouds_bg.pal
index 09a1ee728..09a1ee728 100644
--- a/graphics/intro/85F0CFC.pal
+++ b/graphics/intro/scene_2/clouds_bg.pal
diff --git a/graphics/intro/intro2_bgclouds.png b/graphics/intro/scene_2/clouds_bg.png
index 7ba3d78f4..7ba3d78f4 100644
--- a/graphics/intro/intro2_bgclouds.png
+++ b/graphics/intro/scene_2/clouds_bg.png
diff --git a/graphics/intro/intro2_bgclouds_map.bin b/graphics/intro/scene_2/clouds_bg_map.bin
index 25b65f766..25b65f766 100644
--- a/graphics/intro/intro2_bgclouds_map.bin
+++ b/graphics/intro/scene_2/clouds_bg_map.bin
diff --git a/graphics/intro/85F0D5C.pal b/graphics/intro/scene_2/clouds_bg_sunset.pal
index 4ff388f48..4ff388f48 100644
--- a/graphics/intro/85F0D5C.pal
+++ b/graphics/intro/scene_2/clouds_bg_sunset.pal
diff --git a/graphics/intro/intro2_bgclouds_afternoon.pal b/graphics/intro/scene_2/clouds_sunset.pal
index 6d5d9dbcd..6d5d9dbcd 100644
--- a/graphics/intro/intro2_bgclouds_afternoon.pal
+++ b/graphics/intro/scene_2/clouds_sunset.pal
diff --git a/graphics/intro/intro2_flygon.png b/graphics/intro/scene_2/flygon.png
index ab0b8d728..ab0b8d728 100644
--- a/graphics/intro/intro2_flygon.png
+++ b/graphics/intro/scene_2/flygon.png
diff --git a/graphics/intro/intro2_grass.png b/graphics/intro/scene_2/grass.png
index e573ca45e..e573ca45e 100644
--- a/graphics/intro/intro2_grass.png
+++ b/graphics/intro/scene_2/grass.png
diff --git a/graphics/intro/intro2_grass_map.bin b/graphics/intro/scene_2/grass_map.bin
index 2a6f1a72b..2a6f1a72b 100644
--- a/graphics/intro/intro2_grass_map.bin
+++ b/graphics/intro/scene_2/grass_map.bin
diff --git a/graphics/intro/intro2_grass_night.pal b/graphics/intro/scene_2/grass_night.pal
index e44980f78..e44980f78 100644
--- a/graphics/intro/intro2_grass_night.pal
+++ b/graphics/intro/scene_2/grass_night.pal
diff --git a/graphics/intro/intro2_grass_afternoon.pal b/graphics/intro/scene_2/grass_sunset.pal
index 20b1e45f5..20b1e45f5 100644
--- a/graphics/intro/intro2_grass_afternoon.pal
+++ b/graphics/intro/scene_2/grass_sunset.pal
diff --git a/graphics/intro/intro2_night.png b/graphics/intro/scene_2/house_silhouette.png
index 9a10567bb..9a10567bb 100644
--- a/graphics/intro/intro2_night.png
+++ b/graphics/intro/scene_2/house_silhouette.png
diff --git a/graphics/intro/85F231C.pal b/graphics/intro/scene_2/houses.pal
index 82855d938..82855d938 100644
--- a/graphics/intro/85F231C.pal
+++ b/graphics/intro/scene_2/houses.pal
diff --git a/graphics/intro/intro2_bgnight.png b/graphics/intro/scene_2/houses.png
index cb95bb04f..cb95bb04f 100644
--- a/graphics/intro/intro2_bgnight.png
+++ b/graphics/intro/scene_2/houses.png
diff --git a/graphics/intro/intro2_bgnight_map.bin b/graphics/intro/scene_2/houses_map.bin
index ef7c889ba..ef7c889ba 100644
--- a/graphics/intro/intro2_bgnight_map.bin
+++ b/graphics/intro/scene_2/houses_map.bin
diff --git a/graphics/intro/intro2_latias.png b/graphics/intro/scene_2/latias.png
index 5623895ce..5623895ce 100644
--- a/graphics/intro/intro2_latias.png
+++ b/graphics/intro/scene_2/latias.png
diff --git a/graphics/intro/intro2_latios.png b/graphics/intro/scene_2/latios.png
index 439e26fe6..439e26fe6 100644
--- a/graphics/intro/intro2_latios.png
+++ b/graphics/intro/scene_2/latios.png
diff --git a/graphics/intro/intro2_manectric.png b/graphics/intro/scene_2/manectric.png
index bcb054d7b..bcb054d7b 100644
--- a/graphics/intro/intro2_manectric.png
+++ b/graphics/intro/scene_2/manectric.png
diff --git a/graphics/intro/intro2_may_noturn.png b/graphics/intro/scene_2/may.png
index e88300610..e88300610 100644
--- a/graphics/intro/intro2_may_noturn.png
+++ b/graphics/intro/scene_2/may.png
diff --git a/graphics/intro/intro2_may.png b/graphics/intro/scene_2/may_credits.png
index 238924d88..238924d88 100644
--- a/graphics/intro/intro2_may.png
+++ b/graphics/intro/scene_2/may_credits.png
diff --git a/graphics/intro/intro2_brendan_noturn.pal b/graphics/intro/scene_2/player.pal
index 49a329307..49a329307 100644
--- a/graphics/intro/intro2_brendan_noturn.pal
+++ b/graphics/intro/scene_2/player.pal
diff --git a/graphics/intro/intro2_torchic.png b/graphics/intro/scene_2/torchic.png
index 1bd1b1184..1bd1b1184 100644
--- a/graphics/intro/intro2_torchic.png
+++ b/graphics/intro/scene_2/torchic.png
diff --git a/graphics/intro/intro2_bgtrees.png b/graphics/intro/scene_2/trees.png
index e6d163579..e6d163579 100644
--- a/graphics/intro/intro2_bgtrees.png
+++ b/graphics/intro/scene_2/trees.png
diff --git a/graphics/intro/intro2_bgtrees_map.bin b/graphics/intro/scene_2/trees_map.bin
index d1c23cc36..d1c23cc36 100644
--- a/graphics/intro/intro2_bgtrees_map.bin
+++ b/graphics/intro/scene_2/trees_map.bin
diff --git a/graphics/intro/intro2_bgtreessmall.png b/graphics/intro/scene_2/trees_small.png
index 33a7213b8..33a7213b8 100644
--- a/graphics/intro/intro2_bgtreessmall.png
+++ b/graphics/intro/scene_2/trees_small.png
diff --git a/graphics/intro/intro2_bgtrees2_afternoon.pal b/graphics/intro/scene_2/trees_sunset.pal
index 9736a6e95..9736a6e95 100644
--- a/graphics/intro/intro2_bgtrees2_afternoon.pal
+++ b/graphics/intro/scene_2/trees_sunset.pal
diff --git a/graphics/intro/intro2_volbeat.png b/graphics/intro/scene_2/volbeat.png
index 8b6c61eb0..8b6c61eb0 100644
--- a/graphics/intro/intro2_volbeat.png
+++ b/graphics/intro/scene_2/volbeat.png
diff --git a/graphics/intro/intro3.pal b/graphics/intro/scene_3/bg.pal
index 909fae91d..909fae91d 100644
--- a/graphics/intro/intro3.pal
+++ b/graphics/intro/scene_3/bg.pal
diff --git a/graphics/intro/intro2_bubbles.png b/graphics/intro/scene_3/bubbles.png
index d1f18701c..d1f18701c 100644
--- a/graphics/intro/intro2_bubbles.png
+++ b/graphics/intro/scene_3/bubbles.png
diff --git a/graphics/intro/intro3_clouds.png b/graphics/intro/scene_3/clouds.png
index aaa77f4a9..aaa77f4a9 100644
--- a/graphics/intro/intro3_clouds.png
+++ b/graphics/intro/scene_3/clouds.png
diff --git a/graphics/intro/intro3_clouds1.bin b/graphics/intro/scene_3/clouds_left.bin
index c2aa2533f..c2aa2533f 100644
--- a/graphics/intro/intro3_clouds1.bin
+++ b/graphics/intro/scene_3/clouds_left.bin
diff --git a/graphics/intro/intro3_clouds2.bin b/graphics/intro/scene_3/clouds_right.bin
index c256567f4..c256567f4 100644
--- a/graphics/intro/intro3_clouds2.bin
+++ b/graphics/intro/scene_3/clouds_right.bin
diff --git a/graphics/intro/intro3_clouds3.bin b/graphics/intro/scene_3/clouds_sun.bin
index c47ade01f..c47ade01f 100644
--- a/graphics/intro/intro3_clouds3.bin
+++ b/graphics/intro/scene_3/clouds_sun.bin
diff --git a/graphics/intro/intro3_groudon.bin b/graphics/intro/scene_3/groudon.bin
index c0472196f..c0472196f 100644
--- a/graphics/intro/intro3_groudon.bin
+++ b/graphics/intro/scene_3/groudon.bin
diff --git a/graphics/intro/intro3_groudon.png b/graphics/intro/scene_3/groudon.png
index 3e4c6852b..3e4c6852b 100644
--- a/graphics/intro/intro3_groudon.png
+++ b/graphics/intro/scene_3/groudon.png
diff --git a/graphics/intro/legend_bg1.bin b/graphics/intro/scene_3/groudon_bg.bin
index e289ca779..e289ca779 100644
--- a/graphics/intro/legend_bg1.bin
+++ b/graphics/intro/scene_3/groudon_bg.bin
diff --git a/graphics/intro/intro3_kyogre.bin b/graphics/intro/scene_3/kyogre.bin
index b5bdbb37c..b5bdbb37c 100644
--- a/graphics/intro/intro3_kyogre.bin
+++ b/graphics/intro/scene_3/kyogre.bin
diff --git a/graphics/intro/intro3_kyogre.png b/graphics/intro/scene_3/kyogre.png
index d84aa45a2..d84aa45a2 100644
--- a/graphics/intro/intro3_kyogre.png
+++ b/graphics/intro/scene_3/kyogre.png
diff --git a/graphics/intro/legend_bg2.bin b/graphics/intro/scene_3/kyogre_bg.bin
index a151b458e..a151b458e 100644
--- a/graphics/intro/legend_bg2.bin
+++ b/graphics/intro/scene_3/kyogre_bg.bin
diff --git a/graphics/intro/legend_bg.png b/graphics/intro/scene_3/legend_bg.png
index 5baf32aec..5baf32aec 100644
--- a/graphics/intro/legend_bg.png
+++ b/graphics/intro/scene_3/legend_bg.png
diff --git a/graphics/intro/intro3_lightning.png b/graphics/intro/scene_3/lightning.png
index e858926ec..e858926ec 100644
--- a/graphics/intro/intro3_lightning.png
+++ b/graphics/intro/scene_3/lightning.png
diff --git a/graphics/intro/intro3_misc2.pal b/graphics/intro/scene_3/misc.pal
index 3c985dc07..3c985dc07 100644
--- a/graphics/intro/intro3_misc2.pal
+++ b/graphics/intro/scene_3/misc.pal
diff --git a/graphics/intro/intro3_misc.png b/graphics/intro/scene_3/misc.png
index 26be33c01..26be33c01 100644
--- a/graphics/intro/intro3_misc.png
+++ b/graphics/intro/scene_3/misc.png
diff --git a/graphics/intro/intro3_pokeball.png b/graphics/intro/scene_3/pokeball.png
index 4af0187f8..4af0187f8 100644
--- a/graphics/intro/intro3_pokeball.png
+++ b/graphics/intro/scene_3/pokeball.png
diff --git a/graphics/intro/intro3_pokeball_map.bin b/graphics/intro/scene_3/pokeball_map.bin
index 2f968aa20..2f968aa20 100644
--- a/graphics/intro/intro3_pokeball_map.bin
+++ b/graphics/intro/scene_3/pokeball_map.bin
diff --git a/graphics/intro/intro3_rayquaza.bin b/graphics/intro/scene_3/rayquaza.bin
index be3a9c560..be3a9c560 100644
--- a/graphics/intro/intro3_rayquaza.bin
+++ b/graphics/intro/scene_3/rayquaza.bin
diff --git a/graphics/intro/intro3_rayquaza.png b/graphics/intro/scene_3/rayquaza.png
index f749ceb50..f749ceb50 100644
--- a/graphics/intro/intro3_rayquaza.png
+++ b/graphics/intro/scene_3/rayquaza.png
diff --git a/graphics/intro/intro3_clouds4.bin b/graphics/intro/scene_3/rayquaza_clouds.bin
index 99bea908c..99bea908c 100644
--- a/graphics/intro/intro3_clouds4.bin
+++ b/graphics/intro/scene_3/rayquaza_clouds.bin
diff --git a/graphics/intro/intro3_clouds2.png b/graphics/intro/scene_3/rayquaza_clouds.png
index 34b523e31..34b523e31 100644
--- a/graphics/intro/intro3_clouds2.png
+++ b/graphics/intro/scene_3/rayquaza_clouds.png
diff --git a/graphics/intro/intro3_misc1.pal b/graphics/intro/scene_3/rayquaza_orb.pal
index a34bebc24..a34bebc24 100644
--- a/graphics/intro/intro3_misc1.pal
+++ b/graphics/intro/scene_3/rayquaza_orb.pal
diff --git a/graphics/intro/intro3_streaks.png b/graphics/intro/scene_3/streaks.png
index a19fa39c4..a19fa39c4 100644
--- a/graphics/intro/intro3_streaks.png
+++ b/graphics/intro/scene_3/streaks.png
diff --git a/graphics/intro/intro3_streaks_map.bin b/graphics/intro/scene_3/streaks_map.bin
index 2d1b69924..2d1b69924 100644
--- a/graphics/intro/intro3_streaks_map.bin
+++ b/graphics/intro/scene_3/streaks_map.bin
diff --git a/graphics/intro/scene_3/unused_1.bin b/graphics/intro/scene_3/unused_1.bin
new file mode 100644
index 000000000..960ba873e
--- /dev/null
+++ b/graphics/intro/scene_3/unused_1.bin
diff --git a/graphics/intro/scene_3/unused_2.bin b/graphics/intro/scene_3/unused_2.bin
new file mode 100644
index 000000000..69dbe982a
--- /dev/null
+++ b/graphics/intro/scene_3/unused_2.bin