diff options
| -rw-r--r-- | include/asm.h | 9 | ||||
| -rw-r--r-- | src/field_control_avatar.c | 38 |
2 files changed, 21 insertions, 26 deletions
diff --git a/include/asm.h b/include/asm.h index acf688d84..9e47794f5 100644 --- a/include/asm.h +++ b/include/asm.h @@ -16,7 +16,14 @@ struct UnkInputStruct u8 input_field_0_5:1; u8 input_field_0_6:1; u8 input_field_0_7:1; - u8 input_field_1; + u8 input_field_1_0:1; + u8 input_field_1_1:1; + u8 input_field_1_2:1; + u8 input_field_1_3:1; + u8 input_field_1_4:1; + u8 input_field_1_5:1; + u8 input_field_1_6:1; + u8 input_field_1_7:1; u8 input_field_2; u8 input_field_3; }; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index e850a0125..c68976cf9 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -112,33 +112,21 @@ extern void sub_8080F58(void); extern void sub_80BC038(); extern void DoCoordEventWeather(u8); -__attribute__((naked)) void sub_8067EEC(struct UnkInputStruct *s) { - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - movs r1, 0x2\n\ - negs r1, r1\n\ - movs r3, 0x3\n\ - negs r3, r3\n\ - movs r4, 0x5\n\ - negs r4, r4\n\ - movs r5, 0x9\n\ - negs r5, r5\n\ - movs r2, 0\n\ - strb r2, [r0]\n\ - ldrb r2, [r0, 0x1]\n\ - ands r1, r2\n\ - ands r1, r3\n\ - ands r1, r4\n\ - ands r1, r5\n\ - strb r1, [r0, 0x1]\n\ - movs r1, 0\n\ - strb r1, [r0, 0x2]\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); + s->input_field_0_0 = 0; + s->input_field_0_1 = 0; + s->input_field_0_2 = 0; + s->input_field_0_3 = 0; + s->input_field_0_4 = 0; + s->input_field_0_5 = 0; + s->input_field_0_6 = 0; + s->input_field_0_7 = 0; + s->input_field_1_0 = 0; + s->input_field_1_1 = 0; + s->input_field_1_2 = 0; + s->input_field_1_3 = 0; + s->input_field_2 = 0; } void process_overworld_input(struct UnkInputStruct *pStruct, u16 keys, u16 heldKeys) |