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

Merge pull request #583 from nonmatch/patch-61

Browse Source
This commit is contained in:
notyourav
2022-11-06 10:45:10 -08:00
committed by GitHub
parent 5209d6af3a 6531b88285
commit 1ceeac3c84
25 changed files with 750 additions and 3669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matching/armos/sub_0803086C.inc
-154
View File
@@ -1,154 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
adds r5, r0, #0
ldr r0, [r5, #0x7c]
cmp r0, #0
bne _08030880
b _0803099C
_08030880:
ldr r0, _08030928 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
bne _0803088E
b _0803098A
_0803088E:
ldr r0, _0803092C @ =gRoomControls
mov sb, r0
ldrh r0, [r5, #0x2e]
mov r2, sb
ldrh r1, [r2, #6]
subs r0, r0, r1
lsls r0, r0, #0x10
lsrs r7, r0, #0x10
ldrh r0, [r5, #0x32]
ldrh r1, [r2, #8]
subs r0, r0, r1
lsls r0, r0, #0x10
lsrs r6, r0, #0x10
movs r3, #0x2e
ldrsh r0, [r5, r3]
ldrh r1, [r2, #6]
subs r0, r0, r1
asrs r4, r0, #4
movs r2, #0x3f
ands r4, r2
movs r1, #0x32
ldrsh r0, [r5, r1]
mov r3, sb
ldrh r1, [r3, #8]
subs r0, r0, r1
asrs r0, r0, #4
ands r0, r2
lsls r0, r0, #6
orrs r4, r0
movs r0, #0x38
adds r0, r0, r5
mov r8, r0
ldrb r1, [r0]
adds r0, r4, #0
bl GetTileType
ldr r1, _08030930 @ =0x00004049
mov sl, r1
cmp r0, sl
bne _08030950
adds r0, r7, #0
adds r1, r6, #0
movs r2, #2
movs r3, #0xc
bl CheckPlayerInRegion
cmp r0, #0
beq _0803093C
subs r1, r6, #4
adds r0, r7, #0
movs r2, #2
movs r3, #4
bl CheckPlayerInRegion
cmp r0, #0
beq _0803098A
ldr r2, _08030934 @ =gPlayerEntity
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #3
orrs r0, r1
strb r0, [r2]
ldr r0, [r5, #0x7c]
bl DoExitTransition
ldr r0, _08030938 @ =gRoomTransition
adds r1, r5, #0
adds r1, #0x80
ldrb r1, [r1]
adds r0, #0xae
strh r1, [r0]
movs r0, #1
b _0803099E
.align 2, 0
_08030928: .4byte gPlayerState
_0803092C: .4byte gRoomControls
_08030930: .4byte 0x00004049
_08030934: .4byte gPlayerEntity
_08030938: .4byte gRoomTransition
_0803093C:
ldr r0, _0803094C @ =0x00004022
mov r3, r8
ldrb r2, [r3]
adds r1, r4, #0
bl SetTile
b _0803098A
.align 2, 0
_0803094C: .4byte 0x00004022
_08030950:
adds r1, r6, #6
adds r0, r7, #0
movs r2, #2
movs r3, #5
bl CheckPlayerInRegion
cmp r0, #0
beq _0803098A
movs r4, #0x2e
ldrsh r1, [r5, r4]
mov r2, sb
ldrh r0, [r2, #6]
subs r1, r1, r0
asrs r1, r1, #4
movs r3, #0x3f
ands r1, r3
movs r4, #0x32
ldrsh r0, [r5, r4]
ldrh r2, [r2, #8]
subs r0, r0, r2
asrs r0, r0, #4
ands r0, r3
lsls r0, r0, #6
orrs r1, r0
mov r0, r8
ldrb r2, [r0]
mov r0, sl
bl SetTile
_0803098A:
adds r2, r5, #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]
_0803099C:
movs r0, #0
_0803099E:
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.syntax divided
asm/non_matching/beanstalkSubtask/UpdatePlayerCollision.inc
-1394
View File
File diff suppressed because it is too large Load Diff
asm/non_matching/common/sub_0801E82C.inc
-69
View File
@@ -1,69 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r1, _0801E8AC @ =gSave+0x114
movs r5, #0
adds r2, r1, #4
_0801E83C:
ldrb r0, [r2, #0x13]
adds r3, r1, #4
mov sl, r3
cmp r0, #0
bne _0801E848
strb r0, [r2]
_0801E848:
adds r2, #1
adds r5, #1
cmp r5, #0x12
bls _0801E83C
movs r0, #0
strb r0, [r1, #0x16]
adds r2, r1, #0
adds r2, #0x29
strb r0, [r2]
movs r5, #0
movs r0, #0x17
adds r0, r0, r1
mov sb, r0
movs r3, #0x18
adds r3, r3, r1
mov r8, r3
adds r7, r1, #4
adds r6, r1, #5
_0801E86C:
mov r1, sl
adds r0, r1, r5
ldrb r0, [r0]
subs r0, #0x65
cmp r0, #0x10
bls _0801E890
movs r4, #0x12
subs r4, r4, r5
adds r0, r6, #0
adds r1, r7, #0
adds r2, r4, #0
bl MemCopy
mov r0, r8
mov r1, sb
adds r2, r4, #0
bl MemCopy
_0801E890:
movs r3, #1
add sb, r3
add r8, r3
adds r7, #1
adds r6, #1
adds r5, #1
cmp r5, #0x11
bls _0801E86C
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801E8AC: .4byte gSave+0x114
.syntax divided
asm/non_matching/frozenOctorok/FrozenOctorok_Action1.inc
-267
View File
@@ -1,267 +0,0 @@
.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 SetAffineInfo
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
asm/non_matching/gleerok/sub_0802D86C.inc
-401
View File
@@ -1,401 +0,0 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
cmp r0, #6
bls _0802D878
b _0802DB7E
_0802D878:
lsls r0, r0, #2
ldr r1, _0802D884 @ =_0802D888
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0802D884: .4byte _0802D888
_0802D888: @ jump table
.4byte _0802DB64 @ case 0
.4byte _0802D8A4 @ case 1
.4byte _0802D8CE @ case 2
.4byte _0802DA54 @ case 3
.4byte _0802D94C @ case 4
.4byte _0802D9A2 @ case 5
.4byte _0802D9F8 @ case 6
_0802D8A4:
ldrb r0, [r4, #0xb]
cmp r0, #1
bne _0802D8CE
ldr r0, [r4, #0x50]
adds r0, #0x80
ldrb r0, [r0]
cmp r0, #0
bne _0802D8BE
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x1e
lsrs r0, r0, #0x1e
cmp r0, #1
beq _0802D8C6
_0802D8BE:
ldrb r1, [r4, #0x10]
movs r0, #0x7f
ands r0, r1
b _0802D8CC
_0802D8C6:
ldrb r1, [r4, #0x10]
movs r0, #0x80
orrs r0, r1
_0802D8CC:
strb r0, [r4, #0x10]
_0802D8CE:
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x1e
lsrs r0, r0, #0x1e
movs r1, #1
ands r0, r1
cmp r0, #0
bne _0802D8DE
b _0802DB7E
_0802D8DE:
ldr r0, [r4, #0x50]
adds r0, #0x3d
ldrb r0, [r0]
adds r1, r4, #0
adds r1, #0x3d
strb r0, [r1]
lsls r0, r0, #0x18
cmp r0, #0
bne _0802D918
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _0802D906
adds r0, r4, #0
bl UnloadOBJPalette
adds r0, r4, #0
movs r1, #0xc9
bl LoadObjPalette
b _0802D918
_0802D906:
subs r0, #1
strb r0, [r4, #0xf]
adds r0, r4, #0
bl UnloadOBJPalette
adds r0, r4, #0
movs r1, #0xca
bl LoadObjPalette
_0802D918:
ldr r0, [r4, #0x50]
adds r0, #0x80
ldrb r0, [r0]
cmp r0, #0
bne _0802D924
b _0802DB7E
_0802D924:
ldr r1, _0802D944 @ =gPlayerEntity
adds r0, r4, #0
movs r2, #8
movs r3, #8
bl EntityInRectRadius
cmp r0, #0
bne _0802D936
b _0802DB7E
_0802D936:
ldr r0, _0802D948 @ =gPlayerState
movs r1, #1
strb r1, [r0, #0x14]
adds r0, #0x3f
movs r1, #0xfc
strb r1, [r0]
b _0802DB7E
.align 2, 0
_0802D944: .4byte gPlayerEntity
_0802D948: .4byte gPlayerState
_0802D94C:
adds r0, r4, #0
adds r0, #0x5a
ldrb r0, [r0]
cmp r0, #0
bne _0802D95E
adds r0, r4, #0
bl UpdateAnimationSingleFrame
b _0802DB7E
_0802D95E:
movs r1, #0xc0
lsls r1, r1, #5
adds r0, r4, #0
bl GravityUpdate
adds r2, r0, #0
cmp r2, #0
beq _0802D970
b _0802DB7E
_0802D970:
ldr r0, [r4, #0x50]
adds r0, #0x7b
movs r1, #1
strb r1, [r0]
strb r2, [r4, #0xe]
_0802D97A:
ldrb r3, [r4, #0xe]
adds r0, r4, #0
movs r1, #0x67
movs r2, #0
bl CreateObjectWithParent
ldrb r0, [r4, #0xe]
adds r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #7
bls _0802D97A
movs r0, #0xa8
lsls r0, r0, #1
bl SoundReq
_0802D99C:
bl DeleteThisEntity
b _0802DB7E
_0802D9A2:
ldr r0, _0802D9F4 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
cmp r0, #0
beq _0802D9B8
ldr r0, [r4, #0x50]
ldrb r0, [r0, #0xc]
cmp r0, #2
bne _0802D9B8
b _0802DB7E
_0802D9B8:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
bne _0802D9CE
b _0802DB7E
_0802D9CE:
movs r0, #0x24
movs r1, #6
bl CreateEnemy
adds r1, r0, #0
str r1, [r4, #0x54]
cmp r1, #0
beq _0802D99C
ldr r0, [r4, #0x50]
str r0, [r1, #0x50]
adds r2, r4, #0
adds r2, #0x84
ldr r1, [r2]
ldr r0, [r4, #0x54]
str r0, [r1, #0x38]
adds r0, #0x84
ldr r1, [r2]
str r1, [r0]
b _0802D99C
.align 2, 0
_0802D9F4: .4byte gRoomTransition
_0802D9F8:
ldr r0, _0802DA50 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
cmp r0, #0
beq _0802DA0E
ldr r0, [r4, #0x50]
ldrb r0, [r0, #0xc]
cmp r0, #2
bne _0802DA0E
b _0802DB7E
_0802DA0E:
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
bne _0802DA24
b _0802DB7E
_0802DA24:
movs r0, #0x24
movs r1, #3
bl CreateEnemy
adds r1, r0, #0
str r1, [r4, #0x54]
cmp r1, #0
beq _0802D99C
ldr r0, [r4, #0x50]
str r0, [r1, #0x50]
adds r1, r4, #0
adds r1, #0x84
ldr r0, [r1]
ldrb r0, [r0, #1]
strb r0, [r4, #0xe]
ldr r2, [r1]
ldr r0, [r4, #0x54]
str r0, [r2, #0x38]
adds r0, #0x84
ldr r1, [r1]
str r1, [r0]
b _0802D99C
.align 2, 0
_0802DA50: .4byte gRoomTransition
_0802DA54:
adds r0, r4, #0
adds r0, #0x74
ldrb r1, [r0]
adds r6, r0, #0
cmp r1, #0
beq _0802DA96
subs r0, r1, #1
strb r0, [r6]
lsls r0, r0, #0x18
cmp r0, #0
bne _0802DA96
adds r5, r4, #0
adds r5, #0x75
ldrb r0, [r5]
adds r0, #2
strb r0, [r5]
ldr r7, _0802DAD4 @ =gUnk_080CD884
ldrb r0, [r5]
adds r0, r0, r7
ldrb r0, [r0]
strb r0, [r6]
cmp r0, #0
beq _0802DA96
adds r0, r4, #0
bl UnloadOBJPalette
ldrb r0, [r5]
adds r0, #1
adds r0, r0, r7
ldrb r1, [r0]
adds r0, r4, #0
bl LoadObjPalette
_0802DA96:
adds r0, r4, #0
adds r0, #0x41
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _0802DAD8
ldrb r2, [r6]
cmp r2, #0
bne _0802DAD8
movs r0, #0x7f
ands r0, r1
cmp r0, #0x1d
bne _0802DB20
movs r0, #0xc0
lsls r0, r0, #0xa
str r0, [r4, #0x20]
ldr r1, [r4, #0x50]
movs r0, #4
strb r0, [r1, #0xd]
ldr r0, [r4, #0x50]
strb r2, [r0, #0xb]
ldr r0, [r4, #0x50]
adds r0, #0x7b
strb r2, [r0]
movs r0, #0x86
lsls r0, r0, #1
bl SoundReq
b _0802DB20
.align 2, 0
_0802DAD4: .4byte gUnk_080CD884
_0802DAD8:
adds r0, r4, #0
adds r0, #0x84
ldr r2, [r0]
ldrb r1, [r4, #0xe]
adds r3, r0, #0
ldrb r0, [r2, #1]
cmp r1, r0
beq _0802DB20
adds r0, r1, #0
ldrb r1, [r2, #1]
subs r0, r0, r1
movs r1, #0x1f
ands r0, r1
cmp r0, #0x10
ble _0802DB08
ldrb r0, [r4, #0x1e]
adds r0, #1
strb r0, [r4, #0x1e]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0x30
bls _0802DB1A
movs r0, #0x28
b _0802DB18
_0802DB08:
ldrb r0, [r4, #0x1e]
subs r0, #1
strb r0, [r4, #0x1e]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0x27
bhi _0802DB1A
movs r0, #0x30
_0802DB18:
strb r0, [r4, #0x1e]
_0802DB1A:
ldr r0, [r3]
ldrb r0, [r0, #1]
strb r0, [r4, #0xe]
_0802DB20:
ldr r0, [r4, #0x20]
cmp r0, #0
ble _0802DB7E
movs r1, #0xc0
lsls r1, r1, #5
adds r0, r4, #0
bl GravityUpdate
ldr r0, [r4, #0x20]
cmp r0, #0
bgt _0802DB7E
movs r0, #0x24
movs r1, #4
bl CreateEnemy
adds r1, r0, #0
str r1, [r4, #0x54]
cmp r1, #0
beq _0802DB7E
ldr r0, [r4, #0x50]
str r0, [r1, #0x50]
adds r2, r4, #0
adds r2, #0x84
ldr r1, [r2]
ldr r0, [r4, #0x54]
str r0, [r1, #0x38]
adds r0, #0x84
ldr r1, [r2]
str r1, [r0]
ldr r1, [r4, #0x54]
adds r0, r4, #0
bl CopyPosition
b _0802D99C
_0802DB64:
ldr r1, _0802DB80 @ =gUnk_080CD810
ldrb r0, [r4, #0xd]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
adds r0, #0x84
ldr r0, [r0]
bl sub_0802E7E4
_0802DB7E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0802DB80: .4byte gUnk_080CD810
.syntax divided
asm/non_matching/gleerok/sub_0802E768.inc
-61
View File
@@ -1,61 +0,0 @@
.syntax unified
.text
push {r4, r5, r6, lr}
adds r4, r0, #0
movs r2, #0
movs r6, #0x1f
_0802E770:
lsls r3, r2, #2
adds r0, r4, r3
ldrb r1, [r0, #1]
adds r2, #1
lsls r0, r2, #2
adds r0, r4, r0
ldrb r0, [r0, #1]
subs r0, r1, r0
ands r0, r6
adds r5, r2, #0
cmp r0, #0x10
ble _0802E790
cmp r0, #0x1e
bgt _0802E798
adds r1, #1
b _0802E796
_0802E790:
cmp r0, #1
ble _0802E798
subs r1, #1
_0802E796:
ands r1, r6
_0802E798:
adds r0, r4, r3
strb r1, [r0, #1]
ldrb r1, [r0, #0x19]
lsls r0, r5, #2
adds r0, r4, r0
ldrb r0, [r0, #0x19]
subs r0, r1, r0
movs r2, #0x1f
ands r0, r2
cmp r0, #0x10
ble _0802E7B6
cmp r0, #0x1d
bgt _0802E7BE
adds r1, #1
b _0802E7BC
_0802E7B6:
cmp r0, #2
ble _0802E7BE
subs r1, #1
_0802E7BC:
ands r1, r2
_0802E7BE:
adds r0, r4, r3
strb r1, [r0, #0x19]
adds r2, r5, #0
cmp r2, #4
bls _0802E770
pop {r4, r5, r6, pc}
.align 2, 0
.syntax divided
asm/non_matching/npc23/sub_08066570.inc
-59
View File
@@ -1,59 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _080665DE
ldrb r0, [r5, #0xc]
cmp r0, #3
beq _080665DE
ldr r4, _080665E0 @ =gPlayerEntity
adds r0, r5, #0
adds r1, r4, #0
movs r2, #0x50
bl sub_0806FC80
cmp r0, #0
beq _080665DE
adds r0, r5, #0
adds r1, r4, #0
bl GetFacingDirection
adds r3, r0, #0
movs r6, #1
movs r1, #0x18
adds r4, r3, #0
ands r4, r1
ldrb r0, [r5, #0x15]
adds r2, r1, #0
ands r2, r0
cmp r2, r4
bne _080665C8
adds r2, r3, #5
movs r1, #7
ands r2, r1
ldrb r0, [r5, #0x15]
adds r0, #5
ands r0, r1
cmp r0, #2
bhi _080665C8
cmp r2, #2
bhi _080665C8
movs r6, #0
_080665C8:
cmp r6, #0
beq _080665DE
strb r3, [r5, #0x15]
adds r3, #4
movs r0, #0x18
ands r3, r0
lsrs r3, r3, #3
adds r0, r5, #0
adds r1, r3, #0
bl InitializeAnimation
_080665DE:
pop {r4, r5, r6, pc}
.align 2, 0
_080665E0: .4byte gPlayerEntity
.syntax divided
asm/non_matching/objectUtils/SyncPlayerToPlatform.inc
-109
View File
@@ -1,109 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r6, r1, #0
ldrb r1, [r4, #0x15]
movs r0, #0x80
ands r0, r1
cmp r0, #0
bne _080A2CBA
lsrs r0, r1, #3
cmp r0, #1
beq _080A2C3C
cmp r0, #1
bgt _080A2C04
cmp r0, #0
beq _080A2C0E
b _080A2CBA
_080A2C04:
cmp r0, #2
beq _080A2C68
cmp r0, #3
beq _080A2C94
b _080A2CBA
_080A2C0E:
ldrh r5, [r4, #0x32]
adds r0, r4, #0
bl LinearMoveUpdate
ldrh r1, [r4, #0x32]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
subs r0, r0, r1
lsls r0, r0, #0x10
asrs r1, r0, #0x10
cmp r1, #0
beq _080A2CBA
cmp r6, #0
beq _080A2CBA
ldr r0, _080A2C38 @ =gPlayerEntity
lsls r1, r1, #8
movs r2, #0
bl sub_080044AE
b _080A2CBA
.align 2, 0
_080A2C38: .4byte gPlayerEntity
_080A2C3C:
ldrh r5, [r4, #0x2e]
adds r0, r4, #0
bl LinearMoveUpdate
ldrh r1, [r4, #0x2e]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
subs r1, r1, r0
lsls r1, r1, #0x10
asrs r1, r1, #0x10
cmp r1, #0
beq _080A2CBA
cmp r6, #0
beq _080A2CBA
ldr r0, _080A2C64 @ =gPlayerEntity
lsls r1, r1, #8
movs r2, #8
bl sub_080044AE
b _080A2CBA
.align 2, 0
_080A2C64: .4byte gPlayerEntity
_080A2C68:
ldrh r5, [r4, #0x32]
adds r0, r4, #0
bl LinearMoveUpdate
ldrh r1, [r4, #0x32]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
subs r1, r1, r0
lsls r1, r1, #0x10
asrs r1, r1, #0x10
cmp r1, #0
beq _080A2CBA
cmp r6, #0
beq _080A2CBA
ldr r0, _080A2C90 @ =gPlayerEntity
lsls r1, r1, #8
movs r2, #0x10
bl sub_080044AE
b _080A2CBA
.align 2, 0
_080A2C90: .4byte gPlayerEntity
_080A2C94:
ldrh r5, [r4, #0x2e]
adds r0, r4, #0
bl LinearMoveUpdate
ldrh r1, [r4, #0x2e]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
subs r0, r0, r1
lsls r0, r0, #0x10
asrs r1, r0, #0x10
cmp r1, #0
beq _080A2CBA
cmp r6, #0
beq _080A2CBA
ldr r0, _080A2CBC @ =gPlayerEntity
lsls r1, r1, #8
movs r2, #0x18
bl sub_080044AE
_080A2CBA:
pop {r4, r5, r6, pc}
.align 2, 0
_080A2CBC: .4byte gPlayerEntity
.syntax divided
asm/non_matching/octorokBoss/sub_08036AF0.inc
-210
View File
@@ -1,210 +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, #0xc
str r1, [sp]
mov r8, r2
adds r0, #0x84
ldr r0, [r0]
str r0, [sp, #4]
ldrb r0, [r0, #1]
subs r4, r0, #1
cmp r4, #0
bne _08036B10
b _08036C80
_08036B10:
ldr r0, [sp, #4]
adds r0, #0xc
str r0, [sp, #8]
lsls r0, r1, #0x14
asrs r0, r0, #0x10
mov sl, r0
_08036B1C:
mov r1, r8
cmp r1, #0
bne _08036BC0
lsls r0, r4, #2
ldr r2, [sp, #8]
adds r6, r2, r0
ldr r0, [r6]
subs r4, #1
lsls r1, r4, #2
adds r5, r2, r1
ldr r2, [r5]
movs r3, #0x2e
ldrsh r1, [r2, r3]
movs r3, #0x32
ldrsh r2, [r2, r3]
bl sub_080041DC
mov sb, r4
ldr r1, [sp]
cmp r1, r0
blo _08036B48
b _08036C78
_08036B48:
ldr r2, [r5]
ldr r3, [r6]
ldr r0, [r2, #0x2c]
ldr r1, [r3, #0x2c]
subs r0, r0, r1
ldr r1, [r2, #0x30]
ldr r2, [r3, #0x30]
subs r1, r1, r2
bl sub_080045DA
ldr r1, [r5]
adds r1, #0x7b
strb r0, [r1]
ldr r0, [r5]
adds r0, #0x7b
ldrb r0, [r0]
lsls r0, r0, #1
ldr r2, _08036BBC @ =gSineTable
adds r0, r0, r2
movs r3, #0
ldrsh r0, [r0, r3]
mov r1, sl
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r1, #0x80
lsls r1, r1, #1
bl FixedDiv
ldr r2, [r5]
ldr r1, [r6]
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r1, #0x2c]
adds r1, r1, r0
str r1, [r2, #0x2c]
ldr r0, [r5]
adds r0, #0x7b
ldrb r0, [r0]
adds r0, #0x40
lsls r0, r0, #1
ldr r1, _08036BBC @ =gSineTable
adds r0, r0, r1
movs r2, #0
ldrsh r0, [r0, r2]
mov r1, sl
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r1, #0x80
lsls r1, r1, #1
bl FixedDiv
ldr r2, [r5]
ldr r1, [r6]
b _08036C6E
.align 2, 0
_08036BBC: .4byte gSineTable
_08036BC0:
subs r2, r4, #1
lsls r0, r2, #2
ldr r3, [sp, #8]
adds r0, r3, r0
ldr r0, [r0]
adds r5, r0, #0
adds r5, #0x7b
lsls r1, r4, #2
adds r0, r3, r1
ldr r0, [r0]
adds r0, #0x7b
ldrb r4, [r5]
ldrb r3, [r0]
adds r7, r1, #0
ldr r6, [sp, #4]
adds r6, #0xc
mov sb, r2
cmp r4, r3
beq _08036C0E
subs r0, r3, r4
lsls r0, r0, #0x18
asrs r1, r0, #0x18
cmp r1, #0
ble _08036BFE
mov r2, r8
lsls r0, r2, #0x18
lsrs r0, r0, #0x18
cmp r1, r0
ble _08036C0E
subs r0, r3, r2
b _08036C0C
_08036BFE:
mov r2, r8
rsbs r0, r2, #0
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r1, r0
bge _08036C0E
adds r0, r3, r2
_08036C0C:
strb r0, [r5]
_08036C0E:
mov r3, sb
lsls r4, r3, #2
adds r4, r6, r4
ldr r0, [r4]
adds r0, #0x7b
ldrb r0, [r0]
lsls r0, r0, #1
ldr r1, _08036C8C @ =gSineTable
adds r0, r0, r1
movs r2, #0
ldrsh r0, [r0, r2]
mov r1, sl
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r1, #0x80
lsls r1, r1, #1
bl FixedDiv
ldr r2, [r4]
adds r5, r6, r7
ldr r1, [r5]
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r1, #0x2c]
adds r1, r1, r0
str r1, [r2, #0x2c]
ldr r0, [r4]
adds r0, #0x7b
ldrb r0, [r0]
adds r0, #0x40
lsls r0, r0, #1
ldr r3, _08036C8C @ =gSineTable
adds r0, r0, r3
movs r1, #0
ldrsh r0, [r0, r1]
mov r1, sl
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r1, #0x80
lsls r1, r1, #1
bl FixedDiv
ldr r2, [r4]
ldr r1, [r5]
_08036C6E:
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r1, #0x30]
subs r1, r1, r0
str r1, [r2, #0x30]
_08036C78:
mov r4, sb
cmp r4, #0
beq _08036C80
b _08036B1C
_08036C80:
add sp, #0xc
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08036C8C: .4byte gSineTable
.syntax divided
asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc
-579
View File
@@ -1,579 +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, #0x38
adds r7, r0, #0
bl GetNextFrame
ldrb r0, [r7, #0xa]
cmp r0, #9
bls _0809A1D2
b _0809A632
_0809A1D2:
lsls r0, r0, #2
ldr r1, _0809A1DC @ =_0809A1E0
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0809A1DC: .4byte _0809A1E0
_0809A1E0: @ jump table
.4byte _0809A208 @ case 0
.4byte _0809A25C @ case 1
.4byte _0809A33E @ case 2
.4byte _0809A378 @ case 3
.4byte _0809A394 @ case 4
.4byte _0809A3E0 @ case 5
.4byte _0809A378 @ case 6
.4byte _0809A46C @ case 7
.4byte _0809A47C @ case 8
.4byte _0809A616 @ case 9
_0809A208:
adds r1, r7, #0
adds r1, #0x79
ldrb r0, [r1]
cmp r0, #0
beq _0809A25C
subs r0, #1
strb r0, [r1]
ldrb r0, [r7, #0xf]
subs r0, #1
strb r0, [r7, #0xf]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
adds r1, #0xb
str r1, [sp, #0x20]
cmp r0, #0xff
bne _0809A254
movs r0, #5
strb r0, [r7, #0xf]
ldrb r3, [r7, #0xb]
adds r0, r7, #0
movs r1, #0x87
movs r2, #1
bl CreateObjectWithParent
adds r1, r0, #0
str r1, [r7, #0x54]
cmp r1, #0
beq _0809A24E
ldr r0, [r7, #0x50]
str r0, [r1, #0x50]
ldr r0, [r7, #0x54]
adds r0, #0x84
ldr r2, [sp, #0x20]
ldr r1, [r2]
str r1, [r0]
_0809A24E:
ldrb r0, [r7, #0xb]
adds r0, #1
strb r0, [r7, #0xb]
_0809A254:
ldr r1, [sp, #0x20]
ldr r0, [r1]
ldr r0, [r0, #0xc]
b _0809A474
_0809A25C:
adds r4, r7, #0
adds r4, #0x84
ldr r1, [r4]
ldrb r0, [r7, #0xe]
lsls r0, r0, #2
adds r1, #0xc
adds r1, r1, r0
ldr r2, [r1]
ldr r0, [r2, #0x2c]
ldr r1, [r7, #0x2c]
subs r0, r0, r1
ldr r1, [r2, #0x30]
ldr r2, [r7, #0x30]
subs r1, r1, r2
bl sub_080045DA
strb r0, [r7, #0x15]
movs r2, #0x24
ldrsh r1, [r7, r2]
ldrb r2, [r7, #0x15]
adds r0, r7, #0
bl LinearMoveAngle
ldr r1, [r4]
ldrb r0, [r7, #0xe]
lsls r0, r0, #2
adds r1, #0xc
adds r1, r1, r0
ldr r1, [r1]
adds r0, r7, #0
movs r2, #2
movs r3, #2
bl EntityInRectRadius
cmp r0, #0
bne _0809A2A6
b _0809A632
_0809A2A6:
ldrb r0, [r7, #0xa]
cmp r0, #0
bne _0809A2CC
ldr r1, [r4]
ldrb r0, [r7, #0xe]
lsls r0, r0, #2
adds r1, #0xc
adds r1, r1, r0
ldr r3, [r1]
ldrb r2, [r3, #0x18]
lsls r1, r2, #0x1e
lsrs r1, r1, #0x1e
movs r0, #2
rsbs r0, r0, #0
ands r1, r0
subs r0, #2
ands r0, r2
orrs r0, r1
strb r0, [r3, #0x18]
_0809A2CC:
ldrb r1, [r7, #0xe]
ldr r0, [r4]
ldrb r0, [r0, #1]
subs r0, #1
cmp r1, r0
bne _0809A338
movs r0, #2
strb r0, [r7, #0xc]
movs r0, #0xf0
strb r0, [r7, #0xe]
bl Random
ldr r6, _0809A330 @ =gUnk_0812384C
ldrb r2, [r7, #0xb]
movs r3, #0xf
movs r4, #0xf
adds r1, r4, #0
ands r1, r2
lsls r1, r1, #2
adds r1, r1, r6
ands r0, r3
ldrb r1, [r1]
adds r0, r0, r1
strb r0, [r7, #0x15]
bl Random
ldrb r1, [r7, #0xb]
ands r4, r1
lsls r4, r4, #1
adds r4, #1
lsls r4, r4, #1
adds r4, r4, r6
ldr r2, _0809A334 @ =0x000001FF
adds r1, r2, #0
ands r0, r1
ldrh r4, [r4]
adds r0, r0, r4
strh r0, [r7, #0x24]
ldrb r0, [r7, #0xa]
cmp r0, #0
beq _0809A320
b _0809A632
_0809A320:
ldr r1, [r7, #0x50]
movs r0, #4
strb r0, [r1, #0xc]
ldr r1, [r7, #0x50]
movs r0, #0
strb r0, [r1, #0xd]
b _0809A632
.align 2, 0
_0809A330: .4byte gUnk_0812384C
_0809A334: .4byte 0x000001FF
_0809A338:
adds r0, r1, #1
strb r0, [r7, #0xe]
b _0809A632
_0809A33E:
ldr r1, [r7, #0x50]
ldrb r0, [r1, #0xb]
cmp r0, #3
bne _0809A38E
adds r0, r1, #0
adds r0, #0x84
ldr r0, [r0]
ldr r2, [r0, #8]
ldr r0, [r2, #0x2c]
ldr r1, [r7, #0x2c]
subs r0, r0, r1
ldr r1, [r2, #0x30]
ldr r2, [r7, #0x30]
subs r1, r1, r2
bl sub_080045DA
strb r0, [r7, #0x15]
movs r1, #0xa0
lsls r1, r1, #2
ldrb r2, [r7, #0x15]
adds r0, r7, #0
bl LinearMoveAngle
ldr r1, [r7, #0x50]
adds r0, r7, #0
movs r2, #0x48
bl sub_0806FC80
b _0809A388
_0809A378:
ldrb r2, [r7, #0x15]
adds r0, r7, #0
movs r1, #0x80
bl LinearMoveAngle
adds r0, r7, #0
adds r0, #0x5a
ldrb r0, [r0]
_0809A388:
cmp r0, #0
bne _0809A38E
b _0809A632
_0809A38E:
bl DeleteThisEntity
b _0809A632
_0809A394:
ldr r3, [r7, #0x78]
cmp r3, #0
bne _0809A3B4
ldr r0, _0809A3B0 @ =gRoomVars
movs r2, #0xc
ldrsh r1, [r0, r2]
movs r0, #0x80
lsls r0, r0, #1
cmp r1, r0
beq _0809A38E
movs r0, #8
bl ChangeLightLevel
b _0809A632
.align 2, 0
_0809A3B0: .4byte gRoomVars
_0809A3B4:
ldr r2, [r7, #0x50]
adds r0, r2, #0
adds r0, #0x45
ldrb r1, [r0]
cmp r1, #0
bne _0809A3C8
movs r0, #1
strb r0, [r7, #0xd]
str r1, [r7, #0x78]
b _0809A632
_0809A3C8:
ldrb r0, [r7, #0xd]
cmp r0, #0
bne _0809A3D6
ldrb r0, [r2, #0xb]
cmp r0, #0
beq _0809A3D6
b _0809A632
_0809A3D6:
movs r0, #1
strb r0, [r7, #0xd]
subs r0, r3, #1
str r0, [r7, #0x78]
b _0809A632
_0809A3E0:
ldr r0, [r7, #0x78]
cmp r0, #0
bne _0809A432
adds r0, r7, #0
adds r0, #0x76
ldrh r2, [r0]
movs r1, #0x80
lsls r1, r1, #1
adds r5, r0, #0
cmp r2, r1
bne _0809A40E
ldr r0, [r7, #0x50]
adds r0, #0x7c
ldrb r1, [r0]
movs r0, #1
ands r0, r1
adds r4, r7, #0
adds r4, #0x74
cmp r0, #0
beq _0809A420
bl DeleteThisEntity
b _0809A420
_0809A40E:
adds r0, r2, #0
subs r0, #0x20
strh r0, [r5]
adds r1, r7, #0
adds r1, #0x74
ldrh r0, [r1]
subs r0, #0x20
strh r0, [r1]
adds r4, r1, #0
_0809A420:
ldrh r1, [r5]
ldrh r2, [r4]
adds r0, r7, #0
adds r0, #0x7a
ldrh r3, [r0]
adds r0, r7, #0
bl SetAffineInfo
b _0809A436
_0809A432:
subs r0, #1
str r0, [r7, #0x78]
_0809A436:
ldr r0, [r7, #0x50]
adds r1, r7, #0
bl CopyPosition
ldr r4, _0809A468 @ =gUnk_0812388C
ldrb r3, [r7, #0xb]
lsls r0, r3, #1
adds r0, #1
lsls r0, r0, #1
adds r0, r0, r4
ldrh r1, [r0]
ldr r0, [r7, #0x50]
adds r0, #0x7b
ldrb r2, [r0]
rsbs r2, r2, #0
lsls r2, r2, #0x18
lsls r3, r3, #2
adds r3, r3, r4
lsrs r2, r2, #0x18
ldrh r3, [r3]
adds r2, r2, r3
adds r0, r7, #0
bl LinearMoveAngle
b _0809A632
.align 2, 0
_0809A468: .4byte gUnk_0812388C
_0809A46C:
ldrb r0, [r7, #0xe]
cmp r0, #0
bne _0809A38E
ldr r0, [r7, #0x50]
_0809A474:
adds r1, r7, #0
bl CopyPosition
b _0809A632
_0809A47C:
ldrb r0, [r7, #0xe]
subs r0, #1
strb r0, [r7, #0xe]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0xff
beq _0809A48C
b _0809A632
_0809A48C:
movs r0, #4
strb r0, [r7, #0xe]
ldrb r0, [r7, #0xf]
adds r0, #1
strb r0, [r7, #0xf]
adds r0, r7, #0
adds r0, #0x84
str r0, [sp, #4]
ldrb r1, [r7, #0xf]
lsls r0, r1, #5
subs r0, r0, r1
ldr r2, [sp, #4]
ldr r1, [r2]
subs r1, r1, r0
mov sl, r1
mov r0, sl
str r0, [sp]
adds r1, r7, #0
adds r1, #0x82
str r1, [sp, #8]
ldrh r0, [r1]
adds r2, r7, #0
adds r2, #0x7e
str r2, [sp, #0xc]
strh r0, [r2]
ldrh r0, [r1]
subs r1, #8
str r1, [sp, #0x10]
strh r0, [r1]
movs r2, #0x80
adds r2, r2, r7
mov sb, r2
ldrb r0, [r7, #0xf]
lsls r0, r0, #4
ldrh r1, [r2]
subs r1, r1, r0
movs r0, #0x7c
adds r0, r0, r7
mov r8, r0
strh r1, [r0]
adds r4, r7, #0
adds r4, #0x78
strh r1, [r4]
ldr r1, [sp, #0x10]
ldrh r0, [r1]
ldrh r1, [r4]
ldrb r3, [r7, #0xb]
mov r2, sl
bl sub_0809A6F8
adds r5, r0, #0
ldrb r6, [r7, #0xf]
ldr r2, [sp, #4]
str r2, [sp, #0x20]
ldr r0, [sp, #0x10]
str r0, [sp, #0x28]
ldr r1, [sp, #8]
str r1, [sp, #0x1c]
ldr r2, [sp, #0xc]
str r2, [sp, #0x30]
mov r0, sb
str r0, [sp, #0x34]
mov r1, r8
str r1, [sp, #0x2c]
str r4, [sp, #0x24]
cmp r6, #0
beq _0809A568
ldr r2, [sp, #0x28]
str r2, [sp, #0x14]
mov sb, r4
ldr r0, [sp, #0x30]
mov r8, r0
adds r4, r1, #0
_0809A51E:
ldr r1, [sp, #0x14]
ldrh r0, [r1]
subs r0, #0x10
strh r0, [r1]
mov r2, sb
ldrh r0, [r2]
adds r0, #0x10
strh r0, [r2]
ldr r0, [sp]
adds r0, #0x1e
str r0, [sp]
ldrh r0, [r1]
ldrh r1, [r2]
ldrb r3, [r7, #0xb]
ldr r2, [sp]
bl sub_0809A6F8
adds r5, r5, r0
mov r1, r8
ldrh r0, [r1]
adds r0, #0x10
strh r0, [r1]
ldrh r0, [r4]
adds r0, #0x10
strh r0, [r4]
movs r2, #0x20
add sl, r2
ldrh r0, [r1]
ldrh r1, [r4]
ldrb r3, [r7, #0xb]
mov r2, sl
bl sub_0809A6F8
adds r5, r5, r0
subs r6, #1
cmp r6, #0
bne _0809A51E
_0809A568:
ldrb r1, [r7, #0xf]
lsls r0, r1, #5
subs r0, r0, r1
ldr r2, [sp, #0x20]
ldr r1, [r2]
adds r1, r1, r0
mov sl, r1
mov r0, sl
str r0, [sp]
ldr r1, [sp, #0x1c]
ldrh r0, [r1]
ldr r2, [sp, #0x30]
strh r0, [r2]
ldrh r0, [r1]
ldr r1, [sp, #0x28]
strh r0, [r1]
ldrb r0, [r7, #0xf]
lsls r0, r0, #4
ldr r2, [sp, #0x34]
ldrh r2, [r2]
adds r0, r0, r2
ldr r1, [sp, #0x2c]
strh r0, [r1]
ldr r2, [sp, #0x24]
strh r0, [r2]
ldr r1, [sp, #0x28]
ldrh r0, [r1]
ldrh r1, [r2]
ldrb r3, [r7, #0xb]
mov r2, sl
bl sub_0809A6F8
adds r5, r5, r0
ldrb r0, [r7, #0xf]
subs r6, r0, #1
cmp r6, #0
beq _0809A610
ldr r2, [sp, #0x28]
str r2, [sp, #0x18]
ldr r0, [sp, #0x24]
mov sb, r0
ldr r1, [sp, #0x30]
mov r8, r1
ldr r4, [sp, #0x2c]
_0809A5C0:
ldr r2, [sp, #0x18]
ldrh r0, [r2]
subs r0, #0x10
strh r0, [r2]
mov r1, sb
ldrh r0, [r1]
subs r0, #0x10
strh r0, [r1]
ldr r2, [sp]
subs r2, #0x20
str r2, [sp]
ldr r1, [sp, #0x18]
ldrh r0, [r1]
mov r2, sb
ldrh r1, [r2]
ldrb r3, [r7, #0xb]
ldr r2, [sp]
bl sub_0809A6F8
adds r5, r5, r0
mov r1, r8
ldrh r0, [r1]
adds r0, #0x10
strh r0, [r1]
ldrh r0, [r4]
subs r0, #0x10
strh r0, [r4]
movs r2, #0x1e
rsbs r2, r2, #0
add sl, r2
ldrh r0, [r1]
ldrh r1, [r4]
ldrb r3, [r7, #0xb]
mov r2, sl
bl sub_0809A6F8
adds r5, r5, r0
subs r6, #1
cmp r6, #0
bne _0809A5C0
_0809A610:
cmp r5, #0
bne _0809A632
b _0809A38E
_0809A616:
bl sub_08078B48
ldr r0, [r7, #0x78]
subs r0, #1
str r0, [r7, #0x78]
movs r1, #1
rsbs r1, r1, #0
cmp r0, r1
bne _0809A632
ldr r1, _0809A640 @ =gRoomControls
ldr r0, _0809A644 @ =gPlayerEntity
str r0, [r1, #0x30]
bl DeleteThisEntity
_0809A632:
add sp, #0x38
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0809A640: .4byte gRoomControls
_0809A644: .4byte gPlayerEntity
.syntax divided
asm/non_matching/scroll/sub_08080CB4.inc
-136
View File
@@ -1,136 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r4, r0, #0
adds r1, r4, #0
adds r1, #0x58
ldrb r0, [r4, #0xa]
ldrb r1, [r1]
cmp r0, r1
beq _08080CF0
adds r1, r0, #0
adds r0, r4, #0
bl InitAnimationForceUpdate
ldrb r0, [r4, #0xa]
cmp r0, #0x5c
beq _08080CD4
b _08080E00
_08080CD4:
ldrb r0, [r4, #0xb]
lsls r0, r0, #3
ldr r1, _08080CEC @ =gKinstoneWorldEvents
adds r0, r0, r1
ldrb r0, [r0]
movs r1, #0xf
ands r1, r0
lsls r0, r0, #4
orrs r0, r1
strb r0, [r4, #0x1a]
b _08080E00
.align 2, 0
_08080CEC: .4byte gKinstoneWorldEvents
_08080CF0:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x1e
cmp r0, #0
bne _08080D00
b _08080E00
_08080D00:
ldrb r0, [r4, #0xa]
subs r0, #0x40
cmp r0, #0x22
bhi _08080E00
lsls r0, r0, #2
ldr r1, _08080D14 @ =_08080D18
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08080D14: .4byte _08080D18
_08080D18: @ jump table
.4byte _08080DEE @ case 0
.4byte _08080DEE @ case 1
.4byte _08080DEE @ case 2
.4byte _08080DEE @ case 3
.4byte _08080E00 @ case 4
.4byte _08080E00 @ case 5
.4byte _08080E00 @ case 6
.4byte _08080E00 @ case 7
.4byte _08080E00 @ case 8
.4byte _08080E00 @ case 9
.4byte _08080E00 @ case 10
.4byte _08080E00 @ case 11
.4byte _08080E00 @ case 12
.4byte _08080E00 @ case 13
.4byte _08080E00 @ case 14
.4byte _08080E00 @ case 15
.4byte _08080E00 @ case 16
.4byte _08080E00 @ case 17
.4byte _08080E00 @ case 18
.4byte _08080E00 @ case 19
.4byte _08080E00 @ case 20
.4byte _08080E00 @ case 21
.4byte _08080E00 @ case 22
.4byte _08080E00 @ case 23
.4byte _08080E00 @ case 24
.4byte _08080E00 @ case 25
.4byte _08080E00 @ case 26
.4byte _08080E00 @ case 27
.4byte _08080DEE @ case 28
.4byte _08080E00 @ case 29
.4byte _08080E00 @ case 30
.4byte _08080E00 @ case 31
.4byte _08080DA4 @ case 32
.4byte _08080E00 @ case 33
.4byte _08080DEE @ case 34
_08080DA4:
adds r5, r4, #0
adds r5, #0x6a
ldrb r0, [r5]
cmp r0, #0
beq _08080DB4
subs r0, #1
strb r0, [r5]
b _08080E00
_08080DB4:
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0xa
strb r0, [r5]
adds r0, r4, #0
movs r1, #7
movs r2, #0
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08080E00
adds r0, r4, #0
adds r0, #0x62
ldrb r0, [r0]
adds r2, r1, #0
adds r2, #0x62
strb r0, [r2]
adds r0, r4, #0
adds r0, #0x63
ldrb r0, [r0]
adds r2, #1
strb r0, [r2]
adds r0, r4, #0
bl SortEntityAbove
b _08080E00
_08080DEE:
ldr r0, _08080E04 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
cmp r0, #0
bne _08080E00
adds r0, r4, #0
bl CreateSparkle
_08080E00:
pop {r4, r5, pc}
.align 2, 0
_08080E04: .4byte gRoomTransition
.syntax divided
asm/non_matching/stalfos/sub_0803933C.inc
-111
View File
@@ -1,111 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r5, r0, #0
adds r0, #0x3f
ldrb r0, [r0]
cmp r0, #0x44
bne _08039390
adds r0, r5, #0
adds r0, #0x41
ldrb r0, [r0]
movs r1, #0x7f
ands r1, r0
cmp r1, #6
bgt _08039390
cmp r1, #4
blt _08039390
adds r0, r5, #0
adds r0, #0x3d
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
bgt _08039390
movs r0, #4
strb r0, [r5, #0xc]
adds r0, r5, #0
adds r0, #0x3e
ldrb r0, [r0]
strb r0, [r5, #0x15]
ldrb r0, [r5, #0x15]
adds r0, #4
movs r1, #0x18
ands r0, r1
movs r1, #0x10
eors r0, r1
asrs r0, r0, #3
strb r0, [r5, #0x14]
movs r0, #0x90
lsls r0, r0, #1
strh r0, [r5, #0x24]
adds r0, r5, #0
bl sub_0803981C
_08039390:
adds r0, r5, #0
adds r0, #0x41
ldrb r2, [r0]
cmp r2, #0x9d
bne _080393F8
ldr r1, [r5, #0x54]
cmp r1, #0
bne _080393CA
ldrb r0, [r5, #0xc]
cmp r0, #8
bhi _080393EC
adds r0, r5, #0
movs r1, #0x10
movs r2, #1
bl CreateProjectileWithParent
adds r1, r0, #0
cmp r1, #0
beq _080393DC
ldrb r0, [r5, #0x14]
lsls r0, r0, #1
strb r0, [r1, #0x1e]
movs r0, #2
strb r0, [r1, #0xb]
movs r0, #0xc3
lsls r0, r0, #1
bl EnqueueSFX
b _080393DC
_080393CA:
adds r0, r1, #0
adds r0, #0x41
movs r4, #0
strb r2, [r0]
movs r0, #0xc3
lsls r0, r0, #1
bl EnqueueSFX
str r4, [r5, #0x54]
_080393DC:
adds r0, r5, #0
bl sub_08039A48
adds r1, r5, #0
adds r1, #0x78
ldrh r0, [r1]
adds r0, #0x5a
strh r0, [r1]
_080393EC:
adds r2, r5, #0
adds r2, #0x3b
ldrb r1, [r2]
movs r0, #0xfb
ands r0, r1
strb r0, [r2]
_080393F8:
adds r0, r5, #0
adds r0, #0x43
ldrb r0, [r0]
cmp r0, #0
beq _0803940A
adds r0, r5, #0
movs r1, #0x1c
bl Create0x68FX
_0803940A:
ldr r1, _08039414 @ =Stalfos_Functions
adds r0, r5, #0
bl EnemyFunctionHandlerAfterCollision
pop {r4, r5, pc}
.align 2, 0
_08039414: .4byte Stalfos_Functions
.syntax divided
asm/non_matching/ui/CreateUIElement.inc
-41
View File
@@ -1,41 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r6, r1, #0
movs r3, #0
ldr r7, _0801CAA8 @ =gUnk_0200AF34
movs r0, #1
mov ip, r0
ldr r1, _0801CAAC @ =gUIElementDefinitions
lsls r0, r5, #4
adds r4, r0, r1
_0801CA80:
lsls r0, r3, #5
adds r1, r0, r7
ldrb r2, [r1]
movs r0, #1
ands r0, r2
cmp r0, #0
bne _0801CAB0
strb r5, [r1, #1]
strb r6, [r1, #2]
movs r0, #0xff
strb r0, [r1, #0x10]
mov r0, ip
orrs r0, r2
strb r0, [r1]
ldrh r0, [r4, #4]
strh r0, [r1, #0x1a]
ldrb r0, [r4, #0xc]
strb r0, [r1, #3]
b _0801CAB6
.align 2, 0
_0801CAA8: .4byte gUnk_0200AF34
_0801CAAC: .4byte gUIElementDefinitions
_0801CAB0:
adds r3, #1
cmp r3, #0x17
bls _0801CA80
_0801CAB6:
pop {r4, r5, r6, r7, pc}
.syntax divided
src/beanstalkSubtask.c
+447 -2
View File
@@ -57,6 +57,25 @@ void sub_0801AB08(u16*, LayerStruct*);
u32 sub_0801AC68(u32 position, u32 data);
extern u32 sub_0807BDB8(Entity* this, u32 param_2);
extern void sub_0804B388(u32 a1, u32 a2);
extern u32 sub_080A7CFC(u32 a1, u32 tmp); // TODO does this really have a second param?
extern void OpenSmallChest(u32 pos, u32 layer);
extern bool32 sub_08079778();
extern Transition* sub_08080734(u32, u32);
extern const s16 gUnk_080B4490[];
extern const s16 gUnk_080B4468[];
extern const s16 gUnk_080B4478[];
bool32 sub_0801A2B0(LayerStruct* layer, u32 position, u32 collisionType);
bool32 sub_0801A9F0(u32 param_1, u32 param_2, u32 param_3);
u32 sub_0801A570(Entity*, u32);
bool32 sub_0801A458(LayerStruct* layer, u32 position, u32 collisionType);
bool32 sub_0801A370(LayerStruct* layer, u32 position);
u32 sub_0801A8D0(Entity* this, u32 param_2);
extern void sub_080001D0(u32, u32, u32);
void sub_0801967C(void) {
gUnk_080B4458[gMenu.overlayType]();
}
@@ -140,7 +159,433 @@ void sub_080197D4(struct_08109194* param_1) {
}
// Has ifdefs for other variants
ASM_FUNC("asm/non_matching/beanstalkSubtask/UpdatePlayerCollision.inc", void UpdatePlayerCollision())
u32 UpdatePlayerCollision(void) {
u32 direction;
u32 tileType;
LayerStruct* layer;
Transition* transition;
Entity* pushedBlock;
Entity* player;
u32 position;
u32 index;
const s16* ptr1;
const s16* ptr2;
s32 tmp1;
u32 tmp2;
u32 tmp3;
// There are some weird assignment necessary to access gPlayerEntity.animationState correctly.
u32 animationState1;
u32 animationState2;
u32 animationState3;
if (gPlayerState.framestate == 0) {
tmp1 = gPlayerState.framestate_last;
} else {
tmp1 = gPlayerState.framestate;
}
switch (tmp1) {
case 3:
return 0;
case 0x12:
return 0;
case 0x16:
return 0;
}
if (gPlayerState.dash_state != 0 || gPlayerEntity.action == PLAYER_CLIMB) {
direction = gPlayerEntity.direction;
} else {
direction = gPlayerState.direction;
}
if (((direction & 0x83) == 0) && (gPlayerState.field_0xa == 0)) {
index = sub_0807BDB8(&gPlayerEntity, direction >> 2);
if (index != 0xff && (gRoomControls.scroll_flags & 4) == 0) {
ptr1 = &gUnk_080B4490[index * 2];
if (sub_080B1B44(COORD_TO_TILE_OFFSET(&gPlayerEntity, -ptr1[0], -ptr1[1]), gPlayerEntity.collisionLayer) ==
0xff) {
if ((((gPlayerState.flags & 0x10002) != 0) || ((gPlayerState.sword_state & 0x10) != 0)) ||
((sub_080806BC(gPlayerEntity.x.HALF.HI - gRoomControls.origin_x,
gPlayerEntity.y.HALF.HI - gRoomControls.origin_y, index, 5) == 0 &&
(((gPlayerState.heldObject != 0 || ((gPlayerState.field_0x1c & 0xf) != 0)) ||
(sub_0807BD14(&gPlayerEntity, index) == 0)))))) {
return 3;
}
gPlayerEntity.direction = (index << 3);
return 0xf;
}
}
}
layer = GetLayerByIndex(gPlayerEntity.collisionLayer);
ptr1 = &gUnk_080B4468[gPlayerEntity.animationState & 6];
position = COORD_TO_TILE_OFFSET(&gPlayerEntity, -ptr1[0], -ptr1[1]);
tileType = GetTileType(position, gPlayerEntity.collisionLayer);
if (tileType < 0x4000) {
direction = sub_080B1B54(tileType);
} else {
direction = tileType;
}
animationState1 = gPlayerEntity.animationState;
animationState2 = animationState1 & 0xff;
switch (direction) {
case 0x4000:
if (sub_0801A458(layer, position, 2) == 0) {
return 0;
}
layer->mapData[position] = 0x4001 + (gPlayerEntity.animationState >> 1);
if ((gPlayerState.flags & 0x80) != 0) {
gPlayerState.pushedObject = 0xc0;
} else {
gPlayerState.pushedObject = 0xa0;
}
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
return 1;
case 0x28:
if ((gPlayerState.flags & 0x80) != 0) {
return 0;
}
gPlayerEntity.action = gPlayerEntity.action;
if (gPlayerState.field_0xa != 0) {
return 0;
}
if ((Direction8FromAnimationState(gPlayerEntity.animationState)) - gPlayerState.direction != 0) {
return 0;
}
if ((gPlayerEntity.direction & 0x80) != 0) {
return 0;
}
if (sub_080B1B44(position, gPlayerEntity.collisionLayer) != 0xf) {
return 0;
}
if (sub_08079778() == 0) {
return 0;
}
ptr1 = &gUnk_080B4478[gPlayerEntity.animationState & 6];
transition = sub_08080734((gPlayerEntity.x.HALF.HI - gRoomControls.origin_x) + ptr1[0],
(gPlayerEntity.y.HALF.HI - gRoomControls.origin_y) + ptr1[1]);
if (transition == NULL) {
return 0;
}
if ((gPlayerEntity.animationState & 2) != 0) {
gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + transition->startY + 6;
} else {
gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + transition->startX;
}
sub_08078AC0(4, 0, 1);
return 0;
case 0x401b:
if (sub_0801A2B0(layer, position, 0xb) == 0) {
return 0;
}
layer->mapData[position] = 0x401c + (gPlayerEntity.animationState >> 1);
gPlayerState.pushedObject = 0xa0;
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
gPlayerEntity.type = 1;
return 1;
case 0x70:
if ((gPlayerState.field_0x35 & 0x80) == 0) {
if ((gPlayerEntity.frame & 1) != 0) {
if (sub_0801A9F0(gPlayerState.field_0x35 << 2, tileType, position) != 0) {
return 1;
}
}
}
return 0;
case 0x3a:
case 0x5b:
case 0x4051:
if ((gPlayerState.flags & 0x80) != 0) {
return 0;
}
if (gPlayerEntity.animationState != 0) {
return 0;
}
gUnk_0200AF00.unk_2d = 4;
if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_40)) == 0) {
return 0;
}
gPlayerState.mobility = 1;
sub_080A7CFC(position, gPlayerEntity.collisionLayer);
return 1;
case 0x1a:
if ((animationState1 & 0xff) != 0) {
return 0;
}
if ((gPlayerState.flags & 0x4080) != 0) {
return 0;
}
gUnk_0200AF00.unk_2d = 6;
if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_8)) == 0) {
return 0;
}
gPlayerState.mobility = 1;
OpenSmallChest(position, gPlayerEntity.collisionLayer);
return 2;
case 0x71:
if (HasDungeonMap() == 0) {
return 0;
}
gUnk_0200AF00.unk_2d = 6;
if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_8)) == 0) {
return 0;
}
gPlayerState.mobility = 1;
sub_0804B388(position, gPlayerEntity.collisionLayer);
return 2;
case 0x3d:
case 0x4040 ... 0x4048:
if ((gPlayerState.flags & 0x4000) != 0) {
return 0;
}
if (sub_08079778() == 0) {
return 0;
}
#if !(defined(EU) || defined(JP))
if (gPlayerState.field_0xa != 0) {
return 0;
}
#endif
if ((Direction8FromAnimationState(gPlayerEntity.animationState)) - gPlayerState.direction != 0) {
return 0;
}
if ((gPlayerEntity.direction & 0x80) != 0) {
return 0;
}
if (gPlayerEntity.subtimer < 6) {
return 0;
}
gPlayerState.jump_status = 0x81;
gPlayerState.flags |= 0x20;
gPlayerState.queued_action = PLAYER_USEPORTAL;
gPlayerEntity.zVelocity = 0x20000;
COLLISION_OFF(&gPlayerEntity);
return 1;
case 0x400b:
if (sub_0801A2B0(layer, position, 8) == 0) {
return 0;
}
if ((gPlayerEntity.collisionLayer == 3) && (gMapTop.mapData[position] == 0x400b)) {
gMapTop.mapData[position] = 0x400c + (gPlayerEntity.animationState >> 1);
} else {
layer->mapData[position] = 0x400c + (gPlayerEntity.animationState >> 1);
}
gPlayerState.pushedObject = 0xa0;
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
return 1;
case 0x405a:
if (sub_0801A2B0(layer, position, 2) == 0) {
return 0;
}
layer->mapData[position] = 0x405b + (gPlayerEntity.animationState >> 1);
gPlayerState.pushedObject = 0x98;
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
return 1;
case 0x4036:
if (sub_0801A2B0(layer, position, 0xb) == 0) {
return 0;
}
layer->mapData[position] = 0x4037 + (gPlayerEntity.animationState >> 1);
gPlayerState.pushedObject = 0xa0;
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
return 1;
case 0x403e:
if ((animationState1 & 0xff) != 0) {
return 0;
}
if (((gPlayerState.field_0x35 | gPlayerState.direction) & 0x80) != 0) {
return 0;
}
if ((gPlayerEntity.frame & 2) == 0) {
return 0;
}
layer->mapData[position] = 0x403f;
gPlayerState.pushedObject = 0x82;
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
return 1;
case 0x72:
if ((gPlayerState.field_0x35 & 0x80) != 0) {
return 0;
}
if ((gPlayerEntity.frame & 1) == 0) {
return 0;
}
position = sub_0801A570(&gPlayerEntity, 1);
if (position == 0xffff) {
return 0;
}
tmp2 = (position >> 0xc) - 1;
position &= 0xfff;
// TODO convert to for loop?
index = 0;
tmp3 = 0;
while (index < 3) {
if ((((*(u32*)(&(gPlayerClones[0])->field_0x6c)) & (1 << index)) != 0) &&
(sub_0801A570(gPlayerClones[index], 0) == position)) {
tmp3++;
}
index++;
}
if (tmp3 < tmp2) {
return 0;
}
pushedBlock = CreateObject(PUSHED_BLOCK, tmp2, 0);
if (pushedBlock == NULL) {
return 0;
}
pushedBlock->direction = Direction8FromAnimationState(gPlayerEntity.animationState);
pushedBlock->x.HALF.HI = ((position & 0xfff & 0x3f) << 4) + 8 + gRoomControls.origin_x;
pushedBlock->y.HALF.HI = ((position & 0xfc0) >> 2) + 8 + gRoomControls.origin_y;
pushedBlock->collisionLayer = gPlayerEntity.collisionLayer;
gPlayerState.pushedObject = 0xa0;
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = pushedBlock->direction;
return 1;
case 0x402b ... 0x402d:
if (sub_0801A370(layer, position) != 0) {
layer->mapData[position] = 0x4030 + ((gPlayerEntity.animationState & 4) >> 2);
if ((gPlayerState.flags & 0x80) != 0) {
gPlayerState.pushedObject = 0xa0;
} else {
gPlayerState.pushedObject = 0x90;
}
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
return 1;
} else {
return 0;
}
case 0x404a:
if (sub_0801A458(layer, position, 8) == 0) {
return 0;
}
layer->mapData[position] = 0x404b + (gPlayerEntity.animationState >> 1);
if ((gPlayerState.flags & 0x80) != 0) {
gPlayerState.pushedObject = 0xc0;
} else {
gPlayerState.pushedObject = 0xa0;
}
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
return 1;
case 0x4052:
if (gPlayerState.field_0x35 != 0) {
return 0;
}
SetTile(0x4054, position, gPlayerEntity.collisionLayer);
return 4;
case 0x4053:
if (gPlayerState.field_0x35 != 6) {
return 0;
}
SetTile(0x4054, position, gPlayerEntity.collisionLayer);
return 4;
case 0x4055:
position--;
// fallthrough
case 0x4056:
if (gPlayerState.field_0x35 != 0) {
return 0;
}
if ((gPlayerEntity.y.HALF.HI & 0xf) < 10) {
return 0;
}
for (index = 0; index < 3; index++) {
if (sub_0801A8D0(gPlayerClones[index], 0) == position) {
SetTile(0x4059, position, gPlayerEntity.collisionLayer);
return 4;
}
}
return 0;
case 0x4057:
position -= 0x40;
// fallthrough
case 0x4058:
if (gPlayerState.field_0x35 != 6) {
return 0;
}
if ((gPlayerEntity.x.HALF.HI & 0xf) < 10) {
return 0;
}
for (index = 0; index < 3; index++) {
if (sub_0801A8D0(gPlayerClones[index], 6) == position) {
SetTile(0x4059, position, gPlayerEntity.collisionLayer);
return 4;
}
}
return 0;
case 0x405f:
animationState3 = 2;
animationState3 &= animationState1;
if (animationState3 == 0) {
return 0;
}
if (((gPlayerState.field_0x35 | gPlayerState.direction) & 0x80) != 0) {
return 0;
}
if ((gPlayerEntity.frame & 1) == 0) {
return 0;
}
SetTile(0x4074, position, gPlayerEntity.collisionLayer);
gPlayerState.pushedObject = 0xa0;
gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = Direction8FromAnimationState(gPlayerEntity.animationState);
return 1;
case 0x407d:
animationState3 = gPlayerEntity.animationState;
if ((animationState2) != 4) {
return 0;
}
if (((gPlayerState.field_0x35 | gPlayerState.direction) & 0x80) != 0) {
return 0;
}
if ((gPlayerEntity.frame & 1) == 0) {
return 0;
}
SetTile(0x4074, position, gPlayerEntity.collisionLayer);
sub_080001D0(0xd, position, gPlayerEntity.collisionLayer);
return 1;
default:
return 0;
}
}
bool32 sub_0801A2B0(LayerStruct* layer, u32 position, u32 collisionType) {
u16 uVar1;
@@ -287,7 +732,7 @@ bool32 sub_0801A4F8(void) {
return TRUE;
}
ASM_FUNC("asm/non_matching/beanstalkSubtask/sub_0801A570.inc", void sub_0801A570())
ASM_FUNC("asm/non_matching/beanstalkSubtask/sub_0801A570.inc", u32 sub_0801A570(Entity* a, u32 b))
u32 sub_0801A8D0(Entity* this, u32 param_2) {
u16* mapData;
src/common.c
+63 -1
View File
@@ -824,7 +824,69 @@ bool32 sub_0801E810(u32 kinstoneId) {
return ReadBit(&gSave.unk24E, kinstoneId);
}
ASM_FUNC("asm/non_matching/common/sub_0801E82C.inc", void sub_0801E82C(void));
void sub_0801E82C(void) {
#ifdef NON_MATCHING
u32 r5;
for (r5 = 0; r5 < 0x13; r5++) {
if (gSave.unk12B[r5] == 0) {
gSave.unk118[r5] = gSave.unk12B[r5];
}
}
gSave.unk118[0x12] = 0;
gSave.unk12B[0x12] = 0;
for (r5 = 0; r5 < 0x12; r5++) {
if ((gSave.unk118[r5] - 0x65) > 0x10) {
MemCopy(&gSave.unk118[r5 + 1], &gSave.unk118[r5], 0x12 - r5);
MemCopy(&gSave.unk12B[r5 + 1], &gSave.unk12B[r5], 0x12 - r5);
}
}
#else
u32 r0, r4, r5;
u32 new_var;
u8 *r1, *r2, *r3, *r6, *r7, *r8, *r9, *r10;
new_var = 4;
r1 = &gSave.inventory[34];
r5 = 0;
r2 = gSave.unk118;
code0_0:
r0 = r2[0x13];
r3 = &r1[4];
r10 = r3;
if (r0 == 0) {
*r2 = r0;
}
r2++;
r5++;
if (r5 <= 0x12)
goto code0_0;
r1[0x16] = 0;
r1[0x29] = 0;
r5 = 0;
r9 = &r1[0x17];
r3 = &r1[0x18];
r8 = r3;
r7 = &r1[new_var];
r6 = &r1[5];
code0_2:
r0 = r10[r5] - 0x65;
if (r0 > 0x10) {
MemCopy(r6, r7, 0x12 - r5);
MemCopy(r8, r9, 0x12 - r5);
}
r9++;
r8++;
r7++;
r6++;
r5++;
if (r5 <= 0x11)
goto code0_2;
#endif
}
s32 sub_0801E8B0(u32 idx) {
u32 i;
src/enemy/armos.c
+37 -1
View File
@@ -413,7 +413,43 @@ void sub_08030834(ArmosEntity* this) {
SetTile(this->unk_78, COORD_TO_TILE(super), super->collisionLayer);
}
ASM_FUNC("asm/non_matching/armos/sub_0803086C.inc", bool32 sub_0803086C(ArmosEntity* this))
bool32 sub_0803086C(ArmosEntity* this) {
u32 uVar2;
u32 pos;
u32 pos2;
u16 centerY;
u16 centerX;
FORCE_REGISTER(u32 r2, r2);
if (this->unk_7c != NULL) {
if ((gPlayerState.flags & 0x80) != 0) {
centerX = super->x.HALF_U.HI - gRoomControls.origin_x;
centerY = super->y.HALF_U.HI - gRoomControls.origin_y;
// TODO for some reason the 0x3f of COORD_TO_TILE(super) needs to be forced to r2 here.
pos = ((((((super)->x.HALF.HI) - gRoomControls.origin_x) >> 4) & (r2 = 0x3f)) |
(((((super)->y.HALF.HI) - gRoomControls.origin_y) >> 4) & r2) << 6);
if (GetTileType(pos, super->collisionLayer) == 0x4049) {
if (CheckPlayerInRegion(centerX, centerY, 2, 0xc) != 0) {
if (CheckPlayerInRegion(centerX, centerY - 4, 2, 4) != 0) {
gPlayerEntity.spritePriority.b0 = 3;
DoExitTransition(this->unk_7c);
gRoomTransition.armos_data.field_0xae = this->unk_80;
return TRUE;
}
} else {
SetTile(0x4022, pos, super->collisionLayer);
}
} else {
if (CheckPlayerInRegion(centerX, centerY + 6, 2, 5) != 0) {
SetTile(0x4049, COORD_TO_TILE(super), super->collisionLayer);
}
}
}
super->spritePriority.b0 = 4;
}
return FALSE;
}
void sub_080309A8(ArmosEntity* this) {
GetNextFrame(super);
src/enemy/gleerok.c
+12 -18
View File
@@ -78,7 +78,7 @@ extern void sub_0802EA48(Gleerok_HeapStruct* param_1, u32 param_2, u32 param_3,
extern void sub_0802EA68(Gleerok_HeapStruct* param_1, u32 param_2, u32 param_3, u32 param_4);
extern bool32 sub_0802E7CC(Gleerok_HeapStruct* param_1, u32 param_2, u32 param_3, u32 param_4);
extern bool32 sub_0802EA88(Gleerok_HeapStruct* param_1);
extern bool32 sub_0802E768(Gleerok_HeapStruct* param_1);
extern void sub_0802E768(Gleerok_HeapStruct* param_1);
void Gleerok_OnTick(GleerokEntity* this);
void Gleerok_OnDeath(GleerokEntity* this);
@@ -548,7 +548,7 @@ void sub_0802D7B4(GleerokEntity* this) {
sub_0802E518(this);
}
NONMATCH("asm/non_matching/gleerok/sub_0802D86C.inc", void sub_0802D86C(GleerokEntity* this)) {
void sub_0802D86C(GleerokEntity* this) {
Entity* enemy;
Entity* enemy2;
switch (super->type) {
@@ -692,14 +692,12 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D86C.inc", void sub_0802D86C(GleerokE
if (super->zVelocity > 0)
return;
enemy = CreateEnemy(GLEEROK, 4);
super->child = enemy;
if (enemy) {
enemy->parent = super->parent;
super->child = CreateEnemy(GLEEROK, 4);
if (super->child) {
super->child->parent = super->parent;
this->unk_84->ent = super->child;
((GleerokEntity*)super->child)->unk_84 = this->unk_84;
// Making super in super->child volatile solves this but ugly
CopyPosition(super, super->child);
CopyPosition(super, ((volatile Entity*)super)->child);
DeleteThisEntity();
}
@@ -710,7 +708,6 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D86C.inc", void sub_0802D86C(GleerokE
break;
}
}
END_NONMATCH
void sub_0802DB84(GleerokEntity* this) {
u32 timer;
@@ -1319,13 +1316,11 @@ NONMATCH("asm/non_matching/gleerok/sub_0802E518.inc", void sub_0802E518(GleerokE
}
END_NONMATCH
NONMATCH("asm/non_matching/gleerok/sub_0802E768.inc", bool32 sub_0802E768(Gleerok_HeapStruct* param_1)) {
void sub_0802E768(Gleerok_HeapStruct* param_1) {
u32 cVar1;
s32 bVar2;
s32 bVar2a;
u32 bVar3;
// solves regalloc
// register u32 bVar3 asm("r1");
FORCE_REGISTER(u32 bVar3, r1);
u32 bVar3a;
u32 uVar4;
s32 iVar5;
@@ -1343,8 +1338,8 @@ NONMATCH("asm/non_matching/gleerok/sub_0802E768.inc", bool32 sub_0802E768(Gleero
}
param_1->filler[uVar4].unk0.HALF.HI = bVar3;
bVar3 = param_1->filler2[uVar4].unk0.HALF.HI;
bVar2 = (bVar3 - param_1->filler2[uVar4 + 1].unk0.HALF.HI) & 0x1f;
bVar3 = param_1->filler2[(uVar4)].unk0.HALF.HI;
bVar2 = (bVar3 - param_1->filler2[(uVar4 + 1)].unk0.HALF.HI) & 0x1f;
if (bVar2 > 0x10) {
if (bVar2 <= 0x1d) {
@@ -1354,10 +1349,9 @@ NONMATCH("asm/non_matching/gleerok/sub_0802E768.inc", bool32 sub_0802E768(Gleero
bVar3 = (bVar3 - 1) & 0x1f;
}
param_1->filler2[uVar4].unk0.HALF.HI = bVar3;
param_1->filler2[(uVar4)].unk0.HALF.HI = bVar3;
}
}
END_NONMATCH
u32 sub_0802E7CC(Gleerok_HeapStruct* param_1, u32 param_2, u32 param_3, u32 param_4) {
param_1->entities[(u8)param_2]->animationState = param_1->filler[(u8)param_2].unk0.HALF.HI;
src/enemy/octorokBoss.c
+46 -2
View File
@@ -1048,8 +1048,52 @@ void sub_080369D0(OctorokBossEntity* this, s32 radius, s32 angleSpeed) {
}
/** Calculate tail angles frozen sub_08036AF0 */
ASM_FUNC("asm/non_matching/octorokBoss/sub_08036AF0.inc",
void sub_08036AF0(OctorokBossEntity* this, s32 radius, s32 angleSpeed))
void sub_08036AF0(OctorokBossEntity* this, s32 radius, s32 angleSpeed) {
s16 tmp;
OctorokBossHeap* heap;
u32 index;
heap = this->heap;
for (index = heap->tailCount - 1; index != 0; index--) {
if (angleSpeed == 0) {
if (radius >= sub_080041DC(&heap->tailObjects[index]->base, heap->tailObjects[index - 1]->base.x.HALF.HI,
heap->tailObjects[index - 1]->base.y.HALF.HI)) {
continue;
} else {
heap->tailObjects[index - 1]->angle.HALF.HI =
sub_080045DA(heap->tailObjects[index - 1]->base.x.WORD - heap->tailObjects[index]->base.x.WORD,
heap->tailObjects[index - 1]->base.y.WORD - heap->tailObjects[index]->base.y.WORD);
tmp = FixedMul(gSineTable[heap->tailObjects[index - 1]->angle.HALF.HI], radius << 4);
tmp = FixedDiv(tmp, 0x100);
heap->tailObjects[index - 1]->base.x.WORD = heap->tailObjects[index]->base.x.WORD + ((s32)tmp << 8);
tmp = FixedMul(gSineTable[heap->tailObjects[index - 1]->angle.HALF.HI + 0x40], radius << 4);
heap->tailObjects[index - 1]->base.y.WORD =
heap->tailObjects[index]->base.y.WORD - (FixedDiv(tmp, 0x100) << 8);
}
} else {
if (heap->tailObjects[index - 1]->angle.HALF.HI != heap->tailObjects[index]->angle.HALF.HI) {
if ((s8)(heap->tailObjects[index]->angle.HALF.HI - heap->tailObjects[index - 1]->angle.HALF.HI) >= 1) {
if ((s8)(heap->tailObjects[index]->angle.HALF.HI - heap->tailObjects[index - 1]->angle.HALF.HI) >
(u8)angleSpeed) {
heap->tailObjects[index - 1]->angle.HALF.HI =
heap->tailObjects[index]->angle.HALF.HI - angleSpeed;
}
} else {
if ((s8)(heap->tailObjects[index]->angle.HALF.HI - heap->tailObjects[index - 1]->angle.HALF.HI) <
(s8)-angleSpeed) {
heap->tailObjects[index - 1]->angle.HALF.HI =
heap->tailObjects[index]->angle.HALF.HI + angleSpeed;
}
}
}
tmp = FixedMul(gSineTable[heap->tailObjects[index - 1]->angle.HALF.HI], radius << 4);
heap->tailObjects[index - 1]->base.x.WORD =
heap->tailObjects[index]->base.x.WORD + (FixedDiv(tmp, 0x100) << 8);
tmp = FixedMul(gSineTable[heap->tailObjects[index - 1]->angle.HALF.HI + 0x40], radius << 4);
heap->tailObjects[index - 1]->base.y.WORD =
heap->tailObjects[index]->base.y.WORD - (FixedDiv(tmp, 0x100) << 8);
}
}
}
void OctorokBoss_SetAttackTimer(OctorokBossEntity* this) {
// These attack timers are only used if the boss isn't frozen and gRoomVars.field_0xc != 0x100
src/enemy/stalfos.c
+14 -9
View File
@@ -73,7 +73,10 @@ void Stalfos_OnTick(StalfosEntity* this) {
}
}
NONMATCH("asm/non_matching/stalfos/sub_0803933C.inc", void sub_0803933C(StalfosEntity* this)) {
void sub_0803933C(StalfosEntity* this) {
Entity* r0;
Entity* r1;
u32 r2;
if (super->hitType == 0x44) {
switch (super->contactFlags & 0x7f) {
case 4 ... 6:
@@ -87,20 +90,23 @@ NONMATCH("asm/non_matching/stalfos/sub_0803933C.inc", void sub_0803933C(StalfosE
break;
}
}
if (super->contactFlags == 0x9d) {
if (super->child == NULL) {
r2 = super->contactFlags;
if (r2 == 0x9d) {
r1 = super->child;
if (r1 == NULL) {
if (super->action < 9) {
Entity* projectile = CreateProjectileWithParent(super, STALFOS_PROJECTILE, 1);
if (projectile != NULL) {
projectile->frameIndex = super->animationState << 1;
projectile->type2 = 2;
r1 = CreateProjectileWithParent(super, STALFOS_PROJECTILE, 1);
if (r1 != NULL) {
r1->frameIndex = super->animationState << 1;
r1->type2 = 2;
EnqueueSFX(SFX_186);
}
sub_08039A48(this);
this->unk_78 += 0x5a;
}
} else {
super->child->contactFlags = 0x9d;
r0 = r1;
r0->contactFlags = r2;
EnqueueSFX(SFX_186);
super->child = NULL;
sub_08039A48(this);
@@ -113,7 +119,6 @@ NONMATCH("asm/non_matching/stalfos/sub_0803933C.inc", void sub_0803933C(StalfosE
}
EnemyFunctionHandlerAfterCollision(super, Stalfos_Functions);
}
END_NONMATCH
void sub_08039418(StalfosEntity* this) {
if (super->type == 0) {
src/npc/npc23.c
+4 -3
View File
@@ -174,8 +174,9 @@ bool32 sub_0806650C(Entity* this) {
return 1;
}
NONMATCH("asm/non_matching/npc23/sub_08066570.inc", void sub_08066570(Entity* this)) {
void sub_08066570(Entity* this) {
u32 direction;
s32 tmp;
u32 dir1, dir2;
bool32 cond;
if ((this->frame & ANIM_DONE) == 0) {
@@ -191,6 +192,7 @@ NONMATCH("asm/non_matching/npc23/sub_08066570.inc", void sub_08066570(Entity* th
dir2 = (direction & 0x18);
dir1 = (this->direction & 0x18);
tmp = 0x18;
if (dir1 == dir2) {
dir1 = (direction + 5) & 7;
dir2 = (this->direction + 5) & 7;
@@ -201,9 +203,8 @@ NONMATCH("asm/non_matching/npc23/sub_08066570.inc", void sub_08066570(Entity* th
if (cond) {
this->direction = direction;
direction += 4;
direction &= 0x18;
direction &= tmp;
direction >>= 3;
InitializeAnimation(this, direction);
}
}
END_NONMATCH
src/object/frozenOctorok.c
+83 -2
View File
@@ -40,6 +40,8 @@ void FrozenOctorok_ChangeObjPaletteOfChildren(FrozenOctorokEntity*, u32);
void sub_0809CBE4(FrozenOctorokEntity*);
void sub_0809CB70(FrozenOctorokEntity*, s32, s32);
extern const u8 gUnk_08123E1C[];
void FrozenOctorok(FrozenOctorokEntity* this) {
static void (*const FrozenOctorok_Actions[])(FrozenOctorokEntity*) = {
FrozenOctorok_Init,
@@ -162,8 +164,87 @@ const u8 gUnk_08123E1C[] = {
128,
};
ASM_FUNC("asm/non_matching/frozenOctorok/FrozenOctorok_Action1.inc",
void FrozenOctorok_Action1(FrozenOctorokEntity* this))
void FrozenOctorok_Action1(FrozenOctorokEntity* this) {
u32 tmp1;
u32 tmp2;
switch (super->type) {
case 1:
case 2:
case 3:
case 4:
SortEntityBelow(super->parent, super);
if (super->parent->subAction == 6) {
if ((s8)super->subtimer < 0) {
super->subtimer = -this->heap->unk_0;
} else {
super->subtimer = this->heap->unk_0;
}
sub_0809CBE4(this);
}
tmp1 = 0x10000 / (((FrozenOctorokEntity*)super->parent)->unk_76);
tmp1 = ((tmp1 << 0xd) >> 8);
tmp1 -= 0x2000;
if (this->heap->mouthObject->base.health == 1) {
tmp1 = 0x2200 + tmp1;
} else {
tmp1 = (tmp1 >> 1) + 0x2200;
}
tmp2 = (u8) - (((FrozenOctorokEntity*)super->parent)->unk_7b + gUnk_08123E18[super->type - 1]);
sub_0809CB70(this, tmp2, tmp1);
this->unk_7b =
((FrozenOctorokEntity*)super->parent)->unk_7b + gUnk_08123E1C[super->type - 1] + this->unk_79;
SetAffineInfo(super, this->unk_76, this->unk_74, *(u16*)&this->unk_7a);
break;
case 5:
SortEntityBelow(super->parent, super);
if ((super->parent->subAction != 4) && (super->health != 1)) {
if (0x1c < this->unk_79) {
this->unk_79--;
}
if (this->unk_76 > 0x100) {
this->unk_76--;
} else {
this->unk_76 = 0x100;
}
}
tmp1 = (0x10000 / ((FrozenOctorokEntity*)super->parent)->unk_74);
tmp1 = ((this->unk_79 << 8) * tmp1 >> 8);
tmp2 = (u8) - (((FrozenOctorokEntity*)super->parent)->unk_7b + 0x80);
sub_0809CB70(this, tmp2, tmp1);
this->unk_7b = ((FrozenOctorokEntity*)super->parent)->unk_7b;
SetAffineInfo(super, this->unk_76, this->unk_74, *(u16*)&this->unk_7a);
return;
case 0:
if (CheckFlags(OUGONTEKI_G)) {
RequestPriorityDuration(super, 0x1e);
}
FrozenOctorok_Action1SubActions[super->subAction](this);
if (super->subtimer != 0) {
if ((gRoomTransition.frameCount & 7) == 0) {
CreateSparkle(super->child);
}
if (this->unk_7e != 0) {
super->child->zVelocity = super->child->zVelocity - (s16)this->unk_7e;
super->child->z.WORD += super->child->zVelocity;
if (((super->child)->zVelocity == 0x3000) || ((super->child)->zVelocity == -0x3000)) {
this->unk_7e = -this->unk_7e;
}
}
}
SetAffineInfo(super, this->unk_76, this->unk_74, *(u16*)&this->unk_7a);
break;
case 6:
CopyPosition(super->parent, super);
SetAffineInfo(super, this->unk_76, this->unk_74, *(u16*)&this->unk_7a);
break;
case 7:
if (gRoomControls.camera_target != super) {
DeleteThisEntity();
}
break;
}
}
void FrozenOctorok_Action1SubAction0(FrozenOctorokEntity* this) {
Entity* child;
src/object/octorokBossObject.c
+4 -4
View File
@@ -146,8 +146,7 @@ void OctorokBossObject_Init(Entity* this) {
}
}
NONMATCH("asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc",
void OctorokBossObject_Action1(Entity* this)) {
void OctorokBossObject_Action1(Entity* this) {
s32 tmp_c;
u32 loop_var;
@@ -184,7 +183,7 @@ NONMATCH("asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc",
if ((u32)this->timer == GET_HELPER(this)->tailCount - 1) {
this->action = 2;
this->timer = 240;
this->direction = gUnk_0812384C[(this->type2 & 0xf) * 2] + ((u8)Random() & 0xf);
this->direction = gUnk_0812384C[(u8)((this->type2 & 0xf) * 2)] + ((u8)Random() & 0xf);
this->speed = gUnk_0812384C[(this->type2 & 0xf) * 2 + 1] + ((u16)Random() & 0x1ff);
if (this->type != 0) {
return;
@@ -233,6 +232,7 @@ NONMATCH("asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc",
*(int*)&this->field_0x78 += -1;
return;
}
GET_HELPER(this)->tailObjects[this->timer]->x = GET_HELPER(this)->tailObjects[this->timer]->x;
DeleteThisEntity();
break;
case 5:
@@ -245,6 +245,7 @@ NONMATCH("asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc",
this->field_0x76.HWORD -= 0x20;
this->field_0x74.HWORD -= 0x20;
}
SetAffineInfo(this, (u32)this->field_0x76.HWORD, (u32)(u16)this->field_0x74.HWORD,
(u32)(u16)this->field_0x7a.HWORD);
} else {
@@ -313,7 +314,6 @@ NONMATCH("asm/non_matching/octorokBossObject/OctorokBossObject_Action1.inc",
break;
}
}
END_NONMATCH
void OctorokBossObject_Action2(Entity* this) {
s32 tmp;
src/objectUtils.c
+22 -21
View File
@@ -266,52 +266,53 @@ void CreateSparkle(Entity* entity) {
}
}
NONMATCH("asm/non_matching/objectUtils/SyncPlayerToPlatform.inc",
void SyncPlayerToPlatform(Entity* this, bool32 param_2)) {
void SyncPlayerToPlatform(Entity* this, bool32 param_2) {
s16 oldValue;
s32 diff;
u16 newValue;
FORCE_REGISTER(Entity * that, r4) = this;
FORCE_REGISTER(bool32 p2, r6) = param_2;
u16 dir = that->direction;
if ((this->direction & 0x80) == 0) {
switch (this->direction >> 3) {
if ((dir & 0x80) == 0) {
switch (dir >> 3) {
case 0:
oldValue = this->y.HALF_U.HI;
LinearMoveUpdate(this);
newValue = this->y.HALF_U.HI;
oldValue = that->y.HALF_U.HI;
LinearMoveUpdate(that);
newValue = that->y.HALF_U.HI;
diff = ((oldValue - newValue) << 0x10) >> 0x10;
if ((diff != 0) && (param_2 != 0)) {
if ((diff != 0) && (p2 != 0)) {
sub_080044AE(&gPlayerEntity, diff << 8, 0);
}
break;
case 1:
oldValue = this->x.HALF_U.HI;
LinearMoveUpdate(this);
diff = ((this->x.HALF_U.HI - oldValue) * 0x10000) >> 0x10;
if ((diff != 0) && (param_2 != 0)) {
oldValue = that->x.HALF_U.HI;
LinearMoveUpdate(that);
diff = ((that->x.HALF_U.HI - oldValue) * 0x10000) >> 0x10;
if ((diff != 0) && (p2 != 0)) {
sub_080044AE(&gPlayerEntity, diff << 8, 8);
}
break;
case 2:
oldValue = this->y.HALF_U.HI;
LinearMoveUpdate(this);
diff = ((this->y.HALF_U.HI - oldValue) * 0x10000) >> 0x10;
if ((diff != 0) && (param_2 != 0)) {
oldValue = that->y.HALF_U.HI;
LinearMoveUpdate(that);
diff = ((that->y.HALF_U.HI - oldValue) * 0x10000) >> 0x10;
if ((diff != 0) && (p2 != 0)) {
sub_080044AE(&gPlayerEntity, diff << 8, 0x10);
}
break;
case 3:
oldValue = this->x.HALF_U.HI;
LinearMoveUpdate(this);
newValue = this->x.HALF_U.HI;
oldValue = that->x.HALF_U.HI;
LinearMoveUpdate(that);
newValue = that->x.HALF_U.HI;
diff = ((oldValue - newValue) << 0x10) >> 0x10;
if ((diff != 0) && (param_2 != 0)) {
if ((diff != 0) && (p2 != 0)) {
sub_080044AE(&gPlayerEntity, diff << 8, 0x18);
}
break;
}
}
}
END_NONMATCH
void UpdateRailMovement(Entity* this, u16** param_2, u16* param_3) {
u16* ptr = *param_2;
src/scroll.c
+6 -5
View File
@@ -813,20 +813,22 @@ void sub_08080C80(u32* param_1) {
sub_0807C8B0(gMapTop.mapData, gRoomControls.width >> 4, gRoomControls.height >> 4);
}
NONMATCH("asm/non_matching/scroll/sub_08080CB4.inc", void sub_08080CB4(Entity* this)) {
void sub_08080CB4(Entity* this) {
Entity* effect;
u32 tmp;
u32 tmp2;
u32 tmp3;
u32 mask;
if (this->type != this->animIndex) {
InitAnimationForceUpdate(this, this->type);
if (this->type == 0x5c) {
const KinstoneWorldEvent* ptr = &gKinstoneWorldEvents[this->type2];
this->palette.raw = ((ptr->objPalette & 0xf) << 4) | ptr->objPalette;
tmp = ptr->objPalette;
tmp2 = tmp & 0xf;
this->palette.raw = (tmp << 4) | tmp2;
}
} else {
UpdateAnimationSingleFrame(this);
if (this->spriteSettings.draw != 0) {
switch (this->type) {
@@ -857,4 +859,3 @@ NONMATCH("asm/non_matching/scroll/sub_08080CB4.inc", void sub_08080CB4(Entity* t
}
}
}
END_NONMATCH
src/ui.c
+12 -10
View File
@@ -592,27 +592,29 @@ void DrawKeys(void) {
}
}
NONMATCH("asm/non_matching/ui/CreateUIElement.inc", void CreateUIElement(u32 type, u32 type2)) {
u8 bVar1;
void CreateUIElement(u32 type, u32 type2) {
u32 index;
UIElement* new_var;
UIElement* element;
UIElementDefinition* definition;
for (index = 0; index < MAX_UI_ELEMENTS; index++) {
element = &gUnk_0200AF00.elements[index];
if (element->used == 0) {
definition = &gUIElementDefinitions[type];
element->type = (u8)type;
element = gUnk_0200AF00.elements;
element += index;
if (!element->used) {
element->type = type;
element->type2 = type2;
element->frameIndex = 0xff;
element->used = 1;
element->unk_1a = definition->unk_4;
element->buttonElementId = definition->buttonElementId;
element->unk_1a = gUIElementDefinitions[type].unk_4;
// Permuter trickery. TODO find something more senseful?
index = type;
element->buttonElementId = gUIElementDefinitions[index].buttonElementId;
return;
}
}
}
END_NONMATCH
void sub_0801CAB8(UIElement* element, Frame* frame) {
element->framePtr = frame;