Decompile DoubleBookshelf

This commit is contained in:
octorock 2022-02-17 18:10:22 +01:00
parent 4a1d2fb406
commit b35a3216dc
6 changed files with 218 additions and 582 deletions

View File

@ -1,560 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start DoubleBookshelf
DoubleBookshelf: @ 0x0809AF5C
push {lr}
ldr r2, _0809AF70 @ =gUnk_08123D58
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0809AF70: .4byte gUnk_08123D58
thumb_func_start sub_0809AF74
sub_0809AF74: @ 0x0809AF74
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
strb r0, [r4, #0x1e]
movs r0, #0x2e
ldrsh r2, [r4, r0]
ldr r1, _0809AFBC @ =gRoomControls
ldrh r0, [r1, #6]
subs r2, r2, r0
asrs r2, r2, #4
movs r3, #0x3f
ands r2, r3
movs r5, #0x32
ldrsh r0, [r4, r5]
ldrh r1, [r1, #8]
subs r0, r0, r1
asrs r0, r0, #4
ands r0, r3
lsls r0, r0, #6
orrs r2, r0
adds r0, r4, #0
adds r0, #0x80
movs r6, #0
strh r2, [r0]
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _0809AFC4
movs r1, #1
strb r1, [r4, #0xc]
adds r0, r4, #0
adds r0, #0x84
ldrb r0, [r0]
cmp r0, #0
bne _0809AFC0
strb r6, [r4, #0xd]
b _0809B02C
.align 2, 0
_0809AFBC: .4byte gRoomControls
_0809AFC0:
strb r1, [r4, #0xd]
b _0809B02C
_0809AFC4:
movs r0, #3
strb r0, [r4, #0xc]
movs r0, #4
strb r0, [r4, #0xd]
adds r0, r4, #0
adds r0, #0x84
strb r6, [r0]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
movs r0, #0x8b
movs r1, #1
movs r2, #0
bl CreateObject
adds r5, r0, #0
cmp r5, #0
beq _0809B026
str r4, [r5, #0x50]
str r5, [r4, #0x54]
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl CheckFlags
cmp r0, #0
bne _0809B010
movs r3, #0x80
lsls r3, r3, #0xd
adds r0, r4, #0
adds r1, r5, #0
adds r2, r3, #0
bl PositionRelative
adds r0, r5, #0
adds r0, #0x84
strb r6, [r0]
b _0809B026
_0809B010:
movs r3, #0x80
lsls r3, r3, #0xd
adds r0, r4, #0
adds r1, r5, #0
movs r2, #0
bl PositionRelative
adds r1, r5, #0
adds r1, #0x84
movs r0, #1
strb r0, [r1]
_0809B026:
adds r0, r4, #0
bl sub_0809B334
_0809B02C:
adds r0, r4, #0
bl sub_0809B0B0
pop {r4, r5, r6, pc}
thumb_func_start sub_0809B034
sub_0809B034: @ 0x0809B034
push {r4, lr}
adds r4, r0, #0
adds r0, #0x82
ldrh r0, [r0]
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl GetTileType
adds r0, r4, #0
bl sub_0809B234
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0809B050
sub_0809B050: @ 0x0809B050
push {r4, r5, lr}
adds r4, r0, #0
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _0809B0A2
movs r0, #1
strb r0, [r4, #0xc]
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r2, _0809B0A4 @ =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]
movs r0, #0
bl SetPlayerControl
adds r0, r4, #0
bl sub_0809B0B0
movs r0, #0x86
lsls r0, r0, #1
bl EnqueueSFX
_0809B0A2:
pop {r4, r5, pc}
.align 2, 0
_0809B0A4: .4byte gRoomControls
thumb_func_start sub_0809B0A8
sub_0809B0A8: @ 0x0809B0A8
push {lr}
bl sub_0809B234
pop {pc}
thumb_func_start sub_0809B0B0
sub_0809B0B0: @ 0x0809B0B0
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
mov r8, r0
adds r0, #0x80
ldrh r0, [r0]
subs r6, r0, #1
mov r0, r8
adds r0, #0x38
ldrb r7, [r0]
mov r1, r8
ldrb r0, [r1, #0xd]
cmp r0, #4
bls _0809B0CE
b _0809B228
_0809B0CE:
lsls r0, r0, #2
ldr r1, _0809B0D8 @ =_0809B0DC
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0809B0D8: .4byte _0809B0DC
_0809B0DC: @ jump table
.4byte _0809B0F0 @ case 0
.4byte _0809B130 @ case 1
.4byte _0809B178 @ case 2
.4byte _0809B1C0 @ case 3
.4byte _0809B208 @ case 4
_0809B0F0:
mov r1, r8
adds r1, #0x84
movs r0, #0
strb r0, [r1]
adds r5, r6, #2
mov r0, r8
adds r0, #0x82
strh r5, [r0]
ldr r0, _0809B128 @ =0x00004082
subs r1, r6, #1
adds r2, r7, #0
bl SetTile
ldr r4, _0809B12C @ =0x00004022
adds r0, r4, #0
adds r1, r6, #0
adds r2, r7, #0
bl SetTile
adds r1, r6, #1
adds r0, r4, #0
adds r2, r7, #0
bl SetTile
adds r0, r4, #0
adds r1, r5, #0
b _0809B162
.align 2, 0
_0809B128: .4byte 0x00004082
_0809B12C: .4byte 0x00004022
_0809B130:
mov r1, r8
adds r1, #0x84
movs r0, #1
strb r0, [r1]
mov r0, r8
adds r0, #0x82
strh r6, [r0]
ldr r0, _0809B16C @ =0x0000405F
adds r1, r6, #0
adds r2, r7, #0
bl SetTile
ldr r4, _0809B170 @ =0x00004022
adds r1, r6, #1
adds r0, r4, #0
adds r2, r7, #0
bl SetTile
adds r1, r6, #2
adds r0, r4, #0
adds r2, r7, #0
bl SetTile
ldr r0, _0809B174 @ =0x00004082
adds r1, r6, #3
_0809B162:
adds r2, r7, #0
bl SetTile
b _0809B228
.align 2, 0
_0809B16C: .4byte 0x0000405F
_0809B170: .4byte 0x00004022
_0809B174: .4byte 0x00004082
_0809B178:
mov r1, r8
adds r1, #0x84
movs r0, #1
strb r0, [r1]
mov r0, r8
adds r0, #0x82
strh r6, [r0]
ldr r0, _0809B1B4 @ =0x00004082
adds r1, r6, #3
adds r2, r7, #0
bl SetTile
ldr r0, _0809B1B8 @ =0x00004022
adds r1, r6, #2
adds r2, r7, #0
bl SetTile
ldr r0, _0809B1BC @ =0x0000405F
adds r1, r6, #0
adds r2, r7, #0
bl SetTile
mov r1, r8
ldr r0, [r1, #0x50]
adds r0, #0x86
ldrh r0, [r0]
bl SetFlag
b _0809B228
.align 2, 0
_0809B1B4: .4byte 0x00004082
_0809B1B8: .4byte 0x00004022
_0809B1BC: .4byte 0x0000405F
_0809B1C0:
mov r1, r8
adds r1, #0x84
movs r0, #0
strb r0, [r1]
adds r4, r6, #2
mov r0, r8
adds r0, #0x82
strh r4, [r0]
ldr r0, _0809B1FC @ =0x00004082
subs r1, r6, #1
adds r2, r7, #0
bl SetTile
ldr r0, _0809B200 @ =0x00004022
adds r1, r6, #0
adds r2, r7, #0
bl SetTile
ldr r0, _0809B204 @ =0x0000405F
adds r1, r4, #0
adds r2, r7, #0
bl SetTile
mov r1, r8
ldr r0, [r1, #0x50]
adds r0, #0x86
ldrh r0, [r0]
bl ClearFlag
b _0809B228
.align 2, 0
_0809B1FC: .4byte 0x00004082
_0809B200: .4byte 0x00004022
_0809B204: .4byte 0x0000405F
_0809B208:
ldr r4, _0809B230 @ =0x00004022
adds r0, r4, #0
adds r1, r6, #0
adds r2, r7, #0
bl SetTile
adds r1, r6, #1
adds r0, r4, #0
adds r2, r7, #0
bl SetTile
adds r1, r6, #2
adds r0, r4, #0
adds r2, r7, #0
bl SetTile
_0809B228:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0809B230: .4byte 0x00004022
thumb_func_start sub_0809B234
sub_0809B234: @ 0x0809B234
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _0809B26A
ldr r2, [r4, #0x50]
ldrb r1, [r2, #0x19]
lsrs r1, r1, #6
lsls r1, r1, #6
ldrb r3, [r4, #0x19]
movs r0, #0x3f
ands r0, r3
orrs r0, r1
strb r0, [r4, #0x19]
adds r2, #0x29
ldrb r1, [r2]
lsls r1, r1, #0x1d
adds r3, r4, #0
adds r3, #0x29
lsrs r1, r1, #0x1d
ldrb r2, [r3]
movs r0, #8
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r3]
b _0809B270
_0809B26A:
adds r0, r4, #0
bl sub_0809B274
_0809B270:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0809B274
sub_0809B274: @ 0x0809B274
push {r4, r5, lr}
adds r4, r0, #0
ldr r3, _0809B290 @ =gPlayerEntity
adds r2, r4, #0
adds r2, #0x84
ldrb r0, [r2]
cmp r0, #1
beq _0809B2BA
cmp r0, #1
bgt _0809B294
cmp r0, #0
beq _0809B29A
b _0809B332
.align 2, 0
_0809B290: .4byte gPlayerEntity
_0809B294:
cmp r0, #2
beq _0809B30C
b _0809B332
_0809B29A:
movs r1, #0x32
ldrsh r0, [r3, r1]
adds r0, #0x14
movs r3, #0x32
ldrsh r1, [r4, r3]
cmp r0, r1
bge _0809B332
movs r0, #1
strb r0, [r2]
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
subs r0, #9
ands r0, r1
movs r1, #5
b _0809B306
_0809B2BA:
movs r5, #0x2e
ldrsh r0, [r3, r5]
adds r0, #0x1c
movs r5, #0x2e
ldrsh r1, [r4, r5]
cmp r0, r1
ble _0809B2E8
movs r0, #2
strb r0, [r2]
ldr r0, _0809B2E4 @ =0x00004022
adds r1, r4, #0
adds r1, #0x80
ldrh r1, [r1]
adds r1, #2
movs r2, #1
bl SetTile
ldr r0, [r4, #0x54]
bl sub_0809B358
b _0809B332
.align 2, 0
_0809B2E4: .4byte 0x00004022
_0809B2E8:
movs r1, #0x32
ldrsh r0, [r3, r1]
adds r0, #0x10
movs r3, #0x32
ldrsh r1, [r4, r3]
cmp r0, r1
ble _0809B332
movs r0, #0
strb r0, [r2]
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
subs r0, #8
ands r0, r1
movs r1, #4
_0809B306:
orrs r0, r1
strb r0, [r2]
b _0809B332
_0809B30C:
movs r5, #0x2e
ldrsh r0, [r3, r5]
adds r0, #0x20
movs r3, #0x2e
ldrsh r1, [r4, r3]
cmp r0, r1
bge _0809B332
movs r0, #1
strb r0, [r2]
adds r0, r4, #0
adds r0, #0x80
ldrh r0, [r0]
adds r0, #2
movs r1, #1
bl sub_0807BA8C
ldr r0, [r4, #0x54]
bl sub_0809B38C
_0809B332:
pop {r4, r5, pc}
thumb_func_start sub_0809B334
sub_0809B334: @ 0x0809B334
push {r4, r5, lr}
adds r0, #0x80
ldrh r0, [r0]
adds r4, r0, #0
subs r4, #0x81
movs r5, #2
_0809B340:
ldr r0, _0809B354 @ =0x00004026
adds r1, r4, #0
movs r2, #1
bl SetTile
subs r5, #1
adds r4, #1
cmp r5, #0
bge _0809B340
pop {r4, r5, pc}
.align 2, 0
_0809B354: .4byte 0x00004026
thumb_func_start sub_0809B358
sub_0809B358: @ 0x0809B358
push {r4, r5, r6, lr}
adds r1, r0, #0
adds r1, #0x84
ldrb r1, [r1]
lsls r1, r1, #1
ldr r2, _0809B388 @ =gUnk_08123D68
adds r5, r1, r2
adds r0, #0x80
ldrh r0, [r0]
adds r4, r0, #0
subs r4, #0x82
movs r6, #4
_0809B370:
ldrh r0, [r5]
adds r1, r4, #0
movs r2, #1
bl SetTile
subs r6, #1
adds r4, #1
adds r5, #4
cmp r6, #0
bge _0809B370
pop {r4, r5, r6, pc}
.align 2, 0
_0809B388: .4byte gUnk_08123D68
thumb_func_start sub_0809B38C
sub_0809B38C: @ 0x0809B38C
push {r4, r5, lr}
adds r0, #0x80
ldrh r0, [r0]
adds r4, r0, #0
subs r4, #0x82
movs r5, #4
_0809B398:
adds r0, r4, #0
movs r1, #1
bl sub_0807BA8C
subs r5, #1
adds r4, #1
cmp r5, #0
bge _0809B398
pop {r4, r5, pc}
.align 2, 0

View File

@ -45126,11 +45126,6 @@
"start": 1195152,
"size": 40
},
{
"path": "doubleBookshelf/gUnk_08123D68.bin",
"start": 1195368,
"size": 20
},
{
"path": "object91/gUnk_08123DDC.bin",
"start": 1195484,

View File

@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123D58:: @ 08123D58
.4byte sub_0809AF74
.4byte sub_0809B034
.4byte sub_0809B050
.4byte sub_0809B0A8
gUnk_08123D68:: @ 08123D68
.incbin "doubleBookshelf/gUnk_08123D68.bin"

View File

@ -365,7 +365,7 @@ void OctorokBossObject(Entity*);
void MacroBook(Entity*);
void MazaalBossObject(Entity*);
void CabinFurniture(Entity*);
void DoubleBookshelf(Entity*);
void DoubleBookshelf();
void Book(Entity*);
void Fireplace(Entity*);
void Object8E();

View File

@ -784,7 +784,7 @@ SECTIONS {
asm/object/macroBook.o(.text);
asm/object/mazaalBossObject.o(.text);
asm/object/cabinFurniture.o(.text);
asm/object/doubleBookshelf.o(.text);
src/object/doubleBookshelf.o(.text);
src/object/book.o(.text);
src/object/fireplace.o(.text);
src/object/object8E.o(.text);
@ -1539,7 +1539,7 @@ SECTIONS {
data/animations/object/macroBook.o(.rodata);
data/const/object/mazaalBossObject.o(.rodata);
data/const/object/cabinFurniture.o(.rodata);
data/const/object/doubleBookshelf.o(.rodata);
src/object/doubleBookshelf.o(.rodata);
src/object/book.o(.rodata);
data/const/object/fireplace.o(.rodata);
src/object/object8E.o(.rodata);

View File

@ -0,0 +1,215 @@
/**
* @file doubleBookshelf.c
* @ingroup Objects
*
* @brief Double Bookshelf object
*/
#define NENT_DEPRECATED
#include "global.h"
#include "object.h"
#include "functions.h"
typedef struct {
/*0x00*/ Entity base;
/*0x68*/ u8 unk_68[0x18];
/*0x80*/ u16 unk_80;
/*0x82*/ u16 unk_82;
/*0x84*/ u8 unk_84;
/*0x85*/ u8 unk_85;
/*0x86*/ u16 unk_86;
} DoubleBookshelfEntity;
void sub_0809B334(DoubleBookshelfEntity*);
void sub_0809B0B0(DoubleBookshelfEntity*);
void sub_0809B234(DoubleBookshelfEntity*);
void sub_0809B274(DoubleBookshelfEntity*);
void sub_0809B358(DoubleBookshelfEntity*);
void sub_0809B38C(DoubleBookshelfEntity*);
void DoubleBookshelf_Init(DoubleBookshelfEntity*);
void DoubleBookshelf_Action1(DoubleBookshelfEntity*);
void DoubleBookshelf_Action2(DoubleBookshelfEntity*);
void DoubleBookshelf_Action3(DoubleBookshelfEntity*);
void DoubleBookshelf(DoubleBookshelfEntity* this) {
static void (*const DoubleBookshelf_Actions[])(DoubleBookshelfEntity*) = {
DoubleBookshelf_Init,
DoubleBookshelf_Action1,
DoubleBookshelf_Action2,
DoubleBookshelf_Action3,
};
DoubleBookshelf_Actions[super->action](this);
}
void DoubleBookshelf_Init(DoubleBookshelfEntity* this) {
DoubleBookshelfEntity* child;
super->frameIndex = super->type;
this->unk_80 = COORD_TO_TILE(super);
if (super->type != 0) {
super->action = 1;
if (this->unk_84 == 0) {
super->subAction = 0;
} else {
super->subAction = 1;
}
} else {
super->action = 3;
super->subAction = 4;
this->unk_84 = 0;
UpdateSpriteForCollisionLayer(super);
child = (DoubleBookshelfEntity*)CreateObject(DOUBLE_BOOKSHELF, 1, 0);
if (child != NULL) {
(child->base).parent = super;
super->child = &child->base;
if (CheckFlags(this->unk_86) == 0) {
PositionRelative(super, &child->base, 0x100000, 0x100000);
child->unk_84 = 0;
} else {
PositionRelative(super, &child->base, 0, 0x100000);
child->unk_84 = 1;
}
}
sub_0809B334(this);
}
sub_0809B0B0(this);
}
void DoubleBookshelf_Action1(DoubleBookshelfEntity* this) {
GetTileType(this->unk_82, super->collisionLayer);
sub_0809B234(this);
}
void DoubleBookshelf_Action2(DoubleBookshelfEntity* this) {
LinearMoveUpdate(super);
if (--super->actionDelay == 0) {
super->action = 1;
this->unk_80 = COORD_TO_TILE(super);
SetPlayerControl(CONTROL_ENABLED);
sub_0809B0B0(this);
EnqueueSFX(SFX_BUTTON_PRESS);
}
}
void DoubleBookshelf_Action3(DoubleBookshelfEntity* this) {
sub_0809B234(this);
}
void sub_0809B0B0(DoubleBookshelfEntity* this) {
u32 position = this->unk_80 - 1;
u32 layer = super->collisionLayer;
switch (super->subAction) {
case 0:
this->unk_84 = 0;
this->unk_82 = position + 2;
SetTile(0x4082, position - 1, layer);
SetTile(0x4022, position, layer);
SetTile(0x4022, position + 1, layer);
SetTile(0x4022, position + 2, layer);
break;
case 1:
this->unk_84 = 1;
this->unk_82 = position;
SetTile(0x405f, position, layer);
SetTile(0x4022, position + 1, layer);
SetTile(0x4022, position + 2, layer);
SetTile(0x4082, position + 3, layer);
break;
case 2:
this->unk_84 = 1;
this->unk_82 = position;
SetTile(0x4082, position + 3, layer);
SetTile(0x4022, position + 2, layer);
SetTile(0x405f, position, layer);
SetFlag(((DoubleBookshelfEntity*)super->parent)->unk_86);
break;
case 3:
this->unk_84 = 0;
this->unk_82 = position + 2;
SetTile(0x4082, position - 1, layer);
SetTile(0x4022, position, layer);
SetTile(0x405f, position + 2, layer);
ClearFlag(((DoubleBookshelfEntity*)super->parent)->unk_86);
break;
case 4:
SetTile(0x4022, position, layer);
SetTile(0x4022, position + 1, layer);
SetTile(0x4022, position + 2, layer);
break;
}
}
void sub_0809B234(DoubleBookshelfEntity* this) {
if (super->type != 0) {
super->spriteRendering.b3 = super->parent->spriteRendering.b3;
super->spritePriority.b0 = super->parent->spritePriority.b0;
} else {
sub_0809B274(this);
}
}
void sub_0809B274(DoubleBookshelfEntity* this) {
Entity* player = &gPlayerEntity;
switch (this->unk_84) {
case 0:
if (player->y.HALF.HI + 0x14 >= super->y.HALF.HI) {
return;
}
this->unk_84 = 1;
super->spritePriority.b0 = 5;
break;
case 1:
if (player->x.HALF.HI + 0x1c > super->x.HALF.HI) {
this->unk_84 = 2;
SetTile(0x4022, this->unk_80 + 2, 1);
sub_0809B358((DoubleBookshelfEntity*)super->child);
return;
}
if (player->y.HALF.HI + 0x10 <= super->y.HALF.HI) {
return;
}
this->unk_84 = 0;
super->spritePriority.b0 = 4;
break;
case 2:
if (player->x.HALF.HI + 0x20 >= super->x.HALF.HI) {
return;
}
this->unk_84 = 1;
sub_0807BA8C(this->unk_80 + 2, 1);
sub_0809B38C((DoubleBookshelfEntity*)super->child);
return;
}
}
void sub_0809B334(DoubleBookshelfEntity* this) {
s32 index;
u32 position = this->unk_80 - 0x81;
for (index = 2; index >= 0; index--, position++) {
SetTile(0x4026, position, 1);
}
}
void sub_0809B358(DoubleBookshelfEntity* this) {
static const u16 gUnk_08123D68[] = {
0x4022, 0x4022, 0x4074, 0x4026, 0x4074, 0x4074, 0x4026, 0x4074, 0x4022, 0x4022
};
s32 index;
const u16* array = &gUnk_08123D68[this->unk_84];
u32 position = this->unk_80 - 0x82;
for (index = 4; index >= 0;) {
SetTile(*array, position, 1);
index--;
position++;
array += 2;
}
}
void sub_0809B38C(DoubleBookshelfEntity* this) {
s32 index;
u32 uVar1 = this->unk_80 - 0x82;
for (index = 4; index >= 0;) {
sub_0807BA8C(uVar1, 1);
index--;
uVar1++;
}
}