Merge branch 'master' into rme-update

2022-09-25 11:56:57 -04:00
parent 277750b088 4579efe4c7
commit 7223dbd62f
578 changed files with 8891 additions and 15170 deletions
--- a/graphics/battle_frontier/arena_judgement_symbols.png
+++ b/graphics/battle_frontier/arena_judgement_symbols.png
--- a/graphics/battle_transitions/rayquaza.png
+++ b/graphics/battle_transitions/rayquaza.png
--- a/graphics/battle_transitions/regis.png
+++ b/graphics/battle_transitions/regis.png
--- a/graphics/naming_screen/back_button.png
+++ b/graphics/naming_screen/back_button.png
--- a/graphics/naming_screen/buttons.pal
+++ b/graphics/naming_screen/buttons.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+139 139 131
+197 189 180
+230 222 213
+74 115 139
+123 172 197
+172 115 74
+213 156 115
+98 156 57
+148 189 106
+189 164 32
+230 222 90
+57 57 57
+57 57 57
--- a/graphics/naming_screen/cursor.pal
+++ b/graphics/naming_screen/cursor.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 8 8
+222 57 74
+180 65 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 222 213
+0 0 0
+230 222 213
+0 0 0
--- a/graphics/naming_screen/cursor.png
+++ b/graphics/naming_screen/cursor.png
--- a/graphics/naming_screen/cursor_filled.png
+++ b/graphics/naming_screen/cursor_filled.png
--- a/graphics/naming_screen/cursor_squished.png
+++ b/graphics/naming_screen/cursor_squished.png
--- a/graphics/naming_screen/input_arrow.png
+++ b/graphics/naming_screen/input_arrow.png
--- a/graphics/naming_screen/menu.pal
+++ b/graphics/naming_screen/menu.pal
@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-96
+16
 106 156 213
 255 255 255
 115 115 115
@@ -17,83 +17,3 @@ JASC-PAL
 230 222 90
 238 230 139
 246 238 197
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-74 115 139
-98 139 164
-123 172 197
-156 205 230
-180 222 246
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-172 115 74
-189 131 90
-213 156 115
-246 205 164
-255 230 197
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-98 156 57
-123 172 82
-148 189 106
-197 230 156
-213 238 189
-106 156 213
-255 255 255
-57 57 57
-139 139 131
-197 189 180
-230 222 213
-74 115 139
-123 172 197
-172 115 74
-213 156 115
-98 156 57
-148 189 106
-189 164 32
-230 222 90
-57 57 57
-57 57 57
-106 156 213
-255 8 8
-222 57 74
-180 65 82
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-230 222 213
-0 0 0
-230 222 213
-0 0 0
--- a/graphics/naming_screen/ok_button.png
+++ b/graphics/naming_screen/ok_button.png
--- a/graphics/naming_screen/page_button.png
+++ b/graphics/naming_screen/page_button.png
--- a/graphics/naming_screen/page_swap_button.png
+++ b/graphics/naming_screen/page_swap_button.png
--- a/graphics/naming_screen/page_swap_frame.png
+++ b/graphics/naming_screen/page_swap_frame.png
--- a/graphics/naming_screen/page_swap_lower.pal
+++ b/graphics/naming_screen/page_swap_lower.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+172 115 74
+189 131 90
+213 156 115
+246 205 164
+255 230 197
--- a/graphics/naming_screen/page_swap_lower.png
+++ b/graphics/naming_screen/page_swap_lower.png
--- a/graphics/naming_screen/page_swap_others.pal
+++ b/graphics/naming_screen/page_swap_others.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+98 156 57
+123 172 82
+148 189 106
+197 230 156
+213 238 189
--- a/graphics/naming_screen/page_swap_others.png
+++ b/graphics/naming_screen/page_swap_others.png
--- a/graphics/naming_screen/page_swap_upper.pal
+++ b/graphics/naming_screen/page_swap_upper.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+74 115 139
+98 139 164
+123 172 197
+156 205 230
+180 222 246
--- a/graphics/naming_screen/page_swap_upper.png
+++ b/graphics/naming_screen/page_swap_upper.png
--- a/graphics/naming_screen/pc_icon_off.png
+++ b/graphics/naming_screen/pc_icon_off.png
--- a/graphics/naming_screen/pc_icon_on.png
+++ b/graphics/naming_screen/pc_icon_on.png
--- a/graphics/naming_screen/unused.pal
+++ b/graphics/naming_screen/unused.pal
--- a/graphics/naming_screen/roptions.png
+++ b/graphics/naming_screen/roptions.png
--- a/graphics/naming_screen/rwindow.png
+++ b/graphics/naming_screen/rwindow.png
--- a/graphics/naming_screen/underscore.png
+++ b/graphics/naming_screen/underscore.png
--- a/graphics/picture_frame/lobby.png
+++ b/graphics/picture_frame/lobby.png
--- a/graphics/trainers/back_pics/brendan_back_pic.png
+++ b/graphics/trainers/back_pics/brendan_back_pic.png
--- a/graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.png
+++ b/graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.png
--- a/graphics/trainers/back_pics/leaf_back_pic.png
+++ b/graphics/trainers/back_pics/leaf_back_pic.png
--- a/graphics/trainers/back_pics/may_back_pic.png
+++ b/graphics/trainers/back_pics/may_back_pic.png
--- a/graphics/trainers/back_pics/ruby_sapphire_may_back_pic.png
+++ b/graphics/trainers/back_pics/ruby_sapphire_may_back_pic.png
--- a/graphics/trainers/back_pics/red_back_pic.png
+++ b/graphics/trainers/back_pics/red_back_pic.png
--- a/graphics/trainers/back_pics/steven_back_pic.png
+++ b/graphics/trainers/back_pics/steven_back_pic.png
--- a/graphics/trainers/back_pics/wally_back_pic.png
+++ b/graphics/trainers/back_pics/wally_back_pic.png
--- a/graphics/trainers/front_pics/aqua_admin_f_front_pic.png
+++ b/graphics/trainers/front_pics/aqua_admin_f_front_pic.png
--- a/graphics/trainers/front_pics/aqua_admin_m_front_pic.png
+++ b/graphics/trainers/front_pics/aqua_admin_m_front_pic.png
--- a/graphics/trainers/front_pics/aqua_grunt_f_front_pic.png
+++ b/graphics/trainers/front_pics/aqua_grunt_f_front_pic.png
--- a/graphics/trainers/front_pics/aqua_grunt_m_front_pic.png
+++ b/graphics/trainers/front_pics/aqua_grunt_m_front_pic.png
--- a/graphics/trainers/front_pics/aqua_leader_archie_front_pic.png
+++ b/graphics/trainers/front_pics/aqua_leader_archie_front_pic.png
--- a/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png
+++ b/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png
--- a/graphics/trainers/front_pics/aroma_lady_front_pic.png
+++ b/graphics/trainers/front_pics/aroma_lady_front_pic.png
--- a/graphics/trainers/front_pics/battle_girl_front_pic.png
+++ b/graphics/trainers/front_pics/battle_girl_front_pic.png
--- a/graphics/trainers/front_pics/beauty_front_pic.png
+++ b/graphics/trainers/front_pics/beauty_front_pic.png
--- a/graphics/trainers/front_pics/bird_keeper_front_pic.png
+++ b/graphics/trainers/front_pics/bird_keeper_front_pic.png
--- a/graphics/trainers/front_pics/black_belt_front_pic.png
+++ b/graphics/trainers/front_pics/black_belt_front_pic.png
--- a/graphics/trainers/front_pics/brendan_front_pic.png
+++ b/graphics/trainers/front_pics/brendan_front_pic.png
--- a/graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.png
+++ b/graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.png
--- a/graphics/trainers/front_pics/bug_catcher_front_pic.png
+++ b/graphics/trainers/front_pics/bug_catcher_front_pic.png
--- a/graphics/trainers/front_pics/bug_maniac_front_pic.png
+++ b/graphics/trainers/front_pics/bug_maniac_front_pic.png
--- a/graphics/trainers/front_pics/camper_front_pic.png
+++ b/graphics/trainers/front_pics/camper_front_pic.png
--- a/graphics/trainers/front_pics/champion_wallace_front_pic.png
+++ b/graphics/trainers/front_pics/champion_wallace_front_pic.png
--- a/graphics/trainers/front_pics/collector_front_pic.png
+++ b/graphics/trainers/front_pics/collector_front_pic.png
--- a/graphics/trainers/front_pics/cooltrainer_f_front_pic.png
+++ b/graphics/trainers/front_pics/cooltrainer_f_front_pic.png
--- a/graphics/trainers/front_pics/cooltrainer_m_front_pic.png
+++ b/graphics/trainers/front_pics/cooltrainer_m_front_pic.png
--- a/graphics/trainers/front_pics/cycling_triathlete_f_front_pic.png
+++ b/graphics/trainers/front_pics/cycling_triathlete_f_front_pic.png
--- a/graphics/trainers/front_pics/cycling_triathlete_m_front_pic.png
+++ b/graphics/trainers/front_pics/cycling_triathlete_m_front_pic.png
--- a/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png
+++ b/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png
--- a/graphics/trainers/front_pics/dragon_tamer_front_pic.png
+++ b/graphics/trainers/front_pics/dragon_tamer_front_pic.png
--- a/graphics/trainers/front_pics/elite_four_drake_front_pic.png
+++ b/graphics/trainers/front_pics/elite_four_drake_front_pic.png
--- a/graphics/trainers/front_pics/elite_four_glacia_front_pic.png
+++ b/graphics/trainers/front_pics/elite_four_glacia_front_pic.png
--- a/graphics/trainers/front_pics/elite_four_phoebe_front_pic.png
+++ b/graphics/trainers/front_pics/elite_four_phoebe_front_pic.png
--- a/graphics/trainers/front_pics/elite_four_sidney_front_pic.png
+++ b/graphics/trainers/front_pics/elite_four_sidney_front_pic.png
--- a/graphics/trainers/front_pics/expert_f_front_pic.png
+++ b/graphics/trainers/front_pics/expert_f_front_pic.png
--- a/graphics/trainers/front_pics/expert_m_front_pic.png
+++ b/graphics/trainers/front_pics/expert_m_front_pic.png
--- a/graphics/trainers/front_pics/factory_head_noland_front_pic.png
+++ b/graphics/trainers/front_pics/factory_head_noland_front_pic.png
--- a/graphics/trainers/front_pics/fisherman_front_pic.png
+++ b/graphics/trainers/front_pics/fisherman_front_pic.png
--- a/graphics/trainers/front_pics/gentleman_front_pic.png
+++ b/graphics/trainers/front_pics/gentleman_front_pic.png
--- a/graphics/trainers/front_pics/guitarist_front_pic.png
+++ b/graphics/trainers/front_pics/guitarist_front_pic.png
--- a/graphics/trainers/front_pics/hex_maniac_front_pic.png
+++ b/graphics/trainers/front_pics/hex_maniac_front_pic.png
--- a/graphics/trainers/front_pics/hiker_front_pic.png
+++ b/graphics/trainers/front_pics/hiker_front_pic.png
--- a/graphics/trainers/front_pics/interviewer_front_pic.png
+++ b/graphics/trainers/front_pics/interviewer_front_pic.png
--- a/graphics/trainers/front_pics/kindler_front_pic.png
+++ b/graphics/trainers/front_pics/kindler_front_pic.png
--- a/graphics/trainers/front_pics/lady_front_pic.png
+++ b/graphics/trainers/front_pics/lady_front_pic.png
--- a/graphics/trainers/front_pics/lass_front_pic.png
+++ b/graphics/trainers/front_pics/lass_front_pic.png
--- a/graphics/trainers/front_pics/leader_brawly_front_pic.png
+++ b/graphics/trainers/front_pics/leader_brawly_front_pic.png
--- a/graphics/trainers/front_pics/leader_flannery_front_pic.png
+++ b/graphics/trainers/front_pics/leader_flannery_front_pic.png
--- a/graphics/trainers/front_pics/leader_juan_front_pic.png
+++ b/graphics/trainers/front_pics/leader_juan_front_pic.png
--- a/graphics/trainers/front_pics/leader_norman_front_pic.png
+++ b/graphics/trainers/front_pics/leader_norman_front_pic.png
--- a/graphics/trainers/front_pics/leader_roxanne_front_pic.png
+++ b/graphics/trainers/front_pics/leader_roxanne_front_pic.png
--- a/graphics/trainers/front_pics/leader_tate_and_liza_front_pic.png
+++ b/graphics/trainers/front_pics/leader_tate_and_liza_front_pic.png
--- a/graphics/trainers/front_pics/leader_wattson_front_pic.png
+++ b/graphics/trainers/front_pics/leader_wattson_front_pic.png
--- a/graphics/trainers/front_pics/leader_winona_front_pic.png
+++ b/graphics/trainers/front_pics/leader_winona_front_pic.png
--- a/graphics/trainers/front_pics/leaf_front_pic.png
+++ b/graphics/trainers/front_pics/leaf_front_pic.png
--- a/graphics/trainers/front_pics/magma_admin_front_pic.png
+++ b/graphics/trainers/front_pics/magma_admin_front_pic.png
--- a/graphics/trainers/front_pics/magma_grunt_f_front_pic.png
+++ b/graphics/trainers/front_pics/magma_grunt_f_front_pic.png
--- a/graphics/trainers/front_pics/magma_grunt_m_front_pic.png
+++ b/graphics/trainers/front_pics/magma_grunt_m_front_pic.png
--- a/graphics/trainers/front_pics/magma_leader_maxie_front_pic.png
+++ b/graphics/trainers/front_pics/magma_leader_maxie_front_pic.png
--- a/graphics/trainers/front_pics/may_front_pic.png
+++ b/graphics/trainers/front_pics/may_front_pic.png
--- a/graphics/trainers/front_pics/ruby_sapphire_may_front_pic.png
+++ b/graphics/trainers/front_pics/ruby_sapphire_may_front_pic.png
--- a/graphics/trainers/front_pics/ninja_boy_front_pic.png
+++ b/graphics/trainers/front_pics/ninja_boy_front_pic.png
--- a/graphics/trainers/front_pics/old_couple_front_pic.png
+++ b/graphics/trainers/front_pics/old_couple_front_pic.png
--- a/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png
+++ b/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png
--- a/graphics/trainers/front_pics/parasol_lady_front_pic.png
+++ b/graphics/trainers/front_pics/parasol_lady_front_pic.png
--- a/graphics/trainers/front_pics/picnicker_front_pic.png
+++ b/graphics/trainers/front_pics/picnicker_front_pic.png
--- a/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png
+++ b/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png
--- a/graphics/trainers/front_pics/pokefan_f_front_pic.png
+++ b/graphics/trainers/front_pics/pokefan_f_front_pic.png
--- a/graphics/trainers/front_pics/pokefan_m_front_pic.png
+++ b/graphics/trainers/front_pics/pokefan_m_front_pic.png
--- a/graphics/trainers/front_pics/pokemaniac_front_pic.png
+++ b/graphics/trainers/front_pics/pokemaniac_front_pic.png
--- a/Show More
+++ b/Show More