fix merge conflicts

graphics/field_effects/unk_83C2CE0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+172 230 255
+115 205 255
+74 180 255
+148 148 148
+197 197 197
+213 213 213
+222 222 222
+164 164 164
+255 0 255
+255 0 255
+255 0 255
+180 180 180
+230 230 230
+246 246 246
+255 255 255

graphics/field_effects/unk_83C2D00.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+65 148 255
+180 222 255
+115 205 246
+131 197 255
+82 189 246
+172 238 246
+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

graphics/field_effects/unk_83C2D20.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 230 139
+189 131 74
+238 197 123
+213 164 98
+164 106 49
+255 246 164
+222 205 164
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/interface/hold_icons.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+57 205 106
+255 255 255
+213 213 255
+148 148 180
+255 246 156
+222 222 115
+246 82 41
+164 90 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+98 98 98

graphics/interface/party_menu_cancel_button.bin

@@ -0,0 +1,2 @@
+
+

graphics/interface/party_menu_confirm_button.bin

@@ -0,0 +1 @@
+#$

graphics/link_games/unk_846B794.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+0 0 0
+222 222 213
+255 156 24
+255 222 189
+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

graphics/link_games/unk_846B7B4.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 156 197
+106 222 156
+106 230 230
+139 230 255
+156 238 255
+197 246 255
+189 213 131
+230 213 115
+238 230 131
+246 246 156
+222 222 172
+106 230 172
+255 0 255
+255 0 255
+255 0 255
+255 0 255

graphics/link_games/unk_846BBB0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+213 213 213
+32 98 49
+98 156 115
+90 205 148
+139 238 189
+139 57 0
+189 106 49
+16 16 16
+230 74 65
+255 131 115
+156 246 139
+222 205 49
+255 238 82
+65 164 24
+106 205 65
+255 255 255

graphics/link_games/unk_846C8D8.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 156 197
+148 197 115
+172 222 123
+213 180 57
+238 205 65
+230 164 131
+246 189 172
+98 98 82
+164 148 90
+205 189 82
+255 238 74
+156 164 230
+90 90 106
+172 148 106
+230 205 123
+180 189 246

graphics/link_games/unk_846D9E4.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 156 197
+65 148 74
+82 180 74
+106 205 74
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+98 98 82
+205 189 82
+255 246 82
+255 255 255
+238 172 131
+238 230 131

graphics/link_games/unk_846DA04.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+49 123 57
+65 139 57
+82 164 57
+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

graphics/link_rfu/unk_843F3B8.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 148
+255 197 148
+238 139 90
+189 90 41
+255 213 213
+246 180 180
+197 131 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+41 49 49
+98 98 98
+180 189 180
+222 213 222
+255 255 255

graphics/link_rfu/unk_843F3D8.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 164 0
+255 0 0
+255 32 32
+255 74 74
+255 106 106
+255 148 148
+255 180 180
+255 222 222
+255 255 255
+255 255 255
+255 255 205
+255 255 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/link_rfu/unk_843F76C.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 189 115
+255 139 57
+205 98 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 238 180
+255 255 213
+115 115 115
+180 189 180
+222 213 222
+255 255 255

graphics/link_rfu/unk_843F78C.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+189 255 139
+156 230 106
+123 180 90
+180 213 255
+139 180 230
+115 139 172
+0 0 0
+255 131 131
+238 82 82
+255 238 180
+255 255 213
+115 115 115
+180 189 180
+222 213 222
+255 255 255

graphics/pokemon_special_anim/unk_845963C.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 222 205
+255 222 189
+255 222 180
+255 213 180
+255 205 180
+255 205 164
+255 205 156
+255 205 139
+0 0 0
+255 197 139
+255 172 131
+255 213 156
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon_special_anim/unk_845965C.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 238 255
+213 238 255
+213 230 255
+213 230 255
+205 230 255
+205 222 255
+205 222 255
+197 222 255
+0 0 0
+189 222 255
+172 213 255
+205 230 255
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon_special_anim/unk_8459868.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+230 230 255
+213 213 255
+197 197 255
+180 180 255
+164 164 255
+148 148 255
+131 131 255
+115 115 255
+98 98 255
+82 82 255
+65 65 255
+49 49 255
+32 32 255
+16 16 255

graphics/pokemon_special_anim/unk_84598A4.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+98 90 8
+197 189 24
+246 246 0
+148 139 16
+246 238 32
+222 213 0
+213 197 0
+180 164 0
+49 41 0
+172 148 32
+189 164 49
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon_special_anim/unk_8459940.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+65 106 255
+255 255 255
+230 230 230
+213 213 213
+197 197 197
+180 180 180
+164 164 164
+148 148 148
+131 131 131
+115 115 115
+98 98 98
+82 82 82
+65 65 65
+49 49 49
+32 32 32
+16 16 16

graphics/union_room_chat/unk_845AA24.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+213 205 205
+255 255 255
+255 255 255
+41 41 41
+255 156 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
+0 0 0

graphics/union_room_chat/unk_845AA44.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+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
+0 0 0
+0 0 0
+0 0 0

graphics/union_room_chat/unk_845AA64.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+0 0 0
+205 205 230
+49 213 0
+222 230 213
+0 0 255
+205 213 222
+255 0 0
+222 213 197
+255 189 0
+230 230 222
+197 197 197
+41 32 32
+0 0 0
+57 57 57

graphics/union_room_chat/unk_845AC14.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 197 98
+255 49 49
+156 49 49
+49 98 255
+0 0 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 230 255
+213 213 255
+172 172 172
+115 115 115
+255 255 255
+65 65 65