From 3ce25836aeda87a0d72461bdfed5140d4faedb16 Mon Sep 17 00:00:00 2001 From: Behemoth Date: Tue, 18 Aug 2020 10:33:34 +0200 Subject: [PATCH] decompile backgroundCloud --- asm/backgroundCloud.s | 175 ----------------------------------- linker.ld | 2 +- src/object/backgroundCloud.c | 59 ++++++++++++ 3 files changed, 60 insertions(+), 176 deletions(-) delete mode 100644 asm/backgroundCloud.s create mode 100644 src/object/backgroundCloud.c diff --git a/asm/backgroundCloud.s b/asm/backgroundCloud.s deleted file mode 100644 index 0ed3e9f4..00000000 --- a/asm/backgroundCloud.s +++ /dev/null @@ -1,175 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start BackgroundCloud -BackgroundCloud: @ 0x0808F640 - push {lr} - ldr r2, _0808F654 @ =gUnk_08121EA4 - ldrb r1, [r0, #0xc] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_0808F654: .4byte gUnk_08121EA4 - - thumb_func_start sub_0808F658 -sub_0808F658: @ 0x0808F658 - push {r4, r5, lr} - adds r5, r0, #0 - movs r2, #1 - movs r0, #1 - strb r0, [r5, #0xc] - ldrb r1, [r5, #0x18] - subs r0, #5 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, #0x18] - ldrb r0, [r5, #0x1b] - movs r1, #0xc0 - orrs r0, r1 - strb r0, [r5, #0x1b] - ldrb r0, [r5, #0x19] - orrs r0, r1 - strb r0, [r5, #0x19] - ldrb r0, [r5, #0xa] - adds r3, r5, #0 - adds r3, #0x29 - movs r1, #7 - ands r1, r0 - ldrb r2, [r3] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - ldrb r0, [r5, #0xa] - strb r0, [r5, #0x1e] - movs r0, #8 - strb r0, [r5, #0x15] - ldr r1, _0808F6D8 @ =gUnk_08121EB0 - ldrb r0, [r5, #0xa] - adds r0, r0, r1 - ldrb r0, [r0] - movs r4, #0 - strh r0, [r5, #0x24] - ldr r3, _0808F6DC @ =gRoomControls - ldrh r1, [r3, #6] - adds r2, r1, #0 - subs r2, #0x60 - adds r0, r5, #0 - adds r0, #0x78 - strh r2, [r0] - ldrh r0, [r3, #0x1e] - adds r1, r1, r0 - adds r1, #0x60 - adds r0, r5, #0 - adds r0, #0x7a - strh r1, [r0] - strb r4, [r5, #0x14] - bl Random - movs r1, #0xf - ands r0, r1 - lsls r0, r0, #4 - ldrh r1, [r5, #0x2e] - adds r0, r0, r1 - strh r0, [r5, #0x2e] - strb r4, [r5, #0xe] - strb r4, [r5, #0xd] - pop {r4, r5, pc} - .align 2, 0 -_0808F6D8: .4byte gUnk_08121EB0 -_0808F6DC: .4byte gRoomControls - - thumb_func_start sub_0808F6E0 -sub_0808F6E0: @ 0x0808F6E0 - push {r4, lr} - adds r4, r0, #0 - bl sub_0806F69C - adds r0, r4, #0 - adds r0, #0x78 - movs r2, #0x2e - ldrsh r1, [r4, r2] - movs r2, #0 - ldrsh r0, [r0, r2] - cmp r1, r0 - blt _0808F704 - adds r0, r4, #0 - adds r0, #0x7a - movs r2, #0 - ldrsh r0, [r0, r2] - cmp r1, r0 - ble _0808F708 -_0808F704: - movs r0, #2 - strb r0, [r4, #0xc] -_0808F708: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0808F70C -sub_0808F70C: @ 0x0808F70C - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0xd] - cmp r0, #0 - bne _0808F75C - movs r0, #1 - strb r0, [r4, #0xd] - bl Random - movs r1, #7 - ands r0, r1 - lsls r0, r0, #3 - adds r0, #0x1f - strb r0, [r4, #0xe] - ldrb r1, [r4, #0x15] - movs r0, #0x10 - ands r0, r1 - cmp r0, #0 - beq _0808F738 - adds r0, r4, #0 - adds r0, #0x7a - b _0808F73C -_0808F738: - adds r0, r4, #0 - adds r0, #0x78 -_0808F73C: - ldrh r0, [r0] - strh r0, [r4, #0x2e] - ldrb r0, [r4, #0xa] - cmp r0, #2 - bne _0808F75C - bl Random - ldr r3, _0808F778 @ =gUnk_08121EB3 - ldrb r1, [r4, #0xb] - lsls r1, r1, #1 - movs r2, #1 - ands r2, r0 - adds r1, r1, r2 - adds r1, r1, r3 - ldrb r0, [r1] - strh r0, [r4, #0x32] -_0808F75C: - ldrb r1, [r4, #0xd] - cmp r1, #1 - bne _0808F774 - ldrb r0, [r4, #0xe] - subs r0, #1 - strb r0, [r4, #0xe] - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #0 - bne _0808F774 - strb r1, [r4, #0xc] - strb r0, [r4, #0xd] -_0808F774: - pop {r4, pc} - .align 2, 0 -_0808F778: .4byte gUnk_08121EB3 diff --git a/linker.ld b/linker.ld index a632b5a6..bc099aa9 100644 --- a/linker.ld +++ b/linker.ld @@ -750,7 +750,7 @@ SECTIONS { src/object/heartContainer.o(.text); src/object/object48.o(.text); src/object/object49.o(.text); - asm/backgroundCloud.o(.text); + src/object/backgroundCloud.o(.text); asm/object4B.o(.text); asm/pushableFurniture.o(.text); asm/furniture.o(.text); diff --git a/src/object/backgroundCloud.c b/src/object/backgroundCloud.c new file mode 100644 index 00000000..83941fc3 --- /dev/null +++ b/src/object/backgroundCloud.c @@ -0,0 +1,59 @@ +#include "global.h" +#include "entity.h" +#include "functions.h" + +extern void (*const gUnk_08121EA4[])(Entity*); +extern const u8 gUnk_08121EB0[]; +extern const u8 gUnk_08121EB3[]; + +void BackgroundCloud(Entity* this) { + gUnk_08121EA4[this->action](this); +} + +void sub_0808F658(Entity* this) { + this->action = 1; + this->spriteSettings.b.draw = 1; + this->spriteOrientation.flipY = 3; + this->spriteRendering.b3 = 3; + this->spritePriority.b0 = this->entityType.form; + this->frameIndex = this->entityType.form; + this->direction = 8; + this->nonPlanarMovement = gUnk_08121EB0[(this->entityType).form]; + this->field_0x78.HWORD = gRoomControls.roomOriginX - 0x60; + this->field_0x7a.HWORD = gRoomControls.roomOriginX + gRoomControls.filler2[3] + 0x60; + this->animationState = 0; + this->x.HALF.HI += (Random() & 0xf) << 4; + this->actionDelay = 0; + this->previousActionFlag = 0; +} + +void sub_0808F6E0(Entity* this) { + sub_0806F69C(this); + + if ((short)this->x.HALF.HI < (short)this->field_0x78.HWORD || + (short)this->x.HALF.HI > (short)this->field_0x7a.HWORD) + this->action = 2; +} + +void sub_0808F70C(Entity* this) { + if (this->previousActionFlag == 0) { + this->previousActionFlag = 1; + this->actionDelay = ((Random() & 7) << 3) + 31; + + if ((this->direction & 0x10)) { + this->x.HALF.HI = this->field_0x7a.HWORD; + } else { + this->x.HALF.HI = this->field_0x78.HWORD; + } + + if (this->entityType.form == 2) + this->y.HALF.HI = gUnk_08121EB3[this->entityType.parameter * 2 + (Random() & 1)]; + } + + if (this->previousActionFlag == 1) { + if (--this->actionDelay == 0) { + this->action = 1; + this->previousActionFlag = 0; + } + } +}