From 693224e16639517d1d7680688b559877e73cf0a8 Mon Sep 17 00:00:00 2001 From: theo3 Date: Fri, 14 Aug 2020 21:56:34 -0700 Subject: [PATCH 1/2] CreateItemDrop WIP --- src/code_0805436C.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/src/code_0805436C.c b/src/code_0805436C.c index 8ada4bd5..47f8f4d2 100644 --- a/src/code_0805436C.c +++ b/src/code_0805436C.c @@ -182,6 +182,92 @@ u32 sub_0805457C(u32 arg0, u32 arg1) { asm(".include \"asm/non_matching/code_0805457C.inc\""); } +/* +extern u8 gUnk_080FE1DD[]; + +u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) { + u32 prereqID; + u32 adjustedParam; + u32 uVar1; + Entity* itemEntity; + + adjustedParam = (u8)itemParameter; + switch (adjustedParam) { + case 0x3f: + if (!GetInventoryValue(0x40)) { + return 0; + } + if (itemParameter == 0) { + adjustedParam = 1; + } + case 0x5d: + if (!GetInventoryValue(0x65)) { + return 0; + } + break; + case 0x5e: + if (!GetInventoryValue(0x9)) { + return 0; + } + break; + case 0x5c: + case 0xfc ... 0xfe: + if (GetInventoryValue(0x67) == 0) { + return 0; + } + if (3 < gRoomVars.filler[5]) { + return 0; + } + + if (itemID != 0x5c) { + adjustedParam = gUnk_080FE1DD[(Random() & 0x3f) + (itemID - 0xfc) * 0x40]; + if (adjustedParam == 0) { + itemID = 0; + } + else { + itemID = 0x5c; + } + } + break; + case 0xff: + if (!GetInventoryValue(0x1)) { + return 0; + } + } + if (itemID != 0) { + if (itemID == 0xff) { + itemEntity = CreateEnemy(7, 0); + if (itemEntity != NULL) { + itemEntity->x.HALF.HI = arg0->x.HALF.HI; + itemEntity->y.HALF.HI = arg0->y.HALF.HI; + itemEntity->collisionLayer = arg0->collisionLayer; + UpdateSpriteOrderAndFlip(itemEntity); + } + } else { + itemEntity = CreateObject(0, itemID, adjustedParam); + if (itemEntity != NULL) { + if (arg0 == &gPlayerEntity) { + itemEntity->actionDelay = 1; + } else { + itemEntity->actionDelay = 0; + } + if ((arg0->entityType).type == 6) { + if (arg0->entityType.subtype == 99) { + arg0->attachedEntity = itemEntity; + } else if (arg0->entityType.subtype == 0x1e) { + itemEntity->direction = arg0->animationState << 3 | 0x80; + itemEntity->nonPlanarMovement = 0xc0; + itemEntity->field_0x20 = 0x18000; + } + } + CopyPosition(arg0, itemEntity); + } + } + } + return itemID; +} +*/ + void sub_08054870(void) { gUnk_080FE2A0[gMenu.menuType](); From c32fcaca51729c416451bd2df4318ab9649f3f03 Mon Sep 17 00:00:00 2001 From: theo3 Date: Sat, 15 Aug 2020 11:18:00 -0700 Subject: [PATCH 2/2] lilypadSmall.c OK --- asm/lilypadSmall.s | 145 -------------------------------------- include/functions.h | 5 ++ include/player.h | 4 +- linker.ld | 2 +- src/object/lilypadSmall.c | 68 ++++++++++++++++++ src/sub_08070680.c | 4 +- 6 files changed, 79 insertions(+), 149 deletions(-) delete mode 100644 asm/lilypadSmall.s create mode 100644 src/object/lilypadSmall.c diff --git a/asm/lilypadSmall.s b/asm/lilypadSmall.s deleted file mode 100644 index 166e2b09..00000000 --- a/asm/lilypadSmall.s +++ /dev/null @@ -1,145 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start LilypadSmall -LilypadSmall: @ 0x08097A5C - push {r4, r5, lr} - adds r5, r0, #0 - ldrb r0, [r5, #0xc] - cmp r0, #0 - bne _08097AAC - movs r4, #1 - movs r0, #1 - strb r0, [r5, #0xc] - movs r0, #0x5a - strb r0, [r5, #0xe] - bl Random - strb r0, [r5, #0xf] - lsrs r0, r0, #0x10 - movs r1, #3 - ands r0, r1 - strb r0, [r5, #0x1e] - ldrb r1, [r5, #0x18] - movs r0, #4 - rsbs r0, r0, #0 - ands r0, r1 - orrs r0, r4 - strb r0, [r5, #0x18] - adds r2, r5, #0 - adds r2, #0x29 - ldrb r0, [r2] - movs r1, #7 - orrs r0, r1 - strb r0, [r2] - ldrb r0, [r5, #0xb] - bl GetCurrentRoomProperty - str r0, [r5, #0x54] - adds r1, r5, #0 - adds r1, #0x54 - adds r2, r5, #0 - adds r2, #0x70 - adds r0, r5, #0 - bl sub_080A2CC0 -_08097AAC: - adds r0, r5, #0 - bl sub_08097ADC - adds r1, r0, #0 - adds r0, r5, #0 - bl sub_080A2BE4 - adds r0, r5, #0 - bl sub_08097B24 - adds r2, r5, #0 - adds r2, #0x70 - ldrh r0, [r2] - subs r0, #1 - strh r0, [r2] - lsls r0, r0, #0x10 - cmp r0, #0 - bne _08097ADA - adds r1, r5, #0 - adds r1, #0x54 - adds r0, r5, #0 - bl sub_080A2CC0 -_08097ADA: - pop {r4, r5, pc} - - thumb_func_start sub_08097ADC -sub_08097ADC: @ 0x08097ADC - push {r4, r5, lr} - adds r2, r0, #0 - ldr r5, _08097B18 @ =gPlayerState - ldr r0, [r5, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - beq _08097B20 - ldr r4, _08097B1C @ =gPlayerEntity - adds r0, r2, #0 - adds r1, r4, #0 - movs r2, #8 - movs r3, #8 - bl sub_080041A0 - cmp r0, #0 - beq _08097B20 - bl sub_08079F8C - cmp r0, #0 - beq _08097B20 - movs r0, #1 - strb r0, [r5, #0x14] - movs r1, #0x36 - ldrsh r0, [r4, r1] - cmp r0, #0 - bne _08097B20 - movs r0, #1 - b _08097B22 - .align 2, 0 -_08097B18: .4byte gPlayerState -_08097B1C: .4byte gPlayerEntity -_08097B20: - movs r0, #0 -_08097B22: - pop {r4, r5, pc} - - thumb_func_start sub_08097B24 -sub_08097B24: @ 0x08097B24 - push {r4, lr} - adds r3, r0, #0 - ldrb r0, [r3, #0xe] - subs r0, #1 - strb r0, [r3, #0xe] - movs r4, #0xff - lsls r0, r0, #0x18 - cmp r0, #0 - bne _08097B44 - movs r0, #0x5a - strb r0, [r3, #0xe] - ldrb r0, [r3, #0x1e] - adds r0, #1 - movs r1, #3 - ands r0, r1 - strb r0, [r3, #0x1e] -_08097B44: - ldr r2, _08097B68 @ =gUnk_08123318 - ldrb r0, [r3, #0xf] - adds r0, #1 - strb r0, [r3, #0xf] - ands r0, r4 - lsrs r0, r0, #5 - movs r1, #7 - ands r0, r1 - lsls r0, r0, #1 - adds r0, r0, r2 - ldrh r2, [r0] - adds r0, r3, #0 - adds r1, r2, #0 - movs r3, #0 - bl sub_0805EC9C - pop {r4, pc} - .align 2, 0 -_08097B68: .4byte gUnk_08123318 diff --git a/include/functions.h b/include/functions.h index 57ffde62..b30661d2 100644 --- a/include/functions.h +++ b/include/functions.h @@ -7,6 +7,7 @@ #include "position.h" #include "player.h" #include "structures.h" +#include "room.h" // Identified - to be sorted into header files extern u32 Random(void); @@ -243,4 +244,8 @@ extern void sub_0807921C(); extern void sub_0807A1B8(); extern void sub_08079938(); extern void sub_0807ACCC(Entity*); +extern void sub_080A2BE4(Entity*, u32); +extern u32 sub_08097ADC(Entity*); +extern void sub_08097B24(Entity*); +extern u32 sub_08079F8C(void); #endif \ No newline at end of file diff --git a/include/player.h b/include/player.h index 75c0b6c7..1abc8491 100644 --- a/include/player.h +++ b/include/player.h @@ -20,7 +20,9 @@ typedef struct { /*0x0d*/ u8 field_0xd[2]; /*0x0f*/ u8 hurtBlinkSpeed; /*0x10*/ u8 field_0x10[4]; - /*0x14*/ u16 field_0x14[3]; + /*0x11*/ u8 field_0x14; + /*0x11*/ u8 field_0x15; + /*0x14*/ u16 field_0x16[2]; /*0x1a*/ u8 field_0x1a[2]; /*0x1c*/ u8 field_0x1c; /*0x1d*/ u8 field_0x1d[5]; diff --git a/linker.ld b/linker.ld index 545c8cbc..f23f2078 100644 --- a/linker.ld +++ b/linker.ld @@ -790,7 +790,7 @@ SECTIONS { asm/object70.o(.text); asm/pushableGrave.o(.text); asm/object72.o(.text); - asm/lilypadSmall.o(.text); + src/object/lilypadSmall.o(.text); asm/object74.o(.text); src/object/bell.o(.text); asm/macroDecorations.o(.text); diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c new file mode 100644 index 00000000..b6df8e8f --- /dev/null +++ b/src/object/lilypadSmall.c @@ -0,0 +1,68 @@ +#include "global.h" +#include "entity.h" +#include "functions.h" +#include "player.h" + +extern Entity* GetCurrentRoomProperty(u32); +extern void sub_080A2CC0(Entity*, Entity**, u16*); + +extern u16 gUnk_08123318[]; + +void LilypadSmall(Entity *this) +{ + u32 rand; + u16 *psVar4; + + if (this->action == 0) { + this->action = 1; + this->actionDelay = 0x5a; + rand = Random(); + this->field_0xf = rand; + this->frameIndex = (rand >> 0x10) & 3; + this->spriteSettings.b.draw = TRUE; + this->spritePriority.b0 = 7; + this->attachedEntity = GetCurrentRoomProperty(this->entityType.parameter); + sub_080A2CC0(this, &this->attachedEntity, &this->field_0x70.HALF.LO); + } + sub_080A2BE4(this, sub_08097ADC(this)); + sub_08097B24(this); + psVar4 = (u16 *)&this->field_0x70; + if (--*psVar4 == 0) { + sub_080A2CC0(this, &this->attachedEntity, psVar4); + } +} + +u32 sub_08097ADC(Entity *this) +{ + if ((gPlayerState.flags.all & 0x80) == 0) { + return 0; + } else if (sub_080041A0(this,&gPlayerEntity,8,8) == 0) { + return 0; + } else if (sub_08079F8C() == 0) { + return 0; + } else { + gPlayerState.field_0x14 = 1; + if (gPlayerEntity.height.HALF.HI != 0) { + return 0; + } else { + return 1; + } + } +} + +void sub_08097B24(Entity *this) +{ + u32 temp; + u32 temp2; + u16 *temp3; + + if (--this->actionDelay == 0) { + this->actionDelay = 0x5a; + this->frameIndex = (this->frameIndex + 1) & 3; + } + temp3 = gUnk_08123318; + temp2 = ++this->field_0xf; + + temp = temp3[(temp2 >> 5) & 7]; + sub_0805EC9C(this, temp, temp, 0); +} \ No newline at end of file diff --git a/src/sub_08070680.c b/src/sub_08070680.c index 642167df..f99b745e 100644 --- a/src/sub_08070680.c +++ b/src/sub_08070680.c @@ -20,8 +20,8 @@ void sub_08070698(Entity *this) Entity *ent; gPlayerState.field_0x0[0] = 0xff; - gPlayerState.field_0x14[1] = gPlayerEntity.x.HALF.HI; - gPlayerState.field_0x14[2] = gPlayerEntity.y.HALF.HI; + gPlayerState.field_0x16[0] = gPlayerEntity.x.HALF.HI; + gPlayerState.field_0x16[1] = gPlayerEntity.y.HALF.HI; this->flags = this->flags | 0x80; this->spritePriority.b0 = 0xc; this->spritePriority.b1 = 1;