diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 10:27:59 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 10:27:59 -0400 |
| commit | 2f903c67c9ffbdbec52e1982bbe6cb064e0d1138 (patch) | |
| tree | ce9e676d033e48c0bf23c50c86e240c68fda1eae | |
| parent | af86929d787ca449ab86b3bd8674cbd5c44fb7ea (diff) | |
sub_8049088
| -rw-r--r-- | asm/trade.s | 26 | ||||
| -rw-r--r-- | src/trade.c | 10 |
2 files changed, 9 insertions, 27 deletions
diff --git a/asm/trade.s b/asm/trade.s index abfbc523f..02f09a046 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -10,32 +10,6 @@ .set sub_804A96C_alt, sub_804A96C .endif - thumb_func_start sub_8049088 -sub_8049088: @ 8049088 - push {lr} - sub sp, 0x1C - ldr r1, _080490B0 @ =gTradeText_TradeOkayPrompt - mov r0, sp - bl StringCopy - ldr r0, _080490B4 @ =gUnknown_03004824 - ldr r0, [r0] - adds r0, 0x7E - ldrh r1, [r0] - lsls r1, 5 - ldr r0, _080490B8 @ =0x06010000 - adds r1, r0 - mov r0, sp - movs r2, 0x14 - bl sub_804ACD8 - add sp, 0x1C - pop {r0} - bx r0 - .align 2, 0 -_080490B0: .4byte gTradeText_TradeOkayPrompt -_080490B4: .4byte gUnknown_03004824 -_080490B8: .4byte 0x06010000 - thumb_func_end sub_8049088 - thumb_func_start sub_80490BC sub_80490BC: @ 80490BC push {r4,lr} diff --git a/src/trade.c b/src/trade.c index d4d5e0b50..a8f3bf6e8 100644 --- a/src/trade.c +++ b/src/trade.c @@ -78,7 +78,8 @@ struct TradeEwramSubstruct { /*0x007a*/ u8 unk_007a; /*0x007b*/ u8 unk_007b; /*0x007c*/ u8 unk_007c; - /*0x007d*/ u8 filler_007d[3]; + /*0x007d*/ u8 unk_007d; + /*0x007e*/ u16 unk_007e; /*0x0080*/ u8 unk_0080; /*0x0081*/ u8 unk_0081; /*0x0082*/ u8 filler_0082[4]; @@ -1425,6 +1426,13 @@ bool8 sub_8048D44(void) return FALSE; } +void sub_8049088(void) +{ + u8 string[28]; + StringCopy(string, gTradeText_TradeOkayPrompt); + sub_804ACD8(string, (u8 *)BG_CHAR_ADDR(4) + gUnknown_03004824->unk_007e * 32, 20); +} + asm(".section .text.sub_804A96C"); void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { |