mirror of https://github.com/zeldaret/tmc.git
Merge pull request #377 from hatal175/mountainminish
Decompile the rest of mountainMinish
This commit is contained in:
notyourav
GitHub
commit
8a2a8f6207
|
|
@ -1,67 +0,0 @@
|
|||
.syntax unified
|
||||
push {r4, r5, lr}
|
||||
adds r5, r0, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r4, [r0]
|
||||
movs r0, #0x81
|
||||
rsbs r0, r0, #0
|
||||
ands r4, r0
|
||||
ldrb r2, [r5, #0x1e]
|
||||
adds r0, r5, #0
|
||||
movs r1, #1
|
||||
bl SetExtraSpriteFrame
|
||||
movs r0, #0x40
|
||||
ands r0, r4
|
||||
cmp r0, #0
|
||||
beq _08068226
|
||||
movs r0, #0xe1
|
||||
rsbs r0, r0, #0
|
||||
ands r4, r0
|
||||
adds r2, r4, #4
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
bl SetExtraSpriteFrame
|
||||
adds r0, r5, #0
|
||||
movs r1, #2
|
||||
movs r2, #0xff
|
||||
bl SetExtraSpriteFrame
|
||||
adds r0, r5, #0
|
||||
movs r1, #1
|
||||
movs r2, #0
|
||||
bl SetSpriteSubEntryOffsetData1
|
||||
b _08068268
|
||||
_08068226:
|
||||
movs r0, #0x20
|
||||
ands r0, r4
|
||||
cmp r0, #0
|
||||
beq _08068254
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
movs r2, #0xff
|
||||
bl SetExtraSpriteFrame
|
||||
movs r0, #0xe1
|
||||
rsbs r0, r0, #0
|
||||
ands r4, r0
|
||||
adds r0, r5, #0
|
||||
movs r1, #2
|
||||
adds r2, r4, #0
|
||||
bl SetExtraSpriteFrame
|
||||
adds r0, r5, #0
|
||||
movs r1, #1
|
||||
movs r2, #2
|
||||
bl SetSpriteSubEntryOffsetData1
|
||||
b _08068268
|
||||
_08068254:
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
movs r2, #0xff
|
||||
bl SetExtraSpriteFrame
|
||||
adds r0, r5, #0
|
||||
movs r1, #2
|
||||
movs r2, #0xff
|
||||
bl SetExtraSpriteFrame
|
||||
_08068268:
|
||||
adds r0, r5, #0
|
||||
bl sub_0807000C
|
||||
pop {r4, r5, pc}
|
||||
.syntax divided
|
||||
|
|
@ -1,249 +0,0 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r5, r0, #0
|
||||
ldrb r4, [r5, #0xc]
|
||||
cmp r4, #1
|
||||
beq _08067F58
|
||||
cmp r4, #1
|
||||
bgt _08067F04
|
||||
cmp r4, #0
|
||||
beq _08067F10
|
||||
b _0806801A
|
||||
_08067F04:
|
||||
cmp r4, #2
|
||||
beq _08067FDC
|
||||
cmp r4, #3
|
||||
bne _08067F0E
|
||||
b _08068000
|
||||
_08067F0E:
|
||||
b _0806801A
|
||||
_08067F10:
|
||||
ldr r1, _08067F50 @ =gUnk_08111358
|
||||
adds r0, r5, #0
|
||||
bl LoadExtraSpriteData
|
||||
cmp r0, #0
|
||||
bne _08067F1E
|
||||
b _080680F0
|
||||
_08067F1E:
|
||||
movs r2, #1
|
||||
movs r0, #1
|
||||
strb r0, [r5, #0xc]
|
||||
ldrb r1, [r5, #0x18]
|
||||
subs r0, #5
|
||||
ands r0, r1
|
||||
orrs r0, r2
|
||||
strb r0, [r5, #0x18]
|
||||
ldrb r0, [r5, #0xa]
|
||||
strb r0, [r5, #0x14]
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x69
|
||||
strb r4, [r0]
|
||||
adds r0, r5, #0
|
||||
movs r1, #2
|
||||
bl SetDefaultPriority
|
||||
adds r0, r5, #0
|
||||
bl sub_0807DD50
|
||||
ldr r1, _08067F54 @ =gUnk_08111304
|
||||
ldrb r0, [r5, #0xb]
|
||||
adds r0, r0, r1
|
||||
ldrb r1, [r0]
|
||||
b _08067FF2
|
||||
.align 2, 0
|
||||
_08067F50: .4byte gUnk_08111358
|
||||
_08067F54: .4byte gUnk_08111304
|
||||
_08067F58:
|
||||
adds r4, r5, #0
|
||||
adds r4, #0x39
|
||||
movs r0, #0
|
||||
ldrsb r0, [r4, r0]
|
||||
cmp r0, #2
|
||||
bne _08067F98
|
||||
movs r1, #0
|
||||
movs r0, #3
|
||||
strb r0, [r5, #0xc]
|
||||
strb r1, [r4]
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x58
|
||||
ldrb r0, [r0]
|
||||
adds r1, r5, #0
|
||||
adds r1, #0x69
|
||||
strb r0, [r1]
|
||||
ldr r1, _08067F94 @ =gPlayerEntity
|
||||
adds r0, r5, #0
|
||||
bl GetFacingDirection
|
||||
bl sub_0806F5A4
|
||||
adds r1, r0, #0
|
||||
adds r0, r5, #0
|
||||
bl InitializeAnimation
|
||||
adds r0, r5, #0
|
||||
bl sub_0806F118
|
||||
b _0806801A
|
||||
.align 2, 0
|
||||
_08067F94: .4byte gPlayerEntity
|
||||
_08067F98:
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
bl ExecuteScriptForEntity
|
||||
adds r0, r5, #0
|
||||
bl HandleEntity0x82Actions
|
||||
ldrb r0, [r5, #0xb]
|
||||
cmp r0, #3
|
||||
bne _0806801A
|
||||
movs r0, #0
|
||||
ldrsb r0, [r4, r0]
|
||||
cmp r0, #0
|
||||
beq _0806801A
|
||||
movs r1, #0
|
||||
movs r0, #2
|
||||
strb r0, [r5, #0xc]
|
||||
strb r1, [r4]
|
||||
ldr r1, _08067FD8 @ =gPlayerEntity
|
||||
adds r0, r5, #0
|
||||
bl GetFacingDirection
|
||||
bl sub_0806F5A4
|
||||
adds r1, r0, #0
|
||||
adds r0, r5, #0
|
||||
bl InitializeAnimation
|
||||
adds r0, r5, #0
|
||||
bl sub_08068190
|
||||
b _0806801A
|
||||
.align 2, 0
|
||||
_08067FD8: .4byte gPlayerEntity
|
||||
_08067FDC:
|
||||
ldr r0, _08067FFC @ =gMessage
|
||||
ldrb r1, [r0]
|
||||
movs r0, #0x7f
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _0806801A
|
||||
movs r0, #1
|
||||
strb r0, [r5, #0xc]
|
||||
ldrb r1, [r5, #0x14]
|
||||
lsrs r1, r1, #1
|
||||
adds r1, #4
|
||||
_08067FF2:
|
||||
adds r0, r5, #0
|
||||
bl InitializeAnimation
|
||||
b _0806801A
|
||||
.align 2, 0
|
||||
_08067FFC: .4byte gMessage
|
||||
_08068000:
|
||||
adds r0, r5, #0
|
||||
bl UpdateFuseInteraction
|
||||
cmp r0, #0
|
||||
beq _0806801A
|
||||
movs r0, #1
|
||||
strb r0, [r5, #0xc]
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x69
|
||||
ldrb r1, [r0]
|
||||
adds r0, r5, #0
|
||||
bl InitializeAnimation
|
||||
_0806801A:
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x59
|
||||
ldrb r1, [r0]
|
||||
adds r7, r0, #0
|
||||
cmp r1, #0xff
|
||||
beq _0806802C
|
||||
adds r0, r5, #0
|
||||
bl GetNextFrame
|
||||
_0806802C:
|
||||
adds r1, r5, #0
|
||||
adds r1, #0x5b
|
||||
ldrb r2, [r1]
|
||||
movs r0, #1
|
||||
ands r0, r2
|
||||
adds r6, r1, #0
|
||||
cmp r0, #0
|
||||
beq _0806807E
|
||||
movs r0, #0xfe
|
||||
ands r0, r2
|
||||
strb r0, [r6]
|
||||
adds r0, r5, #0
|
||||
bl CheckOnScreen
|
||||
cmp r0, #0
|
||||
bne _08068068
|
||||
ldr r4, _08068064 @ =gUnk_0811137A
|
||||
bl Random
|
||||
movs r1, #3
|
||||
bl __modsi3
|
||||
lsls r0, r0, #1
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
bl SoundReq
|
||||
b _0806807E
|
||||
.align 2, 0
|
||||
_08068064: .4byte gUnk_0811137A
|
||||
_08068068:
|
||||
ldr r4, _080680F4 @ =gUnk_08111374
|
||||
bl Random
|
||||
movs r1, #3
|
||||
bl __modsi3
|
||||
lsls r0, r0, #1
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
bl EnqueueSFX
|
||||
_0806807E:
|
||||
ldrb r1, [r6]
|
||||
movs r0, #2
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080680A8
|
||||
movs r0, #0xfd
|
||||
ands r0, r1
|
||||
strb r0, [r6]
|
||||
adds r0, r5, #0
|
||||
movs r1, #4
|
||||
movs r2, #0
|
||||
bl CreateFx
|
||||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _080680A8
|
||||
ldr r3, _080680F8 @ =0xFFE80000
|
||||
adds r0, r5, #0
|
||||
movs r2, #0
|
||||
bl PositionRelative
|
||||
_080680A8:
|
||||
ldrb r1, [r6]
|
||||
movs r0, #4
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080680D2
|
||||
movs r0, #0xfb
|
||||
ands r0, r1
|
||||
strb r0, [r6]
|
||||
adds r0, r5, #0
|
||||
movs r1, #0x3d
|
||||
movs r2, #0x20
|
||||
bl CreateFx
|
||||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _080680D2
|
||||
ldr r2, _080680FC @ =0xFFEC0000
|
||||
ldr r3, _08068100 @ =0xFFF60000
|
||||
adds r0, r5, #0
|
||||
bl PositionRelative
|
||||
_080680D2:
|
||||
ldrb r1, [r6]
|
||||
movs r0, #8
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080680F0
|
||||
movs r0, #0xf7
|
||||
ands r0, r1
|
||||
strb r0, [r6]
|
||||
bl Random
|
||||
movs r1, #0x1f
|
||||
ands r0, r1
|
||||
ldrb r1, [r7]
|
||||
adds r0, r0, r1
|
||||
strb r0, [r7]
|
||||
_080680F0:
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_080680F4: .4byte gUnk_08111374
|
||||
_080680F8: .4byte 0xFFE80000
|
||||
_080680FC: .4byte 0xFFEC0000
|
||||
_08068100: .4byte 0xFFF60000
|
||||
.syntax divided
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xe]
|
||||
adds r7, r0, #0
|
||||
cmp r7, #0
|
||||
beq _0806812E
|
||||
subs r0, #1
|
||||
strb r0, [r4, #0xe]
|
||||
b _0806818A
|
||||
_0806812E:
|
||||
movs r0, #2
|
||||
strb r0, [r4, #0xe]
|
||||
adds r0, r4, #0
|
||||
movs r1, #0x20
|
||||
movs r2, #0x20
|
||||
bl sub_0806EDD8
|
||||
adds r3, r0, #0
|
||||
cmp r3, #0
|
||||
bge _08068148
|
||||
ldrb r0, [r4, #0xa]
|
||||
strb r0, [r4, #0x14]
|
||||
lsls r3, r0, #2
|
||||
_08068148:
|
||||
ldrb r0, [r4, #0x14]
|
||||
lsrs r0, r0, #1
|
||||
lsls r0, r0, #5
|
||||
asrs r1, r3, #1
|
||||
lsls r1, r1, #1
|
||||
ldr r2, _0806818C @ =gUnk_08111284
|
||||
adds r1, r1, r2
|
||||
adds r0, r0, r1
|
||||
ldrb r6, [r0]
|
||||
ldrb r5, [r0, #1]
|
||||
movs r0, #0x80
|
||||
ands r0, r5
|
||||
cmp r0, #0
|
||||
beq _0806816C
|
||||
adds r0, r3, #0
|
||||
bl sub_0806F5B0
|
||||
strb r0, [r4, #0x14]
|
||||
_0806816C:
|
||||
movs r0, #0x40
|
||||
orrs r6, r0
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x5a
|
||||
strb r6, [r0]
|
||||
movs r0, #0x7f
|
||||
ands r5, r0
|
||||
strb r5, [r4, #0x1e]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x58
|
||||
strb r7, [r0]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x59
|
||||
movs r0, #0xff
|
||||
strb r0, [r1]
|
||||
_0806818A:
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_0806818C: .4byte gUnk_08111284
|
||||
.syntax divided
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, lr}
|
||||
adds r6, r0, #0
|
||||
ldrb r5, [r6, #0xb]
|
||||
cmp r5, #8
|
||||
bls _0806819C
|
||||
movs r5, #8
|
||||
_0806819C:
|
||||
movs r0, #0x7e
|
||||
bl CheckLocalFlag
|
||||
rsbs r1, r0, #0
|
||||
orrs r1, r0
|
||||
lsrs r4, r1, #0x1f
|
||||
movs r0, #0x41
|
||||
bl GetInventoryValue
|
||||
cmp r0, #0
|
||||
beq _080681B4
|
||||
movs r4, #2
|
||||
_080681B4:
|
||||
movs r0, #2
|
||||
bl GetInventoryValue
|
||||
cmp r0, #0
|
||||
beq _080681C0
|
||||
movs r4, #3
|
||||
_080681C0:
|
||||
ldr r2, _080681D4 @ =gUnk_0811130E
|
||||
lsls r0, r4, #1
|
||||
lsls r1, r5, #3
|
||||
adds r0, r0, r1
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
adds r1, r6, #0
|
||||
bl MessageNoOverlap
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
_080681D4: .4byte gUnk_0811130E
|
||||
.syntax divided
|
||||
|
|
@ -38116,36 +38116,6 @@
|
|||
"size": 5,
|
||||
"type": "animation"
|
||||
},
|
||||
{
|
||||
"path": "mountainMinish/gUnk_08111284.bin",
|
||||
"start": 1118852,
|
||||
"size": 128
|
||||
},
|
||||
{
|
||||
"path": "mountainMinish/gUnk_08111304.bin",
|
||||
"start": 1118980,
|
||||
"size": 10
|
||||
},
|
||||
{
|
||||
"path": "mountainMinish/gUnk_0811130E.bin",
|
||||
"start": 1118990,
|
||||
"size": 74
|
||||
},
|
||||
{
|
||||
"path": "mountainMinish/gUnk_08111358.bin",
|
||||
"start": 1119064,
|
||||
"size": 16
|
||||
},
|
||||
{
|
||||
"path": "mountainMinish/gUnk_08111374.bin",
|
||||
"start": 1119092,
|
||||
"size": 6
|
||||
},
|
||||
{
|
||||
"path": "mountainMinish/gUnk_0811137A.bin",
|
||||
"start": 1119098,
|
||||
"size": 6
|
||||
},
|
||||
{
|
||||
"path": "animations/gSpriteAnimations_Melari_1.bin",
|
||||
"start": 1119556,
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_08111284:: @ 08111284
|
||||
.incbin "mountainMinish/gUnk_08111284.bin"
|
||||
|
||||
gUnk_08111304:: @ 08111304
|
||||
.incbin "mountainMinish/gUnk_08111304.bin"
|
||||
|
||||
gUnk_0811130E:: @ 0811130E
|
||||
.incbin "mountainMinish/gUnk_0811130E.bin"
|
||||
|
||||
gUnk_08111358:: @ 08111358
|
||||
.incbin "mountainMinish/gUnk_08111358.bin"
|
||||
|
||||
gUnk_08111368:: @ 08111368
|
||||
.4byte sub_08067E60
|
||||
.4byte sub_08067E88
|
||||
.4byte sub_08067EE8
|
||||
|
||||
gUnk_08111374:: @ 08111374
|
||||
.incbin "mountainMinish/gUnk_08111374.bin"
|
||||
|
||||
gUnk_0811137A:: @ 0811137A
|
||||
.incbin "mountainMinish/gUnk_0811137A.bin"
|
||||
|
|
@ -256,7 +256,7 @@ void InitAnimationForceUpdate(Entity*, u32);
|
|||
void UpdateAnimationSingleFrame(Entity*);
|
||||
void UpdateSpriteForCollisionLayer(Entity*);
|
||||
void GetNextFrame(Entity*);
|
||||
u32 LoadExtraSpriteData(Entity*, SpriteLoadData*);
|
||||
u32 LoadExtraSpriteData(Entity*, const SpriteLoadData*);
|
||||
void SetExtraSpriteFrame(Entity*, u32, u32);
|
||||
void SetSpriteSubEntryOffsetData1(Entity*, u32, u32);
|
||||
void SetSpriteSubEntryOffsetData2(Entity*, u32, u32);
|
||||
|
|
|
|||
|
|
@ -1262,7 +1262,7 @@ SECTIONS {
|
|||
data/animations/npc/castorWildsStatue.o(.rodata);
|
||||
data/const/npc/cat.o(.rodata);
|
||||
data/animations/npc/cat.o(.rodata);
|
||||
data/const/npc/mountainMinish.o(.rodata);
|
||||
src/npc/mountainMinish.o(.rodata);
|
||||
data/animations/npc/mountainMinish.o(.rodata);
|
||||
data/const/npc/melari.o(.rodata);
|
||||
data/animations/npc/melari.o(.rodata);
|
||||
|
|
|
|||
|
|
@ -541,8 +541,8 @@ bool32 sub_0806FDA0(Entity* this) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
u32 LoadExtraSpriteData(Entity* ent, SpriteLoadData* data) {
|
||||
SpriteLoadData* ptr;
|
||||
u32 LoadExtraSpriteData(Entity* ent, const SpriteLoadData* data) {
|
||||
const SpriteLoadData* ptr;
|
||||
u32 index;
|
||||
struct_gUnk_020000C0_1* ptr2;
|
||||
if (sub_0806FDA0(ent) == 0)
|
||||
|
|
|
|||
|
|
@ -5,16 +5,48 @@
|
|||
#include "flags.h"
|
||||
#include "npc.h"
|
||||
|
||||
extern SpriteLoadData gUnk_08111358;
|
||||
const u8 gUnk_08111284[][0x20] = {
|
||||
{ 0x8, 0x1, 0x9, 0x1, 0xa, 0x1, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x83, 0xf, 0x80,
|
||||
0, 0x80, 0x1, 0x80, 0x2, 0x82, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x1, 0x7, 0x1 },
|
||||
{ 0x8, 0x81, 0x9, 0x81, 0xa, 0x3, 0xb, 0x3, 0xc, 0x3, 0xd, 0x3, 0xe, 0x3, 0xf, 0x80,
|
||||
0, 0x80, 0x1, 0x80, 0x2, 0x80, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x81, 0x7, 0x81 },
|
||||
{ 0x8, 0x81, 0x9, 0x81, 0xa, 0x83, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x0, 0xf, 0x0,
|
||||
0, 0x0, 0x1, 0x0, 0x2, 0x0, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x82, 0x7, 0x81 },
|
||||
{ 0x8, 0x81, 0x9, 0x81, 0xa, 0x81, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x80, 0xf, 0x80,
|
||||
0, 0x80, 0x1, 0x80, 0x2, 0x2, 0x3, 0x2, 0x4, 0x2, 0x5, 0x2, 0x6, 0x2, 0x7, 0x81 },
|
||||
};
|
||||
|
||||
const u8 gUnk_08111304[] = {
|
||||
10, 10, 3, 1, 0, 0, 0, 0, 0, 0,
|
||||
};
|
||||
|
||||
const u16 gUnk_0811130E[][4] = {
|
||||
{ 0x120b, 0x120b, 0x120b, 0x120b }, { 0x120c, 0x120c, 0x120c, 0x120c }, { 0x120d, 0x120e, 0x120e, 0x121f },
|
||||
{ 0x120f, 0x120f, 0x120f, 0x120f }, { 0x1210, 0x1211, 0x1216, 0x1225 }, { 0x1212, 0x1212, 0x1217, 0x1217 },
|
||||
{ 0x1213, 0x1213, 0x1217, 0x1217 }, { 0x122b, 0x122b, 0x122b, 0x122b }, { 0x1231, 0x1231, 0x1231, 0x1231 },
|
||||
};
|
||||
|
||||
const SpriteLoadData gUnk_08111358[] = {
|
||||
{ 0xb4, 0x1b, 0x4 },
|
||||
{ 0x30b4, 0x1b, 0x4 },
|
||||
{ 0x60b4, 0x1c, 0x4 },
|
||||
{ 0x0, 0x0, 0x0 },
|
||||
};
|
||||
|
||||
extern void (*const gUnk_08111368[])(Entity*);
|
||||
void sub_08067EF0(Entity*);
|
||||
|
||||
extern u16 gUnk_0811130E[];
|
||||
void sub_08068190(Entity*);
|
||||
void sub_08067E60(Entity*);
|
||||
void sub_08067E88(Entity*);
|
||||
void sub_08067EE8(Entity*);
|
||||
|
||||
void MountainMinish(Entity* this) {
|
||||
static void (*const MountainMinish_Actions[])(Entity*) = {
|
||||
sub_08067E60,
|
||||
sub_08067E88,
|
||||
sub_08067EE8,
|
||||
};
|
||||
if ((this->flags & ENT_SCRIPTED) == 0) {
|
||||
gUnk_08111368[this->action](this);
|
||||
MountainMinish_Actions[this->action](this);
|
||||
sub_0806ED78(this);
|
||||
} else {
|
||||
sub_08067EF0(this);
|
||||
|
|
@ -22,7 +54,7 @@ void MountainMinish(Entity* this) {
|
|||
}
|
||||
|
||||
void sub_08067E60(Entity* this) {
|
||||
if (LoadExtraSpriteData(this, &gUnk_08111358) != 0) {
|
||||
if (LoadExtraSpriteData(this, gUnk_08111358) != 0) {
|
||||
this->action = 1;
|
||||
sub_08078778(this);
|
||||
InitializeAnimation(this, 2);
|
||||
|
|
@ -57,16 +89,131 @@ void sub_08067EE8(Entity* this) {
|
|||
this->action = 1;
|
||||
}
|
||||
|
||||
ASM_FUNC("asm/non_matching/mountainMinish/sub_08067EF0.inc", void sub_08067EF0(Entity* this))
|
||||
void sub_08067EF0(Entity* this) {
|
||||
static const u16 gUnk_08111374[] = {
|
||||
SFX_HAMMER1,
|
||||
SFX_HAMMER2,
|
||||
SFX_HAMMER3,
|
||||
};
|
||||
|
||||
static const u16 gUnk_0811137A[] = {
|
||||
SFX_HAMMER4,
|
||||
SFX_HAMMER5,
|
||||
SFX_HAMMER6,
|
||||
};
|
||||
Entity* fxEnt;
|
||||
|
||||
switch (this->action) {
|
||||
case 0:
|
||||
if (LoadExtraSpriteData(this, gUnk_08111358) == 0) {
|
||||
return;
|
||||
}
|
||||
this->action = 1;
|
||||
this->spriteSettings.draw = 1;
|
||||
this->animationState = this->type;
|
||||
this->field_0x68.HALF.HI = 0;
|
||||
SetDefaultPriority(this, 2);
|
||||
sub_0807DD50(this);
|
||||
InitializeAnimation(this, gUnk_08111304[this->type2]);
|
||||
break;
|
||||
case 1:
|
||||
if (this->interactType == 2) {
|
||||
this->action = 3;
|
||||
this->interactType = 0;
|
||||
this->field_0x68.HALF.HI = this->animIndex;
|
||||
InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)));
|
||||
sub_0806F118(this);
|
||||
} else {
|
||||
ExecuteScriptForEntity(this, 0);
|
||||
HandleEntity0x82Actions(this);
|
||||
if ((this->type2 == 3) && (this->interactType != 0)) {
|
||||
this->action = 2;
|
||||
this->interactType = 0;
|
||||
InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)));
|
||||
sub_08068190(this);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if ((gMessage.doTextBox & 0x7f) != 0)
|
||||
break;
|
||||
this->action = 1;
|
||||
InitializeAnimation(this, (this->animationState >> 1) + 4);
|
||||
break;
|
||||
case 3:
|
||||
if (UpdateFuseInteraction(this) != 0) {
|
||||
this->action = 1;
|
||||
InitializeAnimation(this, this->field_0x68.HALF.HI);
|
||||
}
|
||||
}
|
||||
|
||||
if (this->frameDuration != 0xff) {
|
||||
GetNextFrame(this);
|
||||
}
|
||||
if ((this->frameSpriteSettings & 1) != 0) {
|
||||
this->frameSpriteSettings &= 0xfe;
|
||||
if (CheckOnScreen(this) == 0) {
|
||||
SoundReq(gUnk_0811137A[((s32)Random()) % 3]);
|
||||
} else {
|
||||
EnqueueSFX(gUnk_08111374[((s32)Random()) % 3]);
|
||||
}
|
||||
}
|
||||
if ((this->frameSpriteSettings & 2) != 0) {
|
||||
this->frameSpriteSettings &= 0xfd;
|
||||
fxEnt = CreateFx(this, FX_ROCK, 0);
|
||||
if (fxEnt != NULL) {
|
||||
PositionRelative(this, fxEnt, 0, 0xffe80000);
|
||||
}
|
||||
}
|
||||
if ((this->frameSpriteSettings & 4) != 0) {
|
||||
this->frameSpriteSettings &= 0xfb;
|
||||
fxEnt = CreateFx(this, FX_STARS2, 0x20);
|
||||
if (fxEnt != NULL) {
|
||||
PositionRelative(this, fxEnt, 0xffec0000, 0xfff60000);
|
||||
}
|
||||
}
|
||||
if ((this->frameSpriteSettings & 8) != 0) {
|
||||
this->frameSpriteSettings &= 0xf7;
|
||||
this->frameDuration += Random() & 0x1f;
|
||||
}
|
||||
}
|
||||
|
||||
void sub_08068104(Entity* this) {
|
||||
this->field_0x68.HALF.LO = sub_0801E99C(this);
|
||||
sub_08078784(this, this->field_0x68.HALF.LO);
|
||||
}
|
||||
|
||||
ASM_FUNC("asm/non_matching/mountainMinish/sub_0806811C.inc", void sub_0806811C(Entity* this))
|
||||
void sub_0806811C(Entity* this) {
|
||||
u32 bVar1;
|
||||
u32 bVar2;
|
||||
int type;
|
||||
int iVar4;
|
||||
const u8* ptr;
|
||||
|
||||
NONMATCH("asm/non_matching/mountainMinish/sub_08068190.inc", void sub_08068190(Entity* this)) {
|
||||
if (this->actionDelay) {
|
||||
this->actionDelay--;
|
||||
} else {
|
||||
this->actionDelay = 2;
|
||||
iVar4 = sub_0806EDD8(this, 0x20, 0x20);
|
||||
if (iVar4 < 0) {
|
||||
type = this->type;
|
||||
this->animationState = type;
|
||||
iVar4 = type << 2;
|
||||
}
|
||||
ptr = &gUnk_08111284[(this->animationState >> 1)][(iVar4 >> 1) * 2];
|
||||
bVar1 = ptr[0];
|
||||
bVar2 = ptr[1];
|
||||
if ((bVar2 & 0x80) != 0) {
|
||||
this->animationState = sub_0806F5B0(iVar4);
|
||||
}
|
||||
this->frame = bVar1 | 0x40;
|
||||
this->frameIndex = bVar2 & 0x7f;
|
||||
this->animIndex = 0;
|
||||
this->frameDuration = 0xff;
|
||||
}
|
||||
}
|
||||
|
||||
void sub_08068190(Entity* this) {
|
||||
u32 uVar2;
|
||||
u32 uVar3;
|
||||
|
||||
|
|
@ -86,20 +233,38 @@ NONMATCH("asm/non_matching/mountainMinish/sub_08068190.inc", void sub_08068190(E
|
|||
uVar2 = 3;
|
||||
}
|
||||
|
||||
// TODO unable to devide the array access variables by two without breaking everything
|
||||
MessageNoOverlap(gUnk_0811130E[uVar2 * 2 + uVar3 * 8], this);
|
||||
MessageNoOverlap(gUnk_0811130E[uVar3][uVar2], this);
|
||||
}
|
||||
END_NONMATCH
|
||||
|
||||
void sub_080681D8(Entity* this, ScriptExecutionContext* context) {
|
||||
this->type = context->intVariable;
|
||||
}
|
||||
|
||||
ASM_FUNC("asm/non_matching/mountainMinish/MountainMinish_Head.inc", void MountainMinish_Head(Entity* this))
|
||||
void MountainMinish_Head(Entity* this) {
|
||||
u32 bVar1;
|
||||
|
||||
bVar1 = this->frame & -0x81;
|
||||
SetExtraSpriteFrame(this, 1, this->frameIndex);
|
||||
if ((bVar1 & 0x40)) {
|
||||
SetExtraSpriteFrame(this, 0, (bVar1 & -0xe1) + 4);
|
||||
SetExtraSpriteFrame(this, 2, 0xff);
|
||||
SetSpriteSubEntryOffsetData1(this, 1, 0);
|
||||
} else {
|
||||
if ((bVar1 & 0x20)) {
|
||||
SetExtraSpriteFrame(this, 0, 0xff);
|
||||
SetExtraSpriteFrame(this, 2, bVar1 & -0xe1);
|
||||
SetSpriteSubEntryOffsetData1(this, 1, 2);
|
||||
} else {
|
||||
SetExtraSpriteFrame(this, 0, 0xff);
|
||||
SetExtraSpriteFrame(this, 2, 0xff);
|
||||
}
|
||||
}
|
||||
sub_0807000C(this);
|
||||
}
|
||||
|
||||
void MountainMinish_Fusion(Entity* this) {
|
||||
if (this->action == 0) {
|
||||
if (LoadExtraSpriteData(this, &gUnk_08111358) != 0) {
|
||||
if (LoadExtraSpriteData(this, gUnk_08111358) != 0) {
|
||||
this->action += 1;
|
||||
this->spriteSettings.draw = 1;
|
||||
InitializeAnimation(this, 6);
|
||||
|
|
|
|||
Loading…
Reference in New Issue