resolve merge conflict

data/overworld/overworld_data.S

 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_539, 0x8231CFC
 
 .align 2
-ow_data_539: 
+ow_data_539:
 .hword 0xFFFF
-.byte 0x1B, 0x13, 0xFF, 0x11 
-.hword 0x80, 0x10, 0x10, 0x0, 0 
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_540, 0x8231CFC
+.byte 0x1B, 0x13,0xFF, 0x11
+.hword 0x800, 0x40, 0x40, 0x0, 0
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_540, 0x8231CFC
 
 .align 2
 ow_data_540: 

data/overworld/overworld_frames.S

 .word ow_00000Tiles+(0*0x80)
 .hword 0x200
 .hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
 
 .align 2
 ow_frames_534:
 .word ow_00000Tiles+(0*0x80)
 .hword 0x200
 .hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
 
 .align 2
 ow_frames_535:
 .word ow_00000Tiles+(0*0x80)
 .hword 0x200
 .hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
 
 .align 2
 ow_frames_536:
 .word ow_00000Tiles+(0*0x80)
 .hword 0x200
 .hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
 
 .align 2
 ow_frames_537:
 .word ow_00000Tiles+(0*0x80)
 .hword 0x200
 .hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
 
 .align 2
 ow_frames_538:
 .word ow_00000Tiles+(0*0x80)
 .hword 0x200
 .hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
-.word
-.hword 0x200
-.hword 0x0
 
 .align 2
 ow_frames_539:
 .word ow_00000Tiles+(0*0x80)
 .hword 0x200
 .hword 0x0
-.word
-.hword 0x200
+
+.align 2
+ow_frames_540:
+.word ow_0539Tiles+(0*0x800)
+.hword 0x800
 .hword 0x0
-.word
-.hword 0x200
+.word ow_0539Tiles+(1*0x800)
+.hword 0x800
 .hword 0x0
-.word
-.hword 0x200
+.word ow_0539Tiles+(2*0x800)
+.hword 0x800
 .hword 0x0
-.word
-.hword 0x200
+.word ow_0539Tiles+(0*0x800)
+.hword 0x800
 .hword 0x0
-.word
-.hword 0x200
+.word ow_0539Tiles+(0*0x800)
+.hword 0x800
 .hword 0x0
-.word
-.hword 0x200
+.word ow_0539Tiles+(0*0x800)
+.hword 0x800
 .hword 0x0
-.word
-.hword 0x200
+.word ow_0539Tiles+(0*0x800)
+.hword 0x800
 .hword 0x0
-.word
-.hword 0x200
+.word ow_0539Tiles+(0*0x800)
+.hword 0x800
 .hword 0x0
-
-.align 2
-ow_frames_540:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_0539Tiles+(0*0x800)
+.hword 0x800
 .hword 0x0
 
 .align 2

data/text_lookup/text_multichoice.s

-.text
-.align 2
-
-.thumb
-
-.global multichoice_array
-multichoice_array:
-    .word smc_yes_no
-    .word 2
-
-    .word smc_difficulty
-    .word 3
-
-
-smc_yes_no:
-    .word str_yes
-    .word 0
-    .word str_no
-    .word 0
-
-smc_difficulty:
-    .word str_beginner
-    .word 0
-    .word str_intermediate
-    .word 0
-    .word str_expert
+.text
+.align 2
+
+.thumb
+
+.global multichoice_array
+multichoice_array:
+    .word smc_yes_no
+    .word 2
+
+    .word smc_difficulty
+    .word 3
+
+    .word smc_left_right
+    .word 2
+
+
+smc_yes_no:
+    .word str_yes
+    .word 0
+    .word str_no
+    .word 0
+
+smc_difficulty:
+    .word str_beginner
+    .word 0
+    .word str_intermediate
+    .word 0
+    .word str_expert
+    .word 0
+
+smc_left_right:
+    .word str_left
+    .word 0
+    .word str_right
     .word 0

src/include/assets/interface/arrows.img.h

 //	+ 24 tiles not compressed
 //	Total size: 768 = 768
 //
+<<<<<<< HEAD
 //	Time-stamp: 2017-05-24, 23:53:39
+=======
+>>>>>>> 287c7ea0c11e046fe6fb8f2f68178aeca2fa326b
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

src/include/assets/interface/emoticons.img.h

 //	+ 60 tiles not compressed
 //	Total size: 1920 = 1920
 //
-//	Time-stamp: 2017-05-24, 23:53:39
+<<<<<<< HEAD
+=======
+//	Time-stamp: 2017-05-25, 13:57:33
+>>>>>>> 287c7ea0c11e046fe6fb8f2f68178aeca2fa326b
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

string/de/text_multichoices.txt

-str_yes=Ja
-str_no=Nein
-str_beginner=Anfänger
-str_intermediate=Fortgeschritten
-str_expert=Experte
+str_yes=Ja
+
+str_no=Nein
+
+str_beginner=Anfänger
+
+str_intermediate=Fortgeschritten
+
+str_expert=Experte
+str_left=Links
+str_right=Rechts