mirror of https://github.com/zeldaret/tmc.git
Decompile Object1E
This commit is contained in:
octorock
parent
1aef85e81c
commit
2044fdcaff
|
|
@ -0,0 +1,107 @@
|
|||
.syntax unified
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
ldr r0, _08087590 @ =gPlayerEntity
|
||||
ldrb r0, [r0, #0x14]
|
||||
lsrs r0, r0, #1
|
||||
strb r0, [r4, #0x14]
|
||||
ldrb r1, [r4, #0x19]
|
||||
movs r2, #0x3f
|
||||
adds r0, r2, #0
|
||||
ands r0, r1
|
||||
movs r1, #0x80
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x19]
|
||||
adds r3, r4, #0
|
||||
adds r3, #0x29
|
||||
ldrb r1, [r3]
|
||||
movs r0, #8
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r1
|
||||
movs r1, #3
|
||||
orrs r0, r1
|
||||
strb r0, [r3]
|
||||
ldrb r1, [r4, #0x1b]
|
||||
lsrs r0, r1, #6
|
||||
subs r0, #1
|
||||
lsls r0, r0, #6
|
||||
ands r2, r1
|
||||
orrs r2, r0
|
||||
strb r2, [r4, #0x1b]
|
||||
ldrb r0, [r4, #0xb]
|
||||
cmp r0, #0
|
||||
beq _08087594
|
||||
ldrb r1, [r4, #0x1a]
|
||||
movs r0, #0x10
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r1
|
||||
movs r1, #1
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x1a]
|
||||
ldrb r0, [r4, #0x14]
|
||||
cmp r0, #1
|
||||
bne _08087588
|
||||
ldrb r0, [r4, #0x18]
|
||||
movs r1, #0x40
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
_08087588:
|
||||
adds r0, r4, #0
|
||||
bl sub_08087640
|
||||
b _080875DC
|
||||
.align 2, 0
|
||||
_08087590: .4byte gPlayerEntity
|
||||
_08087594:
|
||||
ldr r0, _080875B4 @ =gArea
|
||||
ldrb r0, [r0, #1]
|
||||
movs r1, #4
|
||||
cmp r0, #0x10
|
||||
bne _080875A2
|
||||
movs r1, #0xb5
|
||||
lsls r1, r1, #1
|
||||
_080875A2:
|
||||
adds r0, r4, #0
|
||||
bl ChangeObjPalette
|
||||
ldrb r0, [r4, #0x14]
|
||||
cmp r0, #1
|
||||
beq _080875B8
|
||||
cmp r0, #3
|
||||
bne _080875CE
|
||||
b _080875C0
|
||||
.align 2, 0
|
||||
_080875B4: .4byte gArea
|
||||
_080875B8:
|
||||
ldrb r0, [r4, #0x18]
|
||||
movs r1, #0x40
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
_080875C0:
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0x40
|
||||
bne _080875DC
|
||||
ldrh r0, [r4, #0x32]
|
||||
adds r0, #4
|
||||
strh r0, [r4, #0x32]
|
||||
b _080875DC
|
||||
_080875CE:
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0x40
|
||||
bne _080875DC
|
||||
ldrb r0, [r4, #0x18]
|
||||
movs r1, #0x40
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
_080875DC:
|
||||
adds r0, r4, #0
|
||||
movs r1, #3
|
||||
bl SetDefaultPriority
|
||||
ldrb r1, [r4, #0xb]
|
||||
lsls r1, r1, #2
|
||||
ldrb r0, [r4, #0x14]
|
||||
adds r1, r1, r0
|
||||
adds r0, r4, #0
|
||||
bl InitializeAnimation
|
||||
pop {r4, pc}
|
||||
.syntax divided
|
||||
|
|
@ -1,224 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start Object1E
|
||||
Object1E: @ 0x08087504
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl EntityIsDeleted
|
||||
cmp r0, #0
|
||||
bne _08087520
|
||||
ldr r0, _08087524 @ =gUnk_081208B8
|
||||
ldrb r1, [r4, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
adds r0, r4, #0
|
||||
bl _call_via_r1
|
||||
_08087520:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_08087524: .4byte gUnk_081208B8
|
||||
|
||||
thumb_func_start sub_08087528
|
||||
sub_08087528: @ 0x08087528
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
ldr r0, _08087590 @ =gPlayerEntity
|
||||
ldrb r0, [r0, #0x14]
|
||||
lsrs r0, r0, #1
|
||||
strb r0, [r4, #0x14]
|
||||
ldrb r1, [r4, #0x19]
|
||||
movs r2, #0x3f
|
||||
adds r0, r2, #0
|
||||
ands r0, r1
|
||||
movs r1, #0x80
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x19]
|
||||
adds r3, r4, #0
|
||||
adds r3, #0x29
|
||||
ldrb r1, [r3]
|
||||
movs r0, #8
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r1
|
||||
movs r1, #3
|
||||
orrs r0, r1
|
||||
strb r0, [r3]
|
||||
ldrb r1, [r4, #0x1b]
|
||||
lsrs r0, r1, #6
|
||||
subs r0, #1
|
||||
lsls r0, r0, #6
|
||||
ands r2, r1
|
||||
orrs r2, r0
|
||||
strb r2, [r4, #0x1b]
|
||||
ldrb r0, [r4, #0xb]
|
||||
cmp r0, #0
|
||||
beq _08087594
|
||||
ldrb r1, [r4, #0x1a]
|
||||
movs r0, #0x10
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r1
|
||||
movs r1, #1
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x1a]
|
||||
ldrb r0, [r4, #0x14]
|
||||
cmp r0, #1
|
||||
bne _08087588
|
||||
ldrb r0, [r4, #0x18]
|
||||
movs r1, #0x40
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
_08087588:
|
||||
adds r0, r4, #0
|
||||
bl sub_08087640
|
||||
b _080875DC
|
||||
.align 2, 0
|
||||
_08087590: .4byte gPlayerEntity
|
||||
_08087594:
|
||||
ldr r0, _080875B4 @ =gArea
|
||||
ldrb r0, [r0, #1]
|
||||
movs r1, #4
|
||||
cmp r0, #0x10
|
||||
bne _080875A2
|
||||
movs r1, #0xb5
|
||||
lsls r1, r1, #1
|
||||
_080875A2:
|
||||
adds r0, r4, #0
|
||||
bl ChangeObjPalette
|
||||
ldrb r0, [r4, #0x14]
|
||||
cmp r0, #1
|
||||
beq _080875B8
|
||||
cmp r0, #3
|
||||
bne _080875CE
|
||||
b _080875C0
|
||||
.align 2, 0
|
||||
_080875B4: .4byte gArea
|
||||
_080875B8:
|
||||
ldrb r0, [r4, #0x18]
|
||||
movs r1, #0x40
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
_080875C0:
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0x40
|
||||
bne _080875DC
|
||||
ldrh r0, [r4, #0x32]
|
||||
adds r0, #4
|
||||
strh r0, [r4, #0x32]
|
||||
b _080875DC
|
||||
_080875CE:
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0x40
|
||||
bne _080875DC
|
||||
ldrb r0, [r4, #0x18]
|
||||
movs r1, #0x40
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
_080875DC:
|
||||
adds r0, r4, #0
|
||||
movs r1, #3
|
||||
bl SetDefaultPriority
|
||||
ldrb r1, [r4, #0xb]
|
||||
lsls r1, r1, #2
|
||||
ldrb r0, [r4, #0x14]
|
||||
adds r1, r1, r0
|
||||
adds r0, r4, #0
|
||||
bl InitializeAnimation
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start sub_080875F4
|
||||
sub_080875F4: @ 0x080875F4
|
||||
push {r4, r5, lr}
|
||||
adds r4, r0, #0
|
||||
bl GetNextFrame
|
||||
adds r5, r4, #0
|
||||
adds r5, #0x5a
|
||||
ldrb r1, [r5]
|
||||
movs r0, #0x80
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _0808760E
|
||||
bl DeleteThisEntity
|
||||
_0808760E:
|
||||
ldrb r0, [r4, #0xb]
|
||||
cmp r0, #0
|
||||
beq _08087638
|
||||
ldr r0, _0808763C @ =gPlayerEntity
|
||||
adds r0, #0x29
|
||||
ldrb r1, [r0]
|
||||
lsls r1, r1, #0x1d
|
||||
lsrs r1, r1, #0x1d
|
||||
ldrb r0, [r5]
|
||||
subs r0, #1
|
||||
subs r1, r1, r0
|
||||
adds r3, r4, #0
|
||||
adds r3, #0x29
|
||||
movs r0, #7
|
||||
ands r1, r0
|
||||
ldrb r2, [r3]
|
||||
movs r0, #8
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r3]
|
||||
_08087638:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
_0808763C: .4byte gPlayerEntity
|
||||
|
||||
thumb_func_start sub_08087640
|
||||
sub_08087640: @ 0x08087640
|
||||
push {r4, r5, r6, lr}
|
||||
adds r4, r0, #0
|
||||
movs r0, #0x2e
|
||||
ldrsh r5, [r4, r0]
|
||||
movs r1, #0x32
|
||||
ldrsh r6, [r4, r1]
|
||||
ldrb r1, [r4, #0x14]
|
||||
lsls r1, r1, #1
|
||||
ldr r0, _08087684 @ =gUnk_081208C0
|
||||
adds r1, r1, r0
|
||||
movs r0, #0
|
||||
ldrsb r0, [r1, r0]
|
||||
ldrh r2, [r4, #0x2e]
|
||||
adds r0, r0, r2
|
||||
strh r0, [r4, #0x2e]
|
||||
movs r0, #1
|
||||
ldrsb r0, [r1, r0]
|
||||
ldrh r1, [r4, #0x32]
|
||||
adds r0, r0, r1
|
||||
strh r0, [r4, #0x32]
|
||||
ldr r0, _08087688 @ =gRoomControls
|
||||
ldrh r1, [r0, #4]
|
||||
ldr r0, _0808768C @ =0x00000403
|
||||
.ifdef EU
|
||||
movs r2, #0x17
|
||||
.else
|
||||
movs r2, #0x16
|
||||
.endif
|
||||
cmp r1, r0
|
||||
bne _08087676
|
||||
.ifdef EU
|
||||
movs r2, #0x18
|
||||
.else
|
||||
movs r2, #0x17
|
||||
.endif
|
||||
_08087676:
|
||||
adds r0, r4, #0
|
||||
adds r1, r2, #0
|
||||
bl CreateRandomItemDrop
|
||||
strh r5, [r4, #0x2e]
|
||||
strh r6, [r4, #0x32]
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
_08087684: .4byte gUnk_081208C0
|
||||
_08087688: .4byte gRoomControls
|
||||
_0808768C: .4byte 0x00000403
|
||||
|
|
@ -42875,11 +42875,6 @@
|
|||
"size": 44,
|
||||
"type": "animation"
|
||||
},
|
||||
{
|
||||
"path": "object1E/gUnk_081208C0.bin",
|
||||
"start": 1181888,
|
||||
"size": 8
|
||||
},
|
||||
{
|
||||
"path": "object1F/gUnk_08120A18.bin",
|
||||
"start": 1182232,
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_081208B8:: @ 081208B8
|
||||
.4byte sub_08087528
|
||||
.4byte sub_080875F4
|
||||
|
||||
gUnk_081208C0:: @ 081208C0
|
||||
.incbin "object1E/gUnk_081208C0.bin"
|
||||
|
|
@ -650,7 +650,7 @@ SECTIONS {
|
|||
src/object/greatFairy.o(.text);
|
||||
src/object/object1C.o(.text);
|
||||
src/object/object1D.o(.text);
|
||||
asm/object/object1E.o(.text);
|
||||
src/object/object1E.o(.text);
|
||||
asm/object/object1F.o(.text);
|
||||
asm/object/object20.o(.text);
|
||||
src/object/object21.o(.text);
|
||||
|
|
@ -1370,7 +1370,7 @@ SECTIONS {
|
|||
src/object/greatFairy.o(.rodata);
|
||||
data/animations/npc/greatFairy.o(.rodata);
|
||||
data/const/object/object1D.o(.rodata);
|
||||
data/const/object/object1E.o(.rodata);
|
||||
src/object/object1E.o(.rodata);
|
||||
data/animations/object/object1E.o(.rodata);
|
||||
data/const/object/object1F.o(.rodata);
|
||||
data/const/object/object20.o(.rodata);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,107 @@
|
|||
/**
|
||||
* @file object1E.c
|
||||
* @ingroup Objects
|
||||
*
|
||||
* @brief Object1E object
|
||||
*/
|
||||
|
||||
#define NENT_DEPRECATED
|
||||
#include "global.h"
|
||||
#include "object.h"
|
||||
#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, };
|
||||
if (!EntityIsDeleted(this)) {
|
||||
gUnk_081208B8[this->action](this);
|
||||
}
|
||||
}
|
||||
|
||||
NONMATCH("asm/non_matching/object1E/sub_08087528.inc", void sub_08087528(Entity* this)) {
|
||||
u32 palette;
|
||||
|
||||
this->action = 1;
|
||||
this->animationState = gPlayerEntity.animationState >> 1;
|
||||
this->spriteRendering.b3 = 2;
|
||||
this->spritePriority.b0 = 3;
|
||||
this->spriteOrientation.flipY--;
|
||||
if (this->type2 != 0) {
|
||||
this->palette.b.b0 = 1;
|
||||
if (this->animationState == 1) {
|
||||
this->spriteSettings.flipX = 1;
|
||||
}
|
||||
sub_08087640(this);
|
||||
} else {
|
||||
if (gArea.locationIndex == 0x10) {
|
||||
palette = 0x16a;
|
||||
} else {
|
||||
palette = 4;
|
||||
}
|
||||
ChangeObjPalette(this, palette);
|
||||
switch (this->animationState) {
|
||||
case 1:
|
||||
this->spriteSettings.flipX = 1;
|
||||
if (this->type == 0x40) {
|
||||
this->y.HALF.HI += 4;
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
if (this->type == 0x40) {
|
||||
this->y.HALF.HI += 4;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (this->type == 0x40) {
|
||||
this->spriteSettings.flipX = 1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
SetDefaultPriority(this, 3);
|
||||
InitializeAnimation(this, this->type2 * 4 + this->animationState);
|
||||
}
|
||||
END_NONMATCH
|
||||
|
||||
void sub_080875F4(Entity* this) {
|
||||
GetNextFrame(this);
|
||||
if ((this->frame & 0x80) != 0) {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
if (this->type2 != 0) {
|
||||
this->spritePriority.b0 =gPlayerEntity.spritePriority.b0 + 1 - this->frame;
|
||||
}
|
||||
}
|
||||
|
||||
void sub_08087640(Entity* this) {
|
||||
static const s8 gUnk_081208C0[] = { 0, -12, 16, 0, 0, 15, -16, 0 };
|
||||
s32 oldX;
|
||||
s32 oldY;
|
||||
u32 tmp;
|
||||
const s8* ptr;
|
||||
|
||||
oldX = this->x.HALF.HI;
|
||||
oldY = this->y.HALF.HI;
|
||||
ptr = &gUnk_081208C0[this->animationState * 2];
|
||||
this->x.HALF.HI += ptr[0];
|
||||
this->y.HALF.HI += ptr[1];
|
||||
if (gRoomControls.area == 3 && gRoomControls.room == 4) {
|
||||
#ifdef EU
|
||||
tmp = 0x18;
|
||||
} else {
|
||||
tmp = 0x17;
|
||||
#else
|
||||
tmp = 0x17;
|
||||
} else {
|
||||
tmp = 0x16;
|
||||
#endif
|
||||
}
|
||||
CreateRandomItemDrop(this, tmp);
|
||||
this->x.HALF.HI = oldX;
|
||||
this->y.HALF.HI = oldY;
|
||||
}
|
||||
Loading…
Reference in New Issue