mirror of https://github.com/zeldaret/tmc.git
Decompile Object20
This commit is contained in:
octorock
parent
2044fdcaff
commit
cbae0aa1e5
|
|
@ -0,0 +1,104 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, sl
|
||||
mov r6, sb
|
||||
mov r5, r8
|
||||
push {r5, r6, r7}
|
||||
sub sp, #0x10
|
||||
adds r7, r0, #0
|
||||
movs r1, #0x2e
|
||||
ldrsh r0, [r7, r1]
|
||||
str r0, [sp]
|
||||
movs r0, #0x32
|
||||
ldrsh r2, [r7, r0]
|
||||
str r2, [sp, #4]
|
||||
adds r0, r7, #0
|
||||
adds r0, #0x38
|
||||
ldrb r0, [r0]
|
||||
mov r8, r0
|
||||
movs r0, #0x10
|
||||
rsbs r0, r0, #0
|
||||
mov r1, r8
|
||||
lsls r1, r1, #0x18
|
||||
str r1, [sp, #8]
|
||||
_080878F8:
|
||||
movs r2, #0x10
|
||||
rsbs r2, r2, #0
|
||||
mov sb, r2
|
||||
ldr r1, [sp]
|
||||
adds r1, r1, r0
|
||||
mov sl, r1
|
||||
adds r0, #0x10
|
||||
str r0, [sp, #0xc]
|
||||
mov r6, sl
|
||||
_0808790A:
|
||||
ldr r2, _0808795C @ =gRoomControls
|
||||
ldrh r0, [r2, #6]
|
||||
subs r0, r6, r0
|
||||
lsrs r4, r0, #4
|
||||
movs r0, #0x3f
|
||||
ands r4, r0
|
||||
ldr r5, [sp, #4]
|
||||
add r5, sb
|
||||
ldrh r0, [r2, #8]
|
||||
subs r0, r5, r0
|
||||
lsrs r0, r0, #4
|
||||
movs r1, #0x3f
|
||||
ands r0, r1
|
||||
lsls r0, r0, #6
|
||||
orrs r4, r0
|
||||
adds r0, r4, #0
|
||||
ldr r2, [sp, #8]
|
||||
lsrs r1, r2, #0x18
|
||||
bl sub_080B1AE0
|
||||
cmp r0, #0x2e
|
||||
bne _08087970
|
||||
adds r0, r4, #0
|
||||
mov r1, r8
|
||||
bl GetTileType
|
||||
adds r1, r0, #0
|
||||
movs r0, #0xda
|
||||
lsls r0, r0, #2
|
||||
cmp r1, r0
|
||||
bhi _08087960
|
||||
subs r0, #1
|
||||
cmp r1, r0
|
||||
blo _08087960
|
||||
adds r0, r7, #0
|
||||
movs r1, #3
|
||||
adds r2, r6, #0
|
||||
adds r3, r5, #0
|
||||
bl sub_08008796
|
||||
b _0808797C
|
||||
.align 2, 0
|
||||
_0808795C: .4byte gRoomControls
|
||||
_08087960:
|
||||
ldr r0, _0808796C @ =0x00004022
|
||||
adds r1, r4, #0
|
||||
mov r2, r8
|
||||
bl SetTile
|
||||
b _0808797C
|
||||
.align 2, 0
|
||||
_0808796C: .4byte 0x00004022
|
||||
_08087970:
|
||||
adds r0, r7, #0
|
||||
movs r1, #3
|
||||
mov r2, sl
|
||||
adds r3, r5, #0
|
||||
bl sub_08008796
|
||||
_0808797C:
|
||||
movs r0, #0x10
|
||||
add sb, r0
|
||||
mov r1, sb
|
||||
cmp r1, #0x10
|
||||
ble _0808790A
|
||||
ldr r0, [sp, #0xc]
|
||||
cmp r0, #0x10
|
||||
ble _080878F8
|
||||
add sp, #0x10
|
||||
pop {r3, r4, r5}
|
||||
mov r8, r3
|
||||
mov sb, r4
|
||||
mov sl, r5
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.syntax divided
|
||||
|
|
@ -1,212 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start Object20
|
||||
Object20: @ 0x0808780C
|
||||
push {lr}
|
||||
ldr r2, _08087820 @ =gUnk_08120A28
|
||||
ldrb r1, [r0, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_08087820: .4byte gUnk_08120A28
|
||||
|
||||
thumb_func_start sub_08087824
|
||||
sub_08087824: @ 0x08087824
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
adds r0, #0x38
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0
|
||||
bne _08087836
|
||||
adds r0, r4, #0
|
||||
bl ResolveCollisionLayer
|
||||
_08087836:
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
ldrb r1, [r4, #0x10]
|
||||
movs r0, #0x80
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x10]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x3c
|
||||
movs r0, #0x13
|
||||
strb r0, [r1]
|
||||
adds r1, #9
|
||||
movs r0, #0xff
|
||||
strb r0, [r1]
|
||||
subs r1, #6
|
||||
movs r0, #0xa9
|
||||
strb r0, [r1]
|
||||
adds r1, #1
|
||||
movs r0, #0x16
|
||||
strb r0, [r1]
|
||||
ldr r0, _08087884 @ =gUnk_08120A54
|
||||
ldr r0, [r0]
|
||||
str r0, [r4, #0x48]
|
||||
subs r1, #5
|
||||
movs r0, #0x8b
|
||||
strb r0, [r1]
|
||||
adds r0, r4, #0
|
||||
bl sub_080878CC
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
bl InitializeAnimation
|
||||
adds r0, r4, #0
|
||||
bl sub_0801766C
|
||||
movs r0, #0xfd
|
||||
bl EnqueueSFX
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_08087884: .4byte gUnk_08120A54
|
||||
|
||||
thumb_func_start sub_08087888
|
||||
sub_08087888: @ 0x08087888
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl GetNextFrame
|
||||
adds r2, r4, #0
|
||||
adds r2, #0x5a
|
||||
ldrb r1, [r2]
|
||||
movs r0, #0x80
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080878A4
|
||||
bl DeleteThisEntity
|
||||
b _080878C8
|
||||
_080878A4:
|
||||
lsls r0, r1, #0x18
|
||||
lsrs r0, r0, #0x18
|
||||
cmp r0, #4
|
||||
bhi _080878C0
|
||||
ldr r0, _080878BC @ =gUnk_08120A54
|
||||
ldrb r1, [r2]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r0, [r1]
|
||||
str r0, [r4, #0x48]
|
||||
b _080878C8
|
||||
.align 2, 0
|
||||
_080878BC: .4byte gUnk_08120A54
|
||||
_080878C0:
|
||||
ldrb r1, [r4, #0x10]
|
||||
movs r0, #0x7f
|
||||
ands r0, r1
|
||||
strb r0, [r4, #0x10]
|
||||
_080878C8:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_080878CC
|
||||
sub_080878CC: @ 0x080878CC
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, sl
|
||||
mov r6, sb
|
||||
mov r5, r8
|
||||
push {r5, r6, r7}
|
||||
sub sp, #0x10
|
||||
adds r7, r0, #0
|
||||
movs r1, #0x2e
|
||||
ldrsh r0, [r7, r1]
|
||||
str r0, [sp]
|
||||
movs r0, #0x32
|
||||
ldrsh r2, [r7, r0]
|
||||
str r2, [sp, #4]
|
||||
adds r0, r7, #0
|
||||
adds r0, #0x38
|
||||
ldrb r0, [r0]
|
||||
mov r8, r0
|
||||
movs r0, #0x10
|
||||
rsbs r0, r0, #0
|
||||
mov r1, r8
|
||||
lsls r1, r1, #0x18
|
||||
str r1, [sp, #8]
|
||||
_080878F8:
|
||||
movs r2, #0x10
|
||||
rsbs r2, r2, #0
|
||||
mov sb, r2
|
||||
ldr r1, [sp]
|
||||
adds r1, r1, r0
|
||||
mov sl, r1
|
||||
adds r0, #0x10
|
||||
str r0, [sp, #0xc]
|
||||
mov r6, sl
|
||||
_0808790A:
|
||||
ldr r2, _0808795C @ =gRoomControls
|
||||
ldrh r0, [r2, #6]
|
||||
subs r0, r6, r0
|
||||
lsrs r4, r0, #4
|
||||
movs r0, #0x3f
|
||||
ands r4, r0
|
||||
ldr r5, [sp, #4]
|
||||
add r5, sb
|
||||
ldrh r0, [r2, #8]
|
||||
subs r0, r5, r0
|
||||
lsrs r0, r0, #4
|
||||
movs r1, #0x3f
|
||||
ands r0, r1
|
||||
lsls r0, r0, #6
|
||||
orrs r4, r0
|
||||
adds r0, r4, #0
|
||||
ldr r2, [sp, #8]
|
||||
lsrs r1, r2, #0x18
|
||||
bl sub_080B1AE0
|
||||
cmp r0, #0x2e
|
||||
bne _08087970
|
||||
adds r0, r4, #0
|
||||
mov r1, r8
|
||||
bl GetTileType
|
||||
adds r1, r0, #0
|
||||
movs r0, #0xda
|
||||
lsls r0, r0, #2
|
||||
cmp r1, r0
|
||||
bhi _08087960
|
||||
subs r0, #1
|
||||
cmp r1, r0
|
||||
blo _08087960
|
||||
adds r0, r7, #0
|
||||
movs r1, #3
|
||||
adds r2, r6, #0
|
||||
adds r3, r5, #0
|
||||
bl sub_08008796
|
||||
b _0808797C
|
||||
.align 2, 0
|
||||
_0808795C: .4byte gRoomControls
|
||||
_08087960:
|
||||
ldr r0, _0808796C @ =0x00004022
|
||||
adds r1, r4, #0
|
||||
mov r2, r8
|
||||
bl SetTile
|
||||
b _0808797C
|
||||
.align 2, 0
|
||||
_0808796C: .4byte 0x00004022
|
||||
_08087970:
|
||||
adds r0, r7, #0
|
||||
movs r1, #3
|
||||
mov r2, sl
|
||||
adds r3, r5, #0
|
||||
bl sub_08008796
|
||||
_0808797C:
|
||||
movs r0, #0x10
|
||||
add sb, r0
|
||||
mov r1, sb
|
||||
cmp r1, #0x10
|
||||
ble _0808790A
|
||||
ldr r0, [sp, #0xc]
|
||||
cmp r0, #0x10
|
||||
ble _080878F8
|
||||
add sp, #0x10
|
||||
pop {r3, r4, r5}
|
||||
mov r8, r3
|
||||
mov sb, r4
|
||||
mov sl, r5
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
|
|
@ -42885,21 +42885,6 @@
|
|||
"start": 1182240,
|
||||
"size": 8
|
||||
},
|
||||
{
|
||||
"path": "object20/gUnk_08120A30.bin",
|
||||
"start": 1182256,
|
||||
"size": 12
|
||||
},
|
||||
{
|
||||
"path": "object20/gUnk_08120A3C.bin",
|
||||
"start": 1182268,
|
||||
"size": 12
|
||||
},
|
||||
{
|
||||
"path": "object20/gUnk_08120A48.bin",
|
||||
"start": 1182280,
|
||||
"size": 12
|
||||
},
|
||||
{
|
||||
"path": "animations/gSpriteAnimations_FigurineDevice_0.bin",
|
||||
"start": 1182440,
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_08120A30:: @ 08120A30
|
||||
.incbin "object20/gUnk_08120A30.bin"
|
||||
|
||||
gUnk_08120A3C:: @ 08120A3C
|
||||
.incbin "object20/gUnk_08120A3C.bin"
|
||||
|
||||
gUnk_08120A48:: @ 08120A48
|
||||
.incbin "object20/gUnk_08120A48.bin"
|
||||
|
||||
gUnk_08120A54:: @ 08120A54
|
||||
.4byte gUnk_08120A30
|
||||
.4byte gUnk_08120A30
|
||||
.4byte gUnk_08120A48
|
||||
.4byte gUnk_08120A3C
|
||||
.4byte gUnk_08120A3C
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_08120A28:: @ 08120A28
|
||||
.4byte sub_08087824
|
||||
.4byte sub_08087888
|
||||
|
|
@ -652,7 +652,7 @@ SECTIONS {
|
|||
src/object/object1D.o(.text);
|
||||
src/object/object1E.o(.text);
|
||||
asm/object/object1F.o(.text);
|
||||
asm/object/object20.o(.text);
|
||||
src/object/object20.o(.text);
|
||||
src/object/object21.o(.text);
|
||||
src/object/figurineDevice.o(.text);
|
||||
src/object/eyeSwitch.o(.text);
|
||||
|
|
@ -1373,8 +1373,7 @@ SECTIONS {
|
|||
src/object/object1E.o(.rodata);
|
||||
data/animations/object/object1E.o(.rodata);
|
||||
data/const/object/object1F.o(.rodata);
|
||||
data/const/object/object20.o(.rodata);
|
||||
data/animations/object/object20.o(.rodata);
|
||||
src/object/object20.o(.rodata);
|
||||
src/object/object21.o(.rodata);
|
||||
src/object/figurineDevice.o(.rodata);
|
||||
data/animations/object/figurineDevice.o(.rodata);
|
||||
|
|
|
|||
|
|
@ -11,13 +11,15 @@
|
|||
#include "functions.h"
|
||||
#include "area.h"
|
||||
|
||||
|
||||
void sub_08087528(Entity*);
|
||||
void sub_080875F4(Entity*);
|
||||
void sub_08087640(Entity*);
|
||||
|
||||
void Object1E(Entity* this) {
|
||||
static void (*const gUnk_081208B8[])(Entity*) = {sub_08087528, sub_080875F4, };
|
||||
static void (*const gUnk_081208B8[])(Entity*) = {
|
||||
sub_08087528,
|
||||
sub_080875F4,
|
||||
};
|
||||
if (!EntityIsDeleted(this)) {
|
||||
gUnk_081208B8[this->action](this);
|
||||
}
|
||||
|
|
@ -60,7 +62,7 @@ NONMATCH("asm/non_matching/object1E/sub_08087528.inc", void sub_08087528(Entity*
|
|||
if (this->type == 0x40) {
|
||||
this->spriteSettings.flipX = 1;
|
||||
}
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
SetDefaultPriority(this, 3);
|
||||
|
|
@ -74,7 +76,7 @@ void sub_080875F4(Entity* this) {
|
|||
DeleteThisEntity();
|
||||
}
|
||||
if (this->type2 != 0) {
|
||||
this->spritePriority.b0 =gPlayerEntity.spritePriority.b0 + 1 - this->frame;
|
||||
this->spritePriority.b0 = gPlayerEntity.spritePriority.b0 + 1 - this->frame;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,91 @@
|
|||
/**
|
||||
* @file object20.c
|
||||
* @ingroup Objects
|
||||
*
|
||||
* @brief Object20 object
|
||||
*/
|
||||
|
||||
#define NENT_DEPRECATED
|
||||
#include "global.h"
|
||||
#include "object.h"
|
||||
#include "functions.h"
|
||||
|
||||
void sub_08087824(Entity*);
|
||||
void sub_08087888(Entity*);
|
||||
void sub_080878CC(Entity*);
|
||||
|
||||
void (*const gUnk_08120A28[])(Entity*) = {
|
||||
sub_08087824,
|
||||
sub_08087888,
|
||||
};
|
||||
const Hitbox3D gUnk_08120A30 = { 0, 0, { 0, 0, 0, 0 }, 6, 6, 10, { 0, 0, 0 } };
|
||||
const Hitbox3D gUnk_08120A3C = { 0, 0, { 0, 0, 0, 0 }, 12, 12, 16, { 0, 0, 0 } };
|
||||
const Hitbox3D gUnk_08120A48 = { 0, 0, { 0, 0, 0, 0 }, 16, 16, 20, { 0, 0, 0 } };
|
||||
const Hitbox3D* const gUnk_08120A54[] = { &gUnk_08120A30, &gUnk_08120A30, &gUnk_08120A48, &gUnk_08120A3C,
|
||||
&gUnk_08120A3C };
|
||||
|
||||
void Object20(Entity* this) {
|
||||
gUnk_08120A28[this->action](this);
|
||||
}
|
||||
|
||||
void sub_08087824(Entity* this) {
|
||||
if (this->collisionLayer == 0) {
|
||||
ResolveCollisionLayer(this);
|
||||
}
|
||||
this->action = 1;
|
||||
this->flags |= 0x80;
|
||||
this->field_0x3c = 0x13;
|
||||
this->health = 0xff;
|
||||
this->hitType = 0xa9;
|
||||
this->hurtType = 0x16;
|
||||
this->hitbox = (Hitbox*)gUnk_08120A54[0];
|
||||
this->flags2 = 0x8b;
|
||||
sub_080878CC(this);
|
||||
InitializeAnimation(this, 1);
|
||||
sub_0801766C(this);
|
||||
EnqueueSFX(SFX_ITEM_BOMB_EXPLODE);
|
||||
}
|
||||
|
||||
void sub_08087888(Entity* this) {
|
||||
GetNextFrame(this);
|
||||
if ((this->frame & 0x80) != 0) {
|
||||
DeleteThisEntity();
|
||||
} else {
|
||||
if (this->frame < 5) {
|
||||
this->hitbox = (Hitbox*)gUnk_08120A54[this->frame];
|
||||
} else {
|
||||
this->flags &= 0x7f;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NONMATCH("asm/non_matching/object20/sub_080878CC.inc", void sub_080878CC(Entity* this)) {
|
||||
s32 x;
|
||||
s32 y;
|
||||
s32 itX;
|
||||
s32 itY;
|
||||
u32 layer;
|
||||
u32 tileType;
|
||||
u32 pos;
|
||||
|
||||
x = this->x.HALF.HI;
|
||||
y = this->y.HALF.HI;
|
||||
layer = this->collisionLayer;
|
||||
for (itX = -0x10; itX < 0x11; itX += 0x10) {
|
||||
for (itY = -0x10; itY < 0x11; itY += 0x10) {
|
||||
pos = TILE((u32)x + itX, (u32)y + itY);
|
||||
if (sub_080B1AE0(pos, layer) == 0x2e) {
|
||||
tileType = GetTileType(pos, layer);
|
||||
if (tileType == 0x368 || tileType == 0x367
|
||||
/*(tileType < 0x369) && (0x366 < tileType)*/) {
|
||||
sub_08008796(this, 3, x + itX, y + itY);
|
||||
} else {
|
||||
SetTile(0x4022, pos, layer);
|
||||
}
|
||||
} else {
|
||||
sub_08008796(this, 3, x + itX, y + itY);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
END_NONMATCH
|
||||
Loading…
Reference in New Issue