mirror of https://github.com/zeldaret/tmc.git
Decompile Object61
This commit is contained in:
octorock
parent
28301855fd
commit
1e33e5a55d
|
|
@ -1,434 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start Object61
|
||||
Object61: @ 0x08093428
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r0, _0809345C @ =gPlayerState
|
||||
ldr r0, [r0, #0x30]
|
||||
movs r1, #0x80
|
||||
lsls r1, r1, #0x11
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _0809344A
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0
|
||||
bne _08093446
|
||||
ldr r1, _08093460 @ =gRoomControls
|
||||
ldr r0, _08093464 @ =gPlayerEntity
|
||||
str r0, [r1, #0x30]
|
||||
_08093446:
|
||||
bl DeleteThisEntity
|
||||
_0809344A:
|
||||
ldr r0, _08093468 @ =gUnk_081228C8
|
||||
ldrb r1, [r4, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
adds r0, r4, #0
|
||||
bl _call_via_r1
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0809345C: .4byte gPlayerState
|
||||
_08093460: .4byte gRoomControls
|
||||
_08093464: .4byte gPlayerEntity
|
||||
_08093468: .4byte gUnk_081228C8
|
||||
|
||||
thumb_func_start sub_0809346C
|
||||
sub_0809346C: @ 0x0809346C
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
movs r0, #0xff
|
||||
strb r0, [r4, #0x1f]
|
||||
ldr r0, _080934C0 @ =gPlayerEntity
|
||||
ldrb r1, [r0, #0x1a]
|
||||
lsls r1, r1, #0x1c
|
||||
lsrs r1, r1, #0x1c
|
||||
ldrb r2, [r4, #0x1a]
|
||||
movs r0, #0x10
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x1a]
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0
|
||||
bne _080934B8
|
||||
ldr r0, _080934C4 @ =gRoomControls
|
||||
str r4, [r0, #0x30]
|
||||
ldrb r0, [r4, #0x19]
|
||||
movs r1, #3
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x19]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x6e
|
||||
movs r0, #0xc0
|
||||
lsls r0, r0, #1
|
||||
strh r0, [r1]
|
||||
adds r1, #4
|
||||
strh r0, [r1]
|
||||
adds r0, r4, #0
|
||||
movs r1, #0x61
|
||||
movs r2, #1
|
||||
movs r3, #0
|
||||
bl CreateObjectWithParent
|
||||
_080934B8:
|
||||
adds r0, r4, #0
|
||||
bl sub_080934C8
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_080934C0: .4byte gPlayerEntity
|
||||
_080934C4: .4byte gRoomControls
|
||||
|
||||
thumb_func_start sub_080934C8
|
||||
sub_080934C8: @ 0x080934C8
|
||||
push {lr}
|
||||
ldr r2, _080934DC @ =gUnk_081228D0
|
||||
ldrb r1, [r0, #0xa]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_080934DC: .4byte gUnk_081228D0
|
||||
|
||||
thumb_func_start sub_080934E0
|
||||
sub_080934E0: @ 0x080934E0
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r5, r0, #0
|
||||
adds r4, r5, #0
|
||||
adds r4, #0x6e
|
||||
ldrh r1, [r4]
|
||||
movs r2, #0
|
||||
ldrsh r0, [r4, r2]
|
||||
cmp r0, #0
|
||||
bge _080934F6
|
||||
rsbs r0, r1, #0
|
||||
strh r0, [r4]
|
||||
_080934F6:
|
||||
ldr r0, _08093518 @ =gPlayerEntity
|
||||
ldrb r0, [r0, #0xd]
|
||||
cmp r0, #2
|
||||
beq _0809351C
|
||||
cmp r0, #2
|
||||
bgt _080935B0
|
||||
cmp r0, #1
|
||||
bne _080935B0
|
||||
adds r1, r5, #0
|
||||
adds r1, #0x72
|
||||
ldrh r0, [r1]
|
||||
subs r0, #4
|
||||
strh r0, [r1]
|
||||
adds r6, r4, #0
|
||||
adds r7, r1, #0
|
||||
b _080935BE
|
||||
.align 2, 0
|
||||
_08093518: .4byte gPlayerEntity
|
||||
_0809351C:
|
||||
ldrb r2, [r5, #0xf]
|
||||
adds r0, r2, #0
|
||||
cmp r0, #0
|
||||
bne _08093560
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x72
|
||||
ldrh r1, [r0]
|
||||
adds r7, r0, #0
|
||||
cmp r1, #0x80
|
||||
bls _08093538
|
||||
adds r0, r1, #0
|
||||
subs r0, #0x20
|
||||
strh r0, [r7]
|
||||
b _08093544
|
||||
_08093538:
|
||||
adds r0, r2, #1
|
||||
strb r0, [r5, #0xf]
|
||||
movs r0, #0x92
|
||||
lsls r0, r0, #1
|
||||
bl SoundReq
|
||||
_08093544:
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x6e
|
||||
ldrh r2, [r0]
|
||||
ldr r1, _0809355C @ =0x0000011F
|
||||
adds r6, r0, #0
|
||||
cmp r2, r1
|
||||
bhi _080935BE
|
||||
adds r0, r2, #0
|
||||
adds r0, #0x40
|
||||
strh r0, [r6]
|
||||
b _080935BE
|
||||
.align 2, 0
|
||||
_0809355C: .4byte 0x0000011F
|
||||
_08093560:
|
||||
cmp r0, #0xff
|
||||
beq _080935A6
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x72
|
||||
ldrh r1, [r0]
|
||||
adds r7, r0, #0
|
||||
cmp r1, #0xff
|
||||
bhi _08093576
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x20
|
||||
b _0809357A
|
||||
_08093576:
|
||||
movs r0, #0x80
|
||||
lsls r0, r0, #1
|
||||
_0809357A:
|
||||
strh r0, [r7]
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x6e
|
||||
ldrh r1, [r0]
|
||||
movs r2, #0x80
|
||||
lsls r2, r2, #1
|
||||
adds r6, r0, #0
|
||||
cmp r1, r2
|
||||
bls _08093594
|
||||
adds r0, r1, #0
|
||||
subs r0, #0x20
|
||||
strh r0, [r6]
|
||||
b _08093596
|
||||
_08093594:
|
||||
strh r2, [r6]
|
||||
_08093596:
|
||||
ldrh r1, [r6]
|
||||
movs r0, #0x80
|
||||
lsls r0, r0, #1
|
||||
cmp r1, r0
|
||||
bne _080935BE
|
||||
movs r0, #0xff
|
||||
strb r0, [r5, #0xf]
|
||||
b _080935BE
|
||||
_080935A6:
|
||||
adds r0, r5, #0
|
||||
bl sub_080936C8
|
||||
adds r6, r4, #0
|
||||
b _080935BA
|
||||
_080935B0:
|
||||
adds r0, r5, #0
|
||||
bl sub_080936C8
|
||||
adds r6, r5, #0
|
||||
adds r6, #0x6e
|
||||
_080935BA:
|
||||
adds r7, r5, #0
|
||||
adds r7, #0x72
|
||||
_080935BE:
|
||||
ldr r0, _080935E4 @ =gPlayerEntity
|
||||
ldrb r1, [r0, #0x14]
|
||||
movs r0, #2
|
||||
ands r0, r1
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
beq _080935E8
|
||||
movs r0, #1
|
||||
strb r0, [r5, #0x1e]
|
||||
lsls r0, r1, #0x18
|
||||
lsrs r0, r0, #0x18
|
||||
cmp r0, #2
|
||||
bne _080935EA
|
||||
ldrh r0, [r6]
|
||||
rsbs r0, r0, #0
|
||||
strh r0, [r6]
|
||||
b _080935EA
|
||||
.align 2, 0
|
||||
_080935E4: .4byte gPlayerEntity
|
||||
_080935E8:
|
||||
strb r0, [r5, #0x1e]
|
||||
_080935EA:
|
||||
ldrb r0, [r5, #0x1e]
|
||||
ldrb r1, [r5, #0x1f]
|
||||
cmp r0, r1
|
||||
beq _080935FE
|
||||
strb r0, [r5, #0x1f]
|
||||
ldrb r1, [r5, #0x1e]
|
||||
ldrh r2, [r5, #0x12]
|
||||
adds r0, r5, #0
|
||||
bl sub_080042D0
|
||||
_080935FE:
|
||||
ldr r4, _0809364C @ =gPlayerEntity
|
||||
adds r0, r4, #0
|
||||
adds r1, r5, #0
|
||||
bl CopyPosition
|
||||
ldrb r2, [r4, #0x1b]
|
||||
lsrs r2, r2, #6
|
||||
lsls r2, r2, #6
|
||||
ldrb r3, [r5, #0x1b]
|
||||
movs r1, #0x3f
|
||||
adds r0, r1, #0
|
||||
ands r0, r3
|
||||
orrs r0, r2
|
||||
strb r0, [r5, #0x1b]
|
||||
ldrb r0, [r4, #0x19]
|
||||
lsrs r0, r0, #6
|
||||
lsls r0, r0, #6
|
||||
ldrb r2, [r5, #0x19]
|
||||
ands r1, r2
|
||||
orrs r1, r0
|
||||
strb r1, [r5, #0x19]
|
||||
ldrh r1, [r7]
|
||||
adds r0, r5, #0
|
||||
movs r2, #0xa
|
||||
movs r3, #2
|
||||
bl sub_0806FCF4
|
||||
ldrh r1, [r6]
|
||||
ldrh r2, [r7]
|
||||
adds r0, r5, #0
|
||||
movs r3, #0
|
||||
bl sub_0805EC9C
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
adds r2, r5, #0
|
||||
bl sub_0806FEBC
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_0809364C: .4byte gPlayerEntity
|
||||
|
||||
thumb_func_start sub_08093650
|
||||
sub_08093650: @ 0x08093650
|
||||
push {r4, r5, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r5, _080936C4 @ =gPlayerEntity
|
||||
ldrb r0, [r5, #0x15]
|
||||
lsrs r1, r0, #1
|
||||
adds r0, r0, r1
|
||||
asrs r0, r0, #2
|
||||
adds r0, #2
|
||||
strb r0, [r4, #0x1e]
|
||||
ldrb r1, [r4, #0x1f]
|
||||
cmp r0, r1
|
||||
beq _08093674
|
||||
strb r0, [r4, #0x1f]
|
||||
ldrb r1, [r4, #0x1e]
|
||||
ldrh r2, [r4, #0x12]
|
||||
adds r0, r4, #0
|
||||
bl sub_080042D0
|
||||
_08093674:
|
||||
adds r0, r5, #0
|
||||
adds r1, r4, #0
|
||||
bl CopyPosition
|
||||
ldrb r2, [r5, #0x1b]
|
||||
lsrs r2, r2, #6
|
||||
lsls r2, r2, #6
|
||||
ldrb r3, [r4, #0x1b]
|
||||
movs r1, #0x3f
|
||||
adds r0, r1, #0
|
||||
ands r0, r3
|
||||
orrs r0, r2
|
||||
strb r0, [r4, #0x1b]
|
||||
ldrb r0, [r5, #0x19]
|
||||
lsrs r0, r0, #6
|
||||
lsls r0, r0, #6
|
||||
ldrb r2, [r4, #0x19]
|
||||
ands r1, r2
|
||||
orrs r1, r0
|
||||
strb r1, [r4, #0x19]
|
||||
ldr r0, [r4, #0x50]
|
||||
adds r0, #0x72
|
||||
ldrh r1, [r0]
|
||||
adds r0, r4, #0
|
||||
movs r2, #0x18
|
||||
movs r3, #0
|
||||
bl sub_0806FCF4
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x63
|
||||
ldrb r0, [r1]
|
||||
rsbs r0, r0, #0
|
||||
strb r0, [r1]
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
adds r2, r4, #0
|
||||
bl sub_0806FEBC
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
_080936C4: .4byte gPlayerEntity
|
||||
|
||||
thumb_func_start sub_080936C8
|
||||
sub_080936C8: @ 0x080936C8
|
||||
push {r4, r5, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r0, _08093714 @ =gPlayerEntity
|
||||
ldr r0, [r0, #0x7c]
|
||||
lsrs r2, r0, #2
|
||||
movs r3, #0x9c
|
||||
lsls r3, r3, #1
|
||||
adds r1, r3, #0
|
||||
subs r1, r1, r2
|
||||
adds r5, r4, #0
|
||||
adds r5, #0x76
|
||||
strh r1, [r5]
|
||||
movs r1, #0x3c
|
||||
bl __divsi3
|
||||
movs r1, #8
|
||||
subs r1, r1, r0
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x74
|
||||
strh r1, [r0]
|
||||
ldrb r3, [r4, #0xe]
|
||||
cmp r3, #0
|
||||
bne _0809372C
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x6e
|
||||
ldrh r2, [r1]
|
||||
ldrh r0, [r5]
|
||||
cmp r0, r2
|
||||
bhs _08093718
|
||||
adds r0, r2, #0
|
||||
subs r0, #8
|
||||
strh r0, [r1]
|
||||
adds r1, #4
|
||||
ldrh r0, [r1]
|
||||
adds r0, #8
|
||||
strh r0, [r1]
|
||||
b _0809375C
|
||||
.align 2, 0
|
||||
_08093714: .4byte gPlayerEntity
|
||||
_08093718:
|
||||
adds r0, r3, #1
|
||||
strb r0, [r4, #0xe]
|
||||
ldrh r0, [r5]
|
||||
strh r0, [r1]
|
||||
ldrh r0, [r5]
|
||||
adds r0, #0x30
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x72
|
||||
strh r0, [r1]
|
||||
b _0809375C
|
||||
_0809372C:
|
||||
ldrh r0, [r5]
|
||||
adds r0, #0x30
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x6e
|
||||
ldrh r2, [r1]
|
||||
cmp r0, r2
|
||||
ble _0809374A
|
||||
adds r0, r2, #0
|
||||
adds r0, #8
|
||||
strh r0, [r1]
|
||||
adds r1, #4
|
||||
ldrh r0, [r1]
|
||||
subs r0, #8
|
||||
strh r0, [r1]
|
||||
b _0809375C
|
||||
_0809374A:
|
||||
movs r0, #0
|
||||
strb r0, [r4, #0xe]
|
||||
ldrh r0, [r5]
|
||||
adds r0, #0x30
|
||||
strh r0, [r1]
|
||||
ldrh r1, [r5]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x72
|
||||
strh r1, [r0]
|
||||
_0809375C:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_081228C8:: @ 081228C8
|
||||
.4byte sub_0809346C
|
||||
.4byte sub_080934C8
|
||||
|
||||
gUnk_081228D0:: @ 081228D0
|
||||
.4byte sub_080934E0
|
||||
.4byte sub_08093650
|
||||
|
|
@ -23,7 +23,7 @@ typedef struct {
|
|||
u16 unk_02;
|
||||
union SplitWord unk_04;
|
||||
union SplitWord unk_08;
|
||||
union SplitWord unk_0C;
|
||||
u32 unk_0C;
|
||||
} struct_gUnk_020000C0_1;
|
||||
typedef struct {
|
||||
struct_gUnk_020000C0_1 unk_00[4];
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@ extern bool32 sub_0806FC80(Entity*, Entity*, s32);
|
|||
extern void sub_0806FCF4(Entity*, s32, s32, s32);
|
||||
extern void sub_0806FD3C(Entity*);
|
||||
extern bool32 sub_0806FDA0(Entity*);
|
||||
extern void sub_0806FEBC(Entity*, u32, Entity*);
|
||||
extern void sub_080751E8(u32, u32, void*);
|
||||
extern void sub_08077BB8(ItemBehavior*);
|
||||
extern Entity* sub_08077C0C(ItemBehavior*, u32);
|
||||
|
|
|
|||
|
|
@ -323,7 +323,7 @@ void HouseDoorInterior(Entity*);
|
|||
void Whirlwind(Entity*);
|
||||
void ObjectBlockingStairs(Entity*);
|
||||
void SwordsmanNewsletter(Entity*);
|
||||
void Object61(Entity*);
|
||||
void Object61();
|
||||
void GiantTwig();
|
||||
void Object63(Entity*);
|
||||
void Object64(Entity*);
|
||||
|
|
|
|||
|
|
@ -743,7 +743,7 @@ SECTIONS {
|
|||
asm/object/whirlwind.o(.text);
|
||||
asm/object/objectBlockingStairs.o(.text);
|
||||
src/object/swordsmanNewsletter.o(.text);
|
||||
asm/object/object61.o(.text);
|
||||
src/object/object61.o(.text);
|
||||
src/object/giantTwig.o(.text);
|
||||
asm/object/object63.o(.text);
|
||||
asm/object/object64.o(.text);
|
||||
|
|
@ -1487,7 +1487,7 @@ SECTIONS {
|
|||
data/animations/object/whirlwind.o(.rodata);
|
||||
data/const/object/objectBlockingStairs.o(.rodata);
|
||||
data/const/object/swordsmanNewsletter.o(.rodata);
|
||||
data/const/object/object61.o(.rodata);
|
||||
src/object/object61.o(.rodata);
|
||||
src/object/giantTwig.o(.rodata);
|
||||
data/const/object/object63.o(.rodata);
|
||||
data/const/object/object64.o(.rodata);
|
||||
|
|
|
|||
|
|
@ -556,12 +556,12 @@ void sub_0806FE84(Entity* ent) {
|
|||
}
|
||||
}
|
||||
|
||||
void sub_0806FEBC(Entity* ent, u32 param_2, u32 param_3) {
|
||||
void sub_0806FEBC(Entity* ent, u32 param_2, Entity* param_3) {
|
||||
struct_gUnk_020000C0_1* ptr = &gUnk_020000C0[ent->spriteAnimation[2]].unk_00[param_2];
|
||||
*((u32*)ptr) = 0;
|
||||
ptr->unk_04.WORD = 0;
|
||||
ptr->unk_08.WORD = 0;
|
||||
ptr->unk_0C.WORD = param_3;
|
||||
ptr->unk_0C = (u32)param_3;
|
||||
ptr->unk_00.unk0 = 1;
|
||||
ptr->unk_00.unk1 = 1;
|
||||
}
|
||||
|
|
@ -669,7 +669,7 @@ bool32 sub_0807007C(struct_gUnk_020000C0* this, u32 param_2) {
|
|||
|
||||
ptr3 = &ptr2[ptr1->unk_01 * 4];
|
||||
ptr1->unk_08.BYTES.byte1 = *ptr3;
|
||||
ptr1->unk_0C.WORD = spritePtr[2] + ((*(u16*)&ptr3[2]) << 5);
|
||||
ptr1->unk_0C = spritePtr[2] + ((*(u16*)&ptr3[2]) << 5);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,176 @@
|
|||
/**
|
||||
* @file object61.c
|
||||
* @ingroup Objects
|
||||
*
|
||||
* @brief Object61 object
|
||||
*/
|
||||
|
||||
#define NENT_DEPRECATED
|
||||
#include "global.h"
|
||||
#include "object.h"
|
||||
#include "functions.h"
|
||||
|
||||
typedef struct {
|
||||
/*0x00*/ Entity base;
|
||||
/*0x68*/ u8 unk_68[6];
|
||||
/*0x6e*/ u16 unk_6e;
|
||||
/*0x70*/ u8 unk_70[2];
|
||||
/*0x72*/ u16 unk_72;
|
||||
/*0x74*/ u16 unk_74;
|
||||
/*0x76*/ u16 unk_76;
|
||||
} Object61Entity;
|
||||
|
||||
typedef struct {
|
||||
/*0x00*/ Entity base;
|
||||
/*0x68*/ u8 unk_68[0x14];
|
||||
/*0x7c*/ u32 unk_7c;
|
||||
/*0x80*/ u8 unk_80[8];
|
||||
} PlayerEntity;
|
||||
|
||||
#define gNewPlayerEntity (*(PlayerEntity*)&gPlayerEntity)
|
||||
|
||||
void Object61_Init(Object61Entity*);
|
||||
void Object61_Action1(Object61Entity*);
|
||||
void Object61_Action1Type0(Object61Entity*);
|
||||
void Object61_Action1Type1(Object61Entity*);
|
||||
void sub_080936C8(Object61Entity*);
|
||||
|
||||
void Object61(Object61Entity* this) {
|
||||
static void (*const Object61_Actions[])(Object61Entity*) = {
|
||||
Object61_Init,
|
||||
Object61_Action1,
|
||||
};
|
||||
if ((gPlayerState.flags & PL_PARACHUTE) == 0) {
|
||||
if (super->type == 0) {
|
||||
gRoomControls.camera_target = &gPlayerEntity;
|
||||
}
|
||||
DeleteThisEntity();
|
||||
}
|
||||
Object61_Actions[super->action](this);
|
||||
}
|
||||
|
||||
void Object61_Init(Object61Entity* this) {
|
||||
super->action = 1;
|
||||
super->lastFrameIndex = 0xff;
|
||||
super->palette.b.b0 = gPlayerEntity.palette.b.b0;
|
||||
if (super->type == 0) {
|
||||
gRoomControls.camera_target = super;
|
||||
super->spriteRendering.b0 = 3;
|
||||
this->unk_6e = 0x180;
|
||||
this->unk_72 = 0x180;
|
||||
CreateObjectWithParent(super, OBJECT_61, 1, 0);
|
||||
}
|
||||
Object61_Action1(this);
|
||||
}
|
||||
|
||||
void Object61_Action1(Object61Entity* this) {
|
||||
static void (*const Object61_Action1Types[])(Object61Entity*) = {
|
||||
Object61_Action1Type0,
|
||||
Object61_Action1Type1,
|
||||
};
|
||||
Object61_Action1Types[super->type](this);
|
||||
}
|
||||
|
||||
void Object61_Action1Type0(Object61Entity* this) {
|
||||
u32 tmp;
|
||||
if ((s16)this->unk_6e < 0) {
|
||||
this->unk_6e = -this->unk_6e;
|
||||
}
|
||||
switch (gPlayerEntity.subAction) {
|
||||
case 1:
|
||||
this->unk_72 -= 4;
|
||||
break;
|
||||
case 2:
|
||||
if (super->field_0xf == 0) {
|
||||
if (this->unk_72 > 0x80) {
|
||||
this->unk_72 -= 0x20;
|
||||
} else {
|
||||
super->field_0xf += 1;
|
||||
SoundReq(SFX_124);
|
||||
}
|
||||
if (this->unk_6e < 0x120) {
|
||||
this->unk_6e += 0x40;
|
||||
}
|
||||
} else if (super->field_0xf != 0xff) {
|
||||
if (this->unk_72 < 0x100) {
|
||||
this->unk_72 += 0x20;
|
||||
} else {
|
||||
this->unk_72 = 0x100;
|
||||
}
|
||||
if (this->unk_6e > 0x100) {
|
||||
this->unk_6e -= 0x20;
|
||||
} else {
|
||||
this->unk_6e = 0x100;
|
||||
}
|
||||
if (this->unk_6e == 0x100) {
|
||||
super->field_0xf = 0xff;
|
||||
}
|
||||
} else {
|
||||
sub_080936C8(this);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
default:
|
||||
sub_080936C8(this);
|
||||
break;
|
||||
}
|
||||
tmp = gPlayerEntity.animationState & 2;
|
||||
if (tmp != 0) {
|
||||
super->frameIndex = 1;
|
||||
if (gPlayerEntity.animationState == 2) {
|
||||
this->unk_6e = -this->unk_6e;
|
||||
}
|
||||
} else {
|
||||
super->frameIndex = tmp;
|
||||
}
|
||||
if (super->frameIndex != super->lastFrameIndex) {
|
||||
super->lastFrameIndex = super->frameIndex;
|
||||
sub_080042D0(super, super->frameIndex, super->spriteIndex);
|
||||
}
|
||||
CopyPosition(&gPlayerEntity, super);
|
||||
|
||||
super->spriteOrientation.flipY = gPlayerEntity.spriteOrientation.flipY;
|
||||
super->spriteRendering.b3 = gPlayerEntity.spriteRendering.b3;
|
||||
sub_0806FCF4(super, this->unk_72, 10, 2);
|
||||
sub_0805EC9C(super, this->unk_6e, this->unk_72, 0);
|
||||
sub_0806FEBC(&gPlayerEntity, 1, super);
|
||||
}
|
||||
|
||||
void Object61_Action1Type1(Object61Entity* this) {
|
||||
super->frameIndex = ((gPlayerEntity.direction + (gPlayerEntity.direction >> 1)) >> 2) + 2;
|
||||
if (super->frameIndex != super->lastFrameIndex) {
|
||||
super->lastFrameIndex = super->frameIndex;
|
||||
sub_080042D0(super, super->frameIndex, super->spriteIndex);
|
||||
}
|
||||
CopyPosition(&gPlayerEntity, super);
|
||||
super->spriteOrientation.flipY = gPlayerEntity.spriteOrientation.flipY;
|
||||
super->spriteRendering.b3 = gPlayerEntity.spriteRendering.b3;
|
||||
sub_0806FCF4(super, ((Object61Entity*)super->parent)->unk_72, 0x18, 0);
|
||||
super->spriteOffsetY = -super->spriteOffsetY;
|
||||
sub_0806FEBC(&gPlayerEntity, 0, super);
|
||||
}
|
||||
|
||||
void sub_080936C8(Object61Entity* this) {
|
||||
s32 tmp = gNewPlayerEntity.unk_7c;
|
||||
this->unk_76 = 0x138 - (gNewPlayerEntity.unk_7c >> 2);
|
||||
this->unk_74 = 8 - (tmp / 0x3c);
|
||||
if (super->actionDelay == 0) {
|
||||
if (this->unk_76 < this->unk_6e) {
|
||||
this->unk_6e -= 8;
|
||||
this->unk_72 += 8;
|
||||
} else {
|
||||
super->actionDelay++;
|
||||
this->unk_6e = this->unk_76;
|
||||
this->unk_72 = this->unk_76 + 0x30;
|
||||
}
|
||||
} else {
|
||||
if (this->unk_76 + 0x30 > this->unk_6e) {
|
||||
this->unk_6e += 8;
|
||||
this->unk_72 -= 8;
|
||||
} else {
|
||||
super->actionDelay = 0;
|
||||
this->unk_6e = this->unk_76 + 0x30;
|
||||
this->unk_72 = this->unk_76;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue