option menu fix conflicts

2018-01-21 12:46:19 +01:00
parent 77352c7ee4 8a60952fc0
commit ad2ef517bd
734 changed files with 44889 additions and 16751 deletions
--- a/graphics/battle_transitions/frontier_transition.bin
+++ b/graphics/battle_transitions/frontier_transition.bin
--- a/graphics/battle_transitions/frontier_transition.png
+++ b/graphics/battle_transitions/frontier_transition.png
--- a/graphics/battle_transitions/frontier_transition_circles.png
+++ b/graphics/battle_transitions/frontier_transition_circles.png
--- a/graphics/frontier_pass/map_heads.png
+++ b/graphics/frontier_pass/map_heads.png
--- a/graphics/frontier_pass/map_heads_female.pal
+++ b/graphics/frontier_pass/map_heads_female.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 222 205
+222 164 148
+205 131 115
+123 90 82
+98 98 115
+41 57 65
+164 106 82
+74 49 57
+205 205 222
+106 213 65
+65 172 32
+255 98 90
+197 65 65
+255 255 255
+0 0 0
--- a/graphics/frontier_pass/map_screen.bin
+++ b/graphics/frontier_pass/map_screen.bin
--- a/graphics/frontier_pass/map_screen.png
+++ b/graphics/frontier_pass/map_screen.png
--- a/graphics/frontier_pass/record_frame.bin
+++ b/graphics/frontier_pass/record_frame.bin
--- a/graphics/frontier_pass/small_map_and_card.bin
+++ b/graphics/frontier_pass/small_map_and_card.bin
--- a/graphics/frontier_pass/small_map_and_card_affine.bin
+++ b/graphics/frontier_pass/small_map_and_card_affine.bin
@@ -0,0 +1,2 @@
+	
+
$%&'()*+,-./456789:;<=>?DEFGHIJKLMNOTUVWXYZ[\]^_defghijklmnotuvwxyz{|}~у<7F><D183>葛訣誌舶沫<E888B6>圀悃棔､･ｦｧｨｩｪｫｬｭｮｯｴｵｶｷｸｹｺｻｼｽｾｿﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟtuvwxyz{|}~у<7F><D183><EFBFBD>諸楓利劒 !"#洟･ｦｧｨｩｪ0123ｯｴｵｶｷｸｹｺ@ABCｿﾄﾅﾆﾇﾈﾉﾊPQRSﾏﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
--- a/graphics/frontier_pass/unknown_571298.bin
+++ b/graphics/frontier_pass/unknown_571298.bin
@@ -0,0 +1 @@
+¼½¾<11><11><11><11><11><11><11><11>‗לםמן<11>‎‏<11>
--- a/graphics/interface/855C604.pal
+++ b/graphics/interface/855C604.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 180 82
+197 123 0
+255 139 131
+255 49 24
+74 74 74
+213 213 205
+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/interface/855C624.bin
+++ b/graphics/interface/855C624.bin
@@ -0,0 +1 @@
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><11><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><11><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/graphics/interface/85DFA60.bin
+++ b/graphics/interface/85DFA60.bin
--- a/graphics/interface/85DFA80.png
+++ b/graphics/interface/85DFA80.png
--- a/graphics/interface/85DFB60.bin
+++ b/graphics/interface/85DFB60.bin
--- a/graphics/interface/85DFC0C.bin
+++ b/graphics/interface/85DFC0C.bin
--- a/graphics/interface/860F074.pal
+++ b/graphics/interface/860F074.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
--- a/graphics/interface/860F0B0.pal
+++ b/graphics/interface/860F0B0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+74 205 238
+49 164 238
+0 90 131
+24 98 197
+0 139 90
--- a/graphics/interface/bag_spinner.png
+++ b/graphics/interface/bag_spinner.png
--- a/graphics/interface/hold_icons.png
+++ b/graphics/interface/hold_icons.png
--- a/graphics/interface/map_popup/857F444.pal
+++ b/graphics/interface/map_popup/857F444.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+238 255 255
+65 65 123
+255 255 255
+180 222 255
+139 172 213
+98 123 172
+57 74 131
+16 24 90
+180 222 255
+139 172 213
+98 123 172
+57 74 131
+16 24 90
+255 255 255
--- a/graphics/interface/map_popup/brick.png
+++ b/graphics/interface/map_popup/brick.png
--- a/graphics/interface/map_popup/brick_outline.png
+++ b/graphics/interface/map_popup/brick_outline.png
--- a/graphics/interface/map_popup/marble.png
+++ b/graphics/interface/map_popup/marble.png
--- a/graphics/interface/map_popup/marble_outline.png
+++ b/graphics/interface/map_popup/marble_outline.png
--- a/graphics/interface/map_popup/stone.png
+++ b/graphics/interface/map_popup/stone.png
--- a/graphics/interface/map_popup/stone2.png
+++ b/graphics/interface/map_popup/stone2.png
--- a/graphics/interface/map_popup/stone2_outline.png
+++ b/graphics/interface/map_popup/stone2_outline.png
--- a/graphics/interface/map_popup/stone_outline.png
+++ b/graphics/interface/map_popup/stone_outline.png
--- a/graphics/interface/map_popup/underwater.png
+++ b/graphics/interface/map_popup/underwater.png
--- a/graphics/interface/map_popup/underwater_outline.png
+++ b/graphics/interface/map_popup/underwater_outline.png
--- a/graphics/interface/map_popup/wood.png
+++ b/graphics/interface/map_popup/wood.png
--- a/graphics/interface/map_popup/wood_outline.png
+++ b/graphics/interface/map_popup/wood_outline.png
--- a/graphics/interface/red_arrow.png
+++ b/graphics/interface/red_arrow.png
--- a/graphics/interface/red_arrow_other.png
+++ b/graphics/interface/red_arrow_other.png
--- a/graphics/interface/region_map.bin
+++ b/graphics/interface/region_map.bin
--- a/graphics/interface/region_map.pal
+++ b/graphics/interface/region_map.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+156 213 255
+0 115 0
+164 180 255
+57 172 8
+189 0 49
+255 106 139
+164 0 8
+246 0 0
+255 189 205
+255 164 49
+238 230 172
+230 164 0
+238 189 57
+205 205 148
+98 213 0
+0 0 0
+172 238 49
+213 255 123
+238 230 115
+74 156 230
+41 131 230
+24 65 197
+57 131 197
+246 213 82
+32 74 197
+65 106 205
+0 0 0
+255 230 131
+255 156 0
+180 0 0
+255 255 255
+0 0 0
+205 238 255
+197 213 255
+98 98 98
+205 205 205
+189 123 0
+0 0 0
+123 180 213
+0 115 172
+0 57 139
+255 172 16
+255 57 16
+148 0 0
+0 0 0
+0 0 0
+0 0 0
--- a/graphics/interface/region_map.png
+++ b/graphics/interface/region_map.png
--- a/graphics/interface/region_map_affine.bin
+++ b/graphics/interface/region_map_affine.bin
--- a/graphics/interface/region_map_affine.png
+++ b/graphics/interface/region_map_affine.png
--- a/graphics/interface/select_button.png
+++ b/graphics/interface/select_button.png
--- a/graphics/interface/selector_outline.png
+++ b/graphics/interface/selector_outline.png
--- a/graphics/interface/summary_a_button.png
+++ b/graphics/interface/summary_a_button.png
--- a/graphics/interface/summary_b_button.png
+++ b/graphics/interface/summary_b_button.png
--- a/graphics/interface/summary_markings.pal
+++ b/graphics/interface/summary_markings.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+164 148 222
+172 156 238
+255 255 255
+205 205 205
+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/interface/test.bin
+++ b/graphics/interface/test.bin
--- a/graphics/interface/textbox.png
+++ b/graphics/interface/textbox.png
--- a/graphics/interface/ui_learn_move.png
+++ b/graphics/interface/ui_learn_move.png
--- a/graphics/interface/unk_tilemap2.bin
+++ b/graphics/interface/unk_tilemap2.bin
--- a/graphics/interface/unknown_6157C4.bin
+++ b/graphics/interface/unknown_6157C4.bin
@@ -0,0 +1 @@
+#$
--- a/graphics/interface/unknown_6157E0.bin
+++ b/graphics/interface/unknown_6157E0.bin
@@ -0,0 +1,2 @@
+
+
--- a/graphics/link_games/berrycrush_background.bin
+++ b/graphics/link_games/berrycrush_background.bin
--- a/graphics/link_games/berrycrush_btnpress.png
+++ b/graphics/link_games/berrycrush_btnpress.png
--- a/graphics/link_games/berrycrush_container_cap.bin
+++ b/graphics/link_games/berrycrush_container_cap.bin
--- a/graphics/link_games/berrycrush_grinder_base.pal
+++ b/graphics/link_games/berrycrush_grinder_base.pal
--- a/graphics/link_games/berrycrush_grinder_base.png
+++ b/graphics/link_games/berrycrush_grinder_base.png
--- a/graphics/link_games/berrycrush_grinder_top.bin
+++ b/graphics/link_games/berrycrush_grinder_top.bin
--- a/graphics/link_games/berrycrush_misc.pal
+++ b/graphics/link_games/berrycrush_misc.pal
--- a/graphics/link_games/berrycrush_sparkle.png
+++ b/graphics/link_games/berrycrush_sparkle.png
--- a/graphics/link_games/berrycrush_timerdigits.pal
+++ b/graphics/link_games/berrycrush_timerdigits.pal
--- a/graphics/link_games/berrycrush_timerdigits.png
+++ b/graphics/link_games/berrycrush_timerdigits.png
--- a/graphics/link_games/dodrioberry_berrysprites.pal
+++ b/graphics/link_games/dodrioberry_berrysprites.pal
--- a/graphics/link_games/dodrioberry_berrysprites.png
+++ b/graphics/link_games/dodrioberry_berrysprites.png
--- a/graphics/link_games/dodrioberry_bg1.bin
+++ b/graphics/link_games/dodrioberry_bg1.bin
--- a/graphics/link_games/dodrioberry_bg1.pal
+++ b/graphics/link_games/dodrioberry_bg1.pal
--- a/graphics/link_games/dodrioberry_bg1.png
+++ b/graphics/link_games/dodrioberry_bg1.png
--- a/graphics/link_games/dodrioberry_bg2.pal
+++ b/graphics/link_games/dodrioberry_bg2.pal
--- a/graphics/link_games/dodrioberry_bg2.png
+++ b/graphics/link_games/dodrioberry_bg2.png
--- a/graphics/link_games/dodrioberry_bg2left.bin
+++ b/graphics/link_games/dodrioberry_bg2left.bin
--- a/graphics/link_games/dodrioberry_bg2right.bin
+++ b/graphics/link_games/dodrioberry_bg2right.bin
--- a/graphics/link_games/dodrioberry_pkmn.pal
+++ b/graphics/link_games/dodrioberry_pkmn.pal
--- a/graphics/link_games/dodrioberry_pkmn.png
+++ b/graphics/link_games/dodrioberry_pkmn.png
--- a/graphics/link_games/dodrioberry_platform.pal
+++ b/graphics/link_games/dodrioberry_platform.pal
--- a/graphics/link_games/dodrioberry_platform.png
+++ b/graphics/link_games/dodrioberry_platform.png
--- a/graphics/link_games/dodrioberry_shiny.pal
+++ b/graphics/link_games/dodrioberry_shiny.pal
--- a/graphics/link_games/dodrioberry_status.pal
+++ b/graphics/link_games/dodrioberry_status.pal
--- a/graphics/link_games/dodrioberry_status.png
+++ b/graphics/link_games/dodrioberry_status.png
--- a/graphics/link_games/pkmnjump_321start1.pal
+++ b/graphics/link_games/pkmnjump_321start1.pal
--- a/graphics/link_games/pkmnjump_321start1.png
+++ b/graphics/link_games/pkmnjump_321start1.png
--- a/graphics/link_games/pkmnjump_321start2.pal
+++ b/graphics/link_games/pkmnjump_321start2.pal
--- a/graphics/link_games/pkmnjump_321start2.png
+++ b/graphics/link_games/pkmnjump_321start2.png
--- a/graphics/link_games/pkmnjump_bg.bin
+++ b/graphics/link_games/pkmnjump_bg.bin
--- a/graphics/link_games/pkmnjump_bg.pal
+++ b/graphics/link_games/pkmnjump_bg.pal
--- a/graphics/link_games/pkmnjump_bg.png
+++ b/graphics/link_games/pkmnjump_bg.png
--- a/graphics/link_games/pkmnjump_pal1.pal
+++ b/graphics/link_games/pkmnjump_pal1.pal
--- a/graphics/link_games/pkmnjump_pal2.pal
+++ b/graphics/link_games/pkmnjump_pal2.pal
--- a/graphics/link_games/pkmnjump_pal3.pal
+++ b/graphics/link_games/pkmnjump_pal3.pal
--- a/graphics/link_games/pkmnjump_results.bin
+++ b/graphics/link_games/pkmnjump_results.bin
--- a/graphics/link_games/pkmnjump_results.pal
+++ b/graphics/link_games/pkmnjump_results.pal
--- a/graphics/link_games/pkmnjump_results.png
+++ b/graphics/link_games/pkmnjump_results.png
--- a/graphics/link_games/pkmnjump_rope1.png
+++ b/graphics/link_games/pkmnjump_rope1.png
--- a/graphics/link_games/pkmnjump_rope2.png
+++ b/graphics/link_games/pkmnjump_rope2.png
--- a/graphics/link_games/pkmnjump_rope3.png
+++ b/graphics/link_games/pkmnjump_rope3.png
--- a/graphics/link_games/pkmnjump_rope4.png
+++ b/graphics/link_games/pkmnjump_rope4.png
--- a/graphics/link_games/pkmnjump_star.png
+++ b/graphics/link_games/pkmnjump_star.png
--- a/graphics/link_games/pkmnjump_venusaur.bin
+++ b/graphics/link_games/pkmnjump_venusaur.bin
--- a/graphics/link_games/pkmnjump_venusaur.pal
+++ b/graphics/link_games/pkmnjump_venusaur.pal
--- a/graphics/link_games/pkmnjump_venusaur.png
+++ b/graphics/link_games/pkmnjump_venusaur.png
--- a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png
+++ b/graphics/map_objects/pics/effects/unknown_4F6D38/0.png
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1,2 @@`

				`$%&'()*+,-./456789:;<=>?DEFGHIJKLMNOTUVWXYZ[\]^_defghijklmnotuvwxyz{\|}~у<7F><D183>葛訣誌舶沫<E888B6>圀悃棔､･ｦｧｨｩｪｫｬｭｮｯｴｵｶｷｸｹｺｻｼｽｾｿﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟtuvwxyz{\|}~у<7F><D183><EFBFBD>諸楓利劒 !"#洟･ｦｧｨｩｪ0123ｯｴｵｶｷｸｹｺ@ABCｿﾄﾅﾆﾇﾈﾉﾊPQRSﾏﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ`
				`@@ -0,0 +1 @@`
				`¼½¾<11><11><11><11><11><11><11><11>‗לםמן<11>‎‏<11>`
				`@@ -0,0 +1 @@`
				`<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><11><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><11><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`