diff options
| author | chandler <chandlerm2016@yahoo.com> | 2020-07-15 20:10:22 -0400 |
|---|---|---|
| committer | chandler <chandlerm2016@yahoo.com> | 2020-07-15 20:10:22 -0400 |
| commit | ca5de28b09f4e9e6d2912e91b58aaea421996772 (patch) | |
| tree | 45e3a9a14f006d418d1d886171ce87f30bb6f2e3 | |
| parent | b80c5bd4680567bf166f43586717356f54a561a8 (diff) | |
beedle Ok
| -rw-r--r-- | asm/non_matching/beedle/sub_08063314.inc | 52 | ||||
| -rw-r--r-- | src/npc/beedle.c | 10 |
2 files changed, 1 insertions, 61 deletions
diff --git a/asm/non_matching/beedle/sub_08063314.inc b/asm/non_matching/beedle/sub_08063314.inc deleted file mode 100644 index 2d5151d1..00000000 --- a/asm/non_matching/beedle/sub_08063314.inc +++ /dev/null @@ -1,52 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0xf] - adds r0, #1 - strb r0, [r4, #0xf] - movs r1, #0xff - ands r0, r1 - movs r1, #0xf - ands r0, r1 - cmp r0, #0 - bne _08063342 - adds r0, r4, #0 - bl sub_080633C8 - adds r1, r0, #0 - adds r0, r4, #0 - adds r0, #0x58 - ldrb r0, [r0] - cmp r0, r1 - beq _08063342 - adds r0, r4, #0 - bl InitializeAnimation -_08063342: - adds r0, r4, #0 - adds r0, #0x39 - ldrb r0, [r0] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - cmp r0, #0 - beq _08063360 - ldrb r0, [r4, #0xe] - ldr r1, _08063368 @ =0x00000A01 - adds r0, r0, r1 - bl TextboxNoOverlapFollow - ldrb r0, [r4, #0xc] - adds r0, #1 - strb r0, [r4, #0xc] -_08063360: - adds r0, r4, #0 - bl sub_0806ED78 - pop {r4, pc} - .align 2, 0 -_08063368: .4byte 0x00000A01 - .syntax divided -
\ No newline at end of file diff --git a/src/npc/beedle.c b/src/npc/beedle.c index 5d56a13f..bdcce8c7 100644 --- a/src/npc/beedle.c +++ b/src/npc/beedle.c @@ -45,12 +45,10 @@ void sub_080632E0(Entity* this) { } } -#ifdef NON_MATCHING void sub_08063314(Entity* this) { u32 offset; - this->field_0xf++; - if (((this->field_0xf & 0xF) == 0) && (offset = sub_080633C8(this), this->animIndex != offset)) { + if (((++this->field_0xf & 0xF) == 0) && (offset = sub_080633C8(this), this->animIndex != offset)) { InitializeAnimation(this, offset); } if (this->interactType != '\0') { @@ -59,12 +57,6 @@ void sub_08063314(Entity* this) { } sub_0806ED78(this); } -#else -NAKED -void sub_08063314(Entity* this) { - asm(".include \"asm/non_matching/beedle/sub_08063314.inc\""); -} -#endif void sub_0806336C(Entity* this) { if ((gTextBox.doTextBox & 0x7F) == 0) { |