diff options
| -rw-r--r-- | asm/trade.s | 16 | ||||
| -rw-r--r-- | src/trade.c | 5 |
2 files changed, 5 insertions, 16 deletions
diff --git a/asm/trade.s b/asm/trade.s index dce4baa9e..8d14dbe09 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -495,22 +495,6 @@ _0804A2B0: .4byte gUnknown_03004824 .section .text.sub_804A9F4 - thumb_func_start sub_804ACD8 -sub_804ACD8: @ 804ACD8 - push {r4,lr} - adds r4, r0, 0 - lsls r3, r2, 24 - lsrs r3, 24 - ldr r0, _0804ACF0 @ =gWindowConfig_81E725C - adds r2, r4, 0 - bl sub_804AFB8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0804ACF0: .4byte gWindowConfig_81E725C - thumb_func_end sub_804ACD8 - thumb_func_start sub_804ACF4 sub_804ACF4: @ 804ACF4 push {r4-r7,lr} diff --git a/src/trade.c b/src/trade.c index 4262f19bf..efd6a1314 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2619,6 +2619,11 @@ static bool8 sub_804ABF8(void) } } +/*static*/ void sub_804ACD8(const u8 *src, u8 *dest, u8 a2) +{ + sub_804AFB8(&gWindowConfig_81E725C, dest, src, a2); +} + asm(".section .text.sub_804DAD4"); /*static*/ void sub_804DAD4(struct UnkStructC *arg0, struct InGameTrade *trade) { |