actually fix trade.s

2018-10-14 16:38:48 +02:00
parent 3037f37cc6
commit 771cc93d93
1 changed files with 0 additions and 5 deletions
@@ -7897,13 +7897,8 @@ sub_80504CC: @ 80504CC
 	.align 2, 0
 _080505B4: .4byte gUnknown_826D1D4
 _080505B8: .4byte gUnknown_8D00000
-<<<<<<< HEAD
 _080505BC: .4byte gFile_graphics_interface_menu_map_tilemap
-_080505C0: .4byte gUnknown_201C000
-=======
-_080505BC: .4byte gUnknown_8D0051C
 _080505C0: .4byte gDecompressionBuffer
->>>>>>> upstream/master
 _080505C4: .4byte gUnknown_8D004D8
 _080505C8: .4byte gUnknown_826D1BC
 	thumb_func_end sub_80504CC