falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

symbol StartCutscene

This commit is contained in:
theo3 2020-06-15 21:49:06 -07:00
parent d92be5f9cc
commit 80214ba9ee
17 changed files with 48 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/bird.s
View File

@ -879,7 +879,7 @@ _0809D5E6:
cmp r4, #0
beq _0809D62E
ldr r1, _0809D668 @ =gUnk_0800B0AC
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]

2
asm/businessScrubPrologue.s
View File

@ -144,7 +144,7 @@ sub_08045C3C: @ 0x08045C3C
bl sub_08095C48
ldr r1, _08045CA0 @ =gUnk_08015AC4
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r0, r4, #0
bl sub_0807DD50
pop {r4, pc}

2
asm/code_0804AEB0.s
View File

@ -115,7 +115,7 @@ _0804AF64:
strh r0, [r4, #0x32]
ldr r1, [r2, #0xc]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
cmp r0, #0
bne _0804AF88
adds r0, r4, #0

2
asm/code_080732D0.s
View File

@ -4253,7 +4253,7 @@ _08075252:
bl CopyPosition
adds r0, r4, #0
adds r1, r6, #0
bl sub_0807DAD0
bl StartCutscene
_08075270:
ldr r4, _08075298 @ =gLinkEntity
movs r1, #0xe

4
asm/code_0807CC3C.s
View File

@ -2014,8 +2014,8 @@ sub_0807DAC4: @ 0x0807DAC4
pop {pc}
.align 2, 0
thumb_func_start sub_0807DAD0
sub_0807DAD0: @ 0x0807DAD0
thumb_func_start StartCutscene
StartCutscene: @ 0x0807DAD0
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0

4
asm/ezloCap.s
View File

@ -436,7 +436,7 @@ sub_0806DB84: @ 0x0806DB84
bl PositionRelative
ldr r1, _0806DBEC @ =gUnk_08016030
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -456,7 +456,7 @@ _0806DBB6:
bl PositionRelative
ldr r1, _0806DBF0 @ =gUnk_0801606C
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]

2
asm/forestMinish.s
View File

@ -52,7 +52,7 @@ _0805FFF2:
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r0, r4, #0
bl sub_0807DD50
b _0806008C

2
asm/houseDoorExterior.s
View File

@ -116,7 +116,7 @@ _08086718:
cmp r1, #0
beq _080867A8
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]

2
asm/mazaalMacro.s
View File

@ -302,7 +302,7 @@ _08034E8A:
strb r0, [r4, #0xc]
ldr r1, _08034EB4 @ =gUnk_08012E20
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]

28
asm/object6A.s
View File

@ -99,7 +99,7 @@ sub_08094AE8: @ 0x08094AE8
cmp r4, #0
beq _08094B08
ldr r1, [r5, #4]
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -206,7 +206,7 @@ sub_08094B94: @ 0x08094B94
strh r0, [r4, #0x36]
ldr r1, _08094BDC @ =gUnk_0800AEDC
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -1075,7 +1075,7 @@ sub_08095244: @ 0x08095244
bl PositionRelative
ldr r1, _08095284 @ =gUnk_0801183C
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -1307,7 +1307,7 @@ sub_08095420: @ 0x08095420
bl PositionRelative
ldr r1, [r6, #4]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -1340,7 +1340,7 @@ sub_0809545C: @ 0x0809545C
bl PositionRelative
ldr r1, [r6, #4]
adds r0, r5, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r5, #0
adds r1, #0x84
str r0, [r1]
@ -1376,7 +1376,7 @@ sub_080954AC: @ 0x080954AC
bl CopyPosition
ldr r1, _080954D8 @ =gUnk_08015B14
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -1823,7 +1823,7 @@ sub_08095810: @ 0x08095810
bl sub_0806FAB0
ldr r1, _08095848 @ =gUnk_08011940
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -1986,7 +1986,7 @@ sub_08095954: @ 0x08095954
strh r0, [r4, #0x36]
ldr r1, _080959B4 @ =gUnk_08012C48
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -2083,7 +2083,7 @@ sub_08095A1C: @ 0x08095A1C
strb r0, [r1]
ldr r1, [r5, #4]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -2512,7 +2512,7 @@ sub_08095D54: @ 0x08095D54
strb r0, [r1]
ldr r1, [r5, #4]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -2538,7 +2538,7 @@ sub_08095D8C: @ 0x08095D8C
bl CopyPosition
ldr r1, [r6, #4]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -2658,7 +2658,7 @@ sub_08095E7C: @ 0x08095E7C
bl CopyPosition
ldr r1, [r6, #4]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -2975,7 +2975,7 @@ sub_080960C4: @ 0x080960C4
bl sub_0806FAD8
ldr r1, [r6, #4]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@ -3011,7 +3011,7 @@ _08096110:
strb r0, [r1]
ldr r1, [r6, #4]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]

2
asm/object89.s
View File

@ -87,7 +87,7 @@ _0809AB70:
strb r0, [r1]
ldr r1, _0809ABA0 @ =gUnk_08012DD8
adds r0, r5, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r5, #0
adds r1, #0x84
str r0, [r1]

2
asm/objectB9.s
View File

@ -481,7 +481,7 @@ _080A1582:
mov r0, r8
ldr r1, [r0, #4]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]

26
asm/rem.s
View File

@ -6,32 +6,6 @@
.text
thumb_func_start sub_0806A3D8
sub_0806A3D8: @ 0x0806A3D8
push {r4, lr}
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
movs r0, #0xb4
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #2
bl sub_0805E3A0
adds r0, r4, #0
bl sub_0806A8C8
ldr r1, _0806A40C @ =gUnk_08012F0C
adds r0, r4, #0
bl sub_0807DAD0
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
adds r0, r4, #0
movs r1, #0
bl sub_0807DD94
pop {r4, pc}
.align 2, 0
_0806A40C: .4byte gUnk_08012F0C
thumb_func_start sub_0806A410
sub_0806A410: @ 0x0806A410
push {lr}

2
asm/stockwell.s
View File

@ -56,7 +56,7 @@ sub_08065080: @ 0x08065080
bl sub_08078850
ldr r1, _080650C8 @ =gUnk_080142B0
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r4, #0x84
str r0, [r4]
pop {r4, pc}

2
include/functions.h
View File

@ -25,6 +25,7 @@ extern void LoadRoomEntityList();
void ModHealth(s32);
void PositionRelative(Entity*, Entity*, u32, u32);
void CopyPosition(Entity*, Entity*);
extern u32* StartCutscene(Entity*, u8*);
// Unidentified
extern void sub_0806ED78(Entity*);
@ -60,7 +61,6 @@ extern Entity* sub_0805EB00(u32, u32, u32);
extern Entity* sub_0805EB2C(u32, u32, u32, u32, u32);
extern u32 LoadExtraSpriteData(Entity*, u32*);
extern s32 sub_0806ED9C(Entity*, u32, u32);
extern s32* sub_0807DAD0(Entity*, u8*);
extern void sub_0806FF60(Entity*, u32, u32);
extern void sub_0806FF88(Entity*, u32, u32);
extern void sub_0807000C(Entity*);

18
src/rem.c
View File

@ -7,10 +7,15 @@ extern void sub_0807DDE4(Entity*);
extern void UpdateAnimationSingleFrame(Entity*);
extern void sub_0806ED78(Entity*);
extern void PlaySFX(u32);
extern void sub_0805E3A0(Entity*, u32);
extern void sub_0806A8C8(Entity*);
extern void sub_0807DD94(Entity*, u32);
extern void (*gUnk_08112260[])(Entity*);
extern void (*gUnk_08112278[])(Entity*);
extern void gUnk_08012F0C;
void sub_0806A358(Entity* this) {
gUnk_08112260[this->entityType.parameter1](this);
}
@ -34,4 +39,17 @@ void sub_0806a370(Entity* this) {
PlaySFX(0x219);
}
}
}
void sub_0806A3D8(Entity *this)
{
u32 *uVar1;
this->action = 1;
this->parameter3 = 0xb4;
sub_0805E3A0(this, 2);
sub_0806A8C8(this);
uVar1 = StartCutscene(this,&gUnk_08012F0C);
*(u32 *)&this->cutsceneBeh = (u32)uVar1;
sub_0807DD94(this, 0);
}

2
src/talon.c
View File

@ -108,7 +108,7 @@ void sub_080656D4(Entity* this) {
} else {
if (this->interactType != 0) {
if (GetInventoryValue(0x37) != 0) { // keyLonLon
sub_0807DAD0(this, &gUnk_0800B41C);
StartCutscene(this, &gUnk_0800B41C);
goto label2;
} else {
this->field_0x69 = this->action;