summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorchandler <chandlerm2016@yahoo.com>2020-07-15 20:10:22 -0400
committerchandler <chandlerm2016@yahoo.com>2020-07-15 20:10:22 -0400
commitca5de28b09f4e9e6d2912e91b58aaea421996772 (patch)
tree45e3a9a14f006d418d1d886171ce87f30bb6f2e3 /src
parentb80c5bd4680567bf166f43586717356f54a561a8 (diff)
beedle Ok
Diffstat (limited to 'src')
-rw-r--r--src/npc/beedle.c10
1 files changed, 1 insertions, 9 deletions
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) {