diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 15:14:30 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 15:14:30 -0400 |
| commit | f4b7f25df8a8231a6ade0a39b833b27b9c31ccbc (patch) | |
| tree | 20188b74416a0a8cba8d7e873772664fd03ef133 | |
| parent | 6183bc1e87b42f0996eb38fbfabb91d79a9cc2cb (diff) | |
DisplayMessageAndContinueTask
| -rw-r--r-- | asm/trade.s | 44 | ||||
| -rw-r--r-- | src/trade.c | 12 |
2 files changed, 12 insertions, 44 deletions
diff --git a/asm/trade.s b/asm/trade.s index ec21c27d5..4333bda3f 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -10,50 +10,6 @@ .set sub_804A96C_alt, sub_804A96C .endif - thumb_func_start DisplayMessageAndContinueTask -DisplayMessageAndContinueTask: @ 8049CF0 - push {r4,lr} - sub sp, 0x4 - ldr r4, _08049D40 @ =gUnknown_03004824 - ldr r1, [r4] - adds r1, 0xB4 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r1, [r4] - adds r0, r1, 0 - adds r0, 0xB4 - ldrb r0, [r0] - cmp r0, 0x78 - bls _08049D36 - adds r0, r1, 0x4 - movs r1, 0x13 - str r1, [sp] - movs r1, 0x18 - movs r2, 0xE - movs r3, 0x1D - bl DrawTextWindow - movs r0, 0x18 - movs r1, 0xE - movs r2, 0x4 - bl InitYesNoMenu - ldr r0, [r4] - adds r0, 0xB4 - movs r1, 0 - strb r1, [r0] - ldr r0, [r4] - adds r0, 0x7B - movs r1, 0x3 - strb r1, [r0] -_08049D36: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08049D40: .4byte gUnknown_03004824 - thumb_func_end DisplayMessageAndContinueTask - thumb_func_start sub_8049D44 sub_8049D44: @ 8049D44 push {lr} diff --git a/src/trade.c b/src/trade.c index 036f0b4f4..308082606 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1920,6 +1920,18 @@ static void sub_8049A20(void) } } +/*static*/ void DisplayMessageAndContinueTask(void) +{ + gUnknown_03004824->unk_00b4++; + if (gUnknown_03004824->unk_00b4 > 120) + { + DrawTextWindow(&gUnknown_03004824->window, 24, 14, 29, 19); + InitYesNoMenu(24, 14, 4); + gUnknown_03004824->unk_00b4 = 0; + gUnknown_03004824->unk_007b = 3; + } +} + asm(".section .text.sub_804A96C"); /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { |