diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-14 16:38:48 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-14 16:38:48 +0200 |
| commit | 771cc93d932058d4ba079a33c04c0380f339c6a7 (patch) | |
| tree | 630f81b6ba3fc8722aec1d3d71228f0f01307003 | |
| parent | 3037f37cc669bec7580fe2623ce2c6ea1c4ebe76 (diff) | |
actually fix trade.s
| -rw-r--r-- | asm/trade.s | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/asm/trade.s b/asm/trade.s index 769b9b808..cf1cde171 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -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 |