From 3ce25836aeda87a0d72461bdfed5140d4faedb16 Mon Sep 17 00:00:00 2001 From: Behemoth Date: Tue, 18 Aug 2020 10:33:34 +0200 Subject: [PATCH 1/4] 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; + } + } +} From f89fa848059ff8f25adeda34203fc515c13a3f82 Mon Sep 17 00:00:00 2001 From: Behemoth Date: Tue, 18 Aug 2020 10:37:32 +0200 Subject: [PATCH 2/4] delete already decompiled bell --- asm/bell.s | 58 ------------------------------------------------------ 1 file changed, 58 deletions(-) delete mode 100644 asm/bell.s diff --git a/asm/bell.s b/asm/bell.s deleted file mode 100644 index fdc37e1b..00000000 --- a/asm/bell.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start Bell -Bell: @ 0x08097D78 - push {lr} - ldr r2, _08097D8C @ =gUnk_08123384 - ldrb r1, [r0, #0xc] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_08097D8C: .4byte gUnk_08123384 - - thumb_func_start sub_08097D90 -sub_08097D90: @ 0x08097D90 - push {r4, lr} - adds r4, r0, #0 - movs r3, #1 - movs r2, #1 - strb r2, [r4, #0xc] - ldrb r1, [r4, #0x18] - movs r0, #4 - rsbs r0, r0, #0 - ands r0, r1 - orrs r0, r3 - strb r0, [r4, #0x18] - adds r0, r4, #0 - adds r0, #0x38 - strb r2, [r0] - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - strb r0, [r2] - adds r0, r4, #0 - bl UpdateSpriteForCollisionLayer - adds r0, r4, #0 - movs r1, #0 - bl InitAnimationForceUpdate - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_08097DCC -sub_08097DCC: @ 0x08097DCC - push {lr} - bl UpdateAnimationSingleFrame - pop {pc} From f0641dda41cf5fb3ab81b59d7bf64a062f829164 Mon Sep 17 00:00:00 2001 From: Behemoth Date: Tue, 18 Aug 2020 14:32:08 +0200 Subject: [PATCH 3/4] decompile bakerOven --- asm/bakerOven.s | 289 ----------------------------------------- linker.ld | 2 +- src/object/bakerOven.c | 102 +++++++++++++++ 3 files changed, 103 insertions(+), 290 deletions(-) delete mode 100644 asm/bakerOven.s create mode 100644 src/object/bakerOven.c diff --git a/asm/bakerOven.s b/asm/bakerOven.s deleted file mode 100644 index 48b0511a..00000000 --- a/asm/bakerOven.s +++ /dev/null @@ -1,289 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start BakerOven -BakerOven: @ 0x0809CC5C - push {lr} - ldr r2, _0809CC70 @ =gUnk_08123E20 - ldrb r1, [r0, #0xc] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_0809CC70: .4byte gUnk_08123E20 - - thumb_func_start sub_0809CC74 -sub_0809CC74: @ 0x0809CC74 - push {r4, r5, lr} - adds r5, r0, #0 - movs r4, #1 - strb r4, [r5, #0xc] - bl UpdateSpriteForCollisionLayer - ldrb r0, [r5, #0xa] - cmp r0, #0 - bne _0809CCD4 - adds r2, r5, #0 - adds r2, #0x29 - ldrb r0, [r2] - movs r1, #8 - rsbs r1, r1, #0 - ands r1, r0 - movs r0, #5 - orrs r1, r0 - strb r1, [r2] - movs r4, #0 -_0809CC9A: - movs r0, #0x92 - movs r1, #1 - adds r2, r4, #0 - bl CreateObject - adds r1, r0, #0 - adds r4, #1 - cmp r1, #0 - beq _0809CCBE - str r5, [r1, #0x50] - lsrs r2, r4, #1 - lsls r2, r2, #0x14 - ldr r0, _0809CCCC @ =0xFFF80000 - adds r2, r2, r0 - adds r0, r5, #0 - ldr r3, _0809CCD0 @ =0xFFF20000 - bl PositionRelative -_0809CCBE: - cmp r4, #2 - bls _0809CC9A - adds r0, r5, #0 - bl sub_0809CDF0 - b _0809CD0A - .align 2, 0 -_0809CCCC: .4byte 0xFFF80000 -_0809CCD0: .4byte 0xFFF20000 -_0809CCD4: - ldrb r1, [r5, #0xb] - adds r0, r4, #0 - ands r0, r1 - cmp r0, #0 - beq _0809CCF2 - ldrb r1, [r5, #0x18] - movs r0, #4 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r5, #0x18] - movs r0, #0x14 - strb r0, [r5, #0xe] - b _0809CD02 -_0809CCF2: - movs r0, #2 - strb r0, [r5, #0xc] - ands r0, r1 - movs r1, #0x12 - cmp r0, #0 - beq _0809CD00 - movs r1, #0x14 -_0809CD00: - strb r1, [r5, #0xe] -_0809CD02: - adds r0, r5, #0 - movs r1, #0 - bl InitializeAnimation -_0809CD0A: - pop {r4, r5, pc} - - thumb_func_start sub_0809CD0C -sub_0809CD0C: @ 0x0809CD0C - push {r4, r5, r6, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0xa] - cmp r0, #0 - beq _0809CDAC - adds r0, r4, #0 - bl GetNextFrame - adds r1, r4, #0 - adds r1, #0x5a - ldrb r2, [r1] - movs r0, #1 - ands r0, r2 - cmp r0, #0 - beq _0809CD36 - movs r0, #0xfe - ands r0, r2 - strb r0, [r1] - ldrh r0, [r4, #0x32] - adds r0, #1 - strh r0, [r4, #0x32] -_0809CD36: - ldrb r1, [r1] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _0809CD56 - adds r0, r4, #0 - adds r0, #0x59 - ldrb r0, [r0] - cmp r0, #1 - bne _0809CD56 - movs r0, #2 - strb r0, [r4, #0xc] - ldrb r1, [r4, #0x18] - subs r0, #6 - ands r0, r1 - strb r0, [r4, #0x18] -_0809CD56: - ldrb r0, [r4, #0xf] - cmp r0, #0 - bne _0809CDAC - ldr r5, _0809CDB0 @ =gPlayerEntity - adds r6, r5, #0 - adds r6, #0x3d - movs r0, #0 - ldrsb r0, [r6, r0] - cmp r0, #0 - bne _0809CDAC - ldrb r0, [r4, #0x1e] - cmp r0, #0 - beq _0809CDAC - adds r0, r4, #0 - adds r1, r5, #0 - movs r2, #4 - bl sub_0806FC80 - cmp r0, #0 - beq _0809CDAC - ldrb r0, [r4, #0xf] - adds r0, #1 - strb r0, [r4, #0xf] - movs r0, #2 - rsbs r0, r0, #0 - bl ModHealth - adds r0, r5, #0 - movs r1, #0x7a - bl sub_0800449C - movs r1, #0x10 - strb r1, [r6] - adds r0, r5, #0 - adds r0, #0x3e - strb r1, [r0] - adds r2, r5, #0 - adds r2, #0x42 - movs r0, #0xc - strb r0, [r2] - adds r0, r5, #0 - adds r0, #0x46 - strh r1, [r0] -_0809CDAC: - pop {r4, r5, r6, pc} - .align 2, 0 -_0809CDB0: .4byte gPlayerEntity - - thumb_func_start sub_0809CDB4 -sub_0809CDB4: @ 0x0809CDB4 - push {lr} - adds r3, r0, #0 - ldrb r0, [r3, #0xe] - subs r0, #1 - strb r0, [r3, #0xe] - lsls r0, r0, #0x18 - lsrs r1, r0, #0x18 - cmp r1, #0 - bne _0809CDEC - movs r2, #1 - movs r0, #1 - strb r0, [r3, #0xc] - movs r0, #0x1e - strb r0, [r3, #0xe] - strb r1, [r3, #0xf] - ldrb r1, [r3, #0x18] - subs r0, #0x22 - ands r0, r1 - orrs r0, r2 - strb r0, [r3, #0x18] - ldr r0, [r3, #0x50] - ldrh r0, [r0, #0x32] - subs r0, #0xe - strh r0, [r3, #0x32] - adds r0, r3, #0 - movs r1, #0 - bl InitializeAnimation -_0809CDEC: - pop {pc} - .align 2, 0 - - thumb_func_start sub_0809CDF0 -sub_0809CDF0: @ 0x0809CDF0 - push {r4, r5, r6, lr} - adds r4, r0, #0 - movs r0, #0x2e - ldrsh r1, [r4, r0] - ldr r2, _0809CE80 @ =gRoomControls - ldrh r0, [r2, #6] - subs r1, r1, r0 - asrs r1, r1, #4 - movs r3, #0x3f - ands r1, r3 - movs r5, #0x32 - ldrsh r0, [r4, r5] - ldrh r2, [r2, #8] - subs r0, r0, r2 - asrs r0, r0, #4 - ands r0, r3 - lsls r0, r0, #6 - orrs r1, r0 - adds r0, r4, #0 - adds r0, #0x80 - strh r1, [r0] - ldrh r6, [r0] - ldr r0, _0809CE84 @ =0x0000402E - subs r1, r6, #1 - adds r4, #0x38 - ldrb r2, [r4] - bl SetTile - ldr r5, _0809CE88 @ =0x00004022 - ldrb r2, [r4] - adds r0, r5, #0 - adds r1, r6, #0 - bl SetTile - adds r1, r6, #1 - ldrb r2, [r4] - adds r0, r5, #0 - bl SetTile - adds r5, #4 - adds r1, r6, #0 - subs r1, #0x41 - ldrb r2, [r4] - adds r0, r5, #0 - bl SetTile - adds r1, r6, #0 - subs r1, #0x40 - ldrb r2, [r4] - adds r0, r5, #0 - bl SetTile - ldr r0, _0809CE8C @ =0x00004024 - adds r1, r6, #0 - subs r1, #0x3f - ldrb r2, [r4] - bl SetTile - adds r1, r6, #0 - subs r1, #0x81 - ldrb r2, [r4] - adds r0, r5, #0 - bl SetTile - adds r1, r6, #0 - subs r1, #0x80 - ldrb r2, [r4] - adds r0, r5, #0 - bl SetTile - pop {r4, r5, r6, pc} - .align 2, 0 -_0809CE80: .4byte gRoomControls -_0809CE84: .4byte 0x0000402E -_0809CE88: .4byte 0x00004022 -_0809CE8C: .4byte 0x00004024 diff --git a/linker.ld b/linker.ld index bc099aa9..ecfef159 100644 --- a/linker.ld +++ b/linker.ld @@ -822,7 +822,7 @@ SECTIONS { asm/frozenWaterElement.o(.text); asm/object90.o(.text); asm/object91.o(.text); - asm/bakerOven.o(.text); + src/object/bakerOven.o(.text); asm/object93.o(.text); src/object/windTribeFlag.o(.text); asm/bird.o(.text); diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c new file mode 100644 index 00000000..0ddc3132 --- /dev/null +++ b/src/object/bakerOven.c @@ -0,0 +1,102 @@ +#include "global.h" +#include "entity.h" +#include "functions.h" + +extern void sub_0800449C(Entity*, u32); +extern u32 sub_0806FC80(Entity*, Entity*, s32); +extern void sub_0809CDF0(Entity*); + +extern void (*const gUnk_08123E20[])(Entity*); + +void BakerOven(Entity* this) { + gUnk_08123E20[this->action](this); +} + +void sub_0809CC74(Entity* this) { + u32 i; + Entity* ent; + + this->action = 1; + UpdateSpriteForCollisionLayer(this); + + if (this->entityType.form == 0) { + this->spritePriority.b0 = 5; + /* Create steam clouds */ + for (i = 0; i < 3; i++) { + ent = CreateObject(0x92, 1, i); + if (ent) { + ent->parent = this; + PositionRelative(this, ent, (((i + 1) / 2) * 0x100000) - 0x80000, -0xe0000); + } + } + sub_0809CDF0(this); + } else { + if (this->entityType.parameter & 1) { + this->spriteSettings.b.draw = 1; + this->actionDelay = 20; + } else { + this->action = 2; + this->actionDelay = (this->entityType.parameter & 2) ? 20 : 18; + } + InitializeAnimation(this, 0); + } +} + +void sub_0809CD0C(Entity* this) { + u8* frames; + + if (this->entityType.form) { + GetNextFrame(this); + frames = &this->frames.all; + if (*frames & 1) { + *frames &= 0xfe; + this->y.HALF.HI++; + } + + if ((*frames & 0x80) && this->frameDuration == 1) { + this->action = 2; + this->spriteSettings.b.draw = 0; + } + + /* Damage minish link if he touches a steam cloud */ + if (this->field_0xf == 0 && gPlayerEntity.hurtBlinkTime == 0 && this->frameIndex && + sub_0806FC80(this, &gPlayerEntity, 4)) { + this->field_0xf++; + ModHealth(-2); + sub_0800449C(&gPlayerEntity, 0x7a); + gPlayerEntity.hurtBlinkTime = 16; + gPlayerEntity.field_0x3e = 16; + gPlayerEntity.field_0x42 = 12; + gPlayerEntity.field_0x46 = 16; + } + } +} + +void sub_0809CDB4(Entity* this) { + /* Reset cloud position and start animation. */ + if (--this->actionDelay == 0) { + this->action = 1; + this->actionDelay = 30; + this->field_0xf = 0; + this->spriteSettings.b.draw = 1; + this->y.HALF.HI = this->parent->y.HALF.HI - 0xe; + InitializeAnimation(this, 0); + } +} + +void sub_0809CDF0(Entity* this) { + u32 y; + + this->field_0x80.HWORD = (((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3f) | + (((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4 & 0x3f) << 6); + + y = this->field_0x80.HWORD; + SetTile(0x402e, y - 0x01, this->collisionLayer); + SetTile(0x4022, y - 0x00, this->collisionLayer); + SetTile(0x4022, y + 0x01, this->collisionLayer); + SetTile(0x4026, y - 0x41, this->collisionLayer); + SetTile(0x4026, y - 0x40, this->collisionLayer); + SetTile(0x4024, y - 0x3f, this->collisionLayer); + SetTile(0x4026, y - 0x81, this->collisionLayer); + SetTile(0x4026, y - 0x80, this->collisionLayer); +} From d275c0e3cd0541aa1c8b48348f171b6ae578610e Mon Sep 17 00:00:00 2001 From: Behemoth Date: Tue, 18 Aug 2020 14:37:32 +0200 Subject: [PATCH 4/4] short -> s16 --- src/object/backgroundCloud.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/object/backgroundCloud.c b/src/object/backgroundCloud.c index 83941fc3..a6106ca7 100644 --- a/src/object/backgroundCloud.c +++ b/src/object/backgroundCloud.c @@ -30,8 +30,8 @@ void sub_0808F658(Entity* this) { 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) + if ((s16)this->x.HALF.HI < (s16)this->field_0x78.HWORD || + (s16)this->x.HALF.HI > (s16)this->field_0x7a.HWORD) this->action = 2; }