Merge branch 'master' into doc-frontierpass2

2021-07-31 13:30:40 -04:00
parent 602855ea99 d391486247
commit 3e60a78406
1360 changed files with 69489 additions and 67093 deletions
--- a/graphics/unknown/unknown_85CE55C.pal
+++ b/graphics/unknown/unknown_85CE55C.pal
--- a/graphics/contest/results_screen/bg.bin
+++ b/graphics/contest/results_screen/bg.bin
--- a/graphics/contest/results_screen/interface.bin
+++ b/graphics/contest/results_screen/interface.bin
--- a/graphics/contest/results_screen/text_window.pal
+++ b/graphics/contest/results_screen/text_window.pal
--- a/graphics/contest/results_screen/text_window.png
+++ b/graphics/contest/results_screen/text_window.png
--- a/graphics/contest/results_screen/tiles.pal
+++ b/graphics/contest/results_screen/tiles.pal
--- a/graphics/contest/results_screen/tiles.png
+++ b/graphics/contest/results_screen/tiles.png
--- a/graphics/contest/results_screen/title.bin
+++ b/graphics/contest/results_screen/title.bin
--- a/graphics/contest/results_screen/title_beauty.bin
+++ b/graphics/contest/results_screen/title_beauty.bin
--- a/graphics/contest/results_screen/title_cool.bin
+++ b/graphics/contest/results_screen/title_cool.bin
--- a/graphics/contest/results_screen/title_cute.bin
+++ b/graphics/contest/results_screen/title_cute.bin
--- a/graphics/contest/results_screen/title_hyper.bin
+++ b/graphics/contest/results_screen/title_hyper.bin
--- a/graphics/contest/results_screen/title_link.bin
+++ b/graphics/contest/results_screen/title_link.bin
--- a/graphics/contest/results_screen/title_master.bin
+++ b/graphics/contest/results_screen/title_master.bin
--- a/graphics/contest/results_screen/title_normal.bin
+++ b/graphics/contest/results_screen/title_normal.bin
--- a/graphics/contest/results_screen/title_smart.bin
+++ b/graphics/contest/results_screen/title_smart.bin
--- a/graphics/contest/results_screen/title_super.bin
+++ b/graphics/contest/results_screen/title_super.bin
--- a/graphics/contest/results_screen/title_tough.bin
+++ b/graphics/contest/results_screen/title_tough.bin
--- a/graphics/contest/results_screen/winner_banner.bin
+++ b/graphics/contest/results_screen/winner_banner.bin
--- a/graphics/credits/credits.pal
+++ b/graphics/credits/credits.pal
@@ -0,0 +1,67 @@
+JASC-PAL
+0100
+64
+0 0 0
+255 255 255
+164 164 164
+255 230 123
+255 82 41
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 230 123
+255 82 41
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+131 65 32
+16 0 0
+8 139 65
+8 8 0
+8 8 0
+8 8 0
+148 131 32
+16 8 0
+0 74 65
+16 65 65
+131 131 32
+148 131 65
+8 139 65
+8 139 0
+8 8 32
+148 131 0
+148 65 65
+16 74 65
+0 139 65
+0 131 65
+0 0 0
+0 0 0
+0 0 0
+0 0 0
--- a/graphics/credits/credits_1.pal
+++ b/graphics/credits/credits_1.pal
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-164 164 164
-255 230 123
-255 82 41
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
--- a/graphics/credits/credits_2.pal
+++ b/graphics/credits/credits_2.pal
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 230 123
-255 82 41
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
--- a/graphics/credits/credits_3.pal
+++ b/graphics/credits/credits_3.pal
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-131 65 32
-16 0 0
-8 139 65
-8 8 0
-8 8 0
-8 8 0
-148 131 32
-16 8 0
--- a/graphics/credits/credits_4.pal
+++ b/graphics/credits/credits_4.pal
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 74 65
-16 65 65
-131 131 32
-148 131 65
-8 139 65
-8 139 0
-8 8 32
-148 131 0
-148 65 65
-16 74 65
-0 139 65
-0 131 65
-0 0 0
-0 0 0
-0 0 0
-0 0 0
--- a/graphics/easy_chat/interview_frame.png
+++ b/graphics/easy_chat/interview_frame.png
--- a/graphics/easy_chat/text.pal
+++ b/graphics/easy_chat/text.pal
--- a/graphics/easy_chat/title_text.pal
+++ b/graphics/easy_chat/title_text.pal
--- a/graphics/interface/map_popup/underwater.pal
+++ b/graphics/interface/map_popup/underwater.pal
--- a/graphics/interface/menu_border.png
+++ b/graphics/interface/menu_border.png
--- a/graphics/intro/intro.png
+++ b/graphics/intro/intro.png
--- a/graphics/intro/intro2_bgtrees2.pal
+++ b/graphics/intro/intro2_bgtrees2.pal
@@ -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
--- a/graphics/intro/intro1_bgpal.pal
+++ b/graphics/intro/intro1_bgpal.pal
--- a/graphics/intro/scene_1/bg.png
+++ b/graphics/intro/scene_1/bg.png
--- a/graphics/intro/scene_1/bg0_map.bin
+++ b/graphics/intro/scene_1/bg0_map.bin
--- a/graphics/intro/scene_1/bg1_map.bin
+++ b/graphics/intro/scene_1/bg1_map.bin
--- a/graphics/intro/scene_1/bg2_map.bin
+++ b/graphics/intro/scene_1/bg2_map.bin
--- a/graphics/intro/scene_1/bg3_map.bin
+++ b/graphics/intro/scene_1/bg3_map.bin
--- a/graphics/intro/scene_1/drops.pal
+++ b/graphics/intro/scene_1/drops.pal
--- a/graphics/intro/scene_1/drops_logo.png
+++ b/graphics/intro/scene_1/drops_logo.png
--- a/graphics/intro/scene_1/flygon.png
+++ b/graphics/intro/scene_1/flygon.png
--- a/graphics/intro/scene_1/lati.png
+++ b/graphics/intro/scene_1/lati.png
--- a/graphics/intro/intro1_gflogo.pal
+++ b/graphics/intro/intro1_gflogo.pal
--- a/graphics/intro/scene_1/sparkle.png
+++ b/graphics/intro/scene_1/sparkle.png
--- a/graphics/intro/scene_1/text.pal
+++ b/graphics/intro/scene_1/text.pal
--- a/graphics/intro/scene_2/bicycle.png
+++ b/graphics/intro/scene_2/bicycle.png
--- a/graphics/intro/intro2_brendan_noturn.png
+++ b/graphics/intro/intro2_brendan_noturn.png
--- a/graphics/intro/scene_2/brendan_credits.png
+++ b/graphics/intro/scene_2/brendan_credits.png
--- a/graphics/intro/intro2_bgclouds2.png
+++ b/graphics/intro/intro2_bgclouds2.png
--- a/graphics/intro/scene_2/clouds_bg.pal
+++ b/graphics/intro/scene_2/clouds_bg.pal
--- a/graphics/intro/scene_2/clouds_bg.png
+++ b/graphics/intro/scene_2/clouds_bg.png
--- a/graphics/intro/scene_2/clouds_bg_map.bin
+++ b/graphics/intro/scene_2/clouds_bg_map.bin
--- a/graphics/intro/scene_2/clouds_bg_sunset.pal
+++ b/graphics/intro/scene_2/clouds_bg_sunset.pal
--- a/graphics/intro/intro2_bgclouds_afternoon.pal
+++ b/graphics/intro/intro2_bgclouds_afternoon.pal
--- a/graphics/intro/scene_2/flygon.png
+++ b/graphics/intro/scene_2/flygon.png
--- a/graphics/intro/scene_2/grass.png
+++ b/graphics/intro/scene_2/grass.png
--- a/graphics/intro/scene_2/grass_map.bin
+++ b/graphics/intro/scene_2/grass_map.bin
--- a/graphics/intro/scene_2/grass_night.pal
+++ b/graphics/intro/scene_2/grass_night.pal
--- a/graphics/intro/intro2_grass_afternoon.pal
+++ b/graphics/intro/intro2_grass_afternoon.pal
--- a/graphics/intro/scene_2/house_silhouette.png
+++ b/graphics/intro/scene_2/house_silhouette.png
--- a/graphics/intro/scene_2/houses.pal
+++ b/graphics/intro/scene_2/houses.pal
--- a/graphics/intro/scene_2/houses.png
+++ b/graphics/intro/scene_2/houses.png
--- a/graphics/intro/scene_2/houses_map.bin
+++ b/graphics/intro/scene_2/houses_map.bin
--- a/graphics/intro/scene_2/latias.png
+++ b/graphics/intro/scene_2/latias.png
--- a/graphics/intro/scene_2/latios.png
+++ b/graphics/intro/scene_2/latios.png
--- a/graphics/intro/scene_2/manectric.png
+++ b/graphics/intro/scene_2/manectric.png
--- a/graphics/intro/intro2_may_noturn.png
+++ b/graphics/intro/intro2_may_noturn.png
--- a/graphics/intro/scene_2/may_credits.png
+++ b/graphics/intro/scene_2/may_credits.png
--- a/graphics/intro/intro2_brendan_noturn.pal
+++ b/graphics/intro/intro2_brendan_noturn.pal
--- a/graphics/intro/scene_2/torchic.png
+++ b/graphics/intro/scene_2/torchic.png
--- a/graphics/intro/intro2_bgtrees.png
+++ b/graphics/intro/intro2_bgtrees.png
--- a/graphics/intro/intro2_bgtrees_map.bin
+++ b/graphics/intro/intro2_bgtrees_map.bin
--- a/graphics/intro/scene_2/trees_small.png
+++ b/graphics/intro/scene_2/trees_small.png
--- a/graphics/intro/intro2_bgtrees2_afternoon.pal
+++ b/graphics/intro/intro2_bgtrees2_afternoon.pal
--- a/graphics/intro/scene_2/volbeat.png
+++ b/graphics/intro/scene_2/volbeat.png
--- a/graphics/intro/scene_3/bg.pal
+++ b/graphics/intro/scene_3/bg.pal
--- a/graphics/intro/scene_3/bubbles.png
+++ b/graphics/intro/scene_3/bubbles.png
--- a/graphics/intro/scene_3/clouds.png
+++ b/graphics/intro/scene_3/clouds.png
--- a/graphics/intro/scene_3/clouds_left.bin
+++ b/graphics/intro/scene_3/clouds_left.bin
--- a/graphics/intro/scene_3/clouds_right.bin
+++ b/graphics/intro/scene_3/clouds_right.bin
--- a/graphics/intro/scene_3/clouds_sun.bin
+++ b/graphics/intro/scene_3/clouds_sun.bin
--- a/graphics/intro/scene_3/groudon.bin
+++ b/graphics/intro/scene_3/groudon.bin
--- a/graphics/intro/scene_3/groudon.png
+++ b/graphics/intro/scene_3/groudon.png
--- a/graphics/intro/scene_3/groudon_bg.bin
+++ b/graphics/intro/scene_3/groudon_bg.bin
--- a/graphics/intro/scene_3/kyogre.bin
+++ b/graphics/intro/scene_3/kyogre.bin
--- a/graphics/intro/scene_3/kyogre.png
+++ b/graphics/intro/scene_3/kyogre.png
--- a/graphics/intro/scene_3/kyogre_bg.bin
+++ b/graphics/intro/scene_3/kyogre_bg.bin
--- a/graphics/intro/scene_3/legend_bg.png
+++ b/graphics/intro/scene_3/legend_bg.png
--- a/graphics/intro/scene_3/lightning.png
+++ b/graphics/intro/scene_3/lightning.png
--- a/graphics/intro/scene_3/misc.pal
+++ b/graphics/intro/scene_3/misc.pal
--- a/graphics/intro/scene_3/misc.png
+++ b/graphics/intro/scene_3/misc.png
--- a/graphics/intro/scene_3/pokeball.png
+++ b/graphics/intro/scene_3/pokeball.png
--- a/graphics/intro/scene_3/pokeball_map.bin
+++ b/graphics/intro/scene_3/pokeball_map.bin
--- a/graphics/intro/scene_3/rayquaza.bin
+++ b/graphics/intro/scene_3/rayquaza.bin
--- a/graphics/intro/scene_3/rayquaza.png
+++ b/graphics/intro/scene_3/rayquaza.png
--- a/graphics/intro/scene_3/rayquaza_clouds.bin
+++ b/graphics/intro/scene_3/rayquaza_clouds.bin
--- a/graphics/intro/scene_3/rayquaza_clouds.png
+++ b/graphics/intro/scene_3/rayquaza_clouds.png
--- a/graphics/intro/scene_3/rayquaza_orb.pal
+++ b/graphics/intro/scene_3/rayquaza_orb.pal
--- a/graphics/intro/scene_3/streaks.png
+++ b/graphics/intro/scene_3/streaks.png
--- a/graphics/intro/scene_3/streaks_map.bin
+++ b/graphics/intro/scene_3/streaks_map.bin
--- a/graphics/intro/scene_3/unused_1.bin
+++ b/graphics/intro/scene_3/unused_1.bin
--- a/Show More
+++ b/Show More