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

Merge pull request #438 from octorock/octorokBoss 

Use new entity struct for octorok boss
This commit is contained in:
notyourav 2022-03-08 17:36:36 -08:00 committed by GitHub
parent 00524c0385 38b21f63fe
commit a0548a8921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 1727 additions and 3289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

267
asm/non_matching/frozenOctorok/FrozenOctorok_Action1.inc Normal file
View File

@ -0,0 +1,267 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
ldrb r0, [r5, #0xa]
cmp r0, #7
bls _0809C5D0
b _0809C7DE
_0809C5D0:
lsls r0, r0, #2
ldr r1, _0809C5DC @ =_0809C5E0
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0809C5DC: .4byte _0809C5E0
_0809C5E0: @ jump table
.4byte _0809C738 @ case 0
.4byte _0809C600 @ case 1
.4byte _0809C600 @ case 2
.4byte _0809C600 @ case 3
.4byte _0809C600 @ case 4
.4byte _0809C6B8 @ case 5
.4byte _0809C7B4 @ case 6
.4byte _0809C7D2 @ case 7
_0809C600:
ldr r0, [r5, #0x50]
adds r1, r5, #0
bl SortEntityBelow
ldr r0, [r5, #0x50]
ldrb r0, [r0, #0xd]
adds r6, r5, #0
adds r6, #0x84
cmp r0, #6
bne _0809C630
movs r0, #0xf
ldrsb r0, [r5, r0]
cmp r0, #0
bge _0809C624
ldr r0, [r6]
ldrb r0, [r0]
rsbs r0, r0, #0
b _0809C628
_0809C624:
ldr r0, [r6]
ldrb r0, [r0]
_0809C628:
strb r0, [r5, #0xf]
adds r0, r5, #0
bl sub_0809CBE4
_0809C630:
ldr r4, [r5, #0x50]
adds r0, r4, #0
adds r0, #0x76
ldrh r1, [r0]
movs r0, #0x80
lsls r0, r0, #9
bl __divsi3
adds r3, r0, #0
lsls r0, r3, #0xd
lsrs r3, r0, #8
ldr r0, _0809C660 @ =0xFFFFE000
adds r3, r3, r0
ldr r0, [r6]
ldr r0, [r0, #8]
adds r0, #0x45
ldrb r0, [r0]
cmp r0, #1
bne _0809C664
movs r1, #0x88
lsls r1, r1, #6
adds r3, r3, r1
b _0809C66C
.align 2, 0
_0809C660: .4byte 0xFFFFE000
_0809C664:
lsrs r0, r3, #1
movs r1, #0x88
lsls r1, r1, #6
adds r3, r0, r1
_0809C66C:
adds r2, r4, #0
adds r2, #0x7b
ldr r1, _0809C6B0 @ =gUnk_08123E18
ldrb r0, [r5, #0xa]
subs r0, #1
adds r0, r0, r1
ldrb r0, [r0]
ldrb r2, [r2]
adds r0, r0, r2
rsbs r0, r0, #0
lsls r0, r0, #0x18
lsrs r1, r0, #0x18
adds r0, r5, #0
adds r2, r3, #0
bl sub_0809CB70
ldr r2, [r5, #0x50]
adds r2, #0x7b
ldr r1, _0809C6B4 @ =gUnk_08123E1C
ldrb r0, [r5, #0xa]
subs r0, #1
adds r0, r0, r1
ldrb r1, [r0]
ldrb r2, [r2]
adds r1, r1, r2
adds r0, r5, #0
adds r0, #0x79
ldrb r0, [r0]
adds r0, r0, r1
adds r1, r5, #0
adds r1, #0x7b
strb r0, [r1]
b _0809C7BC
.align 2, 0
_0809C6B0: .4byte gUnk_08123E18
_0809C6B4: .4byte gUnk_08123E1C
_0809C6B8:
ldr r0, [r5, #0x50]
adds r1, r5, #0
bl SortEntityBelow
ldr r0, [r5, #0x50]
ldrb r0, [r0, #0xd]
adds r6, r5, #0
adds r6, #0x79
adds r7, r5, #0
adds r7, #0x76
cmp r0, #4
beq _0809C6F6
adds r0, r5, #0
adds r0, #0x45
ldrb r0, [r0]
cmp r0, #1
beq _0809C6F6
ldrb r0, [r6]
cmp r0, #0x1c
bls _0809C6E4
subs r0, #1
strb r0, [r6]
_0809C6E4:
ldrh r0, [r7]
movs r1, #0x80
lsls r1, r1, #1
cmp r0, r1
bls _0809C6F4
subs r0, #1
strh r0, [r7]
b _0809C6F6
_0809C6F4:
strh r1, [r7]
_0809C6F6:
ldr r4, [r5, #0x50]
adds r0, r4, #0
adds r0, #0x74
ldrh r1, [r0]
movs r0, #0x80
lsls r0, r0, #9
bl __divsi3
adds r3, r0, #0
ldrb r0, [r6]
lsls r0, r0, #8
muls r0, r3, r0
lsrs r3, r0, #8
adds r4, #0x7b
ldrb r0, [r4]
adds r0, #0x80
rsbs r0, r0, #0
lsls r0, r0, #0x18
lsrs r1, r0, #0x18
adds r0, r5, #0
adds r2, r3, #0
bl sub_0809CB70
ldr r0, [r5, #0x50]
adds r0, #0x7b
ldrb r0, [r0]
adds r1, r5, #0
adds r1, #0x7b
strb r0, [r1]
ldrh r1, [r7]
adds r0, r5, #0
adds r0, #0x74
b _0809C7C4
_0809C738:
movs r0, #0x37
bl CheckFlags
cmp r0, #0
beq _0809C74A
adds r0, r5, #0
movs r1, #0x1e
bl RequestPriorityDuration
_0809C74A:
ldr r1, _0809C7A8 @ =FrozenOctorok_Action1SubActions
ldrb r0, [r5, #0xd]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r5, #0
bl _call_via_r1
ldrb r0, [r5, #0xf]
cmp r0, #0
beq _0809C7BC
ldr r0, _0809C7AC @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
cmp r0, #0
bne _0809C772
ldr r0, [r5, #0x54]
bl CreateSparkle
_0809C772:
adds r3, r5, #0
adds r3, #0x7e
ldrh r0, [r3]
cmp r0, #0
beq _0809C7BC
ldr r2, [r5, #0x54]
movs r1, #0
ldrsh r0, [r3, r1]
ldr r1, [r2, #0x20]
subs r1, r1, r0
str r1, [r2, #0x20]
ldr r0, [r2, #0x34]
adds r0, r0, r1
str r0, [r2, #0x34]
ldr r0, [r5, #0x54]
ldr r1, [r0, #0x20]
movs r0, #0xc0
lsls r0, r0, #6
cmp r1, r0
beq _0809C7A0
ldr r0, _0809C7B0 @ =0xFFFFD000
cmp r1, r0
bne _0809C7BC
_0809C7A0:
ldrh r0, [r3]
rsbs r0, r0, #0
strh r0, [r3]
b _0809C7BC
.align 2, 0
_0809C7A8: .4byte FrozenOctorok_Action1SubActions
_0809C7AC: .4byte gRoomTransition
_0809C7B0: .4byte 0xFFFFD000
_0809C7B4:
ldr r0, [r5, #0x50]
adds r1, r5, #0
bl CopyPosition
_0809C7BC:
adds r0, r5, #0
adds r0, #0x76
ldrh r1, [r0]
subs r0, #2
_0809C7C4:
ldrh r2, [r0]
adds r0, #6
ldrh r3, [r0]
adds r0, r5, #0
bl sub_0805EC9C
b _0809C7DE
_0809C7D2:
ldr r0, _0809C7E0 @ =gRoomControls
ldr r0, [r0, #0x30]
cmp r0, r5
beq _0809C7DE
bl DeleteThisEntity
_0809C7DE:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0809C7E0: .4byte gRoomControls
.syntax divided

122
asm/non_matching/frozenOctorok/FrozenOctorok_Action1SubAction5.inc Normal file
View File

@ -0,0 +1,122 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r0, _0809CA04 @ =gRoomTransition
ldr r1, [r0]
movs r2, #2
ands r1, r2
adds r7, r0, #0
cmp r1, #0
beq _0809CA08
adds r2, r4, #0
adds r2, #0x84
ldr r0, [r2]
ldr r1, [r0, #8]
adds r1, #0x76
ldrh r0, [r1]
subs r0, #8
b _0809CA16
.align 2, 0
_0809CA04: .4byte gRoomTransition
_0809CA08:
adds r2, r4, #0
adds r2, #0x84
ldr r0, [r2]
ldr r1, [r0, #8]
adds r1, #0x76
ldrh r0, [r1]
adds r0, #8
_0809CA16:
strh r0, [r1]
adds r5, r2, #0
ldr r0, [r7]
movs r6, #3
ands r0, r6
cmp r0, #0
bne _0809CA30
adds r0, r4, #0
movs r1, #0x87
movs r2, #2
movs r3, #0
bl CreateObjectWithParent
_0809CA30:
adds r2, r4, #0
adds r2, #0x79
ldrb r0, [r2]
adds r1, r0, #0
cmp r1, #0
bne _0809CA92
ldr r0, [r4, #0x54]
adds r0, #0x62
strb r1, [r0]
ldr r0, [r4, #0x54]
movs r1, #0x80
lsls r1, r1, #2
adds r2, #2
ldrb r2, [r2]
rsbs r2, r2, #0
bl LinearMoveAngle
ldr r1, [r4, #0x54]
adds r0, r4, #0
movs r2, #0x48
bl sub_0806FC80
cmp r0, #0
beq _0809CAC4
movs r0, #6
strb r0, [r4, #0xd]
movs r1, #0
movs r0, #0xc0
strh r0, [r4, #0x24]
strb r1, [r4, #0xb]
strb r1, [r4, #0xf]
ldr r2, [r4, #0x54]
ldrb r1, [r2, #0x18]
subs r0, #0xc4
ands r0, r1
strb r0, [r2, #0x18]
ldr r0, [r5]
ldr r0, [r0, #8]
adds r0, #0x76
movs r1, #0x80
lsls r1, r1, #1
strh r1, [r0]
ldr r1, [r5]
movs r0, #1
strb r0, [r1]
movs r0, #0xed
bl SoundReq
b _0809CAC4
_0809CA92:
subs r0, #1
strb r0, [r2]
ldr r0, [r7]
ands r0, r6
cmp r0, #1
beq _0809CAB4
cmp r0, #1
blo _0809CAAC
cmp r0, #2
beq _0809CAAC
cmp r0, #3
beq _0809CABC
b _0809CAC4
_0809CAAC:
ldr r0, [r4, #0x54]
adds r0, #0x62
movs r1, #0
b _0809CAC2
_0809CAB4:
ldr r0, [r4, #0x54]
adds r0, #0x62
movs r1, #0xfc
b _0809CAC2
_0809CABC:
ldr r0, [r4, #0x54]
adds r0, #0x62
movs r1, #4
_0809CAC2:
strb r1, [r0]
_0809CAC4:
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided

236
asm/non_matching/frozenOctorok/FrozenOctorok_Init.inc Normal file
View File

@ -0,0 +1,236 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0xa]
cmp r0, #7
bls _0809C400
b _0809C5A4
_0809C400:
lsls r0, r0, #2
ldr r1, _0809C40C @ =_0809C410
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0809C40C: .4byte _0809C410
_0809C410: @ jump table
.4byte _0809C430 @ case 0
.4byte _0809C53E @ case 1
.4byte _0809C53E @ case 2
.4byte _0809C53E @ case 3
.4byte _0809C53E @ case 4
.4byte _0809C586 @ case 5
.4byte _0809C440 @ case 6
.4byte _0809C5BA @ case 7
_0809C430:
adds r0, r4, #0
movs r1, #6
bl SetDefaultPriority
adds r1, r4, #0
adds r1, #0x7e
movs r0, #0
strh r0, [r1]
_0809C440:
movs r0, #1
strb r0, [r4, #0xe]
movs r0, #0x10
strb r0, [r4, #0x15]
adds r1, r4, #0
adds r1, #0x79
movs r0, #0xf0
strb r0, [r1]
ldr r1, _0809C4B4 @ =gRoomControls
movs r2, #0x84
lsls r2, r2, #1
adds r0, r2, #0
ldrh r2, [r1, #6]
adds r0, r0, r2
strh r0, [r4, #0x2e]
movs r2, #0xb4
lsls r2, r2, #1
adds r0, r2, #0
ldrh r1, [r1, #8]
adds r0, r0, r1
strh r0, [r4, #0x32]
ldrb r0, [r4, #0x19]
movs r1, #3
orrs r0, r1
strb r0, [r4, #0x19]
adds r0, r4, #0
adds r0, #0x76
movs r1, #0xa0
strh r1, [r0]
subs r0, #2
strh r1, [r0]
adds r1, r4, #0
adds r1, #0x7b
movs r0, #0x80
strb r0, [r1]
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0809C52E
subs r1, #0x19
movs r0, #0x29
strb r0, [r1]
adds r1, #1
movs r0, #0xe0
strb r0, [r1]
movs r0, #0x30
bl zMalloc
adds r2, r0, #0
adds r0, r4, #0
adds r0, #0x84
str r2, [r0]
mov r8, r0
cmp r2, #0
bne _0809C4B8
bl DeleteThisEntity
b _0809C5BA
.align 2, 0
_0809C4B4: .4byte gRoomControls
_0809C4B8:
str r2, [r4, #0x64]
mov r0, r8
ldr r1, [r0]
movs r0, #5
strb r0, [r1, #1]
movs r5, #0
mov r7, r8
_0809C4C6:
adds r6, r5, #1
adds r0, r4, #0
movs r1, #0x91
adds r2, r6, #0
movs r3, #0
bl CreateObjectWithParent
str r0, [r4, #0x54]
cmp r0, #0
beq _0809C4EE
adds r1, r0, #0
adds r1, #0x84
ldr r0, [r7]
str r0, [r1]
ldr r1, [r7]
lsls r0, r5, #2
adds r1, #0x20
adds r1, r1, r0
ldr r0, [r4, #0x54]
str r0, [r1]
_0809C4EE:
adds r5, r6, #0
cmp r5, #3
bls _0809C4C6
adds r0, r4, #0
movs r1, #0x91
movs r2, #5
movs r3, #0
bl CreateObjectWithParent
str r0, [r4, #0x54]
cmp r0, #0
beq _0809C510
adds r1, r0, #0
adds r1, #0x84
mov r2, r8
ldr r0, [r2]
str r0, [r1]
_0809C510:
adds r0, r4, #0
movs r1, #0x91
movs r2, #6
movs r3, #0
bl CreateObjectWithParent
str r0, [r4, #0x50]
cmp r0, #0
beq _0809C5A4
adds r1, r0, #0
adds r1, #0x84
mov r2, r8
ldr r0, [r2]
str r0, [r1]
b _0809C5A4
_0809C52E:
adds r1, r4, #0
adds r1, #0x62
movs r0, #0xd7
strb r0, [r1]
adds r1, #1
movs r0, #0xe0
strb r0, [r1]
b _0809C5A4
_0809C53E:
movs r1, #0
movs r0, #0x10
strb r0, [r4, #0xe]
adds r0, r4, #0
adds r0, #0x79
strb r1, [r0]
ldrb r1, [r4, #0xa]
movs r2, #2
adds r0, r2, #0
ands r0, r1
cmp r0, #0
bne _0809C55A
strb r2, [r4, #0xf]
b _0809C55E
_0809C55A:
movs r0, #0xfe
strb r0, [r4, #0xf]
_0809C55E:
adds r0, r4, #0
adds r0, #0x74
movs r2, #0x80
lsls r2, r2, #1
strh r2, [r0]
ldrb r1, [r4, #0xa]
movs r0, #1
ands r0, r1
cmp r0, #0
bne _0809C57E
adds r1, r4, #0
adds r1, #0x76
movs r0, #0xff
lsls r0, r0, #8
strh r0, [r1]
b _0809C5A4
_0809C57E:
adds r0, r4, #0
adds r0, #0x76
strh r2, [r0]
b _0809C5A4
_0809C586:
adds r0, r4, #0
adds r0, #0x76
movs r1, #0x80
lsls r1, r1, #1
strh r1, [r0]
subs r0, #2
strh r1, [r0]
adds r1, r4, #0
adds r1, #0x79
movs r0, #0x1c
strb r0, [r1]
adds r0, r4, #0
adds r0, #0x84
ldr r0, [r0]
str r4, [r0, #8]
_0809C5A4:
ldr r0, _0809C5C0 @ =gUnk_08123DDC
ldrb r1, [r4, #0xa]
lsls r1, r1, #2
adds r1, r1, r0
ldrb r1, [r1]
adds r0, r4, #0
bl InitializeAnimation
adds r0, r4, #0
bl FrozenOctorok_Action1
_0809C5BA:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0809C5C0: .4byte gUnk_08123DDC
.syntax divided

40
asm/non_matching/frozenOctorok/sub_0809CBE4.inc Normal file
View File

@ -0,0 +1,40 @@
.syntax unified
push {r4, lr}
adds r2, r0, #0
adds r3, r2, #0
adds r3, #0x79
ldrb r0, [r2, #0xf]
ldrb r4, [r3]
adds r1, r0, r4
strb r1, [r3]
ldrb r4, [r2, #0xf]
movs r0, #0xf
ldrsb r0, [r2, r0]
cmp r0, #0
bge _0809CC16
ldrb r0, [r2, #0xe]
lsls r1, r1, #0x18
lsls r0, r0, #0x18
cmn r1, r0
bge _0809CC2C
rsbs r0, r4, #0
strb r0, [r2, #0xf]
movs r0, #0xcf
lsls r0, r0, #1
bl SoundReq
b _0809CC2C
_0809CC16:
movs r0, #0
ldrsb r0, [r3, r0]
ldrb r1, [r2, #0xe]
cmp r0, r1
ble _0809CC2C
rsbs r0, r4, #0
strb r0, [r2, #0xf]
movs r0, #0xcf
lsls r0, r0, #1
bl SoundReq
_0809CC2C:
pop {r4, pc}
.align 2, 0
.syntax divided

41
asm/object/object90.s
View File

@ -1,41 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Object90
Object90: @ 0x0809C394
push {lr}
ldr r2, _0809C3A8 @ =gUnk_08123DCC
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0809C3A8: .4byte gUnk_08123DCC
thumb_func_start sub_0809C3AC
sub_0809C3AC: @ 0x0809C3AC
movs r2, #0
movs r1, #1
strb r1, [r0, #0xc]
strb r2, [r0, #0x1e]
adds r0, #0x29
ldrb r2, [r0]
subs r1, #9
ands r1, r2
movs r2, #5
orrs r1, r2
strb r1, [r0]
bx lr
thumb_func_start nullsub_536
nullsub_536: @ 0x0809C3C4
bx lr
.align 2, 0

1129
asm/object/object91.s
View File

File diff suppressed because it is too large Load Diff

1083
asm/vram.s
View File

File diff suppressed because it is too large Load Diff

15
assets/assets.json
View File

@ -44859,21 +44859,6 @@
"size": 41,
"type": "animation"
},
{
"path": "object91/gUnk_08123DDC.bin",
"start": 1195484,
"size": 28
},
{
"path": "object91/gUnk_08123E18.bin",
"start": 1195544,
"size": 4
},
{
"path": "object91/gUnk_08123E1C.bin",
"start": 1195548,
"size": 4
},
{
"path": "animations/gSpriteAnimations_BakerOven_0.bin",
"start": 1195564,

9
data/const/object/object90.s
View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123DCC:: @ 08123DCC
.4byte sub_0809C3AC
.4byte nullsub_536

28
data/const/object/object91.s
View File

@ -1,28 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123DD4:: @ 08123DD4
.4byte sub_0809C3EC
.4byte sub_0809C5C4
gUnk_08123DDC:: @ 08123DDC
.incbin "object91/gUnk_08123DDC.bin"
gUnk_08123DF8:: @ 08123DF8
.4byte sub_0809C7E4
.4byte sub_0809C854
.4byte sub_0809C8BC
.4byte sub_0809C924
.4byte sub_0809C988
.4byte sub_0809C9E0
.4byte sub_0809CAC8
.4byte sub_0809CB4C
gUnk_08123E18:: @ 08123E18
.incbin "object91/gUnk_08123E18.bin"
gUnk_08123E1C:: @ 08123E1C
.incbin "object91/gUnk_08123E1C.bin"

2
include/enemy.h
View File

@ -190,7 +190,7 @@ void SpinyBeetle(Entity*);
void MazaalHead(Entity*);
void MazaalMacro(Entity*);
void MazaalHand(Entity*);
void OctorokBoss(Entity*);
void OctorokBoss();
void FlyingPot(Entity*);
void Gibdo(Entity*);
void OctorokGolden(Entity*);

77
include/enemy/octorokBoss.h Normal file
View File

@ -0,0 +1,77 @@
#ifndef ENEMY_OCTOROK_BOSS_H
#define ENEMY_OCTOROK_BOSS_H
#include "enemy.h"
typedef struct OctorokBossEntity OctorokBossEntity;
typedef struct {
/*0x00*/ u8 unk_0; // [0,1,2,4] is later stored in super->field_0xf
/*0x01*/ u8 tailCount;
/*0x02*/ u8 field_0x2; // [0,1]
/*0x03*/ u8 targetAngle; // relates to this->field_0x7a.HALF.HI
/*0x04*/ u8 rotation; // [0,1,0xff]
/*0x05*/ u8 phase4PrevAttackPattern; // [0-4], sets this->phase4AttackPattern
/*0x06*/ u8 fallingStonesTimer;
/*0x07*/ u8 field_0x7; // some sort of counter that is only set when hit for the first time?
/*0x08*/ OctorokBossEntity* mouthObject;
/*0x0c*/ OctorokBossEntity* tailObjects[5];
/*0x20*/ OctorokBossEntity* legObjects[4];
} OctorokBossHeap;
static_assert(sizeof(OctorokBossHeap) == 0x30);
struct OctorokBossEntity {
Entity base;
/*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a;
/*0x6c*/ union SplitHWord field_0x6c;
/*0x6e*/ union SplitHWord field_0x6e;
/*0x70*/ union SplitWord field_0x70;
/*0x74*/ u16 unk_74;
/*0x76*/ u16 unk_76;
/*0x78*/ u8 attackWaitTurns; /**< Turns until the next attack */
/*0x79*/ u8 timer; /**< Reused timer */
/*0x7a*/ union SplitHWord angle; /**< Angle of legs */
/*0x7c*/ u8 bossPhase; /**< Boss Phase
0: unfrozen
1: frozen 1
2: unfrozen
3: frozen 2
4: unfrozen -> death */
/*0x7d*/ u8 currentAttack;
/*0x7e*/ u8 nextAttackIndex;
/*0x7f*/ u8 unk_7f;
/*0x80*/ u8 unk_80;
/*0x81*/ u8 phase4AttackPattern; /**< Which attack pattern is currently used in phase 4 */
/*0x82*/ union SplitHWord angularSpeed;
/*0x84*/ OctorokBossHeap* heap; /**< Heap data allocated with #zMalloc. */
};
enum OctorokRotation { ROTATION_CW, ROTATION_CCW, NO_ROTATION = 0xff };
enum OctorokBossPart { WHOLE, LEG_BR, LEG_FR, LEG_FL, LEG_BL, MOUTH, TAIL_END, TAIL };
enum OctorokBossAction {
INIT, // 0
ACTION1, // 1
HIT, // 2
INTRO, // 3
BURNING, // 4
};
enum OctorokBossAttack {
ATTACK_SPITROCK, // 0
ATTACK_VACUUM, // 1
ATTACK_SMOKE, // 2
ATTACK_FREEZE, // 3
NO_ATTACK, // 4
END_OF_ATTACK_PATTERN // 5
};
enum OctorokBossAction1SubAction {
ACTION1_AIMTOWARDSPLAYER, // Moving around with step sounds
ACTION1_WAITFORTURN, // Also step sounds
ACTION1_SUBACTION2, // Step sounds, some kind of attack that is started in OctorokBoss_StartRegularAttack?
ACTION1_WAITFORATTACK, // Wait for GET_TIMER(), then OctorokBoss_SetWaitTurnsForNextAttack
ACTION1_ATTACK, // Attack
};
#endif

2
include/functions.h
View File

@ -66,6 +66,7 @@ extern void SetDirtTile(u32);
extern void SetInventoryValue(u32, u32);
extern void SoundReqClipped(Entity*, u32);
extern void TryLoadPrologueHyruleTown(void);
extern void UnloadGFXSlots(Entity*);
extern void UnloadOBJPalette(Entity*);
extern void UpdateDisplayControls(void);
extern void UpdateItemAnim(ItemBehavior*);
@ -243,7 +244,6 @@ extern void sub_080A57F4(void);
extern void sub_080A71C4(u32, u32, u32, u32);
extern void sub_080A7C18(u32, u32, u32);
extern void sub_080ADD70(void);
extern void UnloadGFXSlots(Entity*);
extern bool32 sub_080AE4CC(Entity*, u32, u32, u32);
extern void sub_080AE58C(Entity*, u32, u32);
extern void sub_080AF284(void);

4
include/object.h
View File

@ -175,7 +175,7 @@ typedef enum {
OBJECT_8E,
FROZEN_WATER_ELEMENT,
OBJECT_90,
OBJECT_91,
FROZEN_OCTOROK,
BAKER_OVEN,
LAMP,
WIND_TRIBE_FLAG,
@ -371,7 +371,7 @@ void Fireplace(Entity*);
void Object8E();
void FrozenWaterElement();
void Object90(Entity*);
void Object91(Entity*);
void FrozenOctorok();
void BakerOven(Entity*);
void Lamp(Entity*);
void WindTribeFlag(Entity*);

8
linker.ld
View File

@ -766,8 +766,8 @@ SECTIONS {
src/object/fireplace.o(.text);
src/object/object8E.o(.text);
src/object/frozenWaterElement.o(.text);
asm/object/object90.o(.text);
asm/object/object91.o(.text);
src/object/object90.o(.text);
src/object/frozenOctorok.o(.text);
src/object/bakerOven.o(.text);
src/object/lamp.o(.text);
src/object/windTribeFlag.o(.text);
@ -1518,8 +1518,8 @@ SECTIONS {
data/const/object/fireplace.o(.rodata);
src/object/object8E.o(.rodata);
src/object/frozenWaterElement.o(.rodata);
data/const/object/object90.o(.rodata);
data/const/object/object91.o(.rodata);
src/object/object90.o(.rodata);
src/object/frozenOctorok.o(.rodata);
data/const/object/bakerOven.o(.rodata);
data/animations/object/bakerOven.o(.rodata);
src/object/lamp.o(.rodata);

1638
src/enemy/octorokBoss.c
View File

File diff suppressed because it is too large Load Diff

2
src/object.c
View File

@ -147,7 +147,7 @@ void (*const gObjectFunctions[])(Entity*) = {
[OBJECT_8E] = Object8E,
[FROZEN_WATER_ELEMENT] = FrozenWaterElement,
[OBJECT_90] = Object90,
[OBJECT_91] = Object91,
[FROZEN_OCTOROK] = FrozenOctorok,
[BAKER_OVEN] = BakerOven,
[LAMP] = Lamp,
[WIND_TRIBE_FLAG] = WindTribeFlag,

280
src/object/frozenOctorok.c Normal file
View File

@ -0,0 +1,280 @@
/**
* @file frozenOctorok.c
* @ingroup Objects
*
* @brief Frozen Octorok object
*/
#define NENT_DEPRECATED
#include "enemy/octorokBoss.h"
#include "global.h"
#include "object.h"
#include "functions.h"
#include "message.h"
typedef struct {
/*0x00*/ Entity base;
/*0x68*/ u8 unk_68[0xc];
/*0x74*/ u16 unk_74;
/*0x76*/ u16 unk_76;
/*0x78*/ u8 unk_78;
/*0x79*/ u8 unk_79;
/*0x7a*/ u8 unk_7a;
/*0x7b*/ u8 unk_7b;
/*0x7c*/ u8 unk_7c[2];
/*0x7e*/ u16 unk_7e;
/*0x7f*/ u8 unk_7f[4];
/*0x84*/ OctorokBossHeap* heap;
} FrozenOctorokEntity;
void FrozenOctorok_Init(FrozenOctorokEntity*);
void FrozenOctorok_Action1(FrozenOctorokEntity*);
void FrozenOctorok_Action1SubAction0(FrozenOctorokEntity*);
void FrozenOctorok_Action1SubAction1(FrozenOctorokEntity*);
void FrozenOctorok_Action1SubAction2(FrozenOctorokEntity*);
void FrozenOctorok_Action1SubAction3(FrozenOctorokEntity*);
void FrozenOctorok_Action1SubAction4(FrozenOctorokEntity*);
void FrozenOctorok_Action1SubAction5(FrozenOctorokEntity*);
void FrozenOctorok_Action1SubAction6(FrozenOctorokEntity*);
void FrozenOctorok_Action1SubAction7(FrozenOctorokEntity*);
void FrozenOctorok_ChangeObjPaletteOfChildren(FrozenOctorokEntity*, u32);
void sub_0809CBE4(FrozenOctorokEntity*);
void sub_0809CB70(FrozenOctorokEntity*, s32, s32);
void FrozenOctorok(FrozenOctorokEntity* this) {
static void (*const FrozenOctorok_Actions[])(FrozenOctorokEntity*) = {
FrozenOctorok_Init,
FrozenOctorok_Action1,
};
FrozenOctorok_Actions[super->action](this);
super->spriteRendering.b3 = 3;
}
const u8 gUnk_08123DDC[] = {
9, 4, 0, 0, 1, 5, 0, 0, 1, 4, 0, 0, 1, 3, 0, 0, 1, 2, 0, 0, 2, 1, 0, 0, 10, 4, 0, 0,
};
ASM_FUNC("asm/non_matching/frozenOctorok/FrozenOctorok_Init.inc", void FrozenOctorok_Init(FrozenOctorokEntity* this))
void (*const FrozenOctorok_Action1SubActions[])(FrozenOctorokEntity*) = {
FrozenOctorok_Action1SubAction0, FrozenOctorok_Action1SubAction1, FrozenOctorok_Action1SubAction2,
FrozenOctorok_Action1SubAction3, FrozenOctorok_Action1SubAction4, FrozenOctorok_Action1SubAction5,
FrozenOctorok_Action1SubAction6, FrozenOctorok_Action1SubAction7,
};
const u8 gUnk_08123E18[] = {
40,
80,
176,
216,
};
const u8 gUnk_08123E1C[] = {
128,
0,
0,
128,
};
ASM_FUNC("asm/non_matching/frozenOctorok/FrozenOctorok_Action1.inc",
void FrozenOctorok_Action1(FrozenOctorokEntity* this))
void FrozenOctorok_Action1SubAction0(FrozenOctorokEntity* this) {
Entity* child;
if (super->field_0xf != 0) {
if (this->unk_7e == 0) {
child = super->child;
if (child->z.HALF.HI > -0x10) {
child->z.WORD -= 0x4000;
} else {
child->z.WORD -= 0x1000;
(super->child)->zVelocity = 0x3000;
this->unk_7e = 0x200;
}
}
if (this->unk_79-- == 0) {
MessageFromTarget(0xb43);
super->subAction = 1;
this->unk_79 = 8;
}
}
}
void FrozenOctorok_Action1SubAction1(FrozenOctorokEntity* this) {
Entity* obj;
if ((gMessage.doTextBox & 0x7f) == 0) {
if (this->unk_79-- == 0) {
obj = CreateObjectWithParent(super, FROZEN_OCTOROK, 7, 0);
if (obj != NULL) {
obj->y.HALF.HI -= 0x50;
gRoomControls.camera_target = obj;
}
if (super->field_0xf < 3) {
super->subAction = 2;
this->unk_79 = 0x1e;
SoundReq(SFX_THUD_HEAVY);
} else {
super->subAction = 3;
this->unk_79 = 0x78;
}
}
}
}
void FrozenOctorok_Action1SubAction2(FrozenOctorokEntity* this) {
if (this->unk_79-- == 0) {
super->subAction = 1;
this->unk_79 = 0x1e;
super->field_0xf++;
return;
}
switch (this->unk_79 & 3) {
case 0:
case 2:
super->x.HALF.HI = (super->x.HALF.HI & 0xfff0) + 8;
break;
case 1:
super->x.HALF.HI = (super->x.HALF.HI & 0xfff8) + 4;
break;
case 3:
super->x.HALF.HI = (super->x.HALF.HI & 0xfff8) - 4;
break;
}
}
void FrozenOctorok_Action1SubAction3(FrozenOctorokEntity* this) {
if (this->unk_79-- != 0) {
CreateObjectWithParent(super, OCTOROK_BOSS_OBJECT, 6, 0);
} else {
super->subAction = 4;
this->unk_79 = 0x3c;
LoadFixedGFX(super, 0x115);
LoadFixedGFX(super->parent, 0x115);
ChangeObjPalette(super, 0xef);
ChangeObjPalette(super->parent, 0xef);
FrozenOctorok_ChangeObjPaletteOfChildren(this, 0xef);
SoundReq(SFX_WIND2);
}
}
void FrozenOctorok_Action1SubAction4(FrozenOctorokEntity* this) {
u8 bVar1;
s16 sVar2;
u8* pbVar3;
u8* puVar4;
if (this->unk_79-- == 0) {
super->subAction = 5;
this->unk_79 = 0xb4;
super->type2 = 3;
} else {
if ((gRoomTransition.frameCount & 8) != 0) {
this->heap->mouthObject->unk_76 -= 4;
} else {
this->heap->mouthObject->unk_76 += 4;
}
}
}
NONMATCH("asm/non_matching/frozenOctorok/FrozenOctorok_Action1SubAction5.inc",
void FrozenOctorok_Action1SubAction5(FrozenOctorokEntity* this)) {
Entity* child;
if ((gRoomTransition.frameCount & 2) != 0) {
this->heap->mouthObject->unk_76 -= 8;
} else {
this->heap->mouthObject->unk_76 += 8;
}
if ((gRoomTransition.frameCount & 3) == 0) {
CreateObjectWithParent(super, OCTOROK_BOSS_OBJECT, 2, 0);
}
if (this->unk_79 == 0) {
(super->child)->spriteOffsetX = 0;
LinearMoveAngle(super->child, 0x200, -this->unk_7b);
if (sub_0806FC80(super, super->child, 0x48) != 0) {
super->subAction = 6;
super->speed = 0xc0;
super->type2 = 0;
super->field_0xf = 0;
child = super->child;
child->spriteSettings.draw = 0;
this->heap->mouthObject->unk_76 = 0x100;
this->heap->unk_0 = 1;
SoundReq(SFX_ED);
}
} else {
this->unk_79--;
switch ((gRoomTransition.frameCount & 3)) {
case 0:
case 2:
(super->child)->spriteOffsetX = 0;
break;
case 1:
(super->child)->spriteOffsetX = 0xfc;
break;
case 3:
(super->child)->spriteOffsetX = 4;
break;
}
}
}
END_NONMATCH
void FrozenOctorok_Action1SubAction6(FrozenOctorokEntity* this) {
LinearMoveUpdate(super);
if ((gRoomControls.origin_y + 0x1c8) < super->y.HALF.HI) {
gRoomControls.unk5 = 4;
gRoomControls.camera_target = &gPlayerEntity;
SetLocalFlag(0x9b);
DeleteEntity(super->parent);
DeleteEntity(&this->heap->mouthObject->base);
DeleteEntity(&this->heap->legObjects[0]->base);
DeleteEntity(&this->heap->legObjects[1]->base);
DeleteEntity(&this->heap->legObjects[2]->base);
DeleteEntity(&this->heap->legObjects[3]->base);
super->subAction = 7;
}
if ((gRoomTransition.frameCount & 0xf) == 0) {
SoundReq(SFX_163);
}
}
void FrozenOctorok_Action1SubAction7(FrozenOctorokEntity* this) {
if ((gRoomControls.scroll_flags & 4) == 0) {
CreateEzloHint(0xb44, 0);
DeleteThisEntity();
}
}
void sub_0809CB70(FrozenOctorokEntity* this, s32 angle, s32 radius) {
s32 tmp;
tmp = FixedMul(gSineTable[angle], radius);
tmp = FixedDiv(tmp, 0x100);
super->x.WORD = (super->parent)->x.WORD + ((tmp << 0x10) >> 8);
tmp = FixedMul(gSineTable[angle + 0x40], radius);
tmp = FixedDiv(tmp, 0x100);
super->y.WORD = super->parent->y.WORD - ((tmp << 0x10) >> 8);
super->z.WORD = super->parent->z.WORD;
}
NONMATCH("asm/non_matching/frozenOctorok/sub_0809CBE4.inc", void sub_0809CBE4(FrozenOctorokEntity* this)) {
this->unk_79 += super->field_0xf;
if ((s8)super->field_0xf < 0) {
if (super->actionDelay < -(this->unk_79 << 0x18 >> 0x18)) {
super->field_0xf = -super->field_0xf;
SoundReq(SFX_19E);
}
} else if ((s8)this->unk_79 > super->actionDelay) {
super->field_0xf = -super->field_0xf;
SoundReq(SFX_19E);
}
}
END_NONMATCH
void FrozenOctorok_ChangeObjPaletteOfChildren(FrozenOctorokEntity* this, u32 palette) {
u32 index;
ChangeObjPalette(&this->heap->mouthObject->base, palette);
for (index = 0; index < 4; index++) {
ChangeObjPalette(&this->heap->legObjects[index]->base, palette);
}
}

2
src/object/frozenWaterElement.c
View File

@ -39,7 +39,7 @@ void sub_0809BECC(FrozenWaterElementEntity* this) {
if (CheckFlags(0x9b)) {
DeleteThisEntity();
}
obj = CreateObject(OBJECT_91, 0, 0);
obj = CreateObject(FROZEN_OCTOROK, 0, 0);
super->child = obj;
if (obj != NULL) {
super->action = 1;

31
src/object/object90.c Normal file
View File

@ -0,0 +1,31 @@
/**
* @file object90.c
* @ingroup Objects
*
* @brief Object90 object
*/
#define NENT_DEPRECATED
#include "global.h"
#include "object.h"
#include "functions.h"
void Object90_Init(Entity*);
void Object90_Action1(Entity*);
void Object90(Entity* this) {
static void (*const Object90_Actions[])(Entity*) = {
Object90_Init,
Object90_Action1,
};
Object90_Actions[this->action](this);
}
void Object90_Init(Entity* this) {
this->action = 1;
this->frameIndex = 0;
this->spritePriority.b0 = 5;
}
void Object90_Action1(Entity* this) {
}