From 8c1734596d52a404f50ffb152a6f797836dc6d34 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sat, 19 Feb 2022 08:13:36 +0200 Subject: [PATCH] Match sub_080740D8 --- asm/non_matching/player/sub_080740D8.inc | 123 ----------------------- src/player.c | 45 +++------ 2 files changed, 16 insertions(+), 152 deletions(-) delete mode 100644 asm/non_matching/player/sub_080740D8.inc diff --git a/asm/non_matching/player/sub_080740D8.inc b/asm/non_matching/player/sub_080740D8.inc deleted file mode 100644 index 7c4c6ca7..00000000 --- a/asm/non_matching/player/sub_080740D8.inc +++ /dev/null @@ -1,123 +0,0 @@ - .syntax unified - push {r4, r5, r6, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - ldrb r0, [r4, #0xf] - cmp r0, #0 - bne _080740EA - ldrb r0, [r4, #0x15] - b _080740F0 -_080740EA: - ldrb r1, [r4, #0x15] - movs r0, #0x10 - eors r0, r1 -_080740F0: - cmp r0, #8 - beq _08074128 - cmp r0, #8 - bhi _080740FE - cmp r0, #0 - beq _08074168 - b _0807418C -_080740FE: - cmp r0, #0x10 - beq _08074148 - cmp r0, #0x18 - bne _0807418C - movs r0, #0x2e - ldrsh r1, [r4, r0] - ldr r2, [r4, #0x48] - ldrb r0, [r2, #2] - subs r1, r1, r0 - movs r0, #0 - ldrsb r0, [r2, r0] - adds r1, r1, r0 - ldr r3, _08074124 @ =gRoomControls - ldrh r0, [r3, #6] - subs r6, r1, r0 - movs r1, #0x32 - ldrsh r0, [r4, r1] - b _08074182 - .align 2, 0 -_08074124: .4byte gRoomControls -_08074128: - ldr r2, [r4, #0x48] - movs r1, #0x2e - ldrsh r0, [r4, r1] - ldrb r1, [r2, #2] - adds r0, r0, r1 - movs r1, #0 - ldrsb r1, [r2, r1] - adds r0, r0, r1 - ldr r3, _08074144 @ =gRoomControls - ldrh r1, [r3, #6] - subs r6, r0, r1 - movs r1, #0x32 - ldrsh r0, [r4, r1] - b _08074182 - .align 2, 0 -_08074144: .4byte gRoomControls -_08074148: - movs r0, #0x2e - ldrsh r1, [r4, r0] - ldr r2, [r4, #0x48] - movs r0, #0 - ldrsb r0, [r2, r0] - adds r1, r1, r0 - ldr r3, _08074164 @ =gRoomControls - ldrh r0, [r3, #6] - subs r6, r1, r0 - movs r1, #0x32 - ldrsh r0, [r4, r1] - ldrb r1, [r2, #5] - adds r0, r0, r1 - b _08074182 - .align 2, 0 -_08074164: .4byte gRoomControls -_08074168: - movs r0, #0x2e - ldrsh r1, [r4, r0] - ldr r2, [r4, #0x48] - movs r0, #0 - ldrsb r0, [r2, r0] - adds r1, r1, r0 - ldr r3, _080741A4 @ =gRoomControls - ldrh r0, [r3, #6] - subs r6, r1, r0 - movs r1, #0x32 - ldrsh r0, [r4, r1] - ldrb r1, [r2, #5] - subs r0, r0, r1 -_08074182: - movs r1, #1 - ldrsb r1, [r2, r1] - adds r0, r0, r1 - ldrh r1, [r3, #8] - subs r5, r0, r1 -_0807418C: - ldr r2, _080741A8 @ =gUnk_080082DC - adds r0, r6, #0 - adds r1, r5, #0 - bl sub_080086B4 - cmp r0, #0 - beq _080741AC - adds r0, r4, #0 - bl LinearMoveUpdate - b _080741B0 - .align 2, 0 -_080741A4: .4byte gRoomControls -_080741A8: .4byte gUnk_080082DC -_080741AC: - movs r0, #1 - strb r0, [r4, #0xf] -_080741B0: - movs r1, #0x80 - lsls r1, r1, #6 - adds r0, r4, #0 - bl GravityUpdate - cmp r0, #0 - bne _080741C2 - bl sub_0807921C -_080741C2: - pop {r4, r5, r6, pc} - .syntax divided diff --git a/src/player.c b/src/player.c index 03a297aa..fef3c5d8 100644 --- a/src/player.c +++ b/src/player.c @@ -3313,55 +3313,42 @@ static void sub_08074060(Entity* this) { } } -/*static*/ NONMATCH("asm/non_matching/player/sub_080740D8.inc", void sub_080740D8(Entity* this)) { - int v1; // r5 - int v2; // r6 - unsigned int v4; // r0 - Hitbox* v5; // r2 - int v6; // r0 +void sub_080740D8(Entity* this) { + int y; + int x; + u32 dir; UpdateAnimationSingleFrame(this); if (!this->field_0xf) - v4 = this->direction; + dir = this->direction; else - v4 = this->direction ^ 0x10; - switch (v4) { + dir = DirectionTurnAround(this->direction); + switch (dir) { case 24: - v5 = this->hitbox; - v2 = this->x.HALF.HI - v5->unk2[0] + v5->offset_x - gRoomControls.origin_x; - v6 = this->y.HALF.HI; - v1 = v6 + v5->offset_y - gRoomControls.origin_y; + x = this->x.HALF.HI - this->hitbox->unk2[0] + this->hitbox->offset_x - gRoomControls.origin_x; + y = this->y.HALF.HI + this->hitbox->offset_y - gRoomControls.origin_y; break; case 8: - v5 = this->hitbox; - v2 = this->x.HALF.HI + v5->unk2[0] + v5->offset_x - gRoomControls.origin_x; - v6 = this->y.HALF.HI; - v1 = v6 + v5->offset_y - gRoomControls.origin_y; + x = this->x.HALF.HI + this->hitbox->unk2[0] + this->hitbox->offset_x - gRoomControls.origin_x; + y = this->y.HALF.HI + this->hitbox->offset_y - gRoomControls.origin_y; break; case 16: - v5 = this->hitbox; - v2 = this->x.HALF.HI + v5->offset_x - gRoomControls.origin_x; - v6 = this->y.HALF.HI + v5->unk2[3]; - v1 = v6 + v5->offset_y - gRoomControls.origin_y; + x = this->x.HALF.HI + this->hitbox->offset_x - gRoomControls.origin_x; + y = this->y.HALF.HI + this->hitbox->unk2[3] + this->hitbox->offset_y - gRoomControls.origin_y; break; case 0: - v5 = this->hitbox; - v2 = this->x.HALF.HI + v5->unk2[0] + v5->offset_x - gRoomControls.origin_x; - v6 = this->y.HALF.HI; - v1 = v6 + v5->offset_y - gRoomControls.origin_y; - break; - default: + x = this->x.HALF.HI + this->hitbox->offset_x - gRoomControls.origin_x; + y = this->y.HALF.HI - this->hitbox->unk2[3] + this->hitbox->offset_y - gRoomControls.origin_y; break; } - if (sub_080086B4(v2, v1, gUnk_080082DC)) + if (sub_080086B4(x, y, gUnk_080082DC)) LinearMoveUpdate(this); else this->field_0xf = 1; if (!GravityUpdate(this, GRAVITY_RATE)) sub_0807921C(); } -END_NONMATCH u32 sub_080741C4(void) { if ((gPlayerState.jump_status && (gPlayerState.jump_status & 7) != 3) || gPlayerEntity.z.WORD != 0) {