merge start

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

 //	+ 24 tiles not compressed
 //	Total size: 768 = 768
 //
-//	Time-stamp: 2017-01-24, 13:22:54
+//	Time-stamp: 2017-05-24, 23:53:39
 //	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-01-24, 13:22:54
+//	Time-stamp: 2017-05-24, 23:53:39
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

src/player_interaction/player_interaction.c

     (void*)NULL,
     (void*)0x0891B807,
     (void*)0x0891B807
-};
-
-//TODO implement actual functtions
-
-void* pi_dummy(bool darg)
-{
-    return darg ? behavior_walk_table[0] : script_walk_table[0];
-}
+};