mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-23 23:05:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #584 from hatal175/LatestPrs

Browse Source
This commit is contained in:
notyourav
2022-11-21 10:05:33 -08:00
committed by GitHub
parent 1ceeac3c84 44e4b69cdb
commit 03408debcd
37 changed files with 327 additions and 2447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matching/bombPeahat/sub_0802AFC8.inc
-76
View File
@@ -1,76 +0,0 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xf]
movs r7, #8
cmp r0, #0x28
bhi _0802B022
movs r7, #4
adds r1, r4, #0
adds r1, #0x82
ldrh r2, [r1]
movs r0, #0x80
lsls r0, r0, #8
ands r0, r2
cmp r0, #0
beq _0802AFEC
adds r0, r2, #0
subs r0, #0x10
b _0802AFF0
_0802AFEC:
adds r0, r2, #0
adds r0, #0x10
_0802AFF0:
strh r0, [r1]
adds r5, r1, #0
ldrh r2, [r5]
movs r6, #0xf0
adds r3, r6, #0
ands r3, r2
subs r0, r3, #1
cmp r0, #0x7f
bls _0802B00C
movs r3, #0x80
lsls r3, r3, #8
adds r0, r3, #0
eors r0, r2
strh r0, [r5]
_0802B00C:
ldrh r0, [r1]
adds r3, r6, #0
ands r3, r0
movs r2, #0x98
lsls r2, r2, #1
subs r2, r2, r3
adds r0, r4, #0
adds r1, r2, #0
movs r3, #0
bl SetAffineInfo
_0802B022:
ldrb r0, [r4, #0xf]
ands r0, r7
cmp r0, #0
beq _0802B03A
ldrb r0, [r4, #0x1a]
lsrs r2, r0, #4
movs r1, #0x10
rsbs r1, r1, #0
ands r1, r0
orrs r1, r2
strb r1, [r4, #0x1a]
b _0802B044
_0802B03A:
ldrb r1, [r4, #0x1a]
movs r0, #0x10
rsbs r0, r0, #0
ands r0, r1
strb r0, [r4, #0x1a]
_0802B044:
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided
asm/non_matching/chuchuBoss/sub_08025DD8.inc
-328
View File
@@ -1,328 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
movs r0, #1
strb r0, [r5, #0xc]
ldrb r1, [r5, #0xa]
cmp r1, #8
bne _08025DF2
movs r0, #4
strb r0, [r5, #0xa]
ldr r0, [r5, #0x54]
ldr r0, [r0, #0x48]
str r0, [r5, #0x48]
b _0802605E
_08025DF2:
ldr r6, _08025E48 @ =gUnk_080CC1B8
movs r4, #3
movs r3, #3
adds r0, r3, #0
ands r0, r1
lsls r0, r0, #2
adds r0, r0, r6
ldrb r0, [r0, #1]
movs r1, #0x29
adds r1, r1, r5
mov ip, r1
movs r1, #7
ands r1, r0
mov r0, ip
ldrb r2, [r0]
movs r0, #8
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
mov r1, ip
strb r0, [r1]
adds r1, r5, #0
adds r1, #0x76
movs r0, #0xa0
strh r0, [r1]
adds r1, #4
strh r0, [r1]
adds r1, #4
movs r0, #0
strh r0, [r1]
ldrb r0, [r5, #0x19]
orrs r0, r4
strb r0, [r5, #0x19]
ldrb r0, [r5, #0xa]
ands r3, r0
cmp r3, #1
bne _08025E4C
adds r0, r5, #0
movs r1, #0
bl InitAnimationForceUpdate
b _08025E58
.align 2, 0
_08025E48: .4byte gUnk_080CC1B8
_08025E4C:
lsls r0, r3, #2
adds r0, r0, r6
ldrb r1, [r0]
adds r0, r5, #0
bl InitializeAnimation
_08025E58:
ldrb r0, [r5, #0xa]
movs r6, #3
ands r6, r0
cmp r6, #0
beq _08025E86
cmp r6, #0
bge _08025E68
b _08026050
_08025E68:
cmp r6, #3
ble _08025E6E
b _08026050
_08025E6E:
ldr r4, [r5, #0x48]
adds r0, r5, #0
bl AllocMutableHitbox
adds r1, r0, #0
cmp r1, #0
beq _08025E7E
b _08026020
_08025E7E:
ldr r0, [r5, #0x68]
adds r0, #0x45
strb r1, [r0]
b _0802605E
_08025E86:
strb r0, [r5, #0xb]
movs r0, #0x10
bl zMalloc
adds r4, r5, #0
adds r4, #0x84
str r0, [r4]
cmp r0, #0
beq _08025EA2
adds r0, r5, #0
bl AllocMutableHitbox
cmp r0, #0
bne _08025EAA
_08025EA2:
adds r0, r5, #0
bl GenericDeath
b _0802605E
_08025EAA:
ldr r0, [r4]
str r0, [r5, #0x64]
ldr r2, [r5, #0x48]
ldr r1, _0802601C @ =gUnk_080FD238
ldrb r0, [r1]
strb r0, [r2]
ldr r2, [r5, #0x48]
ldrb r0, [r1, #1]
strb r0, [r2, #1]
ldr r2, [r5, #0x48]
ldrb r0, [r1, #2]
strb r0, [r2, #2]
ldr r2, [r5, #0x48]
ldrb r0, [r1, #3]
strb r0, [r2, #3]
ldr r2, [r5, #0x48]
ldrb r0, [r1, #4]
strb r0, [r2, #4]
ldr r2, [r5, #0x48]
ldrb r0, [r1, #5]
strb r0, [r2, #5]
ldr r2, [r5, #0x48]
ldrb r0, [r1, #6]
strb r0, [r2, #6]
ldr r2, [r5, #0x48]
ldrb r0, [r1, #7]
strb r0, [r2, #7]
strb r6, [r5, #0xd]
adds r1, r5, #0
adds r1, #0x6d
ldrb r0, [r1]
movs r7, #1
orrs r0, r7
strb r0, [r1]
ldr r0, [r4]
strb r6, [r0, #6]
ldr r0, [r4]
strb r6, [r0, #5]
ldr r1, [r4]
movs r0, #0xf
strb r0, [r1, #1]
ldr r0, [r4]
strb r6, [r0, #3]
ldr r0, [r4]
strb r6, [r0, #4]
ldr r1, [r4]
ldrh r0, [r5, #0x2e]
strh r0, [r1, #0xe]
ldrb r0, [r5, #0xa]
movs r1, #3
orrs r1, r0
movs r0, #0x13
bl CreateEnemy
adds r2, r0, #0
str r2, [r5, #0x68]
cmp r2, #0
beq _08025F46
adds r0, r5, #0
adds r0, #0x38
ldrb r1, [r0]
adds r0, r2, #0
adds r0, #0x38
strb r1, [r0]
ldr r1, [r5, #0x68]
ldrh r0, [r5, #0x2e]
strh r0, [r1, #0x2e]
ldr r1, [r5, #0x68]
ldrh r0, [r5, #0x32]
subs r0, #0xe
strh r0, [r1, #0x32]
ldr r1, [r5, #0x68]
movs r0, #0xe
strb r0, [r1, #0xe]
ldr r0, [r5, #0x68]
str r5, [r0, #0x50]
ldr r0, [r5, #0x68]
str r5, [r0, #0x68]
_08025F46:
ldrb r0, [r5, #0xa]
movs r1, #2
orrs r1, r0
movs r0, #0x13
bl CreateEnemy
adds r2, r0, #0
str r2, [r5, #0x50]
cmp r2, #0
beq _08025F8C
adds r0, r5, #0
adds r0, #0x38
ldrb r1, [r0]
adds r0, r2, #0
adds r0, #0x38
strb r1, [r0]
ldr r1, [r5, #0x50]
ldrh r0, [r5, #0x2e]
strh r0, [r1, #0x2e]
ldr r1, [r5, #0x50]
ldr r0, [r5, #0x68]
ldrh r0, [r0, #0x32]
subs r0, #0x12
strh r0, [r1, #0x32]
ldr r1, [r5, #0x50]
movs r0, #0x12
strb r0, [r1, #0xe]
ldr r1, [r5, #0x50]
ldr r0, [r5, #0x68]
str r0, [r1, #0x50]
ldr r1, [r5, #0x68]
ldr r0, [r5, #0x50]
str r0, [r1, #0x54]
ldr r0, [r5, #0x50]
str r5, [r0, #0x68]
_08025F8C:
ldrb r0, [r5, #0xa]
adds r1, r7, #0
orrs r1, r0
movs r0, #0x13
bl CreateEnemy
adds r2, r0, #0
str r2, [r5, #0x54]
cmp r2, #0
beq _08025FD6
adds r0, r5, #0
adds r0, #0x38
ldrb r1, [r0]
adds r0, r2, #0
adds r0, #0x38
strb r1, [r0]
ldr r1, [r5, #0x54]
ldrh r0, [r5, #0x2e]
strh r0, [r1, #0x2e]
ldr r1, [r5, #0x54]
ldr r0, [r5, #0x50]
ldrh r0, [r0, #0x32]
subs r0, #0xe
strh r0, [r1, #0x32]
ldr r1, [r5, #0x54]
movs r0, #0xe
strb r0, [r1, #0xe]
ldr r1, [r5, #0x54]
ldr r0, [r5, #0x50]
str r0, [r1, #0x50]
ldr r0, [r5, #0x54]
str r5, [r0, #0x54]
ldr r1, [r5, #0x50]
ldr r0, [r5, #0x54]
str r0, [r1, #0x54]
ldr r0, [r5, #0x54]
str r5, [r0, #0x68]
_08025FD6:
movs r0, #0x13
movs r1, #8
bl CreateEnemy
adds r1, r0, #0
cmp r1, #0
beq _08025FE6
str r5, [r1, #0x54]
_08025FE6:
adds r0, r5, #0
movs r1, #0x49
movs r2, #1
movs r3, #0
bl CreateObjectWithParent
adds r1, r0, #0
cmp r1, #0
beq _08025FFC
ldr r0, [r5, #0x54]
str r0, [r1, #0x54]
_08025FFC:
ldrb r0, [r5, #0xa]
cmp r0, #0
beq _08026050
adds r0, r5, #0
movs r1, #0x49
movs r2, #3
movs r3, #0
bl CreateObjectWithParent
adds r1, r0, #0
cmp r1, #0
beq _08026050
ldr r0, [r5, #0x54]
str r0, [r1, #0x54]
b _08026050
.align 2, 0
_0802601C: .4byte gUnk_080FD238
_08026020:
ldr r1, [r5, #0x48]
ldrb r0, [r4]
strb r0, [r1]
ldr r1, [r5, #0x48]
ldrb r0, [r4, #1]
strb r0, [r1, #1]
ldr r1, [r5, #0x48]
ldrb r0, [r4, #2]
strb r0, [r1, #2]
ldr r1, [r5, #0x48]
ldrb r0, [r4, #3]
strb r0, [r1, #3]
ldr r1, [r5, #0x48]
ldrb r0, [r4, #4]
strb r0, [r1, #4]
ldr r1, [r5, #0x48]
ldrb r0, [r4, #5]
strb r0, [r1, #5]
ldr r1, [r5, #0x48]
ldrb r0, [r4, #6]
strb r0, [r1, #6]
ldr r1, [r5, #0x48]
ldrb r0, [r4, #7]
strb r0, [r1, #7]
_08026050:
ldrb r1, [r5, #0xa]
movs r0, #3
ands r0, r1
strb r0, [r5, #0xa]
adds r0, r5, #0
bl sub_08026060
_0802605E:
pop {r4, r5, r6, r7, pc}
.syntax divided
asm/non_matching/dust/sub_080442BC.inc
-46
View File
@@ -1,46 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r3, r0, #0
ldr r5, _0804430C @ =gUnk_080D15B4
ldr r0, [r3, #0x64]
ldrb r6, [r0]
movs r4, #0
cmp r4, r6
bhs _08044304
movs r7, #0
_080442CE:
ldr r1, [r3, #0x48]
lsls r2, r4, #3
adds r1, r2, r1
ldrb r0, [r5]
strb r0, [r1, #0xc]
ldr r0, [r3, #0x48]
adds r0, r2, r0
ldrb r1, [r5, #1]
strb r1, [r0, #0xd]
ldr r0, [r3, #0x48]
adds r0, r2, r0
ldrb r1, [r5, #2]
strb r1, [r0, #0xe]
ldr r0, [r3, #0x48]
adds r0, r2, r0
ldrb r1, [r5, #3]
strb r1, [r0, #0xf]
ldr r0, [r3, #0x48]
adds r0, r2, r0
adds r0, #0xc
strb r7, [r0, #4]
ldr r0, [r3, #0x48]
adds r2, r2, r0
strb r4, [r2, #0x11]
adds r4, #1
cmp r4, r6
blo _080442CE
_08044304:
adds r0, r3, #0
adds r0, #0x74
strb r6, [r0]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0804430C: .4byte gUnk_080D15B4
.syntax divided
asm/non_matching/dust/sub_08044310.inc
-213
View File
@@ -1,213 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r5, r0, #0
movs r4, #0xff
movs r6, #0xff
ldr r0, _08044334 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r1, r0, #1
movs r0, #3
ands r1, r0
cmp r1, #1
beq _0804436A
cmp r1, #1
bgt _08044338
cmp r1, #0
beq _08044342
b _080443EA
.align 2, 0
_08044334: .4byte gPlayerEntity
_08044338:
cmp r1, #2
beq _08044392
cmp r1, #3
beq _080443C4
b _080443EA
_08044342:
movs r2, #0
adds r0, r5, #0
adds r0, #0x74
ldrb r0, [r0]
cmp r2, r0
bhs _080443EA
adds r3, r0, #0
ldr r1, [r5, #0x48]
_08044352:
ldrb r0, [r1, #0x10]
cmp r0, #0
bne _08044360
ldrb r0, [r1, #0xd]
cmp r6, r0
bls _08044360
adds r4, r2, #0
_08044360:
adds r1, #8
adds r2, #1
cmp r2, r3
blo _08044352
b _080443EA
_0804436A:
movs r2, #0
adds r0, r5, #0
adds r0, #0x74
ldrb r0, [r0]
cmp r2, r0
bhs _080443EA
adds r3, r0, #0
ldr r1, [r5, #0x48]
_0804437A:
ldrb r0, [r1, #0x10]
cmp r0, #0
bne _08044388
ldrb r0, [r1, #0xe]
cmp r6, r0
bls _08044388
adds r4, r2, #0
_08044388:
adds r1, #8
adds r2, #1
cmp r2, r3
blo _0804437A
b _080443EA
_08044392:
movs r2, #0
adds r0, r5, #0
adds r0, #0x74
ldrb r0, [r0]
cmp r2, r0
bhs _080443EA
adds r3, r0, #0
ldr r1, [r5, #0x48]
_080443A2:
ldrb r0, [r1, #0x10]
cmp r0, #0
bne _080443B0
ldrb r0, [r1, #0xc]
cmp r6, r0
bls _080443B0
adds r4, r2, #0
_080443B0:
adds r1, #8
adds r2, #1
cmp r2, r3
blo _080443A2
b _080443EA
_080443BA:
mov r1, r8
adds r0, r1, r4
ldrb r0, [r0, #0x11]
strb r0, [r3, #5]
b _08044492
_080443C4:
movs r2, #0
adds r0, r5, #0
adds r0, #0x74
ldrb r0, [r0]
cmp r2, r0
bhs _080443EA
adds r3, r0, #0
ldr r1, [r5, #0x48]
_080443D4:
ldrb r0, [r1, #0x10]
cmp r0, #0
bne _080443E2
ldrb r0, [r1, #0xf]
cmp r6, r0
bls _080443E2
adds r4, r2, #0
_080443E2:
adds r1, #8
adds r2, #1
cmp r2, r3
blo _080443D4
_080443EA:
cmp r4, #0xff
beq _08044492
ldr r0, [r5, #0x48]
lsls r4, r4, #3
adds r0, r4, r0
movs r1, #1
strb r1, [r0, #0x10]
ldr r1, [r5, #0x64]
ldrb r0, [r1]
subs r0, #1
strb r0, [r1]
ldr r2, [r5, #0x64]
ldrb r1, [r2]
lsls r0, r1, #2
adds r0, r0, r1
adds r0, #1
adds r7, r2, r0
ldr r0, [r5, #0x48]
adds r0, r4, r0
ldrb r1, [r0, #0x11]
lsls r0, r1, #2
adds r0, r0, r1
adds r0, #1
adds r6, r2, r0
movs r0, #0x53
movs r1, #1
bl CreateEnemy
adds r1, r0, #0
mov r8, r4
cmp r1, #0
beq _08044440
movs r2, #0
ldrsb r2, [r6, r2]
adds r2, #8
lsls r2, r2, #0x10
movs r3, #1
ldrsb r3, [r6, r3]
adds r3, #8
lsls r3, r3, #0x10
adds r0, r5, #0
bl PositionRelative
_08044440:
ldr r0, [r5, #0x64]
ldrb r0, [r0]
cmp r0, #0
bne _08044458
movs r0, #0x12
bl SetGlobalFlag
movs r0, #0x72
bl SoundReq
bl DeleteThisEntity
_08044458:
movs r2, #0
adds r3, r5, #0
adds r3, #0x74
_0804445E:
adds r0, r6, r2
adds r1, r7, r2
ldrb r1, [r1]
strb r1, [r0]
adds r2, #1
cmp r2, #4
bls _0804445E
movs r2, #0
ldrb r1, [r3]
cmp r2, r1
bhs _08044492
ldr r4, [r5, #0x48]
ldr r0, [r5, #0x64]
ldrb r6, [r0]
adds r5, r1, #0
adds r3, r4, #0
adds r3, #0xc
adds r1, r4, #0
_08044482:
ldrb r0, [r1, #0x11]
cmp r0, r6
beq _080443BA
adds r3, #8
adds r1, #8
adds r2, #1
cmp r2, r5
blo _08044482
_08044492:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.syntax divided
asm/non_matching/frozenOctorok/FrozenOctorok_Init.inc
-236
View File
@@ -1,236 +0,0 @@
.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
asm/non_matching/gleerok/sub_0802D3B8.inc
-323
View File
@@ -1,323 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r4, r0, #0
movs r0, #3
bl CheckGlobalFlag
cmp r0, #0
beq _0802D3DE
ldr r2, _0802D3F4 @ =gScreen
ldrh r1, [r2]
ldr r0, _0802D3F8 @ =0x0000FDFF
ands r0, r1
strh r0, [r2]
ldr r0, _0802D3FC @ =gPlayerEntity
bl sub_0807AABC
bl DeleteThisEntity
_0802D3DE:
movs r0, #1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0xa]
cmp r0, #6
bls _0802D3EA
b _0802D63C
_0802D3EA:
lsls r0, r0, #2
ldr r1, _0802D400 @ =_0802D404
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0802D3F4: .4byte gScreen
_0802D3F8: .4byte 0x0000FDFF
_0802D3FC: .4byte gPlayerEntity
_0802D400: .4byte _0802D404
_0802D404: @ jump table
.4byte _0802D420 @ case 0
.4byte _0802D544 @ case 1
.4byte _0802D58C @ case 2
.4byte _0802D5A8 @ case 3
.4byte _0802D5EC @ case 4
.4byte _0802D5F6 @ case 5
.4byte _0802D61A @ case 6
_0802D420:
movs r2, #0
movs r0, #2
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #0x10]
adds r3, r4, #0
adds r3, #0x29
ldrb r0, [r3]
movs r1, #7
orrs r0, r1
strb r0, [r3]
adds r0, r4, #0
adds r0, #0x75
strb r2, [r0]
adds r0, #0xb
strb r2, [r0]
subs r0, #7
strb r2, [r0]
movs r0, #0x96
str r0, [r4, #0x7c]
adds r0, r4, #0
bl sub_0802EB9C
movs r0, #0x54
bl zMalloc
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
adds r5, r0, #0
adds r7, r1, #0
cmp r5, #0
bne _0802D470
adds r0, r4, #0
bl GenericDeath
bl DeleteThisEntity
_0802D470:
ldr r0, [r7]
str r0, [r4, #0x64]
movs r6, #0
movs r0, #0
mov r8, r0
_0802D47A:
movs r0, #0x24
movs r1, #1
bl CreateEnemy
str r0, [r4, #0x54]
adds r3, r6, #1
cmp r0, #0
beq _0802D4D6
strb r3, [r0, #0xb]
ldr r1, [r4, #0x54]
adds r0, r4, #0
adds r0, #0x38
ldrb r0, [r0]
adds r1, #0x38
strb r0, [r1]
ldr r1, [r4, #0x54]
ldrh r0, [r4, #0x2e]
strh r0, [r1, #0x2e]
ldr r1, [r4, #0x54]
lsls r0, r3, #1
adds r0, r0, r3
lsls r0, r0, #2
ldrh r2, [r4, #0x32]
adds r0, r0, r2
strh r0, [r1, #0x32]
ldr r0, [r4, #0x54]
str r4, [r0, #0x50]
ldr r0, [r4, #0x54]
adds r0, #0x84
ldr r1, [r7]
str r1, [r0]
lsls r2, r6, #2
adds r0, r5, #0
adds r0, #0x3c
adds r0, r0, r2
ldr r1, [r4, #0x54]
str r1, [r0]
adds r2, r5, r2
movs r0, #0x10
strb r0, [r2, #1]
mov r0, r8
strb r0, [r2, #0x19]
adds r0, r5, #0
adds r0, #0x35
mov r1, r8
strb r1, [r0]
_0802D4D6:
adds r6, r3, #0
cmp r6, #4
bls _0802D47A
movs r0, #0x24
movs r1, #2
bl CreateEnemy
adds r2, r0, #0
str r2, [r4, #0x54]
cmp r2, #0
beq _0802D52E
adds r0, r4, #0
adds r0, #0x38
ldrb r1, [r0]
adds r0, r2, #0
adds r0, #0x38
strb r1, [r0]
ldr r1, [r4, #0x54]
ldrh r0, [r4, #0x2e]
movs r3, #0
strh r0, [r1, #0x2e]
ldr r2, [r4, #0x54]
adds r1, r6, #1
lsls r0, r1, #1
adds r0, r0, r1
lsls r0, r0, #2
ldrh r1, [r4, #0x32]
adds r0, r0, r1
strh r0, [r2, #0x32]
ldr r0, [r4, #0x54]
str r4, [r0, #0x50]
ldr r0, [r4, #0x54]
adds r0, #0x84
ldr r1, [r7]
str r1, [r0]
ldr r0, [r4, #0x54]
str r0, [r5, #0x50]
movs r0, #0x10
strb r0, [r5, #0x15]
adds r0, r5, #0
adds r0, #0x2d
strb r3, [r0]
adds r0, #8
strb r3, [r0]
_0802D52E:
.ifndef EU
ldr r0, _0802D540 @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
.endif
adds r0, r4, #0
movs r1, #0x4c
bl InitializeAnimation
b _0802D63C
.align 2, 0
.ifndef EU
_0802D540: .4byte gPlayerState
.endif
_0802D544:
ldrb r0, [r4, #0xb]
cmp r0, #1
bne _0802D55C
ldrb r0, [r4, #0x10]
movs r1, #0x80
orrs r0, r1
strb r0, [r4, #0x10]
adds r2, r4, #0
adds r2, #0x3b
ldrb r0, [r2]
orrs r1, r0
strb r1, [r2]
_0802D55C:
ldr r1, _0802D588 @ =gUnk_080CD7C4
ldrb r0, [r4, #0xb]
lsls r0, r0, #2
adds r0, r0, r1
ldrb r0, [r0, #1]
adds r3, r4, #0
adds r3, #0x29
movs r1, #7
ands r1, r0
ldrb r2, [r3]
movs r0, #8
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r3]
movs r0, #0
strb r0, [r4, #0xf]
adds r0, r4, #0
movs r1, #0x24
bl InitializeAnimation
b _0802D63C
.align 2, 0
_0802D588: .4byte gUnk_080CD7C4
_0802D58C:
adds r2, r4, #0
adds r2, #0x29
ldrb r0, [r2]
movs r1, #8
rsbs r1, r1, #0
ands r1, r0
strb r1, [r2]
movs r0, #0
strb r0, [r4, #0xf]
adds r0, r4, #0
movs r1, #0
bl InitAnimationForceUpdate
b _0802D63C
_0802D5A8:
ldr r0, _0802D5E8 @ =gUnk_080CD884
ldrb r1, [r0]
adds r0, r4, #0
adds r0, #0x74
movs r2, #0
strb r1, [r0]
adds r0, #1
strb r2, [r0]
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #6
orrs r0, r1
strb r0, [r2]
adds r2, #0x12
ldrb r1, [r2]
movs r0, #0x80
orrs r0, r1
strb r0, [r2]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl CopyPosition
adds r0, r4, #0
movs r1, #0x4f
bl InitializeAnimation
b _0802D63C
.align 2, 0
_0802D5E8: .4byte gUnk_080CD884
_0802D5EC:
adds r0, r4, #0
movs r1, #0x2c
bl InitAnimationForceUpdate
b _0802D63C
_0802D5F6:
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #6
orrs r0, r1
strb r0, [r2]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl CopyPosition
adds r0, r4, #0
movs r1, #0x2d
bl InitAnimationForceUpdate
b _0802D63C
_0802D61A:
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #6
orrs r0, r1
strb r0, [r2]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl CopyPosition
adds r0, r4, #0
movs r1, #0x50
bl InitializeAnimation
_0802D63C:
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _0802D648
adds r0, r4, #0
bl sub_0802D86C
_0802D648:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.syntax divided
asm/non_matching/gleerok/sub_0802E518.inc
-300
View File
@@ -1,300 +0,0 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
sub sp, #0xc
str r0, [sp]
adds r0, #0x84
ldr r0, [r0]
mov sb, r0
ldr r1, [r0, #0x3c]
ldr r0, [r1, #0x50]
bl CopyPosition
mov r0, sb
ldr r1, [r0, #0x3c]
ldrb r0, [r0, #1]
strb r0, [r1, #0x15]
mov r1, sb
ldrb r6, [r1, #1]
cmp r6, #0x10
bls _0802E54C
movs r0, #0xf
eors r6, r0
adds r6, #1
ands r6, r0
_0802E54C:
cmp r6, #0x10
bne _0802E552
movs r6, #0xf
_0802E552:
mov r2, sb
ldr r1, [r2, #0x3c]
movs r0, #0xf
eors r6, r0
adds r0, r6, #0
adds r0, #0x12
lsls r0, r0, #8
strh r0, [r1, #0x24]
ldr r0, [r2, #0x3c]
bl LinearMoveUpdate
movs r6, #0
movs r0, #0x3c
add r0, sb
mov sl, r0
mov r1, sb
adds r1, #0x30
str r1, [sp, #4]
ldr r2, [sp]
adds r2, #0x80
str r2, [sp, #8]
movs r7, #0x80
lsls r7, r7, #1
_0802E580:
lsls r0, r6, #2
add r0, sl
ldr r0, [r0]
adds r1, r6, #1
mov r8, r1
lsls r4, r1, #2
mov r2, sl
adds r5, r2, r4
ldr r1, [r5]
bl CopyPosition
add r4, sb
ldrb r0, [r4, #0x19]
lsls r0, r0, #4
ldr r1, _0802E644 @ =gSineTable
adds r0, r0, r1
movs r2, #0
ldrsh r0, [r0, r2]
ldr r1, [sp, #4]
adds r6, r1, r6
ldrb r1, [r6]
lsls r1, r1, #0x18
asrs r1, r1, #0x10
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r7, #0
bl FixedDiv
adds r1, r0, #0
ldrb r0, [r4, #1]
lsls r0, r0, #4
ldr r2, _0802E644 @ =gSineTable
adds r0, r0, r2
movs r2, #0
ldrsh r0, [r0, r2]
lsls r1, r1, #0x10
asrs r1, r1, #0x10
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r7, #0
bl FixedDiv
ldr r2, [r5]
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r2, #0x2c]
adds r1, r1, r0
str r1, [r2, #0x2c]
ldrb r0, [r4, #0x19]
lsls r0, r0, #4
adds r0, #0x80
ldr r1, _0802E644 @ =gSineTable
adds r0, r0, r1
movs r2, #0
ldrsh r0, [r0, r2]
ldrb r1, [r6]
lsls r1, r1, #0x18
asrs r1, r1, #0x10
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r7, #0
bl FixedDiv
ldr r2, [r5]
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r2, #0x30]
subs r1, r1, r0
str r1, [r2, #0x30]
mov r6, r8
cmp r6, #4
bls _0802E580
mov r1, sb
ldr r0, [r1, #0x50]
ldrb r1, [r0, #0xe]
adds r2, r0, #0
cmp r1, #0x18
bne _0802E662
mov r1, sb
ldrb r0, [r1, #0x15]
lsrs r0, r0, #3
lsls r7, r0, #2
mov r0, sb
adds r0, #0x2d
ldrb r0, [r0]
lsls r1, r0, #0x18
lsrs r0, r1, #0x18
cmp r0, #0xc
bls _0802E648
adds r7, #3
b _0802E64C
.align 2, 0
_0802E644: .4byte gSineTable
_0802E648:
lsrs r0, r1, #0x1a
adds r7, r7, r0
_0802E64C:
adds r0, r2, #0
adds r0, #0x58
ldrb r0, [r0]
adds r1, r7, #0
adds r1, #0x18
cmp r0, r1
beq _0802E6E8
adds r0, r2, #0
bl InitAnimationForceUpdate
b _0802E6E8
_0802E662:
ldr r2, [sp, #8]
ldrb r0, [r2]
cmp r0, #0
bne _0802E688
mov r0, sb
movs r1, #5
movs r2, #0
movs r3, #0
bl sub_0802E7CC
mov r0, sb
ldr r2, [r0, #0x50]
ldrb r1, [r2, #0x14]
lsrs r0, r1, #1
adds r7, r1, r0
lsrs r0, r7, #2
ldrb r2, [r2, #0xe]
adds r7, r0, r2
b _0802E6CA
_0802E688:
ldr r0, [sp]
adds r0, #0x3d
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
bne _0802E6C0
ldr r0, [sp]
adds r0, #0x58
ldrb r3, [r0]
mov r1, sb
ldrb r0, [r1, #0x15]
lsrs r2, r0, #3
adds r0, r2, #0
adds r0, #0x2f
cmp r3, r0
bne _0802E6BA
ldr r0, [sp]
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
adds r7, r3, #0
cmp r0, #0
beq _0802E6CA
_0802E6BA:
adds r7, r2, #0
adds r7, #0x28
b _0802E6CA
_0802E6C0:
mov r2, sb
ldrb r0, [r2, #0x15]
lsrs r0, r0, #3
adds r7, r0, #0
adds r7, #0x2f
_0802E6CA:
mov r0, sb
ldr r1, [r0, #0x50]
adds r0, r1, #0
adds r0, #0x58
ldrb r0, [r0]
cmp r0, r7
beq _0802E6E2
adds r0, r1, #0
adds r1, r7, #0
bl InitAnimationForceUpdate
b _0802E6E8
_0802E6E2:
adds r0, r1, #0
bl UpdateAnimationSingleFrame
_0802E6E8:
movs r6, #0
_0802E6EA:
ldr r1, [sp, #8]
ldrb r0, [r1]
cmp r0, #0
bne _0802E72E
lsls r1, r6, #0x18
lsrs r1, r1, #0x18
mov r0, sb
movs r2, #0
movs r3, #0
bl sub_0802E7CC
lsls r5, r6, #2
mov r2, sl
adds r0, r2, r5
ldr r0, [r0]
ldrb r1, [r0, #0x14]
lsrs r0, r1, #1
adds r7, r1, r0
lsrs r7, r7, #2
adds r4, r6, #1
lsls r0, r4, #2
add r0, sb
ldrb r0, [r0, #0x19]
movs r1, #3
bl __divsi3
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
lsls r1, r0, #1
adds r1, r1, r0
lsls r1, r1, #2
adds r7, r7, r1
adds r1, r5, #0
b _0802E73E
_0802E72E:
lsls r1, r6, #2
mov r2, sb
adds r0, r2, r1
ldrb r0, [r0, #1]
lsrs r0, r0, #3
adds r7, r0, #0
adds r7, #0x48
adds r4, r6, #1
_0802E73E:
mov r2, sl
adds r0, r2, r1
ldr r1, [r0]
adds r0, r1, #0
adds r0, #0x58
ldrb r0, [r0]
cmp r0, r7
beq _0802E756
adds r0, r1, #0
adds r1, r7, #0
bl InitializeAnimation
_0802E756:
adds r6, r4, #0
cmp r6, #4
bls _0802E6EA
add sp, #0xc
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.syntax divided
asm/non_matching/octorokBoss/OctorokBoss_Init.inc
-331
View File
@@ -1,331 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
push {r6, r7}
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0x18]
movs r1, #3
orrs r0, r1
strb r0, [r4, #0x18]
ldrb r0, [r4, #0xa]
cmp r0, #6
bls _0803573A
b _08035974
_0803573A:
lsls r0, r0, #2
ldr r1, _08035744 @ =_08035748
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08035744: .4byte _08035748
_08035748: @ jump table
.4byte _08035764 @ case 0
.4byte _080358D8 @ case 1
.4byte _080358D8 @ case 2
.4byte _080358D8 @ case 3
.4byte _080358D8 @ case 4
.4byte _08035920 @ case 5
.4byte _08035940 @ case 6
_08035764:
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #4
orrs r0, r1
strb r0, [r2]
adds r0, r4, #0
adds r0, #0x7c
movs r5, #0
strb r5, [r0]
movs r0, #1
strb r0, [r4, #0xe]
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 _0803579E
adds r0, r4, #0
bl GenericDeath
b _080359A6
_0803579E:
str r2, [r4, #0x64]
mov r1, r8
ldr r0, [r1]
strb r5, [r0, #6]
ldr r1, [r1]
movs r0, #2
strb r0, [r1]
mov r2, r8
ldr r0, [r2]
strb r5, [r0, #2]
ldr r1, [r2]
movs r0, #5
strb r0, [r1, #1]
ldrb r0, [r4, #0x19]
movs r1, #3
orrs r0, r1
strb r0, [r4, #0x19]
adds r2, r4, #0
adds r2, #0x6d
ldrb r0, [r2]
movs r1, #1
orrs r0, r1
strb r0, [r2]
adds r0, r4, #0
adds r0, #0x76
movs r1, #0xa0
strh r1, [r0]
subs r0, #2
strh r1, [r0]
adds r0, #6
strh r5, [r0]
movs r5, #0
movs r0, #0x79
adds r0, r0, r4
mov sb, r0
mov r7, r8
_080357E6:
adds r6, r5, #1
movs r0, #0x39
adds r1, r6, #0
bl CreateEnemy
adds r1, r0, #0
str r1, [r4, #0x54]
cmp r1, #0
beq _08035816
adds r0, r4, #0
bl CopyPosition
ldr r0, [r4, #0x54]
str r4, [r0, #0x50]
ldr r0, [r4, #0x54]
adds r0, #0x84
ldr r1, [r7]
str r1, [r0]
ldr r1, [r7]
lsls r0, r5, #2
adds r1, #0x20
adds r1, r1, r0
ldr r0, [r4, #0x54]
str r0, [r1]
_08035816:
adds r5, r6, #0
cmp r5, #3
bls _080357E6
movs r0, #0x39
movs r1, #5
bl CreateEnemy
adds r1, r0, #0
str r1, [r4, #0x54]
cmp r1, #0
beq _08035840
adds r0, r4, #0
bl CopyPosition
ldr r0, [r4, #0x54]
str r4, [r0, #0x50]
ldr r0, [r4, #0x54]
adds r0, #0x84
mov r2, r8
ldr r1, [r2]
str r1, [r0]
_08035840:
movs r0, #0x39
movs r1, #6
bl CreateEnemy
adds r1, r0, #0
str r1, [r4, #0x54]
cmp r1, #0
beq _0803586A
adds r0, r4, #0
bl CopyPosition
ldr r0, [r4, #0x54]
str r4, [r0, #0x50]
ldr r0, [r4, #0x54]
adds r0, #0x84
mov r2, r8
ldr r1, [r2]
str r1, [r0]
ldr r1, [r2]
ldr r0, [r4, #0x54]
str r0, [r1, #0xc]
_0803586A:
movs r5, #0
mov r7, r8
_0803586E:
movs r0, #0x39
movs r1, #7
bl CreateEnemy
str r0, [r4, #0x54]
adds r6, r5, #1
cmp r0, #0
beq _080358A0
strb r5, [r0, #0xb]
ldr r1, [r4, #0x54]
adds r0, r4, #0
bl CopyPosition
ldr r0, [r4, #0x54]
str r4, [r0, #0x50]
ldr r0, [r4, #0x54]
adds r0, #0x84
ldr r1, [r7]
str r1, [r0]
ldr r1, [r7]
lsls r0, r6, #2
adds r1, #0xc
adds r1, r1, r0
ldr r0, [r4, #0x54]
str r0, [r1]
_080358A0:
adds r5, r6, #0
cmp r5, #3
bls _0803586E
movs r1, #0
movs r0, #3
strb r0, [r4, #0xc]
strb r1, [r4, #0xd]
movs r0, #0x3c
mov r1, sb
strb r0, [r1]
ldr r1, _080358D0 @ =gPlayerEntity
ldrb r2, [r1, #0x18]
subs r0, #0x40
ands r0, r2
strb r0, [r1, #0x18]
ldrh r0, [r4, #0x2e]
strh r0, [r1, #0x2e]
ldrh r0, [r4, #0x32]
subs r0, #0xa0
strh r0, [r1, #0x32]
ldr r0, _080358D4 @ =gRoomControls
str r4, [r0, #0x30]
b _08035974
.align 2, 0
_080358D0: .4byte gPlayerEntity
_080358D4: .4byte gRoomControls
_080358D8:
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 _080358F4
strb r2, [r4, #0xf]
b _080358F8
_080358F4:
movs r0, #0xfe
strb r0, [r4, #0xf]
_080358F8:
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 _08035918
adds r1, r4, #0
adds r1, #0x76
movs r0, #0xff
lsls r0, r0, #8
strh r0, [r1]
b _08035974
_08035918:
adds r0, r4, #0
adds r0, #0x76
strh r2, [r0]
b _08035974
_08035920:
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]
b _08035974
_08035940:
adds r0, r4, #0
adds r0, #0x76
movs r2, #0
movs r1, #0x80
lsls r1, r1, #1
strh r1, [r0]
subs r0, #2
strh r1, [r0]
adds r3, r4, #0
adds r3, #0x29
ldrb r1, [r3]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
strb r0, [r3]
adds r0, r4, #0
adds r0, #0x79
strb r2, [r0]
movs r0, #0x10
strb r0, [r4, #0xe]
movs r0, #1
strb r0, [r4, #0xf]
adds r1, r4, #0
adds r1, #0x7d
movs r0, #0x80
strb r0, [r1]
_08035974:
ldrb r0, [r4, #0xa]
cmp r0, #6
beq _08035990
ldr r0, _0803598C @ =gUnk_080CF08C
ldrb r1, [r4, #0xa]
lsls r1, r1, #2
adds r1, r1, r0
ldrb r1, [r1]
adds r0, r4, #0
bl InitializeAnimation
b _080359A0
.align 2, 0
_0803598C: .4byte gUnk_080CF08C
_08035990:
ldr r0, _080359B0 @ =gUnk_080CF08C
ldrb r1, [r4, #0xa]
lsls r1, r1, #2
adds r1, r1, r0
ldrb r1, [r1]
adds r0, r4, #0
bl InitAnimationForceUpdate
_080359A0:
adds r0, r4, #0
bl OctorokBoss_Action1
_080359A6:
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080359B0: .4byte gUnk_080CF08C
.syntax divided
asm/non_matching/playerItemSword/sub_080A7A84.inc
-133
View File
@@ -1,133 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r6, _080A7AE0 @ =gPlayerEntity
adds r0, r6, #0
adds r0, #0x5a
ldrb r0, [r0]
movs r1, #0xf
ands r1, r0
cmp r1, #0
beq _080A7B8C
ldr r2, _080A7AE4 @ =gUnk_08129072
subs r0, r1, #1
lsls r0, r0, #1
adds r1, r0, r2
movs r3, #0
ldrsb r3, [r1, r3]
adds r0, #1
adds r0, r0, r2
movs r5, #0
ldrsb r5, [r0, r5]
ldr r2, _080A7AE8 @ =gPlayerState
ldrb r1, [r2, #0x1b]
movs r0, #0xc0
ands r0, r1
adds r7, r2, #0
cmp r0, #0
bne _080A7AC4
ldrb r0, [r6, #0x18]
lsls r0, r0, #0x19
cmp r0, #0
bge _080A7AC4
rsbs r3, r3, #0
_080A7AC4:
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _080A7AEC
movs r0, #0x2e
ldrsh r2, [r4, r0]
adds r2, r2, r3
movs r1, #0x32
ldrsh r3, [r4, r1]
adds r3, r3, r5
adds r0, r4, #0
movs r1, #0
bl sub_08008796
b _080A7B8C
.align 2, 0
_080A7AE0: .4byte gPlayerEntity
_080A7AE4: .4byte gUnk_08129072
_080A7AE8: .4byte gPlayerState
_080A7AEC:
ldr r0, [r4, #0x34]
cmp r0, #0
bne _080A7B8C
adds r0, r7, #0
adds r0, #0xac
ldrh r0, [r0]
movs r1, #8
ands r1, r0
lsls r1, r1, #0x10
lsrs r1, r1, #0x10
rsbs r1, r1, #0
lsrs r1, r1, #0x1f
movs r0, #0x2e
ldrsh r2, [r4, r0]
adds r6, r3, #0
adds r2, r2, r6
movs r0, #0x32
ldrsh r3, [r4, r0]
adds r3, r3, r5
adds r0, r4, #0
bl sub_08008796
cmp r0, #0
bne _080A7B8C
ldrb r2, [r7, #0x1b]
cmp r2, #0
beq _080A7B8C
movs r0, #0xc0
ands r0, r2
cmp r0, #0
bne _080A7B8C
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl GetRelativeCollisionTile
cmp r0, #0x2e
bne _080A7B4C
ldr r0, _080A7B44 @ =gPlayerEntity
ldr r1, _080A7B48 @ =0x00000119
bl SoundReqClipped
b _080A7B54
.align 2, 0
_080A7B44: .4byte gPlayerEntity
_080A7B48: .4byte 0x00000119
_080A7B4C:
ldr r0, _080A7B90 @ =gPlayerEntity
movs r1, #0x74
bl SoundReqClipped
_080A7B54:
movs r0, #0xf
movs r1, #0x1a
movs r2, #0
bl CreateObject
adds r2, r0, #0
cmp r2, #0
beq _080A7B8C
ldr r1, _080A7B94 @ =gUnk_0812908E
ldrb r0, [r4, #0x14]
adds r0, r0, r1
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
ldrh r3, [r4, #0x2e]
adds r0, r0, r3
strh r0, [r2, #0x2e]
ldrb r0, [r4, #0x14]
adds r0, #1
adds r0, r0, r1
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
ldrh r1, [r4, #0x32]
adds r0, r0, r1
strh r0, [r2, #0x32]
ldr r0, [r4, #0x34]
str r0, [r2, #0x34]
_080A7B8C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A7B90: .4byte gPlayerEntity
_080A7B94: .4byte gUnk_0812908E
.syntax divided
asm/non_matching/save/sub_08050B3C.inc
-125
View File
@@ -1,125 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
sub sp, #8
str r0, [sp]
ldr r1, _08050C18 @ =gSave
adds r0, r1, #0
adds r0, #0xaa
ldrb r0, [r0]
lsrs r2, r0, #1
cmp r2, #0
bne _08050B5A
movs r2, #1
_08050B5A:
adds r0, r1, #0
adds r0, #0xab
ldrb r0, [r0]
lsrs r3, r0, #1
cmp r3, #0
beq RETURN
cmp r2, r3
ble _08050B6C
adds r2, r3, #0
_08050B6C:
movs r0, #3
ands r0, r2
str r0, [sp, #4]
adds r0, r2, #0
asrs r5, r0, #2
mov ip, r5
cmp r5, #0xa
ble _08050B80
movs r2, #0xa
mov ip, r2
_08050B80:
adds r6, r5, #0
subs r6, #0xa
mov sb, r6
cmp r6, #0
bge _08050B8E
movs r7, #0
mov sb, r7
_08050B8E:
adds r0, r3, #0
asrs r3, r0, #2
adds r0, r3, #0
cmp r3, #0xa
ble _08050B9A
movs r3, #0xa
_08050B9A:
adds r4, r0, #0
subs r4, #0xa
ldr r2, [sp]
ldr r0, _08050C1C @ =0x0000F24C
mov sl, r0
strh r0, [r2]
ldr r1, _08050C20 @ =0x040000D4
movs r7, #0xa
mov r8, r7
mov r0, r8
mov r7, ip @ var5
subs r0, r0, r7 @ 10 - var5
lsls r0, r0, #1
ldr r7, _08050C24 @ =gUnk_080FC914
mov ip, r7
add r0, ip
str r0, [r1]
adds r0, r2, #2
str r0, [r1, #4]
movs r0, #0x80
lsls r0, r0, #0x18
orrs r3, r0
str r3, [r1, #8]
ldr r0, [r1, #8]
cmp r4, #0
ble _08050BEE
adds r2, #0x40
mov r3, sl
strh r3, [r2]
mov r7, r8
mov r3, sb
subs r0, r7, r3
lsls r0, r0, #1
add r0, ip
str r0, [r1]
adds r0, r2, #2
str r0, [r1, #4]
movs r7, #0x80
lsls r7, r7, #0x18
orrs r4, r7
str r4, [r1, #8]
ldr r0, [r1, #8]
_08050BEE:
ldr r0, [sp, #4]
cmp r0, #0
beq RETURN
ldr r2, [sp]
cmp r5, #9
ble _08050BFE
adds r5, r6, #0
adds r2, #0x40
_08050BFE:
lsls r0, r5, #1
adds r0, r0, r2
ldr r2, [sp, #4]
ldr r3, _08050C28 @ =0xFFFFF24D
adds r1, r2, r3
strh r1, [r0, #2]
RETURN:
add sp, #8
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08050C18: .4byte gSave
_08050C1C: .4byte 0x0000F24C
_08050C20: .4byte 0x040000D4
_08050C24: .4byte gUnk_080FC914
_08050C28: .4byte 0xFFFFF24D
.syntax divided
asm/non_matching/scroll/UpdateDoorTransition.inc
-119
View File
@@ -1,119 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
ldr r7, _08080A70 @ =gRoomControls
ldr r1, [r7, #0x30]
ldr r0, _08080A74 @ =gPlayerEntity
adds r2, r7, #0
cmp r1, r0
beq _08080A50
b _08080B5C
_08080A50:
ldr r0, _08080A78 @ =gPlayerState
ldrb r0, [r0, #2]
cmp r0, #0
beq _08080A5A
b _08080B5C
_08080A5A:
ldrb r0, [r1, #0xc]
subs r0, #1
cmp r0, #0x1c
bls _08080A64
b _08080B5C
_08080A64:
lsls r0, r0, #2
ldr r1, _08080A7C @ =_08080A80
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08080A70: .4byte gRoomControls
_08080A74: .4byte gPlayerEntity
_08080A78: .4byte gPlayerState
_08080A7C: .4byte _08080A80
_08080A80: @ jump table
.4byte _08080AFA @ case 0
.4byte _08080B5C @ case 1
.4byte _08080B5C @ case 2
.4byte _08080B5C @ case 3
.4byte _08080B5C @ case 4
.4byte _08080B5C @ case 5
.4byte _08080B5C @ case 6
.4byte _08080B5C @ case 7
.4byte _08080AFA @ case 8
.4byte _08080B5C @ case 9
.4byte _08080B5C @ case 10
.4byte _08080B5C @ case 11
.4byte _08080B5C @ case 12
.4byte _08080B5C @ case 13
.4byte _08080AF4 @ case 14
.4byte _08080B5C @ case 15
.4byte _08080B5C @ case 16
.4byte _08080B5C @ case 17
.4byte _08080B5C @ case 18
.4byte _08080B5C @ case 19
.4byte _08080B5C @ case 20
.4byte _08080B5C @ case 21
.4byte _08080B5C @ case 22
.4byte _08080AFA @ case 23
.4byte _08080B5C @ case 24
.4byte _08080B5C @ case 25
.4byte _08080B5C @ case 26
.4byte _08080B5C @ case 27
.4byte _08080AFA @ case 28
_08080AF4:
ldrb r0, [r2, #4]
cmp r0, #0x48
beq _08080B5C
_08080AFA:
ldr r3, [r7, #0x30]
movs r0, #0x32
ldrsh r1, [r3, r0]
ldrh r0, [r7, #8]
subs r6, r1, r0
movs r0, #0x2e
ldrsh r1, [r3, r0]
ldrh r0, [r7, #6]
subs r5, r1, r0
asrs r0, r5, #4
movs r2, #0x3f
ands r0, r2
asrs r1, r6, #4
ands r1, r2
lsls r1, r1, #6
orrs r0, r1
adds r3, #0x38
ldrb r1, [r3]
bl sub_080B1AE0
adds r4, r0, #0
ldr r0, [r7, #0x30]
adds r0, #0x38
ldrb r2, [r0]
adds r0, r5, #0
adds r1, r6, #0
bl sub_080B1A48
ldr r1, _08080B48 @ =gRoomTransition
strh r0, [r1, #0xa]
cmp r4, #0x3f
beq _08080B50
cmp r4, #0x3f
bhi _08080B4C
cmp r4, #0x29
bhi _08080B5C
cmp r4, #0x28
blo _08080B5C
b _08080B50
.align 2, 0
_08080B48: .4byte gRoomTransition
_08080B4C:
cmp r4, #0xf1
bne _08080B5C
_08080B50:
adds r0, r5, #0
adds r1, r6, #0
movs r2, #0xff
movs r3, #0xa
bl sub_080806BC
_08080B5C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided
include/effects.h
+1 -1
View File
@@ -42,7 +42,7 @@ typedef enum {
FX_BROWN_SMOKE_LARGE,
FX_BROWN_SMOKE2,
FX_SWEAT,
FX_26,
FX_SPARKLE4,
FX_27,
FX_SLOW_EXPLOSION,
FX_CONFETTI,
include/global.h
+6
View File
@@ -101,6 +101,12 @@
#define FORCE_REGISTER(var, reg) register var asm(#reg)
#endif
#if NON_MATCHING
#define MEMORY_BARRIER
#else
#define MEMORY_BARRIER asm("" ::: "memory")
#endif
typedef union {
s32 WORD;
struct {
src/enemy/bombPeahat.c
+4 -6
View File
@@ -515,7 +515,7 @@ void sub_0802AF9C(Entity* this) {
}
}
NONMATCH("asm/non_matching/bombPeahat/sub_0802AFC8.inc", void sub_0802AFC8(Entity* this)) {
void sub_0802AFC8(Entity* this) {
u32 subtimer = this->subtimer;
u32 flag = 8;
if (subtimer < 0x29) {
@@ -526,13 +526,12 @@ NONMATCH("asm/non_matching/bombPeahat/sub_0802AFC8.inc", void sub_0802AFC8(Entit
} else {
this->field_0x82.HWORD += 0x10;
}
tmp2 = this->field_0x82.HWORD;
tmp = tmp2 & 0xf0;
tmp = this->field_0x82.HWORD & 0xf0;
if (tmp == 0 || tmp > 0x80) {
this->field_0x82.HWORD ^= 0x8000;
}
tmp = 0x130 - (this->field_0x82.HWORD & 0xf0);
SetAffineInfo(this, tmp, tmp, 0);
tmp = this->field_0x82.HWORD & 0xf0;
SetAffineInfo(this, 0x130 - tmp, 0x130 - tmp, 0);
}
if (this->subtimer & flag) {
this->palette.b.b0 = this->palette.b.b4;
@@ -540,7 +539,6 @@ NONMATCH("asm/non_matching/bombPeahat/sub_0802AFC8.inc", void sub_0802AFC8(Entit
this->palette.b.b0 = 0;
}
}
END_NONMATCH
void sub_0802B048(Entity* this) {
Entity* ent;
src/enemy/chuchuBoss.c
+7 -4
View File
@@ -327,7 +327,7 @@ void ChuchuBoss_OnTick(ChuchuBossEntity* this) {
gUnk_080CC1B0[super->action](this);
}
NONMATCH("asm/non_matching/chuchuBoss/sub_08025DD8.inc", void sub_08025DD8(ChuchuBossEntity* this)) {
void sub_08025DD8(ChuchuBossEntity* this) {
super->action = 1;
if (super->type == 8) {
super->type = 4;
@@ -346,7 +346,7 @@ NONMATCH("asm/non_matching/chuchuBoss/sub_08025DD8.inc", void sub_08025DD8(Chuch
switch (super->type & 3) {
Hitbox* hitbox;
case 0:
super->type2 = super->type & 3;
super->type2 = super->type;
this->unk_84 = zMalloc(sizeof(Helper));
if (!this->unk_84 || !AllocMutableHitbox(super)) {
GenericDeath(super);
@@ -376,6 +376,7 @@ NONMATCH("asm/non_matching/chuchuBoss/sub_08025DD8.inc", void sub_08025DD8(Chuch
this->unk_68->base.y.HALF.HI = super->y.HALF.HI - 0xE;
this->unk_68->base.timer = 0xE;
this->unk_68->base.parent = super;
MEMORY_BARRIER;
this->unk_68->unk_68 = this;
}
super->parent = CreateEnemy(CHUCHU_BOSS, super->type | 2);
@@ -385,6 +386,7 @@ NONMATCH("asm/non_matching/chuchuBoss/sub_08025DD8.inc", void sub_08025DD8(Chuch
super->parent->y.HALF.HI = this->unk_68->base.y.HALF.HI - 0x12;
super->parent->timer = 0x12;
super->parent->parent = (Entity*)this->unk_68;
MEMORY_BARRIER;
this->unk_68->base.child = super->parent;
((ChuchuBossEntity*)super->parent)->unk_68 = this;
}
@@ -417,7 +419,9 @@ NONMATCH("asm/non_matching/chuchuBoss/sub_08025DD8.inc", void sub_08025DD8(Chuch
}
}
break;
case 1 ... 3:
case 1:
case 2:
case 3:
hitbox = super->hitbox;
if (!AllocMutableHitbox(super)) {
this->unk_68->base.health = 0;
@@ -437,7 +441,6 @@ NONMATCH("asm/non_matching/chuchuBoss/sub_08025DD8.inc", void sub_08025DD8(Chuch
sub_08026060(this);
}
}
END_NONMATCH
void sub_08026060(ChuchuBossEntity* this) {
gUnk_080CC1C8[super->type](this);
src/enemy/dust.c
+31 -36
View File
@@ -167,69 +167,65 @@ void sub_080442A0(DustEntity* this) {
extern const u8 gUnk_080D15B4[];
NONMATCH("asm/non_matching/dust/sub_080442BC.inc", void sub_080442BC(DustEntity* this)) {
u32 bVar1;
void sub_080442BC(DustEntity* this) {
u32 hitboxCount;
u32 i;
u32 tmp;
const u8* ptr = gUnk_080D15B4;
u8* ptr2;
hitboxCount = HEAP->unk_0;
bVar1 = HEAP->unk_0;
for (i = 0; i < bVar1; i++) {
tmp = 0;
super->hitbox[i + 1].unk2[2] = ptr[0];
super->hitbox[i + 1].unk2[3] = ptr[1];
super->hitbox[i + 1].width = ptr[2];
super->hitbox[i + 1].height = ptr[3];
// hitbox is probably misused here.
super->hitbox[i + 1].offset_x = tmp;
super->hitbox[i + 2].offset_y = (s8)i;
for (i = 0; i < hitboxCount; i++) {
((Hitbox3D*)&super->hitbox[i])[1].offset_x = ptr[0];
((Hitbox3D*)&super->hitbox[i])[1].offset_y = ptr[1];
((Hitbox3D*)&super->hitbox[i])[1].unknown[0] = ptr[2];
((Hitbox3D*)&super->hitbox[i])[1].unknown[1] = ptr[3];
((Hitbox3D*)&super->hitbox[i])[1].unknown[2] = 0;
((Hitbox3D*)&super->hitbox[i])[1].unknown[3] = i;
}
this->unk_74 = bVar1;
this->unk_74 = hitboxCount;
}
END_NONMATCH
// heap and hitbox struct
NONMATCH("asm/non_matching/dust/sub_08044310.inc", void sub_08044310(DustEntity* this)) {
void sub_08044310(DustEntity* this) {
Entity* iVar1;
u32 bVar2;
Hitbox* pHVar3;
DustHeap* puVar4;
u32 i;
u8* puVar6;
u32 uVar7;
Hitbox* pHVar8;
u8* pbVar9;
u32 tmp;
DustHeap* reg7;
uVar7 = 0xff;
tmp = 0xff;
switch (gPlayerEntity.animationState >> 1 & 3) {
switch (gPlayerEntity.animationState / 2 & 3) {
case 0:
for (i = 0; i < this->unk_74; i++) {
if (((u8)super->hitbox[i + 2].offset_x == 0) && (tmp > (u32)super->hitbox[i + 1].unk2[3])) {
if ((((Hitbox3D*)&super->hitbox[i])[1].unknown[2] == 0) &&
(tmp > (u8)((Hitbox3D*)&super->hitbox[i])[1].offset_y)) {
uVar7 = i;
}
}
break;
case 1:
for (i = 0; i < this->unk_74; i++) {
if (((u8)super->hitbox[i + 2].offset_x == 0) && (tmp > (u8)super->hitbox[i + 1].width)) {
if ((((Hitbox3D*)&super->hitbox[i])[1].unknown[2] == 0) &&
(tmp > ((Hitbox3D*)&super->hitbox[i])[1].unknown[0])) {
uVar7 = i;
}
}
break;
case 2:
for (i = 0; i < this->unk_74; i++) {
if ((u8)super->hitbox[i + 2].offset_x == 0 && (tmp > (u8)super->hitbox[i + 1].unk2[2])) {
if ((((Hitbox3D*)&super->hitbox[i])[1].unknown[2] == 0) &&
(tmp > (u8)((Hitbox3D*)&super->hitbox[i])[1].offset_x)) {
uVar7 = i;
}
}
break;
case 3:
for (i = 0; i < this->unk_74; i++) {
if (((u8)super->hitbox[i + 2].offset_x == 0) && (tmp > super->hitbox[i + 1].height)) {
if ((((Hitbox3D*)&super->hitbox[i])[1].unknown[2] == 0) &&
(tmp > ((Hitbox3D*)&super->hitbox[i])[1].unknown[1])) {
uVar7 = i;
}
}
@@ -239,9 +235,9 @@ NONMATCH("asm/non_matching/dust/sub_08044310.inc", void sub_08044310(DustEntity*
if (uVar7 != 0xff) {
super->hitbox[uVar7 + 2].offset_x = 1;
HEAP->unk_0--;
puVar4 = HEAP;
bVar2 = puVar4->unk_0;
pbVar9 = &puVar4->items[(u32)(u8)super->hitbox[uVar7 + 2].offset_y].unk_1;
reg7 = HEAP + 1 + HEAP->unk_0 * 5;
bVar2 = HEAP->unk_0;
pbVar9 = &HEAP->items[(u32)(u8)super->hitbox[uVar7 + 2].offset_y].unk_0;
iVar1 = CreateEnemy(DUST, 1);
if (iVar1 != 0) {
PositionRelative(super, iVar1, ((s8)*pbVar9 + 8) * 0x10000, ((s8)pbVar9[1] + 8) * 0x10000);
@@ -254,18 +250,17 @@ NONMATCH("asm/non_matching/dust/sub_08044310.inc", void sub_08044310(DustEntity*
}
for (i = 0; i < 5; i++) {
pbVar9[i] = (&puVar4->unk_0)[i];
pbVar9[i] = reg7[i].unk_0;
}
for (i = 0; i < this->unk_74; i++) {
if ((u8)super->hitbox[i + 2].offset_y == HEAP->unk_0) {
super->hitbox[i].unk2[3] = super->hitbox[uVar7 + 2].offset_y;
return;
if (((Hitbox3D*)&super->hitbox[i])[1].unknown[3] == HEAP->unk_0) {
((Hitbox3D*)&super->hitbox[i])[1].unknown[3] = super->hitbox[uVar7 + 2].offset_y;
break;
}
}
}
}
END_NONMATCH
void sub_08044498(DustEntity* this) {
Entity* pEVar1;
@@ -288,7 +283,7 @@ void sub_08044498(DustEntity* this) {
for (i = 0; i < uVar4; i++) {
if (xdiff - pbVar2[i].unk_0 < 0x10 && ydiff - pbVar2[i].unk_1 < 0x10) {
pEVar1 = CreateObject(SPECIAL_FX, 0x11, 0);
pEVar1 = CreateObject(SPECIAL_FX, FX_DASH, 0);
if (pEVar1 == NULL) {
return;
}
src/enemy/eyegore.c
+2 -2
View File
@@ -314,13 +314,13 @@ void sub_08030E80(EyegoreEntity* this) {
-11, 9, 11, 9, -9, -2, -8, 10, -11, -1, 11, -1, 9, -2, 8, 10,
};
u32 tmp = super->animationState << 2;
Entity* effect = CreateObject(SPECIAL_FX, 2, 0);
Entity* effect = CreateObject(SPECIAL_FX, FX_DEATH, 0);
if (effect != NULL) {
CopyPosition(super, effect);
effect->x.HALF.HI += gUnk_080CE2F4[tmp + 0];
effect->y.HALF.HI += gUnk_080CE2F4[tmp + 1];
}
effect = CreateObject(SPECIAL_FX, 2, 0);
effect = CreateObject(SPECIAL_FX, FX_DEATH, 0);
if (effect != NULL) {
CopyPosition(super, effect);
effect->x.HALF.HI += gUnk_080CE2F4[tmp + 2];
src/enemy/gleerok.c
+50 -61
View File
@@ -307,16 +307,12 @@ void Gleerok_OnTick(GleerokEntity* this) {
super->spriteRendering.b3 = 3;
}
NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokEntity* this)) {
u32 uvar1;
Entity* ent;
void sub_0802D3B8(GleerokEntity* this) {
u32 tmp1;
Gleerok_HeapStruct* heap;
u32 val;
Gleerok_HeapStruct2* ptr;
Gleerok_HeapStruct2* ptr2;
if (CheckGlobalFlag(LV2_CLEAR)) {
gScreen.lcd.displayControl &= 0xFDFF;
gScreen.lcd.displayControl &= 0xfdff;
sub_0807AABC(&gPlayerEntity);
DeleteThisEntity();
}
@@ -334,7 +330,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE
this->unk_7c.WORD = 0x96;
sub_0802EB9C(this);
this->unk_84 = zMalloc(0x54);
this->unk_84 = zMalloc(sizeof(Gleerok_HeapStruct));
heap = this->unk_84;
if (heap == NULL) {
@@ -343,38 +339,36 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE
}
super->myHeap = this->unk_84;
uvar1 = 0;
do {
for (tmp1 = 0; tmp1 < 5; tmp1++) {
super->child = CreateEnemy(GLEEROK, 1);
if (super->child != NULL) {
super->child->type2 = uvar1 + 1;
super->child->type2 = tmp1 + 1;
super->child->collisionLayer = super->collisionLayer;
super->child->x.HALF.HI = super->x.HALF.HI;
super->child->y.HALF.HI = super->y.HALF.HI + ((uvar1 + 1) * 12);
super->child->y.HALF.HI = super->y.HALF.HI + ((tmp1 + 1) * 12);
super->child->parent = super;
((GleerokEntity*)super->child)->unk_84 = this->unk_84;
this->unk_84->entities[uvar1] = super->child;
ptr = this->unk_84->filler;
ptr2 = ptr + uvar1;
ptr2[0].unk0.HALF.HI = 0x10;
ptr2[6].unk0.HALF.HI = 0;
ptr[13].unk0.HALF.HI = 0;
MEMORY_BARRIER;
heap->entities[tmp1] = super->child;
heap->filler[tmp1].unk0.HALF.HI = 0x10;
heap->filler2[tmp1].unk0.HALF.HI = 0;
heap->unk_30[5] = 0;
}
} while (++uvar1 < 5);
}
ent = CreateEnemy(GLEEROK, 2);
super->child = ent;
if (ent != NULL) {
super->child = CreateEnemy(GLEEROK, 2);
if (super->child != NULL) {
super->child->collisionLayer = super->collisionLayer;
super->child->x.HALF.HI = super->x.HALF.HI;
super->child->y.HALF.HI = super->y.HALF.HI + ((uvar1 + 1) * 12);
super->child->y.HALF.HI = super->y.HALF.HI + ((tmp1 + 1) * 12);
super->child->parent = super;
((GleerokEntity*)super->child)->unk_84 = this->unk_84;
MEMORY_BARRIER;
heap->ent2 = super->child;
heap->filler[5].unk0.HALF.HI = 0x10;
heap->filler2[5].unk0.HALF.HI = 0;
heap->filler[13].unk0.HALF.HI = 0;
heap->unk_30[5] = 0;
}
#ifndef EU
gPlayerState.controlMode = CONTROL_DISABLED;
@@ -386,6 +380,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE
COLLISION_ON(super);
super->flags2 |= 0x80;
}
super->spritePriority.b0 = gUnk_080CD7C4[super->type2].unk0.HALF.HI;
super->subtimer = 0;
InitializeAnimation(super, 0x24);
@@ -422,7 +417,6 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE
sub_0802D86C(this);
}
}
END_NONMATCH
void sub_0802D650(GleerokEntity* this) {
#ifdef EU
@@ -1221,17 +1215,15 @@ void sub_0802E4C0(GleerokEntity* this) {
sub_0802E518(this);
}
NONMATCH("asm/non_matching/gleerok/sub_0802E518.inc", void sub_0802E518(GleerokEntity* this)) {
u32 index;
void sub_0802E518(GleerokEntity* this) {
Gleerok_HeapStruct* heap;
s32 result;
u32 r6;
u32 sp4;
u32 sp8;
s32 r7;
Gleerok_HeapStruct* heap = this->unk_84;
CopyPosition(heap->entities[0]->parent, heap->entities[0]);
heap->entities[0]->direction = heap->filler->unk0.HALF.HI;
u32 r7;
r6 = heap->filler->unk0.HALF.HI;
heap = this->unk_84;
CopyPosition(heap->entities[0]->parent, heap->entities[0]);
r6 = (heap->entities[0]->direction = heap->filler->unk0.HALF.HI);
if (r6 > 0x10) {
r6 ^= 0xf;
r6 = (r6 + 1) & 0xf;
@@ -1243,21 +1235,16 @@ NONMATCH("asm/non_matching/gleerok/sub_0802E518.inc", void sub_0802E518(GleerokE
heap->entities[0]->speed = ((r6 ^ 0xf) + 0x12) << 8;
LinearMoveUpdate(heap->entities[0]);
sp4 = *(u32*)&heap->unk_30;
sp8 = this->unk_80;
for (index = 0; index <= 4; index++) {
s32 result;
CopyPosition(heap->entities[index], heap->entities[index + 1]);
result = FixedMul(gSineTable[heap->filler2[(index + 1)].unk0.HALF.HI * 8], (heap->unk_30)[r6] << 8);
for (r6 = 0; r6 <= 4; r6++) {
CopyPosition(heap->entities[r6], heap->entities[r6 + 1]);
result = FixedMul(gSineTable[heap->filler2[(r6 + 1)].unk0.HALF.HI * 8], (heap->unk_30)[r6] << 8);
result = FixedDiv(result, 0x100);
result = FixedMul(gSineTable[heap->filler[(index + 1)].unk0.HALF.HI * 8], result);
result = FixedDiv(result, 0x100);
heap->entities[index]->x.WORD += result << 8;
result = FixedMul(gSineTable[heap->filler[(r6 + 1)].unk0.HALF.HI * 8], result);
heap->entities[r6 + 1]->x.WORD += FixedDiv(result, 0x100) << 8;
result = FixedMul(gSineTable[heap->filler2[(index + 1)].unk0.HALF.HI * 8 + 0x40], (heap->unk_30)[r6] << 8);
result = FixedDiv(result, 0x100);
heap->entities[index]->y.WORD -= result << 8;
result = FixedMul(gSineTable[heap->filler2[(r6 + 1)].unk0.HALF.HI * 8 + 0x40], (heap->unk_30)[r6] << 8);
heap->entities[r6 + 1]->y.WORD -= FixedDiv(result, 0x100) << 8;
}
if (heap->ent2->timer == 24) {
@@ -1275,17 +1262,16 @@ NONMATCH("asm/non_matching/gleerok/sub_0802E518.inc", void sub_0802E518(GleerokE
if (this->unk_80 == 0) {
sub_0802E7CC(heap, 5, 0, 0);
r7 = (heap->ent2->animationState + (heap->ent2->animationState >> 1));
r7 = (r7 >> 2) + heap->ent2->timer;
r7 >>= 2;
r7 += heap->ent2->timer;
} else {
if (super->iframes == 0) {
if ((super->animIndex != (heap->filler[5].unk0.HALF.HI >> 3) + 0x2f)) {
r7 = (heap->filler[5].unk0.HALF.HI >> 3) + 0x28;
} else if ((super->frame & ANIM_DONE) != 0) {
r7 = (heap->filler[5].unk0.HALF.HI >> 3) + 0x28;
} else {
if ((super->frame & ANIM_DONE) != 0) {
r7 = (heap->filler[5].unk0.HALF.HI >> 3) + 0x28;
} else {
r7 = super->animIndex;
}
r7 = super->animIndex;
}
} else {
r7 = (heap->filler[5].unk0.HALF.HI >> 3) + 0x2f;
@@ -1299,22 +1285,25 @@ NONMATCH("asm/non_matching/gleerok/sub_0802E518.inc", void sub_0802E518(GleerokE
}
}
for (index = 0; index <= 4; index++) {
for (r6 = 0; r6 <= 4; r6++) {
if (this->unk_80 == 0) {
s8 x = 3;
u32 val;
sub_0802E7CC(heap, (u8)index, 0, 0);
r7 = heap->entities[index]->animationState * 12;
r7 += (((s32)heap->filler2[(index + 1)].unk0.HALF.HI) / 3) * 12;
sub_0802E7CC(heap, (u8)r6, 0, 0);
val = heap->entities[r6]->animationState;
r7 = val + (val >> 1);
r7 >>= 2;
r7 += (u8)(heap->filler2[r6 + 1].unk0.HALF.HI / x) * 12;
} else {
r7 = heap->filler[index].unk0.HALF.HI >> 3;
r7 += 0x48;
u32 val;
val = heap->filler[r6].unk0.HALF.HI >> 3;
r7 = val + 0x48;
}
if (heap->entities[index]->animIndex != r7) {
InitializeAnimation(heap->entities[index], r7);
if (heap->entities[r6]->animIndex != r7) {
InitializeAnimation(heap->entities[r6], r7);
}
}
}
END_NONMATCH
void sub_0802E768(Gleerok_HeapStruct* param_1) {
u32 cVar1;
src/enemy/helmasaur.c
+1 -1
View File
@@ -353,7 +353,7 @@ bool32 sub_0802C0E8(Entity* this) {
void sub_0802C18C(Entity* this) {
this->field_0x78.HALF.LO--;
if ((this->field_0x78.HALF.LO & 7) == 0) {
Entity* ent = CreateObject(SPECIAL_FX, 0x11, 0x40);
Entity* ent = CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (ent != NULL) {
PositionRelative(this, ent, 0, Q_16_16(1.0));
}
src/enemy/octorokBoss.c
+119 -1
View File
@@ -317,7 +317,125 @@ const u8 gUnk_080CF08C[] = {
0, 4, 0, 0, 1, 5, 0, 0, 1, 4, 0, 0, 1, 3, 0, 0, 1, 2, 0, 0, 2, 1, 0, 0, 1, 1, 0, 0, 3, 6, 0, 0,
};
ASM_FUNC("asm/non_matching/octorokBoss/OctorokBoss_Init.inc", void OctorokBoss_Init(OctorokBossEntity* this))
void OctorokBoss_Init(OctorokBossEntity* this) {
u32 leg;
u32 tail;
super->action = ACTION1;
super->spriteSettings.draw = 3;
switch (super->type) {
case WHOLE:
super->spritePriority.b0 = 4;
this->bossPhase = 0;
super->timer = 1;
this->heap = (OctorokBossHeap*)zMalloc(sizeof(OctorokBossHeap));
if (this->heap == NULL) {
// Kill this boss
GenericDeath(super);
return;
} else {
super->myHeap = (u32*)this->heap;
}
MEMORY_BARRIER;
(this->heap)->fallingStonesTimer = 0;
(this->heap)->unk_0 = 2;
(this->heap)->field_0x2 = 0;
(this->heap)->tailCount = 5;
super->spriteRendering.b0 = 3;
this->field_0x6c.HALF.HI |= 1;
this->unk_76 = 0xa0;
this->unk_74 = 0xa0;
this->angle.HWORD = 0;
// Create legs
for (leg = 0; leg < 4; leg++) {
super->child = CreateEnemy(OCTOROK_BOSS, leg + 1);
if (super->child != NULL) {
CopyPosition(super, super->child);
super->child->parent = super;
((OctorokBossEntity*)super->child)->heap = this->heap;
MEMORY_BARRIER;
this->heap->legObjects[leg] = ((OctorokBossEntity*)super->child);
}
}
// Create mouth
super->child = CreateEnemy(OCTOROK_BOSS, MOUTH);
if (super->child != NULL) {
CopyPosition(super, super->child);
super->child->parent = super;
((OctorokBossEntity*)super->child)->heap = this->heap;
}
// Create tail end
super->child = CreateEnemy(OCTOROK_BOSS, TAIL_END);
if (super->child != NULL) {
CopyPosition(super, super->child);
super->child->parent = super;
((OctorokBossEntity*)super->child)->heap = this->heap;
MEMORY_BARRIER;
(this->heap)->tailObjects[0] = (OctorokBossEntity*)super->child;
}
// Create tails
for (tail = 0; tail < 4; tail++) {
super->child = CreateEnemy(OCTOROK_BOSS, TAIL);
if (super->child != NULL) {
super->child->type2 = tail;
CopyPosition(super, super->child);
super->child->parent = super;
((OctorokBossEntity*)super->child)->heap = this->heap;
MEMORY_BARRIER;
this->heap->tailObjects[tail + 1] = (OctorokBossEntity*)super->child;
}
}
super->action = INTRO;
super->subAction = 0;
this->timer = 0x3c;
gPlayerEntity.spriteSettings.draw = 0;
gPlayerEntity.x.HALF.HI = super->x.HALF.HI;
gPlayerEntity.y.HALF.HI = super->y.HALF.HI - 0xa0;
gRoomControls.camera_target = super;
break;
case LEG_BR:
case LEG_FR:
case LEG_FL:
case LEG_BL:
super->timer = 0x10;
this->timer = 0;
if ((super->type & 2) == 0) {
super->subtimer = 2;
} else {
super->subtimer = 0xfe;
}
this->unk_74 = 0x100;
if ((super->type & 1) == 0) {
this->unk_76 = 0xff00;
} else {
this->unk_76 = 0x100;
}
break;
case MOUTH:
this->unk_76 = 0x100;
this->unk_74 = 0x100;
this->timer = 0x1c;
this->heap->mouthObject = this;
break;
case TAIL_END:
this->unk_76 = 0x100;
this->unk_74 = 0x100;
super->spritePriority.b0 = 0;
this->timer = 0;
super->timer = 0x10;
super->subtimer = 1;
GET_TAIL_RADIUS(this) = 0x80;
break;
}
if (super->type != TAIL_END) {
InitializeAnimation(super, gUnk_080CF08C[super->type * 4]);
} else {
InitAnimationForceUpdate(super, gUnk_080CF08C[super->type * 4]);
}
OctorokBoss_Action1(this);
}
void OctorokBoss_Intro(OctorokBossEntity* this) {
static void (*const OctorokBoss_Intro_SubActions[])(OctorokBossEntity*) = {
src/fileselect.c
+45 -48
View File
@@ -750,74 +750,71 @@ const u16 gUnk_080FC914[] = { 0xf251, 0xf251, 0xf251, 0xf251, 0xf251, 0xf251, 0x
0xf24d, 0xf24d, 0xf24d, 0xf24d, 0xf24d, 0xf24d, 0xf24d, 0xf24d, 0xf24d, 0xf24d };
// Handles drawing of hearts
NONMATCH("asm/non_matching/save/sub_08050B3C.inc", void sub_08050B3C(u16* arg0)) {
unk_08050B3C sp;
int var0;
int var1;
int var2;
int var3;
int var4;
int var5;
int var6;
int var7;
u16* var8;
void sub_08050B3C(u16* target) {
s32 currentQuarterHearts;
s32 maxQuarterHearts;
s32 maxHeartsFirstRow;
s32 currentFullHearts;
s32 maxHeartsSecondRow;
u32 currentFullHeartsFirstRow;
s32 currentFullHeartsSecondRow;
u16* temp_target;
u32 currentPartialHeartValue;
u32 maxHearts;
sp.unk0 = arg0;
var0 = gSave.stats.health / 2;
if (var0 == 0) {
var0 = 1;
currentQuarterHearts = gSave.stats.health / 2;
if (currentQuarterHearts == 0) {
currentQuarterHearts = 1;
}
var1 = gSave.stats.maxHealth / 2;
if (var1 == 0) {
maxQuarterHearts = gSave.stats.maxHealth / 2;
if (maxQuarterHearts == 0) {
return;
}
if (var0 > var1) {
var0 = var1;
if (currentQuarterHearts > maxQuarterHearts) {
currentQuarterHearts = maxQuarterHearts;
}
sp.unk4 = var0 & 0x3;
var2 = var0 * 2;
var5 = var2;
if (var2 > 10) {
var5 = 10;
currentPartialHeartValue = currentQuarterHearts & 3;
currentFullHearts = currentQuarterHearts / 4;
currentFullHeartsFirstRow = currentFullHearts;
if (currentFullHearts > 10) {
currentFullHeartsFirstRow = 10;
}
var6 = var2;
var6 -= 10;
var7 = var6;
if (var6 < 0) {
var7 = 0;
currentFullHeartsSecondRow = currentFullHearts - 10;
if (currentFullHeartsSecondRow < 0) {
currentFullHeartsSecondRow = 0;
}
var1 = var1 >> 2;
var4 = var1;
if (var1 > 10) {
var1 = 10;
maxHearts = maxQuarterHearts / 4;
maxHeartsFirstRow = maxHearts;
if (maxHeartsFirstRow > 10) {
maxHeartsFirstRow = 10;
}
maxHeartsSecondRow = maxHearts - 10;
temp_target = target;
temp_target[0] = 0xF24C;
DmaCopy16(3, &gUnk_080FC914[10 - currentFullHeartsFirstRow], &temp_target[1], maxHeartsFirstRow * 2);
if (maxHeartsSecondRow > 0) {
temp_target += 0x20;
temp_target[0] = 0xF24C;
DmaCopy16(3, &gUnk_080FC914[10 - currentFullHeartsSecondRow], &temp_target[1], maxHeartsSecondRow * 2);
}
var4 -= 10;
sp.unk0[0] = 0xF24C;
DmaCopy16(3, &gUnk_080FC914[10 - var5], &sp.unk0[1], var1 * 2);
if (var4 > 0) {
sp.unk0[0x20] = 0xF24C;
DmaCopy16(3, &gUnk_080FC914[10 - var7], &sp.unk0[1], var4 * 2);
}
if (!sp.unk4) {
if (!currentPartialHeartValue) {
return;
}
var8 = sp.unk0;
if (var2 >= 10) {
var2 = var6;
var8 += 0x20;
temp_target = target;
if (currentFullHearts >= 10) {
currentFullHearts = currentFullHearts - 10;
temp_target += 0x20;
}
var8[var2 + 1] = sp.unk4 - 0xDB3;
temp_target[currentFullHearts + 1] = currentPartialHeartValue - 0xDB3;
}
END_NONMATCH
void sub_08050C54(void);
void sub_08050D68(void);
src/manager/minishPortalManager.c
+1 -1
View File
@@ -65,7 +65,7 @@ void CreateMagicSparkles(u32 baseX, u32 baseY, u32 layer) {
r = Random();
if (r & 0x7)
return;
spark = CreateObject(SPECIAL_FX, 0x26, 0);
spark = CreateObject(SPECIAL_FX, FX_SPARKLE4, 0);
if (spark == NULL)
return;
offsetX = (r >> 0x8) & 0xF;
src/npc/simon.c
+1 -1
View File
@@ -28,7 +28,7 @@ void sub_0806C224(void) {
}
void Simon_CreateChest(Entity* this) {
CreateObjectWithParent(this, SPECIAL_FX, 0x43, 0);
CreateObjectWithParent(this, SPECIAL_FX, FX_BIG_EXPLOSION2, 0);
SetTileType(0x73, COORD_TO_TILE(this), this->collisionLayer);
SoundReq(SFX_SECRET_BIG);
}
src/npc/syrup.c
+1 -1
View File
@@ -57,7 +57,7 @@ void sub_0806A26C(Entity* this) {
const s8* ptr;
u32 uVar2, uVar1;
Entity* pEVar1;
pEVar1 = CreateObject(SPECIAL_FX, 0x2f, 0);
pEVar1 = CreateObject(SPECIAL_FX, FX_SLOW_SMOKE_SMALL, 0);
if (pEVar1 != NULL) {
PositionEntityOnTop(this, pEVar1);
uVar2 = uVar1 = Random();
src/object/bigIceBlock.c
+1 -1
View File
@@ -116,7 +116,7 @@ void sub_08099880(BigIceBlockEntity* this) {
uVar4 = (0x3c - super->timer) * 0x20 + 0x100;
SetAffineInfo(super, 0x100, uVar4, 0);
sub_0806FCF4(super, uVar4, 2, 0);
obj = CreateObject(SPECIAL_FX, 0x11, 0x40);
obj = CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (obj != NULL) {
rand = Random();
x = ((rand >> 0x10) % 0x21) - 0x10;
src/object/frozenOctorok.c
+7 -8
View File
@@ -55,13 +55,11 @@ 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,
};
NONMATCH("asm/non_matching/frozenOctorok/FrozenOctorok_Init.inc", void FrozenOctorok_Init(FrozenOctorokEntity* this)) {
void FrozenOctorok_Init(FrozenOctorokEntity* this) {
OctorokBossHeap* heap;
Entity*** pppEVar2;
FrozenOctorokEntity* pEVar3;
FrozenOctorokEntity* obj1;
FrozenOctorokEntity* obj2;
u32 uVar3;
u32 i;
u32 type;
super->action = 1;
@@ -89,13 +87,15 @@ NONMATCH("asm/non_matching/frozenOctorok/FrozenOctorok_Init.inc", void FrozenOct
return;
}
super->myHeap = heap;
MEMORY_BARRIER;
this->heap->tailCount = 5;
for (uVar3 = 0; uVar3 < 4; uVar3++) {
super->child = CreateObjectWithParent(super, FROZEN_OCTOROK, uVar3 + 1, 0);
for (i = 0; i < 4; i++) {
super->child = CreateObjectWithParent(super, FROZEN_OCTOROK, i + 1, 0);
if (super->child != NULL) {
((FrozenOctorokEntity*)super->child)->heap = this->heap;
this->heap->legObjects[uVar3] = (OctorokBossEntity*)super->child;
MEMORY_BARRIER;
this->heap->legObjects[i] = (OctorokBossEntity*)super->child;
}
}
obj1 = (FrozenOctorokEntity*)CreateObjectWithParent(super, FROZEN_OCTOROK, 5, 0);
@@ -143,7 +143,6 @@ NONMATCH("asm/non_matching/frozenOctorok/FrozenOctorok_Init.inc", void FrozenOct
InitializeAnimation(super, gUnk_08123DDC[super->type * 4]);
FrozenOctorok_Action1(this);
}
END_NONMATCH
void (*const FrozenOctorok_Action1SubActions[])(FrozenOctorokEntity*) = {
FrozenOctorok_Action1SubAction0, FrozenOctorok_Action1SubAction1, FrozenOctorok_Action1SubAction2,
src/object/frozenWaterElement.c
+2 -2
View File
@@ -92,7 +92,7 @@ void FrozenWaterElement_Action2(FrozenWaterElementEntity* this) {
super->spriteOffsetY += 8;
}
value = gUnk_08123DC0[this->unk_74 >> 5];
effect = CreateObject(SPECIAL_FX, 0x11, 0x40);
effect = CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (effect != NULL) {
rand = Random();
tmp = (((rand >> 0x10) & value) - ((value + 1) >> 1));
@@ -101,7 +101,7 @@ void FrozenWaterElement_Action2(FrozenWaterElementEntity* this) {
effect->x.HALF.HI = this->unk_80 + gRoomControls.origin_x + tmp;
effect->y.HALF.HI = this->unk_82 + gRoomControls.origin_y + tmp2;
}
effect = CreateObject(SPECIAL_FX, 2, 0x40);
effect = CreateObject(SPECIAL_FX, FX_DEATH, 0x40);
if (effect != NULL) {
rand = Random();
tmp = (((rand >> 0x10) & value) - ((value + 1) >> 1));
src/object/gyorgBossObject.c
+1 -1
View File
@@ -437,7 +437,7 @@ void GyorgBossObject_SpawnChildren(u32 unk0, bool32 fromBlue, u32 animationState
}
if (fromBlue == FALSE) {
Entity* tmp;
tmp = CreateObject(SPECIAL_FX, 2, 0);
tmp = CreateObject(SPECIAL_FX, FX_DEATH, 0);
if (tmp) {
tmp->x.HALF.HI = x;
tmp->y.HALF.HI = y;
src/object/objectOnPillar.c
+3 -3
View File
@@ -166,7 +166,7 @@ bool32 sub_08097008(ObjectOnPillarEntity* this) {
this->tileIndex = tileType;
break;
default:
effect = CreateObject(SPECIAL_FX, 4, 0);
effect = CreateObject(SPECIAL_FX, FX_ROCK, 0);
if (effect != NULL) {
CopyPosition(super, effect);
}
@@ -244,11 +244,11 @@ void sub_080971E0(ObjectOnPillarEntity* this) {
EntityWithHitFlag* entity;
u32 tilePosition;
entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, 0x11, 0x40);
entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (entity != NULL) {
PositionRelative(super, &entity->base, -0x80000, 0x20000);
}
entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, 0x11, 0x40);
entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (entity != NULL) {
PositionRelative(super, &entity->base, 0x80000, 0x20000);
}
src/object/pushableStatue.c
+3 -3
View File
@@ -71,7 +71,7 @@ void PushableStatue_Action1(PushableStatueEntity* this) {
sub_08089538(this);
break;
case 0:
obj = CreateObject(SPECIAL_FX, 4, 0);
obj = CreateObject(SPECIAL_FX, FX_ROCK, 0);
if (obj != NULL) {
CopyPosition(super, obj);
}
@@ -118,7 +118,7 @@ void PushableStatue_SubAction0(PushableStatueEntity* this) {
sub_08089538(this);
break;
case 0:
obj = CreateObject(SPECIAL_FX, 4, 0);
obj = CreateObject(SPECIAL_FX, FX_ROCK, 0);
if (obj != NULL) {
CopyPosition(super, obj);
}
@@ -216,7 +216,7 @@ bool32 sub_080895C0(PushableStatueEntity* this) {
sub_08089454(this);
return TRUE;
}
obj = CreateObject(SPECIAL_FX, 4, 0);
obj = CreateObject(SPECIAL_FX, FX_ROCK, 0);
if (obj != NULL) {
CopyPosition(super, obj);
}
src/object/smallIceBlock.c
+2 -2
View File
@@ -98,7 +98,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) {
sub_080994B8(this);
break;
case 0:
obj = CreateObject(SPECIAL_FX, 0xd, 0);
obj = CreateObject(SPECIAL_FX, FX_ICE, 0);
if (obj != NULL) {
CopyPosition(super, obj);
}
@@ -165,7 +165,7 @@ void SmallIceBlock_Action4(SmallIceBlockEntity* this) {
}
SetAffineInfo(super, 0x100, (0x3c - super->timer) * 0x20 + 0x100, 0);
if ((super->timer & 1) != 0) {
obj = CreateObject(SPECIAL_FX, 0x11, 0x40);
obj = CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (obj != NULL) {
rand = Random();
x = ((rand >> 0x10) % 9) - 4;
src/objectDefinitions.c
+1 -1
View File
@@ -44,7 +44,7 @@ const ObjectDefinition gObjectDefinition_F[] = {
{ { 1, 0, 0, 0, 154, 2, 0 }, { 4, 0, 0, 0, SPRITE_SPECIALFX, 0, 0 } }, // FX_BROWN_SMOKE_LARGE
{ { 1, 0, 0, 0, 154, 2, 0 }, { 4, 0, 0, 0, SPRITE_SPECIALFX, 0, 0 } }, // FX_BROWN_SMOKE2
{ { 1, 0, 0, 0, 243, 0, 0 }, { 1, 0, 0, 0, SPRITE_SPECIALFX_1, 0, 0 } }, // FX_SWEAT
{ { 1, 0, 0, 0, 60, 2, 0 }, { 4, 0, 0, 0, SPRITE_SPECIALFX, 0, 0 } }, // FX_26
{ { 1, 0, 0, 0, 60, 2, 0 }, { 4, 0, 0, 0, SPRITE_SPECIALFX, 0, 0 } }, // FX_SPARKLE4
{ { 1, 0, 0, 0, 96, 2, 0 }, { 0, 0, 0, 0, SPRITE_SPECIALFX_1, 0, 0 } }, // FX_27
{ { 1, 0, 0, 0, 154, 2, 0 }, { 3, 0, 0, 0, SPRITE_SPECIALFX, 0, 0 } }, // FX_SLOW_EXPLOSION
{ { 1, 0, 0, 0, 113, 0, 0 }, { 71, 0, 0, 0, SPRITE_SPECIALFX_1, 0, 0 } }, // FX_CONFETTI
src/objectUtils.c
+1 -1
View File
@@ -248,7 +248,7 @@ void CreateSparkle(Entity* entity) {
s32 y;
s32 x;
sparkle = CreateObject(SPECIAL_FX, 0x26, 0);
sparkle = CreateObject(SPECIAL_FX, FX_SPARKLE4, 0);
if (sparkle != NULL) {
rand = Random();
x = rand & 0xf;
src/playerItem/playerItemSword.c
+26 -19
View File
@@ -337,47 +337,54 @@ void sub_080A7A54(PlayerItemSwordEntity* this) {
super->hitbox->height = tmp[3];
}
NONMATCH("asm/non_matching/playerItemSword/sub_080A7A84.inc", void sub_080A7A84(PlayerItemSwordEntity* this)) {
s32 iVar1;
void sub_080A7A84(PlayerItemSwordEntity* this) {
u32 one;
Entity* effect;
s16 new_var;
s32 uVar3;
s32 uVar4;
Entity* new_var2;
const s8* ptr;
const s8* ptr2;
u32 tmp;
u32 tmp2;
u32 r5;
if ((gPlayerEntity.frame & 0xf) != 0) {
uVar3 = gUnk_08129072[((gPlayerEntity.frame & 0xf) - 1)][0];
uVar4 = gUnk_08129072[((gPlayerEntity.frame & 0xf) - 1)][1];
if (((gPlayerState.sword_state & 0xc0) == 0) &&
((s32)((u32) * (u8*)&gPlayerEntity.spriteSettings * 0x2000000) < 0)) {
one = 1;
r5 = gUnk_08129072[(gPlayerEntity.frame & 0xf) - 1][one];
if (((gPlayerState.sword_state & 0xc0) == 0) && (gPlayerEntity.spriteSettings.flipX == 1)) {
uVar3 = -uVar3;
}
if (super->type != 0) {
sub_08008796(super, 0, super->x.HALF.HI + uVar3, super->y.HALF.HI + uVar4);
} else {
if ((((super->z.WORD == 0) && (sub_08008796(super, (gPlayerState.skills & 8) != 0, super->x.HALF.HI + uVar3,
super->y.HALF.HI + uVar4) == NULL)) &&
sub_08008796(super, 0, super->x.HALF.HI + uVar3, super->y.HALF.HI + r5);
} else if (super->z.WORD == 0) {
if (gPlayerState.skills & SKILL_ROCK_BREAKER) {
tmp2 = 1;
} else {
tmp2 = 0;
}
new_var = uVar3;
if (((sub_08008796(super, tmp2, super->x.HALF.HI + new_var, super->y.HALF.HI + r5) == NULL) &&
(gPlayerState.sword_state != 0)) &&
((gPlayerState.sword_state & 0xc0) == 0)) {
if (GetRelativeCollisionTile(super, uVar3, uVar4) == 0x2e) {
new_var2 = super;
if (GetRelativeCollisionTile(new_var2, new_var, r5) == 0x2e) {
SoundReqClipped(&gPlayerEntity, SFX_ITEM_GLOVES_KNOCKBACK);
} else {
SoundReqClipped(&gPlayerEntity, SFX_METAL_CLINK);
}
effect = CreateObject(SPECIAL_FX, 0x1a, 0);
effect = CreateObject(SPECIAL_FX, FX_LIGHTNING, 0);
if (effect != NULL) {
ptr2 = gUnk_0812908E;
effect->x.HALF.HI = super->x.HALF.HI + ptr2[super->animationState];
tmp = super->animationState + 1;
effect->y.HALF.HI = super->y.HALF.HI + (ptr2)[tmp];
effect->z = super->z;
ptr = gUnk_0812908E;
effect->x.HALF.HI = new_var2->x.HALF.HI + ptr[new_var2->animationState];
tmp = new_var2->animationState + 1;
effect->y.HALF.HI = new_var2->y.HALF.HI + ptr[tmp];
effect->z = new_var2->z;
}
}
}
}
}
END_NONMATCH
void sub_080A7B98(PlayerItemSwordEntity* this) {
u32 i, j;
src/room.c
+1 -1
View File
@@ -368,7 +368,7 @@ static void LoadDestructibleTile(TileEntity* tile) {
void sub_0804B388(u32 a1, u32 a2) {
Entity* e;
SetTileType(a2 == 1 ? 38 : 52, a1, a2);
e = CreateObject(SPECIAL_FX, 2, 0);
e = CreateObject(SPECIAL_FX, FX_DEATH, 0);
if (e != NULL) {
e->collisionLayer = a2;
sub_0806F704(e, a1);
src/roomInit.c
+2 -2
View File
@@ -998,12 +998,12 @@ void sub_0804BF38(Entity* this, ScriptExecutionContext* context) {
numEnts = ptr->entCnt;
for (entCnt = 0; entCnt < numEnts; entCnt++) {
fx = CreateObject(SPECIAL_FX, 0xf, 0);
fx = CreateObject(SPECIAL_FX, FX_ROCK_SMALL, 0);
if (fx != NULL) {
fx->x.HALF.HI = ptr->x + gRoomControls.origin_x + entCnt * 0x10;
fx->y.HALF.HI = ptr->y + gRoomControls.origin_y + (entCnt & 1) * 8;
}
fx = CreateObject(SPECIAL_FX, 0x54, 0);
fx = CreateObject(SPECIAL_FX, FX_WHITE_PUFF, 0);
if (fx != NULL) {
fx->x.HALF.HI = ptr->x + gRoomControls.origin_x + entCnt * 0x10;
fx->y.HALF.HI = ptr->y + gRoomControls.origin_y + -0xc + (entCnt & 1) * 8;
src/scroll.c
+8 -10
View File
@@ -718,13 +718,11 @@ void sub_080809D4(void) {
gUpdateVisibleTiles = 1;
}
NONMATCH("asm/non_matching/scroll/UpdateDoorTransition.inc", void UpdateDoorTransition()) {
void UpdateDoorTransition() {
u32 uVar1;
u32 uVar2;
u32 uVar3;
u32 uVar4;
Entity* target;
RoomControls* controls = &gRoomControls;
if (gRoomControls.camera_target != &gPlayerEntity) {
return;
}
@@ -740,11 +738,12 @@ NONMATCH("asm/non_matching/scroll/UpdateDoorTransition.inc", void UpdateDoorTran
case 9:
case 0x18:
case 0x1d:
uVar4 = gRoomControls.camera_target->y.HALF.HI - gRoomControls.origin_y;
uVar3 = gRoomControls.camera_target->x.HALF.HI - gRoomControls.origin_x;
uVar1 =
sub_080B1AE0(COORD_TO_TILE(gRoomControls.camera_target), gRoomControls.camera_target->collisionLayer);
gRoomTransition.stairs_idx = sub_080B1A48(uVar3, uVar4, gRoomControls.camera_target->collisionLayer);
uVar4 = controls->camera_target->y.HALF.HI - controls->origin_y;
uVar3 = controls->camera_target->x.HALF.HI - controls->origin_x;
uVar1 = sub_080B1AE0((((controls->camera_target->x.HALF.HI - controls->origin_x) >> 4) & 0x3F) |
((((controls->camera_target->y.HALF.HI - controls->origin_y) >> 4) & 0x3F) << 6),
controls->camera_target->collisionLayer);
gRoomTransition.stairs_idx = sub_080B1A48(uVar3, uVar4, controls->camera_target->collisionLayer);
switch (uVar1) {
case 0x3f:
case 0xf1:
@@ -755,7 +754,6 @@ NONMATCH("asm/non_matching/scroll/UpdateDoorTransition.inc", void UpdateDoorTran
}
}
}
END_NONMATCH
void sub_08080B60(LayerStruct* layer) {
u32 index;