diff options
| -rw-r--r-- | asm/trade.s | 33 | ||||
| -rw-r--r-- | src/trade.c | 17 |
2 files changed, 15 insertions, 35 deletions
diff --git a/asm/trade.s b/asm/trade.s index 03c51aa52..d44ecf600 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -700,37 +700,4 @@ _0804B20C: bx r0 thumb_func_end sub_804B1BC - thumb_func_start sub_804B210 -sub_804B210: @ 804B210 - push {lr} - bl sub_804B1BC - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_804B210 - - thumb_func_start sub_804B228 -sub_804B228: @ 804B228 - push {r4,lr} - ldr r4, _0804B248 @ =gUnknown_03004828 - ldr r1, [r4] - adds r2, r1, 0 - adds r2, 0xB4 - movs r3, 0 - movs r0, 0 - strh r0, [r2] - adds r1, 0xB2 - strb r3, [r1] - ldr r0, [r4] - adds r0, 0xB3 - strb r3, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0804B248: .4byte gUnknown_03004828 - thumb_func_end sub_804B228 - .align 2, 0 @ Don't pad with nop. diff --git a/src/trade.c b/src/trade.c index 72f149dfd..777d37d27 100644 --- a/src/trade.c +++ b/src/trade.c @@ -3510,9 +3510,22 @@ static bool8 sub_804ABF8(void) asm(".section .text.sub_804DAD4"); -void sub_804B210(void); +void sub_804B1BC(void); -void sub_804B228(void); +void sub_804B210(void) +{ + sub_804B1BC(); + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +void sub_804B228(void) +{ + gUnknown_03004828->unk_00b4 = 0; + gUnknown_03004828->unk_00b2 = 0; + gUnknown_03004828->unk_00b3 = 0; +} void sub_804B24C(void) { |