diff options
| -rw-r--r-- | asm/trade.s | 27 | ||||
| -rw-r--r-- | src/trade.c | 8 |
2 files changed, 8 insertions, 27 deletions
diff --git a/asm/trade.s b/asm/trade.s index 5a0634734..cad31d7d7 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -10,33 +10,6 @@ .set sub_804A96C_alt, sub_804A96C .endif - thumb_func_start nullsub_5 -nullsub_5: @ 8048D20 - bx lr - thumb_func_end nullsub_5 - - thumb_func_start sub_8048D24 -sub_8048D24: @ 8048D24 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r3, 0 - cmp r3, r2 - bcs _08048D3E -_08048D30: - adds r0, r5, r3 - adds r1, r4, r3 - ldrb r1, [r1] - strb r1, [r0] - adds r3, 0x1 - cmp r3, r2 - bcc _08048D30 -_08048D3E: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8048D24 - thumb_func_start sub_8048D44 sub_8048D44: @ 8048D44 push {r4-r7,lr} diff --git a/src/trade.c b/src/trade.c index 5b0ea50fe..60b11b63f 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1213,6 +1213,14 @@ void sub_8048C70(void) gUnknown_03004824->unk_0050 = TRUE; } +void nullsub_5(u8 a0, u8 a1) {} + +void sub_8048D24(u8 *dest, const u8 *src, u32 size) +{ + int i; + for (i = 0; i < size; i ++) dest[i] = src[i]; +} + asm(".section .text.sub_804A96C"); void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { |